Updated Norwegian bokmål translation. Same

2005-06-01  Kjartan Maraas  <kmaraas@gnome.org>

	* nb.po: Updated Norwegian bokmål translation.
	* no.po: Same

svn path=/trunk/; revision=29442

3 files changed, 6745 insertions, 6014 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 57dbe79a30..1255630f4a 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-01  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* nb.po: Updated Norwegian bokmål translation.
+	* no.po: Same
+
 2005-06-01  Adam Weinberger  <adamw@gnome.org>
 
 	* en_CA.po: Updated Canadian English translation.
diff --git a/po/nb.po b/po/nb.po
index 27b4abd3db..2ac6a3675c 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-23 15:21+0100\n"
-"PO-Revision-Date: 2005-02-23 15:26+0100\n"
+"POT-Creation-Date: 2005-06-01 15:23+0200\n"
+"PO-Revision-Date: 2005-06-01 16:07+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <i18n-nb@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:166
+#: ../a11y/addressbook/ea-minicard-view.c:169
 msgid "evolution addressbook"
 msgstr "evolution adressebok"
 
@@ -31,7 +31,7 @@ msgstr "Ny kontakt"
 msgid "New Contact List"
 msgstr "Ny kontaktliste"
 
-#: ../a11y/addressbook/ea-minicard-view.c:149
+#: ../a11y/addressbook/ea-minicard-view.c:152
 #, c-format
 msgid "current addressbook folder has %d card"
 msgid_plural "current addressbook folder has %d cards"
@@ -39,20 +39,20 @@ msgstr[0] "aktiv adressebokmappe har %d kontakt"
 msgstr[1] "aktiv adressebokmappe har %d kontakter"
 
 #: ../a11y/addressbook/ea-minicard.c:31
-#: ../calendar/gui/alarm-notify/alarm-queue.c:863
-#: ../ui/evolution-message-composer.xml.h:10
+#: ../calendar/gui/alarm-notify/alarm-queue.c:953
+#: ../ui/evolution-message-composer.xml.h:11
 msgid "Open"
 msgstr "Åpne"
 
-#: ../a11y/addressbook/ea-minicard.c:138
+#: ../a11y/addressbook/ea-minicard.c:141
 msgid "Contact List: "
 msgstr "Kontaktliste: "
 
-#: ../a11y/addressbook/ea-minicard.c:139
+#: ../a11y/addressbook/ea-minicard.c:142
 msgid "Contact: "
 msgstr "Kontakt: "
 
-#: ../a11y/addressbook/ea-minicard.c:165
+#: ../a11y/addressbook/ea-minicard.c:168
 msgid "evolution minicard"
 msgstr "evolution minikort"
 
@@ -93,7 +93,7 @@ msgstr "Ny avtale"
 msgid "New All Day Event"
 msgstr "Ny avtale som varer hele dagen"
 
-#: ../a11y/calendar/ea-cal-view.c:308 ../calendar/gui/e-calendar-view.c:1372
+#: ../a11y/calendar/ea-cal-view.c:308 ../calendar/gui/e-calendar-view.c:1396
 msgid "New Meeting"
 msgstr "Nytt møte"
 
@@ -152,7 +152,7 @@ msgstr "%A %d %b %Y"
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:190
 #: ../calendar/gui/calendar-component.c:663
-#: ../calendar/gui/e-day-view-top-item.c:719 ../calendar/gui/e-day-view.c:1511
+#: ../calendar/gui/e-day-view-top-item.c:719 ../calendar/gui/e-day-view.c:1516
 #: ../calendar/gui/e-week-view-main-item.c:321
 msgid "%a %d %b"
 msgstr "%a %d %b"
@@ -184,7 +184,7 @@ msgstr "%d %b %Y"
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:220
 #: ../calendar/gui/calendar-component.c:689
-#: ../calendar/gui/e-day-view-top-item.c:723 ../calendar/gui/e-day-view.c:1527
+#: ../calendar/gui/e-day-view-top-item.c:723 ../calendar/gui/e-day-view.c:1532
 #: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%d %b"
 msgstr "%d %b"
@@ -229,17 +229,17 @@ msgstr "kalendervisning for en måned"
 msgid "calendar view for one or more weeks"
 msgstr "kalendervisning for en eller flere uker"
 
-#: ../a11y/widgets/ea-calendar-item.c:290
 #: ../a11y/widgets/ea-calendar-item.c:296
+#: ../a11y/widgets/ea-calendar-item.c:302
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
-#: ../a11y/widgets/ea-calendar-item.c:298
+#: ../a11y/widgets/ea-calendar-item.c:304
 #, c-format
 msgid "Calendar: from %s to %s"
 msgstr "Kalender (fra %s til %s)"
 
-#: ../a11y/widgets/ea-calendar-item.c:333
+#: ../a11y/widgets/ea-calendar-item.c:339
 msgid "evolution calendar item"
 msgstr "Evolution kalenderoppføring"
 
@@ -255,212 +255,163 @@ msgstr "Bruk forvalg"
 msgid "Popup Menu"
 msgstr "Sprettoppmeny"
 
-#. addressbook:ldap-init primary
-#: ../addressbook/addressbook-errors.xml.h:2
-msgid "This addressbook could not be opened."
-msgstr "Denne adresseboken kunne ikke åpnes."
-
-#. addressbook:ldap-init secondary
-#: ../addressbook/addressbook-errors.xml.h:4
+#: ../addressbook/addressbook.error.xml.h:1
 msgid ""
-"This addressbook server might be unreachable or the server name may be "
-"misspelled or your network connection could be down."
+"A contact already exists with this address. Would you like to add a new card "
+"with the same address anyway?"
 msgstr ""
+"En kontakt med denne adressen eksisterer allerede. Vil du legge til en ny "
+"kontakt med samme adresse likevel?"
 
-#. addressbook:ldap-auth primary
-#: ../addressbook/addressbook-errors.xml.h:6
-msgid "Failed to authenticate with LDAP server."
-msgstr "Kunne ikke autentisere mot LDAP-tjener."
+#: ../addressbook/addressbook.error.xml.h:2
+msgid "Address '{0}' already exists."
+msgstr "Adressen «{0}» eksisterer allerede."
+
+#: ../addressbook/addressbook.error.xml.h:3
+msgid "Cannot move contact."
+msgstr "Kan ikke flytte kontakt."
 
-#. addressbook:ldap-auth secondary
-#: ../addressbook/addressbook-errors.xml.h:8
+#: ../addressbook/addressbook.error.xml.h:4
+msgid "Category editor not available."
+msgstr "Kategori editor ikke tilgjengelig."
+
+#: ../addressbook/addressbook.error.xml.h:5
 msgid ""
 "Check to make sure your password is spelled correctly and that you are using "
 "a supported login method. Remember that many passwords are case sensitive; "
 "your caps lock might be on."
 msgstr ""
 
-#. addressbook:ldap-search-base primary
-#: ../addressbook/addressbook-errors.xml.h:10
-msgid "This addressbook server does not have any suggested search bases."
-msgstr "Denne adresseboktjeneren har ingen foreslått søkebase."
-
-#. addressbook:ldap-search-base secondary
-#: ../addressbook/addressbook-errors.xml.h:12
-msgid ""
-"This LDAP server may use an older version of LDAP, which does not support "
-"this functionality or it may be misconfigured. Ask your administrator for "
-"supported search bases."
-msgstr ""
-
-#. addressbook:ldap-v3-schema primary
-#: ../addressbook/addressbook-errors.xml.h:14
-msgid "This server does not support LDAPv3 schema information."
-msgstr "Denne tjeneren støtter ikke LDAPv3 schema-informasjon."
-
-#. addressbook:ldap-get-schema primary
-#: ../addressbook/addressbook-errors.xml.h:16
+#: ../addressbook/addressbook.error.xml.h:6
 msgid "Could not get schema information for LDAP server."
 msgstr "Kunne ikke hente schema-informasjon fra LDAP-tjener."
 
-#. addressbook:ldap-invalid-schema primary
-#: ../addressbook/addressbook-errors.xml.h:18
-msgid "LDAP server did not respond with valid schema information."
-msgstr "LDAP-tjener svarte ikke med gyldig schema-informasjon."
-
-#. addressbook:remove-addressbook primary
-#: ../addressbook/addressbook-errors.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:7
 msgid "Could not remove addressbook."
 msgstr "Kunne ikke fjerne adressebok."
 
-#. addressbook:ask-delete-addressbook primary
-#: ../addressbook/addressbook-errors.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:8
 msgid "Delete address book '{0}'?"
 msgstr "Slett adressebok «{0}»?"
 
-#. addressbook:ask-delete-addressbook secondary
-#: ../addressbook/addressbook-errors.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:9
+msgid "Error loading addressbook."
+msgstr "Feil under lasting av adressebok."
+
+#: ../addressbook/addressbook.error.xml.h:10
+msgid "Error saving {0} to {1}: {2}"
+msgstr "Feil under lagring av {0} til {1}: {2}"
+
+#: ../addressbook/addressbook.error.xml.h:11
+msgid "Failed to authenticate with LDAP server."
+msgstr "Kunne ikke autentisere mot LDAP-tjener."
+
+#: ../addressbook/addressbook.error.xml.h:12
+msgid "LDAP server did not respond with valid schema information."
+msgstr "LDAP-tjener svarte ikke med gyldig schema-informasjon."
+
+#: ../addressbook/addressbook.error.xml.h:13
+msgid "Server Version"
+msgstr "Versjon av tjener"
+
+#: ../addressbook/addressbook.error.xml.h:14
+#: ../calendar/calendar.error.xml.h:44
+msgid "Some features may not work properly with your current server"
+msgstr "Noen funksjoner vil kanskje ikke fungere med denne tjeneren "
+
+#: ../addressbook/addressbook.error.xml.h:15
+msgid "The Evolution addressbook has quit unexpectedly."
+msgstr "Evolution adressebok avsluttet uventet."
+
+#: ../addressbook/addressbook.error.xml.h:16
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "This address book will be removed permanently."
 msgstr "Denne adresseboken vil bli slettet for godt."
 
-#. addressbook:edit-categories primary
-#: ../addressbook/addressbook-errors.xml.h:26
-msgid "Category editor not available."
-msgstr "Kategori editor ikke tilgjengelig."
+#: ../addressbook/addressbook.error.xml.h:18
+msgid "This addressbook could not be opened."
+msgstr "Denne adresseboken kunne ikke åpnes."
 
-#. addressbook:generic-error primary
-#. addressbook:load-error secondary
-#. addressbook:search-error secondary
-#. mail:session-message-info secondary
-#. mail:session-message-info-cancel secondary
-#. mail:session-message-warning secondary
-#. mail:session-message-warning-cancel secondary
-#. mail:session-message-error secondary
-#. mail:session-message-error-cancel secondary
-#. mail:ask-session-password secondary
-#. mail:filter-load-error secondary
-#: ../addressbook/addressbook-errors.xml.h:28
-#: ../addressbook/addressbook-errors.xml.h:36
-#: ../addressbook/addressbook-errors.xml.h:40 ../mail/mail-errors.xml.h:75
-#: ../mail/mail-errors.xml.h:77 ../mail/mail-errors.xml.h:79
-#: ../mail/mail-errors.xml.h:81 ../mail/mail-errors.xml.h:83
-#: ../mail/mail-errors.xml.h:85 ../mail/mail-errors.xml.h:89
-#: ../mail/mail-errors.xml.h:93
-msgid "{0}"
-msgstr "{0}"
+#: ../addressbook/addressbook.error.xml.h:19
+msgid "This addressbook server does not have any suggested search bases."
+msgstr "Denne adresseboktjeneren har ingen foreslått søkebase."
 
-#. addressbook:generic-error secondary
-#. mail-composer:no-attach secondary
-#. mail:no-save-path secondary
-#: ../addressbook/addressbook-errors.xml.h:30
-#: ../composer/mail-composer-errors.xml.h:4 ../mail/mail-errors.xml.h:97
-msgid "{1}"
-msgstr "{1}"
+#: ../addressbook/addressbook.error.xml.h:20
+msgid ""
+"This addressbook server might be unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
 
-#. addressbook:load-error title
-#: ../addressbook/addressbook-errors.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:21
+msgid "This server does not support LDAPv3 schema information."
+msgstr "Denne tjeneren støtter ikke LDAPv3 schema-informasjon."
+
+#: ../addressbook/addressbook.error.xml.h:22
 msgid "Unable to open addressbook"
 msgstr "Kan ikke åpne adressebok"
 
-#. addressbook:load-error primary
-#: ../addressbook/addressbook-errors.xml.h:34
-msgid "Error loading addressbook."
-msgstr "Feil under lasting av adressebok."
-
-#. addressbook:search-error primary
-#: ../addressbook/addressbook-errors.xml.h:38
+#: ../addressbook/addressbook.error.xml.h:23
 msgid "Unable to perform search."
 msgstr "Kan ikke utføre søk."
 
-#. addressbook:prompt-save primary
-#: ../addressbook/addressbook-errors.xml.h:42
+#: ../addressbook/addressbook.error.xml.h:24
+msgid "Unable to save {0}."
+msgstr "Kan ikke lagre {0}."
+
+#: ../addressbook/addressbook.error.xml.h:25
 msgid "Would you like to save your changes?"
 msgstr "Vil du lagre dine endringer?"
 
-#. addressbook:prompt-save secondary
-#: ../addressbook/addressbook-errors.xml.h:44
-msgid ""
-"You have made modifications to this contact. Do you want to save these "
-"changes?"
-msgstr ""
-"Du har gjort endringer for denne kontakten. Vil du lagre disse endringene?"
-
-#: ../addressbook/addressbook-errors.xml.h:45
-msgid "_Discard"
-msgstr "_Forkast"
-
-#. addressbook:prompt-move primary
-#: ../addressbook/addressbook-errors.xml.h:47
-msgid "Cannot move contact."
-msgstr "Kan ikke flytte kontakt."
-
-#. addressbook:prompt-move secondary
-#: ../addressbook/addressbook-errors.xml.h:49
+#: ../addressbook/addressbook.error.xml.h:26
 msgid ""
 "You are attempting to move a contact from one addressbook to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
 msgstr ""
 
-#. addressbook:save-error primary
-#: ../addressbook/addressbook-errors.xml.h:51
-msgid "Unable to save contact(s)."
-msgstr "Kan ikke lagre kontakt(er)."
-
-#. addressbook:save-error secondary
-#: ../addressbook/addressbook-errors.xml.h:53
-msgid "Error saving contacts to {0}: {1}"
-msgstr "Feil under lagring av kontakter til {0}: {1}"
+#: ../addressbook/addressbook.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:59
+msgid ""
+"You are connecting to an unsupported GroupWise server and may encounter "
+"problems using Evolution. For best results the server should be upgraded to "
+"a supported version"
+msgstr ""
 
-#. addressbook:backend-died primary
-#: ../addressbook/addressbook-errors.xml.h:55
-msgid "The Evolution addressbook has quit unexpectedly."
-msgstr "Evolution adressebok avsluttet uventet."
+#: ../addressbook/addressbook.error.xml.h:28
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr ""
+"Du har gjort endringer for denne kontakten. Vil du lagre disse endringene?"
 
-#. addressbook:backend-died secondary
-#: ../addressbook/addressbook-errors.xml.h:57
+#: ../addressbook/addressbook.error.xml.h:29
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
 "Dine kontakter for {0} vil ikke være tilgjengelige før Evolution startes på "
 "nytt."
 
-#. addressbook:ask-list-add-exists primary
-#: ../addressbook/addressbook-errors.xml.h:59
-msgid "Address '{0}' already exists."
-msgstr "Adressen «{0}» eksisterer allerede."
-
-#. addressbook:ask-list-add-exists secondary
-#: ../addressbook/addressbook-errors.xml.h:61
-msgid ""
-"A contact already exists with this address.  Would you like to add a new "
-"card with the same address anyway?"
-msgstr ""
-"En kontakt med denne adressen eksisterer allerede. Vil du legge til en ny "
-"kontakt med samme adresse likevel?"
-
-#: ../addressbook/addressbook-errors.xml.h:62 ../mail/em-vfolder-rule.c:494
-#: ../plugins/shared-folder/properties.glade.h:10
+#: ../addressbook/addressbook.error.xml.h:30 ../mail/em-vfolder-rule.c:494
+#: ../plugins/groupwise-features/properties.glade.h:10
 msgid "_Add"
 msgstr "_Legg til"
 
-#. addressbook:server-version title
-#. calendar:server-version title
-#: ../addressbook/addressbook-errors.xml.h:64
-#: ../calendar/calendar-errors.xml.h:142
-msgid "Server Version"
-msgstr "Versjon av tjener"
+#: ../addressbook/addressbook.error.xml.h:31
+msgid "_Discard"
+msgstr "_Forkast"
 
-#. addressbook:server-version primary
-#. calendar:server-version primary
-#: ../addressbook/addressbook-errors.xml.h:66
-#: ../calendar/calendar-errors.xml.h:144
-msgid "Your server needs to be updated"
-msgstr "Tjeneren din må oppdateres"
+#: ../addressbook/addressbook.error.xml.h:32
+msgid "{0}"
+msgstr "{0}"
 
-#. addressbook:server-version secondary
-#: ../addressbook/addressbook-errors.xml.h:68
-msgid "Some features may not work correctly with your current server version"
-msgstr ""
+#: ../addressbook/addressbook.error.xml.h:33
+msgid "{1}"
+msgstr "{1}"
 
 #: ../addressbook/conduit/address-conduit.c:298
 msgid "Default Sync Address:"
@@ -495,7 +446,7 @@ msgstr "Konfigurer automatisk fullføring her"
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
 #: ../addressbook/gui/component/addressbook-view.c:1119
-#: ../calendar/gui/calendar-component.c:235 ../calendar/gui/migration.c:385
+#: ../calendar/gui/calendar-component.c:246 ../calendar/gui/migration.c:388
 msgid "Contacts"
 msgstr "Kontakter"
 
@@ -535,10 +486,10 @@ msgstr "Håndter dine S/MIME-sertifikater her"
 #. On This Computer is always first and vFolders is always last
 #: ../addressbook/gui/component/addressbook-component.c:133
 #: ../addressbook/gui/component/addressbook-migrate.c:493
-#: ../calendar/gui/calendar-component.c:208 ../calendar/gui/migration.c:459
-#: ../calendar/gui/migration.c:552 ../calendar/gui/tasks-component.c:188
+#: ../calendar/gui/calendar-component.c:208 ../calendar/gui/migration.c:462
+#: ../calendar/gui/migration.c:555 ../calendar/gui/tasks-component.c:188
 #: ../mail/em-folder-tree-model.c:197 ../mail/em-folder-tree-model.c:199
-#: ../mail/mail-component.c:290 ../mail/mail-vfolder.c:222
+#: ../mail/mail-component.c:291 ../mail/mail-vfolder.c:223
 msgid "On This Computer"
 msgstr "På denne datamaskinen"
 
@@ -550,10 +501,10 @@ msgstr "På denne datamaskinen"
 #: ../addressbook/gui/component/addressbook-component.c:141
 #: ../addressbook/gui/component/addressbook-migrate.c:501
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: ../calendar/gui/calendar-component.c:216 ../calendar/gui/migration.c:467
-#: ../calendar/gui/migration.c:560 ../calendar/gui/tasks-component.c:196
-#: ../filter/filter-label.c:123 ../mail/em-migrate.c:1013
-#: ../mail/mail-config.c:77 ../mail/mail-config.glade.h:101
+#: ../calendar/gui/calendar-component.c:216 ../calendar/gui/migration.c:470
+#: ../calendar/gui/migration.c:563 ../calendar/gui/tasks-component.c:196
+#: ../filter/filter-label.c:123 ../mail/em-migrate.c:1043
+#: ../mail/mail-config.c:78 ../mail/mail-config.glade.h:104
 msgid "Personal"
 msgstr "Personlig"
 
@@ -580,7 +531,7 @@ msgid "Create a new contact list"
 msgstr "Opprett en ny kontaktliste"
 
 #: ../addressbook/gui/component/addressbook-component.c:212
-#: ../addressbook/gui/component/addressbook-config.c:1121
+#: ../addressbook/gui/component/addressbook-config.c:1120
 #: ../addressbook/gui/component/addressbook-view.c:757
 msgid "New Address Book"
 msgstr "Ny adressebok"
@@ -602,7 +553,7 @@ msgid "Base"
 msgstr "Basis"
 
 #: ../addressbook/gui/component/addressbook-config.c:510
-#: ../calendar/gui/dialogs/calendar-setup.c:191
+#: ../calendar/gui/dialogs/calendar-setup.c:192
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "_Type:"
 msgstr "_Type:"
@@ -614,10 +565,10 @@ msgstr "Kopier innholdet i adresseboken lokalt for frakoblet operasjon"
 #: ../addressbook/gui/component/addressbook-config.c:904
 #: ../addressbook/gui/component/ldap-config.glade.h:23
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: ../calendar/gui/dialogs/calendar-setup.c:361
-#: ../calendar/gui/dialogs/calendar-setup.c:372
-#: ../mail/em-folder-properties.c:215 ../mail/mail-config.glade.h:84
-#: ../smime/gui/smime-ui.glade.h:27
+#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/dialogs/calendar-setup.c:379
+#: ../mail/em-folder-properties.c:215 ../mail/mail-config.glade.h:85
+#: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Generelt"
 
@@ -636,7 +587,7 @@ msgstr "Autentisering"
 
 #: ../addressbook/gui/component/addressbook-config.c:914
 #: ../addressbook/gui/component/ldap-config.glade.h:18
-#: ../mail/mail-dialogs.glade.h:12 ../smime/gui/smime-ui.glade.h:19
+#: ../mail/mail-dialogs.glade.h:8 ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Detaljer"
 
@@ -648,18 +599,18 @@ msgstr "Søker"
 msgid "Downloading"
 msgstr "Laster ned"
 
-#: ../addressbook/gui/component/addressbook-config.c:1119
+#: ../addressbook/gui/component/addressbook-config.c:1118
 #: ../addressbook/gui/component/ldap-config.glade.h:14
 msgid "Address Book Properties"
 msgstr "Egenskaper for adressebok"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:72
-#: ../calendar/gui/migration.c:142 ../mail/em-migrate.c:1160
+#: ../calendar/gui/migration.c:142 ../mail/em-migrate.c:1190
 msgid "Migrating..."
 msgstr "Migrerer..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:124
-#: ../calendar/gui/migration.c:189 ../mail/em-migrate.c:1201
+#: ../calendar/gui/migration.c:189 ../mail/em-migrate.c:1231
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Migrerer «%s»:"
@@ -715,17 +666,17 @@ msgstr ""
 "Vennligst vent mens Evolution migrerer dine mapper..."
 
 #: ../addressbook/gui/component/addressbook-view.c:758
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
-#: ../calendar/gui/calendar-component.c:526
-#: ../calendar/gui/tasks-component.c:430 ../mail/em-filter-i18n.h:11
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../calendar/gui/calendar-component.c:537
+#: ../calendar/gui/tasks-component.c:441 ../mail/em-filter-i18n.h:11
 #: ../ui/evolution-addressbook.xml.h:8 ../ui/evolution-calendar.xml.h:5
-#: ../ui/evolution-mail-message.xml.h:24 ../ui/evolution-tasks.xml.h:6
+#: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Slett"
 
 #: ../addressbook/gui/component/addressbook-view.c:760
-#: ../calendar/gui/calendar-component.c:527
-#: ../calendar/gui/tasks-component.c:431
+#: ../calendar/gui/calendar-component.c:538
+#: ../calendar/gui/tasks-component.c:442
 msgid "Properties..."
 msgstr "Egenskaper ..."
 
@@ -733,17 +684,17 @@ msgstr "Egenskaper ..."
 msgid "Contact Source Selector"
 msgstr "Valg av kontaktkilde"
 
-#: ../addressbook/gui/component/addressbook.c:98
+#: ../addressbook/gui/component/addressbook.c:99
 msgid "Accessing LDAP Server anonymously"
 msgstr "Aksesserer LDAP-tjener anonymt"
 
 #: ../addressbook/gui/component/addressbook.c:193
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:478
+#: ../plugins/groupwise-features/camel-gw-listener.c:478
 msgid "Failed to authenticate.\n"
 msgstr "Kunne ikke autentisere.\n"
 
 #: ../addressbook/gui/component/addressbook.c:200
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:461
+#: ../plugins/groupwise-features/camel-gw-listener.c:461
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Oppgi passord for %s (bruker %s)"
@@ -786,7 +737,7 @@ msgid "URI for the folder last used in the select names dialog."
 msgstr "URI for sist brukt mappe i dialogen for å velge navn."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
 msgid "Vertical pane position"
 msgstr ""
 
@@ -809,8 +760,8 @@ msgstr "Om forhåndsvisningsområdet skal vises."
 #: ../calendar/gui/dialogs/new-task-list.glade.h:1
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: ../composer/e-msg-composer-attachment.glade.h:1
-#: ../mail/mail-dialogs.glade.h:6 ../mail/message-tags.glade.h:1
-#: ../plugins/shared-folder/properties.glade.h:1
+#: ../mail/mail-dialogs.glade.h:2 ../mail/message-tags.glade.h:1
+#: ../plugins/groupwise-features/properties.glade.h:1
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
@@ -865,7 +816,7 @@ msgid "Add Address Book"
 msgstr "Legg til adressebok"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:15
-#: ../mail/em-account-editor.c:301
+#: ../mail/em-account-editor.c:302 ../mail/em-account-editor.c:757
 msgid "Always"
 msgstr "Alltid"
 
@@ -900,7 +851,7 @@ msgid "Lo_gin:"
 msgstr "Lo_gin"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:299
+#: ../mail/em-account-editor.c:300 ../mail/em-account-editor.c:756
 msgid "Never"
 msgstr "Aldri"
 
@@ -1022,7 +973,7 @@ msgid "Using email address"
 msgstr "Bruker e-post adresse"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:42
-#: ../mail/em-account-editor.c:300
+#: ../mail/em-account-editor.c:301
 msgid "Whenever Possible"
 msgstr "Når mulig"
 
@@ -1039,13 +990,13 @@ msgid "_Find Possible Search Bases"
 msgstr "_Finn mulige søkebaser"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:46
-msgid "_Log in method:"
+msgid "_Login method:"
 msgstr "Metode for på_logging:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:47
-#: ../calendar/gui/dialogs/calendar-setup.c:243
+#: ../calendar/gui/dialogs/calendar-setup.c:244
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:8
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:165
 msgid "_Name:"
 msgstr "_Navn:"
 
@@ -1074,10 +1025,10 @@ msgid "cards"
 msgstr "kort"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:54
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:12
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:14
-#: ../filter/filter.glade.h:16 ../mail/em-account-editor.c:1884
+#: ../filter/filter.glade.h:16 ../mail/em-account-editor.c:1940
 #: ../plugins/calendar-http/calendar-http.c:263
 #: ../plugins/calendar-weather/calendar-weather.c:564
 msgid "minutes"
@@ -1121,7 +1072,7 @@ msgstr "<b>Arbeid</b> "
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:182
-#: ../addressbook/gui/widgets/eab-contact-display.c:346
+#: ../addressbook/gui/widgets/eab-contact-display.c:348
 msgid "AIM"
 msgstr "AIM"
 
@@ -1176,8 +1127,8 @@ msgstr "Telefon"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:235
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:199
-#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1012
-#: ../mail/mail-config.c:76 ../mail/mail-config.glade.h:148
+#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1042
+#: ../mail/mail-config.c:77 ../mail/mail-config.glade.h:153
 msgid "Work"
 msgstr "Arbeid"
 
@@ -1292,8 +1243,8 @@ msgid "_Zip/Postal Code:"
 msgstr "_Zip/postnummer:"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: ../addressbook/gui/widgets/eab-contact-display.c:365
-#: ../addressbook/gui/widgets/eab-contact-display.c:380
+#: ../addressbook/gui/widgets/eab-contact-display.c:367
+#: ../addressbook/gui/widgets/eab-contact-display.c:382
 msgid "Address"
 msgstr "Adresse"
 
@@ -1305,7 +1256,7 @@ msgstr "Adresse"
 #: ../addressbook/gui/widgets/e-addressbook-model.c:310
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
 #: ../addressbook/gui/widgets/e-minicard-view.c:519
 #: ../addressbook/gui/widgets/e-minicard.c:174
 msgid "Editable"
@@ -2291,7 +2242,7 @@ msgstr "AOL øyeblikksmeldinger"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:183
-#: ../addressbook/gui/widgets/eab-contact-display.c:349
+#: ../addressbook/gui/widgets/eab-contact-display.c:351
 msgid "Jabber"
 msgstr "Jabber"
 
@@ -2301,7 +2252,7 @@ msgstr "Yahoo Messenger"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:348
+#: ../addressbook/gui/widgets/eab-contact-display.c:350
 msgid "ICQ"
 msgstr "ICQ"
 
@@ -2312,6 +2263,7 @@ msgstr "Tjeneste"
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:127
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:587
 #: ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../plugins/save-calendar/csv-format.c:400
 msgid "Location"
 msgstr "Lokasjon"
 
@@ -2330,17 +2282,17 @@ msgid "Other"
 msgstr "Andre"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:184
-#: ../addressbook/gui/widgets/eab-contact-display.c:351
+#: ../addressbook/gui/widgets/eab-contact-display.c:353
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:185
-#: ../addressbook/gui/widgets/eab-contact-display.c:350
+#: ../addressbook/gui/widgets/eab-contact-display.c:352
 msgid "MSN"
 msgstr "MSN"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:187
-#: ../addressbook/gui/widgets/eab-contact-display.c:347
+#: ../addressbook/gui/widgets/eab-contact-display.c:349
 msgid "GroupWise"
 msgstr "GroupWise"
 
@@ -2404,21 +2356,39 @@ msgstr "_Fullt navn:"
 msgid "E-_mail:"
 msgstr "E-_post:"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:324
+#: ../addressbook/gui/contact-editor/eab-editor.c:323
+#, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete these contacts?"
+"to delete contact list (%s) ?"
 msgstr ""
 "Er du sikker på at du vil\n"
-"slette disse kontaktene?"
+"slette kontaktliste (%s)?"
+
+#: ../addressbook/gui/contact-editor/eab-editor.c:326
+msgid ""
+"Are you sure you want\n"
+"to delete these contact lists?"
+msgstr ""
+"Er du sikker på at du vil\n"
+"slette disse kontaktlistene?"
+
+#: ../addressbook/gui/contact-editor/eab-editor.c:331
+#, c-format
+msgid ""
+"Are you sure you want\n"
+"to delete contact (%s) ?"
+msgstr ""
+"Er du sikker på at du vil\n"
+"slette kontakt (%s)?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:327
+#: ../addressbook/gui/contact-editor/eab-editor.c:334
 msgid ""
 "Are you sure you want\n"
-"to delete this contact?"
+"to delete these contacts?"
 msgstr ""
 "Er du sikker på at du vil\n"
-"slette denne kontakten?"
+"slette disse kontaktene?"
 
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
@@ -2536,7 +2506,7 @@ msgid "Contact List Editor"
 msgstr "Kontaktlisteredigering"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-msgid "Insert email adresses from Adress Book"
+msgid "Insert email addresses from Address Book"
 msgstr "Sett inn e-postadresser fra adresseboken"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
@@ -2567,7 +2537,7 @@ msgstr "_Skriv en e-post adresse eller dra en kontakt inn i feltet under:"
 #: ../addressbook/gui/widgets/e-addressbook-model.c:296
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
 #: ../addressbook/gui/widgets/e-addressbook-view.c:223
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
 #: ../addressbook/gui/widgets/e-minicard-view.c:505
 msgid "Book"
 msgstr "Bok"
@@ -2641,7 +2611,7 @@ msgstr[1] "%d kontakter"
 #: ../addressbook/gui/widgets/e-addressbook-model.c:303
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
 #: ../addressbook/gui/widgets/e-addressbook-view.c:237
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
 #: ../addressbook/gui/widgets/e-minicard-view.c:512
 msgid "Query"
 msgstr "Spør"
@@ -2689,78 +2659,78 @@ msgstr "Kilde"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:244
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-meeting-list-view.c:319
+#: ../calendar/gui/e-meeting-list-view.c:320
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Type"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:541
+#: ../addressbook/gui/widgets/e-addressbook-view.c:551
 msgid "Address Book"
 msgstr "Adressebok"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:804
-#: ../addressbook/gui/widgets/e-addressbook-view.c:922
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1982
+#: ../addressbook/gui/widgets/e-addressbook-view.c:814
+#: ../addressbook/gui/widgets/e-addressbook-view.c:932
+#: ../addressbook/gui/widgets/e-addressbook-view.c:2008
 #: ../ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard..."
 msgstr "Lagre som VCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:918
+#: ../addressbook/gui/widgets/e-addressbook-view.c:928
 msgid "New Contact..."
 msgstr "Ny kontakt..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:919
+#: ../addressbook/gui/widgets/e-addressbook-view.c:929
 msgid "New Contact List..."
 msgstr "Ny kontaktliste..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:923
+#: ../addressbook/gui/widgets/e-addressbook-view.c:933
 #: ../ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Videresend kontakt"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:924
+#: ../addressbook/gui/widgets/e-addressbook-view.c:934
 msgid "Send Message to Contact"
 msgstr "Send melding til kontakt"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:925
-#: ../calendar/gui/calendar-commands.c:120 ../calendar/gui/print.c:2489
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
+#: ../calendar/gui/calendar-commands.c:120 ../calendar/gui/print.c:2501
 #: ../ui/evolution-addressbook.xml.h:16 ../ui/evolution-calendar.xml.h:19
-#: ../ui/evolution-mail-message.xml.h:80 ../ui/evolution-tasks.xml.h:14
+#: ../ui/evolution-mail-message.xml.h:74 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Skriv ut"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:928
+#: ../addressbook/gui/widgets/e-addressbook-view.c:938
 msgid "Copy to Address Book..."
 msgstr "Kopier til adressebok..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:929
+#: ../addressbook/gui/widgets/e-addressbook-view.c:939
 msgid "Move to Address Book..."
 msgstr "Flytt til adressebok..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:932
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 #: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Klipp ut"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:933
-#: ../calendar/gui/calendar-component.c:525
-#: ../calendar/gui/tasks-component.c:429 ../ui/evolution-addressbook.xml.h:2
-#: ../ui/evolution-mail-message.xml.h:9 ../ui/evolution-tasks.xml.h:2
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../calendar/gui/calendar-component.c:536
+#: ../calendar/gui/tasks-component.c:440 ../ui/evolution-addressbook.xml.h:2
+#: ../ui/evolution-mail-message.xml.h:11 ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopier"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:934
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 #: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Lim inn"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1537
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1547
 #: ../calendar/gui/cal-search-bar.c:346
 msgid "Any Category"
 msgstr "Enhver kategori"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1750
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1760
 msgid "Print cards"
 msgstr "Skriv ut kontakter"
 
@@ -2804,7 +2774,7 @@ msgid "Company Phone"
 msgstr "Firmatelefon"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: ../addressbook/gui/widgets/eab-contact-display.c:560
+#: ../addressbook/gui/widgets/eab-contact-display.c:562
 #: ../smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "E-post"
@@ -2856,7 +2826,7 @@ msgid "Manager"
 msgstr "Leder"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:379
+#: ../addressbook/gui/widgets/eab-contact-display.c:381
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
@@ -2865,7 +2835,7 @@ msgid "Nickname"
 msgstr "Kallenavn"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:390
+#: ../addressbook/gui/widgets/eab-contact-display.c:392
 msgid "Note"
 msgstr "Kommentar"
 
@@ -2874,7 +2844,7 @@ msgid "Office"
 msgstr "Kontor"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: ../addressbook/gui/widgets/eab-contact-display.c:360
+#: ../addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Organization"
 msgstr "Organisasjon"
 
@@ -2900,7 +2870,7 @@ msgstr "Radio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:9
-#: ../calendar/gui/e-meeting-list-view.c:326
+#: ../calendar/gui/e-meeting-list-view.c:327
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Rolle"
@@ -2966,7 +2936,7 @@ msgstr "Tekstmodell"
 msgid "Max field name length"
 msgstr "Maksimal lengde på feltnavn"
 
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:126
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:128
 msgid "Column Width"
 msgstr "Kolonnebredde"
 
@@ -3030,65 +3000,65 @@ msgstr "Valgt"
 msgid "Has Cursor"
 msgstr "Har markør"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:133
-#: ../addressbook/gui/widgets/eab-contact-display.c:196
+#: ../addressbook/gui/widgets/eab-contact-display.c:135
+#: ../addressbook/gui/widgets/eab-contact-display.c:198
 msgid "(map)"
 msgstr "(kart)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:143
-#: ../addressbook/gui/widgets/eab-contact-display.c:209
+#: ../addressbook/gui/widgets/eab-contact-display.c:145
+#: ../addressbook/gui/widgets/eab-contact-display.c:211
 msgid "map"
 msgstr "kart"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:274
-#: ../addressbook/gui/widgets/eab-contact-display.c:541
+#: ../addressbook/gui/widgets/eab-contact-display.c:276
+#: ../addressbook/gui/widgets/eab-contact-display.c:543
 msgid "List Members"
 msgstr "Listemedlemmer"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:337
 #: ../addressbook/gui/widgets/eab-contact-display.c:339
+#: ../addressbook/gui/widgets/eab-contact-display.c:341
 msgid "E-mail"
 msgstr "E-post"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:361
+#: ../addressbook/gui/widgets/eab-contact-display.c:363
 msgid "Position"
 msgstr "Stilling"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:362
+#: ../addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Video Conferencing"
 msgstr "Videokonferanse"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:363
-#: ../addressbook/gui/widgets/eab-contact-display.c:378
+#: ../addressbook/gui/widgets/eab-contact-display.c:365
+#: ../addressbook/gui/widgets/eab-contact-display.c:380
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:364
+#: ../addressbook/gui/widgets/eab-contact-display.c:366
 msgid "Fax"
 msgstr "Faks"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:368
+#: ../addressbook/gui/widgets/eab-contact-display.c:370
 msgid "work"
 msgstr "arbeid"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:375
+#: ../addressbook/gui/widgets/eab-contact-display.c:377
 msgid "WWW"
 msgstr "WWW"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:376
-#: ../addressbook/gui/widgets/eab-contact-display.c:595
+#: ../addressbook/gui/widgets/eab-contact-display.c:378
+#: ../addressbook/gui/widgets/eab-contact-display.c:597
 msgid "Blog"
 msgstr "Weblogg"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:383
+#: ../addressbook/gui/widgets/eab-contact-display.c:385
 msgid "personal"
 msgstr "personlig"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:556
+#: ../addressbook/gui/widgets/eab-contact-display.c:558
 msgid "Job Title"
 msgstr "Jobbtittel"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:587
+#: ../addressbook/gui/widgets/eab-contact-display.c:589
 msgid "Home page"
 msgstr "Hjemmeside"
 
@@ -3146,7 +3116,7 @@ msgstr "Protokollen er ikke støttet"
 #: ../calendar/gui/e-cal-component-preview.c:232
 #: ../calendar/gui/e-cal-model-tasks.c:347
 #: ../calendar/gui/e-cal-model-tasks.c:660
-#: ../calendar/gui/e-calendar-table.c:458 ../calendar/gui/print.c:2352
+#: ../calendar/gui/e-calendar-table.c:458 ../calendar/gui/print.c:2364
 msgid "Cancelled"
 msgstr "Avbrutt"
 
@@ -3256,7 +3226,7 @@ msgid "Error adding list"
 msgstr "Feil under innlegging av liste"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:177
-#: ../addressbook/gui/widgets/eab-gui-util.c:650
+#: ../addressbook/gui/widgets/eab-gui-util.c:675
 msgid "Error adding contact"
 msgstr "Feil under innlegging av kontakt"
 
@@ -3273,7 +3243,7 @@ msgid "Error removing list"
 msgstr "Feil under fjerning av liste"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:200
-#: ../addressbook/gui/widgets/eab-gui-util.c:608
+#: ../addressbook/gui/widgets/eab-gui-util.c:633
 msgid "Error removing contact"
 msgstr "Feil under fjerning av kontakt"
 
@@ -3305,40 +3275,50 @@ msgstr ""
 msgid "Overwrite"
 msgstr "Overskriv"
 
+#. more than one, finding the total number of contacts might
+#. * hit performance while saving large number of contacts
+#.
+#: ../addressbook/gui/widgets/eab-gui-util.c:360
+#: ../addressbook/gui/widgets/eab-gui-util.c:363
+msgid "contact"
+msgid_plural "contacts"
+msgstr[0] "kontakt"
+msgstr[1] "kontakter"
+
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:393
+#: ../addressbook/gui/widgets/eab-gui-util.c:410
 msgid "card.vcf"
 msgstr "kort.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:555
+#: ../addressbook/gui/widgets/eab-gui-util.c:580
 msgid "list"
 msgstr "liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:704
+#: ../addressbook/gui/widgets/eab-gui-util.c:729
 msgid "Move contact to"
 msgstr "Flytt kontakt til"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:706
+#: ../addressbook/gui/widgets/eab-gui-util.c:731
 msgid "Copy contact to"
 msgstr "Kopier kontakt til"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:709
+#: ../addressbook/gui/widgets/eab-gui-util.c:734
 msgid "Move contacts to"
 msgstr "Flytt kontakter til"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:711
+#: ../addressbook/gui/widgets/eab-gui-util.c:736
 msgid "Copy contacts to"
 msgstr "Kopier kontakter til"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:714
+#: ../addressbook/gui/widgets/eab-gui-util.c:739
 msgid "Select target addressbook."
 msgstr "Velg mål-adressebok"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:937
+#: ../addressbook/gui/widgets/eab-gui-util.c:962
 msgid "Multiple VCards"
 msgstr "Flere VCard"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:940
+#: ../addressbook/gui/widgets/eab-gui-util.c:965
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard for %s"
@@ -3594,7 +3574,7 @@ msgid "Top:"
 msgstr "Topp:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:40
-#: ../calendar/gui/dialogs/calendar-setup.c:175
+#: ../calendar/gui/dialogs/calendar-setup.c:176
 msgid "Type:"
 msgstr "Type:"
 
@@ -3709,90 +3689,67 @@ msgstr "Innfil"
 msgid "No filename provided."
 msgstr "Ingen filnavn spesifisert."
 
-#. calendar:prompt-cancel-meeting primary
-#. calendar:prompt-cancel-task primary
-#: ../calendar/calendar-errors.xml.h:2 ../calendar/calendar-errors.xml.h:12
-msgid "Would you like to send all the participants a cancellation notice?"
-msgstr "Vil du sende en avlysningsmelding til alle deltakere?"
-
-#. calendar:prompt-cancel-meeting secondary
-#: ../calendar/calendar-errors.xml.h:4
+#: ../calendar/calendar.error.xml.h:1
 msgid ""
-"If you don't send a cancellation notice, the other participants may not know "
-"the meeting is canceled."
+" There are few attachments getting downloaded. Saving the appointment will "
+"cause the appointment to be saved without those pending attachments "
 msgstr ""
-"Hvis du ikke sender en avlysningsmelding vil ikke deltakerene vite at møtet "
-"er avlyst."
 
-#: ../calendar/calendar-errors.xml.h:5 ../calendar/calendar-errors.xml.h:15
-#: ../calendar/calendar-errors.xml.h:25 ../calendar/calendar-errors.xml.h:87
-#: ../calendar/calendar-errors.xml.h:93 ../calendar/calendar-errors.xml.h:99
-#: ../calendar/calendar-errors.xml.h:105
-msgid "Don't Send"
-msgstr "Ikke send"
-
-#: ../calendar/calendar-errors.xml.h:6 ../calendar/calendar-errors.xml.h:16
-#: ../calendar/calendar-errors.xml.h:26
-msgid "Send Notice"
-msgstr "Send melding"
+#: ../calendar/calendar.error.xml.h:2
+msgid ""
+" There are few attachments getting downloaded. Saving the task will cause "
+"the task to be saved without those pending attachments "
+msgstr ""
 
-#. calendar:prompt-delete-meeting primary
-#: ../calendar/calendar-errors.xml.h:8
-msgid "Are you sure you want to delete this meeting?"
-msgstr "Er du sikker på at du vil slette dette møtet?"
+#: ../calendar/calendar.error.xml.h:3
+msgid ""
+"Adding a meaningful Summary to your appointment will give your recipients an "
+"idea of what your appointment is about."
+msgstr ""
+"Hvis du gir dine avtaler en meningsfylt emnelinje vil mottakerene lettere "
+"forstå hva avtalen gjelder."
 
-#. calendar:prompt-delete-meeting secondary
-#: ../calendar/calendar-errors.xml.h:10
+#: ../calendar/calendar.error.xml.h:4
 msgid ""
-"All information on this meeting will be deleted and can not be restored."
+"Adding a meaningful Summary to your task will give your recipients an idea "
+"of what your task is about."
 msgstr ""
-"All informasjon om dette møtet vil bli slettet og kan ikke gjenopprettes."
+"Hvis du gir dine oppgaver et meningsfylt sammendrag vil mottakerene lettere "
+"forstå hva oppgaven dreier seg om."
 
-#. calendar:prompt-cancel-task secondary
-#: ../calendar/calendar-errors.xml.h:14
+#: ../calendar/calendar.error.xml.h:5
 msgid ""
-"If you don't send a cancellation notice, the other participants may not know "
-"the task has been deleted."
+"All information in these journal entries will be deleted and can not be "
+"restored."
 msgstr ""
-"Hvis du ikke sender en avlysningsmelding vil ikke de andre deltakerene vite "
-"at oppgaven er slettet."
+"All informasjon i disse journaloppføringene vil slettes og kan ikke "
+"gjenopprettes."
 
-#. calendar:prompt-delete-task primary
-#: ../calendar/calendar-errors.xml.h:18 ../calendar/calendar-errors.xml.h:44
-msgid "Are you sure you want to delete this task?"
-msgstr "Er du sikker på at du vil slette denne oppgaven?"
+#: ../calendar/calendar.error.xml.h:6
+msgid ""
+"All information in this journal will be deleted and can not be restored."
+msgstr ""
+"All informasjon i denne journalen vil bli slettet og kan ikke gjenopprettes."
 
-#. calendar:prompt-delete-task secondary
-#. calendar:prompt-delete-named-task secondary
-#. calendar:prompt-delete-task secondary
-#: ../calendar/calendar-errors.xml.h:20 ../calendar/calendar-errors.xml.h:42
-#: ../calendar/calendar-errors.xml.h:46
-msgid "All information on this task will be deleted and can not be restored."
+#: ../calendar/calendar.error.xml.h:7
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
 msgstr ""
-"All informasjon om denne oppgaven vil bli slettet og kan ikke gjenopprettes."
+"All informasjon i disse avtalene vil bli slettet og kan ikke gjenopprettes."
 
-#. calendar:prompt-cancel-journal primary
-#: ../calendar/calendar-errors.xml.h:22
-msgid "Would you like to send a cancellation notice for this journal entry?"
+#: ../calendar/calendar.error.xml.h:8
+msgid "All information on these tasks will be deleted and can not be restored."
 msgstr ""
-"Er du sikker på at du vil sende en avlysing for denne journaloppføringen?"
+"All informasjon om disse oppgavene vil bli slettet og kan ikke gjenopprettes."
 
-#. calendar:prompt-cancel-journal secondary
-#: ../calendar/calendar-errors.xml.h:24
+#: ../calendar/calendar.error.xml.h:9
 msgid ""
-"If you don't send a cancellation notice, the other participants may not know "
-"the journal has been deleted."
+"All information on this appointment will be deleted and can not be restored."
 msgstr ""
-"Hvis du ikke sender en avlysningsmelding vil ikke de andre deltakerene vite "
-"at journalen er slettet."
-
-#. calendar:prompt-delete-journal primary
-#: ../calendar/calendar-errors.xml.h:28 ../calendar/calendar-errors.xml.h:52
-msgid "Are you sure you want to delete this journal entry?"
-msgstr "Er du sikker på at du vil slette denne journaloppføringen?"
+"All informasjon i denne avtalen vil bli slettet og kan ikke gjenopprettes."
 
-#. calendar:prompt-delete-journal secondary
-#: ../calendar/calendar-errors.xml.h:30
+#: ../calendar/calendar.error.xml.h:10
 msgid ""
 "All information on this journal entry will be deleted and can not be "
 "restored."
@@ -3800,143 +3757,153 @@ msgstr ""
 "All informasjon i denne journaloppføringen vil bli slettet og kan ikke "
 "gjenopprettes."
 
-#. calendar:prompt-delete-titled-appointment primary
-#: ../calendar/calendar-errors.xml.h:32
-msgid "Are you sure you want to delete the appointment titled '{0}'?"
-msgstr "Er du sikker på at du vil slette avtalen med navn «{0}»?"
-
-#. calendar:prompt-delete-titled-appointment secondary
-#. calendar:prompt-delete-appointment secondary
-#: ../calendar/calendar-errors.xml.h:34 ../calendar/calendar-errors.xml.h:38
+#: ../calendar/calendar.error.xml.h:11
 msgid ""
-"All information on this appointment will be deleted and can not be restored."
+"All information on this meeting will be deleted and can not be restored."
 msgstr ""
-"All informasjon i denne avtalen vil bli slettet og kan ikke gjenopprettes."
+"All informasjon om dette møtet vil bli slettet og kan ikke gjenopprettes."
 
-#. calendar:prompt-delete-appointment primary
-#: ../calendar/calendar-errors.xml.h:36
-msgid "Are you sure you want to delete this appointment?"
-msgstr "Er du sikker på at du vil slette denne avtalen?"
+#: ../calendar/calendar.error.xml.h:12
+msgid "All information on this task will be deleted and can not be restored."
+msgstr ""
+"All informasjon om denne oppgaven vil bli slettet og kan ikke gjenopprettes."
 
-#. calendar:prompt-delete-named-task primary
-#: ../calendar/calendar-errors.xml.h:40
+#: ../calendar/calendar.error.xml.h:13
 msgid "Are you sure you want to delete the '{0}' task?"
 msgstr "Er du sikker på at du vil slette oppgaven «{0}»?"
 
-#. calendar:prompt-delete-named-journal primary
-#: ../calendar/calendar-errors.xml.h:48
+#: ../calendar/calendar.error.xml.h:14
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr "Er du sikker på at du vil slette avtalen med navn «{0}»?"
+
+#: ../calendar/calendar.error.xml.h:15
 msgid "Are you sure you want to delete the journal entry '{0}'?"
 msgstr "Er du sikker på at du vil slette journaloppføringen «{0}»?"
 
-#. calendar:prompt-delete-named-journal secondary
-#. calendar:prompt-delete-journal secondary
-#: ../calendar/calendar-errors.xml.h:50 ../calendar/calendar-errors.xml.h:54
-msgid ""
-"All information in this journal will be deleted and can not be restored."
-msgstr ""
-"All informasjon i denne journalen vil bli slettet og kan ikke gjenopprettes."
-
-#. calendar:prompt-delete-appointments primary
-#: ../calendar/calendar-errors.xml.h:56
+#: ../calendar/calendar.error.xml.h:16
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "Er du sikker på at du vil slette disse {0} avtalene?"
 
-#. calendar:prompt-delete-appointments secondary
-#: ../calendar/calendar-errors.xml.h:58
-msgid ""
-"All information on these appointments will be deleted and can not be "
-"restored."
-msgstr ""
-"All informasjon i disse avtalene vil bli slettet og kan ikke gjenopprettes."
+#: ../calendar/calendar.error.xml.h:17
+msgid "Are you sure you want to delete these {0} journal entries?"
+msgstr "Er du sikker på at du vil slette disse {0} journaloppføringene?"
 
-#. calendar:prompt-delete-tasks primary
-#: ../calendar/calendar-errors.xml.h:60
+#: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "Er du sikker på at du vil slette disse {0} oppgavene?"
 
-#. calendar:prompt-delete-tasks secondary
-#: ../calendar/calendar-errors.xml.h:62
-msgid "All information on these tasks will be deleted and can not be restored."
-msgstr ""
-"All informasjon om disse oppgavene vil bli slettet og kan ikke gjenopprettes."
+#: ../calendar/calendar.error.xml.h:19
+msgid "Are you sure you want to delete this appointment?"
+msgstr "Er du sikker på at du vil slette denne avtalen?"
 
-#. calendar:prompt-delete-journals primary
-#: ../calendar/calendar-errors.xml.h:64
-msgid "Are you sure you want to delete these {0} journal entries?"
-msgstr "Er du sikker på at du vil slette disse {0} journaloppføringene?"
+#: ../calendar/calendar.error.xml.h:20
+msgid "Are you sure you want to delete this journal entry?"
+msgstr "Er du sikker på at du vil slette denne journaloppføringen?"
 
-#. calendar:prompt-delete-journals secondary
-#: ../calendar/calendar-errors.xml.h:66
-msgid ""
-"All information in these journal entries will be deleted and can not be "
-"restored."
-msgstr ""
-"All informasjon i disse journaloppføringene vil slettes og kan ikke "
-"gjenopprettes."
+#: ../calendar/calendar.error.xml.h:21
+msgid "Are you sure you want to delete this meeting?"
+msgstr "Er du sikker på at du vil slette dette møtet?"
 
-#. calendar:prompt-save-appointment title
-#: ../calendar/calendar-errors.xml.h:68
-msgid "Save Appointment"
-msgstr "Lagre avtale"
+#: ../calendar/calendar.error.xml.h:22
+msgid "Are you sure you want to delete this task?"
+msgstr "Er du sikker på at du vil slette denne oppgaven?"
 
-#. calendar:prompt-save-appointment primary
-#: ../calendar/calendar-errors.xml.h:70
-msgid "Would you like to save your changes to this appointment?"
-msgstr "Vil du lagre dine endringer i denne avtalen?"
+#: ../calendar/calendar.error.xml.h:23
+msgid "Are you sure you want to send the appointment without a summary?"
+msgstr "Er du sikker på at du vil sende en avtelen uten emne?"
 
-#. calendar:prompt-save-appointment secondary
-#: ../calendar/calendar-errors.xml.h:72
-msgid "You have made changes to this appointment, but not yet saved them."
-msgstr "Du har gjort endringer i denne avtalen, men har ikke lagret dem."
+#: ../calendar/calendar.error.xml.h:24
+msgid "Are you sure you want to send the task without a summary?"
+msgstr "Er du sikker på at du vil sende oppgaven uten sammendrag?"
+
+#: ../calendar/calendar.error.xml.h:25
+msgid "Delete calendar '{0}'?"
+msgstr "Slett kalender «{0}»?"
 
-#: ../calendar/calendar-errors.xml.h:73 ../calendar/calendar-errors.xml.h:81
+#: ../calendar/calendar.error.xml.h:26
+msgid "Delete task list '{0}'?"
+msgstr "Slett oppgaveliste «{0}»?"
+
+#: ../calendar/calendar.error.xml.h:27
 msgid "Discard Changes"
 msgstr "Forkast endringer"
 
-#: ../calendar/calendar-errors.xml.h:74 ../calendar/calendar-errors.xml.h:82
-msgid "Save Changes"
-msgstr "Lagre endringer"
-
-#. calendar:prompt-save-task title
-#: ../calendar/calendar-errors.xml.h:76
-msgid "Save Task"
-msgstr "Lagre oppgave"
+#: ../calendar/calendar.error.xml.h:28
+msgid "Don't Send"
+msgstr "Ikke send"
 
-#. calendar:prompt-save-task primary
-#: ../calendar/calendar-errors.xml.h:78
-msgid "Would you like to save your changes to this task?"
-msgstr "Vil du lagre dine endringer i denne oppgaven?"
+#: ../calendar/calendar.error.xml.h:29
+msgid "Download in progress. Do you want to save the appointment?"
+msgstr "Nedlasting pågår. Vil du lagre avtalen?"
 
-#. calendar:prompt-save-task secondary
-#: ../calendar/calendar-errors.xml.h:80
-msgid "You have made changes to this task, but not yet saved them."
-msgstr "Du har gjort endringer i denne oppgaven, men har ikke lagret dem."
+#: ../calendar/calendar.error.xml.h:30
+msgid "Download in progress. Do you want to save the task?"
+msgstr "Nedlasting pågår. Vil du lagre oppgaven?"
 
-#. calendar:prompt-meeting-invite primary
-#: ../calendar/calendar-errors.xml.h:84
-msgid "Would you like to send meeting invitations to participants?"
-msgstr "Vil du sende møteinvitasjoner til deltakerene?"
+#: ../calendar/calendar.error.xml.h:31
+msgid "Editor could not be loaded."
+msgstr "Redigeringskomponenten kunne ikke lastes."
 
-#. calendar:prompt-meeting-invite secondary
-#: ../calendar/calendar-errors.xml.h:86
+#: ../calendar/calendar.error.xml.h:32
 msgid ""
 "Email invitations will be sent to all participants and allow them to RSVP."
 msgstr ""
 "Invitasjoner vil sendes til alle deltakere via e-post slik at de kan gi svar."
 
-#: ../calendar/calendar-errors.xml.h:88 ../calendar/calendar-errors.xml.h:94
-#: ../calendar/calendar-errors.xml.h:100 ../calendar/calendar-errors.xml.h:106
-#: ../ui/evolution-message-composer.xml.h:24
+#: ../calendar/calendar.error.xml.h:33
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+"Invitasjoner vil sendes til alle deltakere via e-post slik at de kan godta "
+"denne oppgaven."
+
+#: ../calendar/calendar.error.xml.h:34
+msgid "Error loading calendar"
+msgstr "Feil under lasting av kalender"
+
+#: ../calendar/calendar.error.xml.h:35
+msgid "Error loading task list"
+msgstr "Feil under lasting av oppgaveliste"
+
+#: ../calendar/calendar.error.xml.h:36
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the journal has been deleted."
+msgstr ""
+"Hvis du ikke sender en avlysningsmelding vil ikke de andre deltakerene vite "
+"at journalen er slettet."
+
+#: ../calendar/calendar.error.xml.h:37
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+"Hvis du ikke sender en avlysningsmelding vil ikke deltakerene vite at møtet "
+"er avlyst."
+
+#: ../calendar/calendar.error.xml.h:38
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+"Hvis du ikke sender en avlysningsmelding vil ikke de andre deltakerene vite "
+"at oppgaven er slettet."
+
+#: ../calendar/calendar.error.xml.h:39
+msgid "Save Changes"
+msgstr "Lagre endringer"
+
+#: ../calendar/calendar.error.xml.h:40
+#: ../ui/evolution-message-composer.xml.h:26
 msgid "Send"
 msgstr "Send"
 
-#. calendar:prompt-send-updated-meeting-info primary
-#: ../calendar/calendar-errors.xml.h:90
-msgid "Would you like to send updated meeting information to participants?"
-msgstr "Vil du sende oppdatert møteinformasjon til alle deltakere?"
+#: ../calendar/calendar.error.xml.h:41
+msgid "Send Notice"
+msgstr "Send melding"
 
-#. calendar:prompt-send-updated-meeting-info secondary
-#: ../calendar/calendar-errors.xml.h:92
+#: ../calendar/calendar.error.xml.h:42
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -3944,27 +3911,7 @@ msgstr ""
 "Sending av oppdatert informasjon lar andre deltakere holde sine kalendere "
 "oppdatert."
 
-#. calendar:prompt-send-task primary
-#: ../calendar/calendar-errors.xml.h:96
-msgid "Would you like to send this task to participants?"
-msgstr "Vil du sende denne oppgaven til deltakere?"
-
-#. calendar:prompt-send-task secondary
-#: ../calendar/calendar-errors.xml.h:98
-msgid ""
-"Email invitations will be sent to all participants and allow them to accept "
-"this task."
-msgstr ""
-"Invitasjoner vil sendes til alle deltakere via e-post slik at de kan godta "
-"denne oppgaven."
-
-#. calendar:prompt-send-updated-task-info primary
-#: ../calendar/calendar-errors.xml.h:102
-msgid "Would you like to send updated task information to participants?"
-msgstr "Vil du sende oppdatert oppgaveinformasjon til deltakere?"
-
-#. calendar:prompt-send-updated-task-info secondary
-#: ../calendar/calendar-errors.xml.h:104
+#: ../calendar/calendar.error.xml.h:43
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -3972,107 +3919,95 @@ msgstr ""
 "Sending av oppdatert informasjon lar andre deltakere holde sine "
 "oppgavelister oppdatert."
 
-#. calendar:tasks-crashed primary
-#: ../calendar/calendar-errors.xml.h:108
-msgid "The Evolution tasks have quit unexpectedly."
-msgstr "Evolution-oppgaver har avsluttet uventet."
-
-#. calendar:tasks-crashed secondary
-#: ../calendar/calendar-errors.xml.h:110
-msgid "Your tasks will not be available until Evolution is restarted."
-msgstr ""
-"Dine oppgaver vil ikke være tilgjengelige før Evolution startes på nytt."
-
-#. calendar:calendar-crashed primary
-#: ../calendar/calendar-errors.xml.h:112
+#: ../calendar/calendar.error.xml.h:45
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Evolution-kalender har avsluttet uventet."
 
-#. calendar:calendar-crashed secondary
-#: ../calendar/calendar-errors.xml.h:114
-msgid "Your calendars will not be available until Evolution is restarted."
-msgstr ""
-"Dine kalendere vil ikke være tilgjengelige før Evolution startes på nytt."
+#: ../calendar/calendar.error.xml.h:46
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr "Evolution-oppgaver har avsluttet uventet."
 
-#. calendar:prompt-delete-calendar primary
-#: ../calendar/calendar-errors.xml.h:116
-msgid "Delete calendar '{0}'?"
-msgstr "Slett kalender «{0}»?"
+#: ../calendar/calendar.error.xml.h:47
+msgid "The calendar is not marked for offline usage"
+msgstr "Kalenderen er ikke merket for frakoblet bruk"
 
-#. calendar:prompt-delete-calendar secondary
-#: ../calendar/calendar-errors.xml.h:118
+#: ../calendar/calendar.error.xml.h:48
+msgid "The task list is not marked for offline usage"
+msgstr "Oppgavelisten er ikke merket for frakoblet bruk"
+
+#: ../calendar/calendar.error.xml.h:49
 msgid "This calendar will be removed permanently."
 msgstr "Denne kalenderen vil bli fjernet for godt."
 
-#. calendar:prompt-delete-task-list primary
-#: ../calendar/calendar-errors.xml.h:120
-msgid "Delete task list '{0}'?"
-msgstr "Slett oppgaveliste «{0}»?"
-
-#. calendar:prompt-delete-task-list secondary
-#: ../calendar/calendar-errors.xml.h:122
+#: ../calendar/calendar.error.xml.h:50
 msgid "This task list will be removed permanently."
 msgstr "Denne oppgavelisten vil bli fjernet for godt."
 
-#. calendar:prompt-send-no-subject-calendar primary
-#: ../calendar/calendar-errors.xml.h:124
-msgid "Are you sure you want to send the appointment without a summary?"
-msgstr "Er du sikker på at du vil sende en avtelen uten emne?"
+#: ../calendar/calendar.error.xml.h:51
+msgid "Would you like to save your changes to this appointment?"
+msgstr "Vil du lagre dine endringer i denne avtalen?"
 
-#. calendar:prompt-send-no-subject-calendar secondary
-#: ../calendar/calendar-errors.xml.h:126
-msgid ""
-"Adding a meaningful Summary to your appointment will give your recipients an "
-"idea of what your appointment is about."
+#: ../calendar/calendar.error.xml.h:52
+msgid "Would you like to save your changes to this task?"
+msgstr "Vil du lagre dine endringer i denne oppgaven?"
+
+#: ../calendar/calendar.error.xml.h:53
+msgid "Would you like to send a cancellation notice for this journal entry?"
 msgstr ""
-"Hvis du gir dine avtaler en meningsfylt emnelinje vil mottakerene lettere "
-"forstå hva avtalen gjelder."
+"Er du sikker på at du vil sende en avlysing for denne journaloppføringen?"
 
-#: ../calendar/calendar-errors.xml.h:127 ../calendar/calendar-errors.xml.h:132
-#: ../mail/mail-errors.xml.h:15 ../mail/mail-errors.xml.h:20
-#: ../mail/mail-errors.xml.h:27 ../mail/mail-errors.xml.h:32
-msgid "_Send"
-msgstr "_Send"
+#: ../calendar/calendar.error.xml.h:54
+msgid "Would you like to send all the participants a cancellation notice?"
+msgstr "Vil du sende en avlysningsmelding til alle deltakere?"
 
-#. calendar:prompt-send-no-subject-task primary
-#: ../calendar/calendar-errors.xml.h:129
-msgid "Are you sure you want to send the task without a summary?"
-msgstr "Er du sikker på at du vil sende oppgaven uten sammendrag?"
+#: ../calendar/calendar.error.xml.h:55
+msgid "Would you like to send meeting invitations to participants?"
+msgstr "Vil du sende møteinvitasjoner til deltakerene?"
 
-#. calendar:prompt-send-no-subject-task secondary
-#: ../calendar/calendar-errors.xml.h:131
-msgid ""
-"Adding a meaningful Summary to your task will give your recipients an idea "
-"of what your task is about."
-msgstr ""
-"Hvis du gir dine oppgaver et meningsfylt sammendrag vil mottakerene lettere "
-"forstå hva oppgaven dreier seg om."
+#: ../calendar/calendar.error.xml.h:56
+msgid "Would you like to send this task to participants?"
+msgstr "Vil du sende denne oppgaven til deltakere?"
 
-#. calendar:prompt-no-contents-offline-calendar primary
-#: ../calendar/calendar-errors.xml.h:134
-msgid "Error loading calendar"
-msgstr "Feil under lasting av kalender"
+#: ../calendar/calendar.error.xml.h:57
+msgid "Would you like to send updated meeting information to participants?"
+msgstr "Vil du sende oppdatert møteinformasjon til alle deltakere?"
 
-#. calendar:prompt-no-contents-offline-calendar secondary
-#: ../calendar/calendar-errors.xml.h:136
-msgid "The calendar is not marked for offline usage"
-msgstr "Kalenderen er ikke merket for frakoblet bruk"
+#: ../calendar/calendar.error.xml.h:58
+msgid "Would you like to send updated task information to participants?"
+msgstr "Vil du sende oppdatert oppgaveinformasjon til deltakere?"
 
-#. calendar:prompt-no-contents-offline-tasks primary
-#: ../calendar/calendar-errors.xml.h:138
-msgid "Error loading task list"
-msgstr "Feil under lasting av oppgaveliste"
+#: ../calendar/calendar.error.xml.h:60
+msgid "You have made changes to this appointment, but not yet saved them."
+msgstr "Du har gjort endringer i denne avtalen, men har ikke lagret dem."
 
-#. calendar:prompt-no-contents-offline-tasks secondary
-#: ../calendar/calendar-errors.xml.h:140
-msgid "The task list is not marked for offline usage"
-msgstr "Oppgavelisten er ikke merket for frakoblet bruk"
+#: ../calendar/calendar.error.xml.h:61
+msgid "You have made changes to this task, but not yet saved them."
+msgstr "Du har gjort endringer i denne oppgaven, men har ikke lagret dem."
+
+#: ../calendar/calendar.error.xml.h:62
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr ""
+"Dine kalendere vil ikke være tilgjengelige før Evolution startes på nytt."
 
-#. calendar:server-version secondary
-#: ../calendar/calendar-errors.xml.h:146
-msgid " Some features may not work correctly with your current server version "
+#: ../calendar/calendar.error.xml.h:63
+msgid "Your tasks will not be available until Evolution is restarted."
 msgstr ""
-" Noen funksjoner vil kanskje ikke fungere med denne versjonen av tjeneren "
+"Dine oppgaver vil ikke være tilgjengelige før Evolution startes på nytt."
+
+#: ../calendar/calendar.error.xml.h:64
+#: ../ui/evolution-message-composer.xml.h:49
+#: ../ui/evolution-signature-editor.xml.h:15
+msgid "_Save"
+msgstr "_Lagre"
+
+#: ../calendar/calendar.error.xml.h:65
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:118
+msgid "_Send"
+msgstr "_Send"
+
+#: ../calendar/calendar.error.xml.h:66
+msgid "{0}."
+msgstr "{0}."
 
 #: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:301
 #: ../smime/gui/component.c:48
@@ -4142,12 +4077,12 @@ msgid "Evolution's Tasks component"
 msgstr "Oppgavekomponent for Evolution"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#: ../calendar/gui/e-tasks.c:1219 ../calendar/gui/print.c:1822
-#: ../calendar/gui/tasks-component.c:508 ../calendar/gui/tasks-component.c:981
+#: ../calendar/gui/e-tasks.c:1222 ../calendar/gui/print.c:1822
+#: ../calendar/gui/tasks-component.c:519 ../calendar/gui/tasks-component.c:994
 #: ../calendar/gui/tasks-control.c:408
 #: ../calendar/importers/icalendar-importer.c:83
 #: ../calendar/importers/icalendar-importer.c:701
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:383
+#: ../plugins/groupwise-features/camel-gw-listener.c:383
 msgid "Tasks"
 msgstr "Oppgaver"
 
@@ -4164,100 +4099,88 @@ msgstr "_Oppgaver"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Tjeneste for alarm-meldinger i Evolution kalender"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:79
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minutt"
 msgstr[1] "minutter"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: ../calendar/gui/dialogs/event-editor.c:140 ../calendar/gui/print.c:2298
-msgid "Appointment"
-msgstr "Avtale"
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+msgid "Start time"
+msgstr "Starttid:"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Appointment Title"
-msgstr "Tittel på avtale"
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:312
+#, c-format
+msgid ""
+"<big><b>%s</b></big>\n"
+"%s until %s"
+msgstr ""
+"<big><b>%s</b></big>\n"
+"%s til %s"
 
-#. End time
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
-#: ../plugins/itip-formatter/itip-view.c:876
-msgid "End time:"
-msgstr "Slutt-tid:"
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:1
+msgid "Appointments"
+msgstr "Avtaler"
 
 #. Location
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
 #: ../calendar/gui/e-itip-control.c:1118
 #: ../plugins/itip-formatter/itip-view.c:859
 msgid "Location:"
 msgstr "Plassering:"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
 msgid "Snooze _time:"
 msgstr "Utsett-_tid:"
 
-#. Start time
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
-#: ../plugins/itip-formatter/itip-view.c:867
-msgid "Start time:"
-msgstr "Start-tid:"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:6
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:153
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:158
 #: ../ui/evolution-addressbook.xml.h:34 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-composer-entries.xml.h:8 ../ui/evolution-mail-list.xml.h:24
-#: ../ui/evolution-mail-messagedisplay.xml.h:6
-#: ../ui/evolution-message-composer.xml.h:43
+#: ../ui/evolution-composer-entries.xml.h:8
+#: ../ui/evolution-mail-messagedisplay.xml.h:5
+#: ../ui/evolution-message-composer.xml.h:42
 #: ../ui/evolution-signature-editor.xml.h:12
 #: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:22
-#: ../ui/evolution.xml.h:38
+#: ../ui/evolution.xml.h:32
 msgid "_Edit"
 msgstr "R_ediger"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
 msgid "_Snooze"
 msgstr "Ut_sett"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:9
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
 msgid "description of appointment"
 msgstr "beskrivelse av avtale"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:10
-msgid "end-time"
-msgstr "slutt-tid"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:11
-msgid "location"
-msgstr "lokasjon"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:13
-msgid "start-time"
-msgstr "start-tid"
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
+msgid "location of appointment"
+msgstr "lokasjon for avtalen"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:864
+#: ../calendar/gui/alarm-notify/alarm-queue.c:954
 msgid "Dismiss"
 msgstr "Se bort fra"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:865
+#: ../calendar/gui/alarm-notify/alarm-queue.c:955
 msgid "Dismiss All"
 msgstr "Se bort fra alle"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:947
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1037
 msgid "No summary available."
 msgstr "Sammendrag er ikke tilgjengelig."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:956
-#: ../calendar/gui/alarm-notify/alarm-queue.c:958
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1046
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1048
 msgid "No description available."
 msgstr "Ingen beskrivelse tilgjengelig."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:966
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1056
 msgid "No location information available."
 msgstr "Beskrivelse av lokasjon er ikke tilgjengelig."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:982
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1072
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -4270,12 +4193,12 @@ msgstr ""
 "Starter %s\n"
 "Slutter %s"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1084
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1108
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1175
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1199
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1088
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1179
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4287,7 +4210,7 @@ msgstr ""
 "å sende e-post. Evolution vil vise en vanlig dialog\n"
 "for påminnelse i stedet."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1114
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1205
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4304,7 +4227,7 @@ msgstr ""
 "\n"
 "Er du sikker på at du ønsker å kjøre dette programmet?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1128
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1219
 msgid "Do not ask me about this program again."
 msgstr "Ikke spør meg om dette programmet igjen."
 
@@ -4341,273 +4264,295 @@ msgid "Calendars to run alarms for"
 msgstr "Kalendere det skal kjøres alarmer for"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+msgid ""
+"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+msgid "Color to draw the Marcus Bains line in the Day View."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
 msgid "Compress weekends in month view"
 msgstr "Komprimer helger i månedsvisning"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
 msgid "Confirm expunge"
 msgstr "Bekreft tømming av mappe"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
 msgid "Default appointment reminder"
 msgstr "Forvalgt påminnelse for avtale"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
 msgid "Default reminder units"
 msgstr "Forvalgt enhet for påminnelser"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
 msgid "Default reminder value"
 msgstr "Forvalgt verdi for påminnelse"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
 msgid "Free/busy server urls"
 msgstr "Tjener-URLer for ledig/opptatt-informasjon"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
 msgid "Free/busy template url"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Hide completed tasks"
 msgstr "Skjul fullførte oppgaver"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
 msgid "Hide task units"
 msgstr "Skjul enheter for oppgaver"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
 msgid "Hide task value"
 msgstr "Skjul oppgaveverdi"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
 msgid "Horizontal pane position"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+msgid "Intervals shown in Day and Work Week views, in minutes."
+msgstr "Intervaller i minutter som vises i dag- og arbeidsukevisningene."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
 msgid "Last alarm time"
 msgstr "Siste varslingstid"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
 msgid "List of server urls for free/busy publishing."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
-msgid "Minute the workday ends on, 0 to 59"
-msgstr "Minutt arbeidsdagen slutter på fra 0 til 59"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+msgid "Marcus Bains Line"
+msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+msgid "Marcus Bains Line Color - Day View"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+msgid "Marcus Bains Line Color - Time bar"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+msgid "Minute the workday ends on, 0 to 59."
+msgstr "Minutt arbeidsdagen slutter på fra 0 til 59."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Minutt arbeidsdagen starter på fra 0 til 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Month view horizontal pane position"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Month view vertical pane position"
-msgstr "Plassering av vertikalt felt i hovedvisningen"
+msgstr "Plassering av vertikalt felt for månedsvisning"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Number of units for determining for a default reminder."
-msgstr "Antall enheter for forvalgt påminnelse"
+msgstr "Antall enheter for forvalgt påminnelse."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
 msgid "Number of units for determining when to hide tasks."
-msgstr "Enheter for å bestemme når oppgaver skal skjules"
+msgstr "Antall enheter for å bestemme når oppgaver skal skjules"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
 msgid "Overdue tasks color"
 msgstr "Farge for utgåtte oppgaver"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
 #, fuzzy
 msgid ""
-"Position of the vertical pane, between task list and the task preview pane, "
-"in pixels."
+"Position of the vertical pane, between the task list and the task preview "
+"pane, in pixels."
 msgstr "Plassering av vertikalt felt i hovedvisningen."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
 msgid "Programs that are allowed to be run by alarms."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
 msgid "Show appointment end times in week and month views"
 msgstr "Vis tid for avtalers slutt i ukes- og månedsvisning"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
 msgid "Show display alarms in notification tray"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
 msgid "Show week numbers in date navigator"
 msgstr "Vis ukenummer i datovelger"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
 msgid "Tasks due today color"
 msgstr "Farge for oppgaver som går ut i dag"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
 msgid "Tasks vertical pane position"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
 #, no-c-format
 msgid ""
 "The url template to use as a free/busy data fallback, %u is replaced by the "
 "user part of the mail address and %d is replaced by the domain."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
-#, fuzzy
-msgid ""
-"Time divisions</short> <short>Intervals shown in Day and Work Week views, in "
-"minutes."
-msgstr "Intervaller vises i dag- og arbeidsukevisningene"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+msgid "Time divisions"
+msgstr "Oppdeling av tid"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
 #, fuzzy
 msgid "Time the last alarm ran, in time_t."
 msgstr "Tid for kjøring av forrige alarm"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
 msgid "Timezone"
 msgstr "Tidssone"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
 msgid "Twenty four hour time format"
 msgstr "24-timers tidsformat"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
-msgstr ""
+msgstr "Enhet for forvalgt påminnelse. «minutes», «hours», eller «days»."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
-msgstr "Enheter for å bestemme når oppgaver skal skjules"
+msgstr "Enheter for å bestemme når oppgaver skal skjules. «minutes», «hours» eller «days»."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
 msgid "Week start"
 msgstr "Ukestart"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
-msgstr "Dag uken starter på"
+msgstr "Dag uken starter på. Fra søndag (0) til lørdag (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
 #, fuzzy
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Om det skal spørres etter bekreftelse ved sletting av avtaler"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
 #, fuzzy
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Om det skal spørres etter bekreftelse ved sletting av avtaler"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
 #, fuzzy
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "Vi_s tid for avtalers slutt i ukes- og månedsvisning"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
+msgid ""
+"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
 #, fuzzy
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Om fullførte oppgaver skal skjules"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
 #, fuzzy
 msgid "Whether to set a default reminder for appointments."
 msgstr "Im en forvalgt påminnelse skal settes for hendelser"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
 #, fuzzy
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "Om tider skal vises i 24-timers format i stedet for å bruke AM/PM"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
 #, fuzzy
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Om ukenummer skal vises i minikalenderen"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
 msgid "Work days"
 msgstr "Arbeidsdager"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
 #, fuzzy
 msgid "Workday end hour"
 msgstr "Time for arbeidsdagens slutt"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
 #, fuzzy
 msgid "Workday end minute"
 msgstr "Ar_beid tilkoblet"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
 #, fuzzy
 msgid "Workday start hour"
 msgstr "Time for arbeidsdagens start"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
 #, fuzzy
 msgid "Workday start minute"
 msgstr "Time for arbeidsdagens start"
@@ -4634,10 +4579,10 @@ msgstr "Ingen treff"
 
 #: ../calendar/gui/calendar-commands.c:120
 #: ../calendar/gui/calendar-component.c:708
-#: ../calendar/gui/dialogs/calendar-setup.c:362
-#: ../calendar/gui/gnome-cal.c:1942
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:382
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:412
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/gnome-cal.c:1974
+#: ../plugins/groupwise-features/camel-gw-listener.c:382
+#: ../plugins/groupwise-features/camel-gw-listener.c:412
 msgid "Calendar"
 msgstr "Kalender"
 
@@ -4659,30 +4604,30 @@ msgstr "Slett hendelser eldre enn"
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:12
 #: ../filter/filter.glade.h:14 ../plugins/calendar-http/calendar-http.c:265
 #: ../plugins/calendar-weather/calendar-weather.c:566
-#: ../widgets/misc/e-send-options.glade.h:39
+#: ../widgets/misc/e-send-options.glade.h:36
 msgid "days"
 msgstr "dager"
 
 #. Create the On the web source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:223 ../calendar/gui/migration.c:486
-#: ../calendar/gui/migration.c:579 ../calendar/gui/tasks-component.c:204
+#: ../calendar/gui/calendar-component.c:234 ../calendar/gui/migration.c:489
+#: ../calendar/gui/migration.c:582 ../calendar/gui/tasks-component.c:215
 msgid "On The Web"
 msgstr "På nettet"
 
-#: ../calendar/gui/calendar-component.c:241 ../calendar/gui/migration.c:388
+#: ../calendar/gui/calendar-component.c:252 ../calendar/gui/migration.c:391
 msgid "Birthdays & Anniversaries"
 msgstr "Fødselsdager og jubileum"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:247
+#: ../calendar/gui/calendar-component.c:258
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "Vær"
 
-#: ../calendar/gui/calendar-component.c:524
-#: ../calendar/gui/dialogs/calendar-setup.c:442
+#: ../calendar/gui/calendar-component.c:535
+#: ../calendar/gui/dialogs/calendar-setup.c:450
 msgid "New Calendar"
 msgstr "Ny kalender"
 
@@ -4779,7 +4724,7 @@ msgstr "Metoden er ikke støttet under åpning av kalender"
 msgid "Permission denied to open the calendar"
 msgstr "Tilgang nektet ved åpning av kalender"
 
-#: ../calendar/gui/comp-editor-factory.c:437 ../shell/e-shell.c:1259
+#: ../calendar/gui/comp-editor-factory.c:437 ../shell/e-shell.c:1263
 msgid "Unknown error"
 msgstr "Ukjent feil"
 
@@ -4903,50 +4848,50 @@ msgstr "Le_gg til"
 msgid "Alarms"
 msgstr "Varsel"
 
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:108
-#: ../composer/e-msg-composer-attachment-bar.c:103
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:110
+#: ../composer/e-msg-composer-attachment-bar.c:105
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:111
-#: ../composer/e-msg-composer-attachment-bar.c:106
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:113
+#: ../composer/e-msg-composer-attachment-bar.c:108
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:114
-#: ../composer/e-msg-composer-attachment-bar.c:109
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:116
+#: ../composer/e-msg-composer-attachment-bar.c:111
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:298
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:913
-#: ../composer/e-msg-composer-attachment-bar.c:295 ../mail/em-utils.c:436
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:311
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:1106
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:438
 msgid "attachment"
 msgstr "vedlegg"
 
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:439
-#: ../calendar/gui/dialogs/meeting-page.c:781
-#: ../composer/e-msg-composer-attachment-bar.c:437
-#: ../plugins/shared-folder/properties.glade.h:14
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:473
+#: ../calendar/gui/dialogs/meeting-page.c:784
+#: ../composer/e-msg-composer-attachment-bar.c:470
+#: ../plugins/groupwise-features/properties.glade.h:14
 msgid "_Remove"
 msgstr "Fje_rn"
 
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:440
-#: ../composer/e-msg-composer-attachment-bar.c:438
-#: ../mail/em-folder-tree.c:2818 ../ui/evolution-mail-list.xml.h:27
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:474
+#: ../composer/e-msg-composer-attachment-bar.c:471
+#: ../mail/em-folder-tree.c:2123 ../ui/evolution-mail-list.xml.h:28
 msgid "_Properties"
 msgstr "Egenska_per..."
 
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:442
-#: ../composer/e-msg-composer-attachment-bar.c:440
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:476
+#: ../composer/e-msg-composer-attachment-bar.c:473
 msgid "_Add attachment..."
 msgstr "_Legg til vedlegg..."
 
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:699
-#: ../composer/e-msg-composer-attachment-bar.c:703
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:736
+#: ../composer/e-msg-composer-attachment-bar.c:740
 msgid "Attachment Bar"
 msgstr "Vedleggsfelt"
 
@@ -4964,16 +4909,22 @@ msgstr "Foreslå automatisk visning av vedlegg"
 msgid "Attach file(s)"
 msgstr "Legg ved fil(er)"
 
-#: ../calendar/gui/dialogs/cal-attachment.c:197
-#: ../calendar/gui/dialogs/cal-attachment.c:213
-#: ../composer/e-msg-composer-attachment.c:174
-#: ../composer/e-msg-composer-attachment.c:190
+#: ../calendar/gui/dialogs/cal-attachment.c:210
+#: ../calendar/gui/dialogs/cal-attachment.c:226
+#: ../calendar/gui/dialogs/cal-attachment.c:319
+#: ../calendar/gui/dialogs/cal-attachment.c:335
+#: ../composer/e-msg-composer-attachment.c:187
+#: ../composer/e-msg-composer-attachment.c:203
+#: ../composer/e-msg-composer-attachment.c:297
+#: ../composer/e-msg-composer-attachment.c:313
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Kan ikke legge ved fil: %s: %s"
 
-#: ../calendar/gui/dialogs/cal-attachment.c:205
-#: ../composer/e-msg-composer-attachment.c:182
+#: ../calendar/gui/dialogs/cal-attachment.c:218
+#: ../calendar/gui/dialogs/cal-attachment.c:327
+#: ../composer/e-msg-composer-attachment.c:195
+#: ../composer/e-msg-composer-attachment.c:305
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Kan ikke legge ved fil %s: ikke en vanlig fil"
@@ -4988,7 +4939,7 @@ msgstr "Egenskaper for vedlegg"
 #: ../calendar/gui/e-itip-control.c:1164
 #: ../calendar/gui/e-itip-control.glade.h:6
 #: ../composer/e-msg-composer-attachment.glade.h:3
-#: ../mail/mail-config.glade.h:68
+#: ../mail/mail-config.glade.h:69
 msgid "Description:"
 msgstr "Beskrivelse:"
 
@@ -5004,7 +4955,7 @@ msgstr "MIME-type:"
 
 #. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:576
-#: ../mail/em-account-prefs.c:460 ../mail/em-composer-prefs.c:888
+#: ../mail/em-account-prefs.c:476 ../mail/em-composer-prefs.c:888
 #: ../plugins/plugin-manager/plugin-manager.c:213
 msgid "Enabled"
 msgstr "Aktivert"
@@ -5024,16 +4975,16 @@ msgstr "Ikke fjern"
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:787
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:820
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:853
-#: ../mail/em-account-prefs.c:307 ../mail/em-account-prefs.c:335
-#: ../mail/em-account-prefs.c:366
+#: ../mail/em-account-prefs.c:323 ../mail/em-account-prefs.c:351
+#: ../mail/em-account-prefs.c:382
 msgid "Disable"
 msgstr "Deaktiver"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:787
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:820
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:855
-#: ../mail/em-account-prefs.c:307 ../mail/em-account-prefs.c:335
-#: ../mail/em-account-prefs.c:368
+#: ../mail/em-account-prefs.c:323 ../mail/em-account-prefs.c:351
+#: ../mail/em-account-prefs.c:384
 msgid "Enable"
 msgstr "Aktiver"
 
@@ -5117,7 +5068,7 @@ msgid "Display"
 msgstr "Vis"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: ../mail/mail-config.glade.h:73
+#: ../mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr "A_ktiver"
 
@@ -5126,7 +5077,7 @@ msgid "Free/Busy"
 msgstr "Ledig/opptatt"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1044
+#: ../calendar/gui/dialogs/recurrence-page.c:1043
 #: ../calendar/gui/e-itip-control.c:732
 msgid "Friday"
 msgstr "Fredag"
@@ -5140,171 +5091,179 @@ msgid "Minutes"
 msgstr "Minutter"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: ../calendar/gui/dialogs/recurrence-page.c:1040
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 #: ../calendar/gui/e-itip-control.c:728
 msgid "Monday"
 msgstr "Mandag"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+msgid "Publishing Table"
+msgstr "Tabell for publisering"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "S_un"
 msgstr "S_ø."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: ../calendar/gui/dialogs/recurrence-page.c:1045
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
 #: ../calendar/gui/e-itip-control.c:733
 msgid "Saturday"
 msgstr "Lørdag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Sh_ow a reminder"
 msgstr "_Vis en påminnelse"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Show week _numbers in date navigator"
 msgstr "Vis uke_nummer i datonavigasjon"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ../calendar/gui/dialogs/recurrence-page.c:1046
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/recurrence-page.c:1045
 #: ../calendar/gui/e-itip-control.c:727
 msgid "Sunday"
 msgstr "Søndag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "T_asks due today:"
 msgstr "Oppg_aver som går ut i dag:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "T_hu"
 msgstr "T_o."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Template:"
 msgstr "Mal:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-#: ../calendar/gui/dialogs/recurrence-page.c:1043
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/recurrence-page.c:1042
 #: ../calendar/gui/e-itip-control.c:731
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "Time _zone:"
 msgstr "Tids_sone:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Time format:"
 msgstr "Tidformat:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: ../calendar/gui/dialogs/recurrence-page.c:1041
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: ../calendar/gui/dialogs/recurrence-page.c:1040
 #: ../calendar/gui/e-itip-control.c:729
 msgid "Tuesday"
 msgstr "Tirsdag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "W_eek starts:"
 msgstr "Uk_en starter:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#: ../calendar/gui/dialogs/recurrence-page.c:1042
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/recurrence-page.c:1041
 #: ../calendar/gui/e-itip-control.c:730
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Work days:"
 msgstr "Arbeidsdager:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_12 hour (AM/PM)"
 msgstr "_12 timer (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_24 hour"
 msgstr "_24 timer"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Add URL"
 msgstr "_Legg til URL"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Ask for confirmation when deleting items"
 msgstr "Spør etter bekreftelse ved sletting _av oppføringer"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_Compress weekends in month view"
 msgstr "_Komprimer helger i månedsvisning"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_Day begins:"
 msgstr "_Dagen begynner:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Fri"
 msgstr "_Fr."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Hide completed tasks after"
 msgstr "Sk_jul utførte oppgaver etter"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "_Mon"
 msgstr "_Ma."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_Overdue tasks:"
 msgstr "Utgåtte _oppgaver:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "_Sat"
 msgstr "L_ø."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_Show appointment end times in week and month views"
 msgstr "Vi_s tid for avtalers slutt i ukes- og månedsvisning"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_Time divisions:"
 msgstr "Oppdeling av _tid:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Tue"
 msgstr "_Ti."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "_Wed"
 msgstr "_On."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "before every appointment"
 msgstr "før hver avtale"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "option menu to choose reminder units"
 msgstr "meny for valg av enheter for påminnelser"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "option menu to choose time units"
 msgstr "meny for å velge tidsenheter"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:284
+#: ../calendar/gui/dialogs/calendar-setup.c:287
 msgid "Copy calendar contents locally for offline operation"
 msgstr "Kopier kalenderinnhold lokalt for frakoblet operasjon"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:336
+#: ../calendar/gui/dialogs/calendar-setup.c:290
+msgid "Copy task list contents locally for offline operation"
+msgstr "Kopier innholdet i oppgavelisten lokalt for frakoblet operasjon"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:343
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:4
 msgid "C_olor:"
 msgstr "F_arge:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:373
+#: ../calendar/gui/dialogs/calendar-setup.c:380
 msgid "Tasks List"
 msgstr "Oppgaveliste"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:440
+#: ../calendar/gui/dialogs/calendar-setup.c:448
 msgid "Calendar Properties"
 msgstr "Kalenderegenskaper"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:506
+#: ../calendar/gui/dialogs/calendar-setup.c:515
 msgid "Task List Properties"
 msgstr "Egenskaper for oppgaveliste"
 
@@ -5317,7 +5276,7 @@ msgid "Add Task List"
 msgstr "Legg til oppgaveliste"
 
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:5
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:105
 msgid "Pick a color"
 msgstr "Velg en farge"
 
@@ -5417,116 +5376,106 @@ msgstr " (Ferdig "
 msgid "Due "
 msgstr "Ferdig "
 
-#: ../calendar/gui/dialogs/comp-editor.c:181 ../composer/e-msg-composer.c:2676
+#: ../calendar/gui/dialogs/comp-editor.c:181 ../composer/e-msg-composer.c:2653
 #, c-format
 msgid "Attached message - %s"
 msgstr "Vedlagt melding - %s"
 
 #. translators, this count will always be >1
 #: ../calendar/gui/dialogs/comp-editor.c:186
-#: ../calendar/gui/dialogs/comp-editor.c:349 ../composer/e-msg-composer.c:2681
-#: ../composer/e-msg-composer.c:2844
+#: ../calendar/gui/dialogs/comp-editor.c:355 ../composer/e-msg-composer.c:2658
+#: ../composer/e-msg-composer.c:2834
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Vedlagt melding"
 msgstr[1] "%d vedlagte meldinger"
 
-#: ../calendar/gui/dialogs/comp-editor.c:412
+#: ../calendar/gui/dialogs/comp-editor.c:418
 #: ../calendar/gui/e-calendar-table.c:1164
-#: ../calendar/gui/e-calendar-view.c:1402 ../composer/e-msg-composer.c:2906
-#: ../mail/em-folder-tree.c:1046 ../mail/em-folder-view.c:966
-#: ../mail/message-list.c:1707 ../ui/evolution-addressbook.xml.h:31
+#: ../calendar/gui/e-calendar-view.c:1426 ../composer/e-msg-composer.c:2896
+#: ../mail/em-folder-tree.c:1047 ../mail/em-folder-view.c:1033
+#: ../mail/message-list.c:1708 ../ui/evolution-addressbook.xml.h:31
 #: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:7
-#: ../ui/evolution-mail-message.xml.h:105 ../ui/evolution-tasks.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:100 ../ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Kopier"
 
-#: ../calendar/gui/dialogs/comp-editor.c:413 ../composer/e-msg-composer.c:2907
-#: ../mail/em-folder-tree.c:1047 ../mail/em-folder-tree.c:2311
-#: ../mail/em-folder-view.c:862 ../mail/message-list.c:1708
+#: ../calendar/gui/dialogs/comp-editor.c:419 ../composer/e-msg-composer.c:2897
+#: ../mail/em-folder-tree.c:1048 ../mail/em-folder-view.c:929
+#: ../mail/message-list.c:1709
 msgid "_Move"
 msgstr "_Flytt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:415 ../composer/e-msg-composer.c:2909
-#: ../mail/em-folder-tree.c:1049 ../mail/message-list.c:1710
+#: ../calendar/gui/dialogs/comp-editor.c:421 ../composer/e-msg-composer.c:2899
+#: ../mail/em-folder-tree.c:1050 ../mail/message-list.c:1711
 msgid "Cancel _Drag"
 msgstr "Avbryt _draoperasjon"
 
-#: ../calendar/gui/dialogs/comp-editor.c:659
+#: ../calendar/gui/dialogs/comp-editor.c:694
 msgid "Could not update object"
 msgstr "Kunne ikke oppdatere objekt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:820 ../composer/e-msg-composer.c:2310
+#: ../calendar/gui/dialogs/comp-editor.c:873 ../composer/e-msg-composer.c:2308
 #, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../calendar/gui/dialogs/comp-editor.c:873 ../composer/e-msg-composer.c:2339
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr "Skjul _vedleggsfeltet (slipp vedlegg her)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:876
-#: ../calendar/gui/dialogs/comp-editor.c:928 ../composer/e-msg-composer.c:2342
-#: ../composer/e-msg-composer.c:3471
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr "Vis _vedleggsfeltet (slipp vedlegg her)"
+msgid "<b>%d</b> Attachment"
+msgid_plural "<b>%d</b> Attachments"
+msgstr[0] "<b>%d</b> vedlegg"
+msgstr[1] "<b>%d</b> vedlegg"
 
-#: ../calendar/gui/dialogs/comp-editor.c:952 ../composer/e-msg-composer.c:3493
-msgid "Attachment Button: Press space key to toggle attachment bar"
-msgstr "Vedleggsknapp: Trykk mellomrom for å slå av/på vedleggsfeletet"
+#: ../calendar/gui/dialogs/comp-editor.c:968 ../composer/e-msg-composer.c:3477
+msgid "_Attachment Bar (drop attachments here)"
+msgstr "_Vedleggsfelt (slipp vedlegg her)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1499
-#: ../calendar/gui/dialogs/comp-editor.c:1542
+#: ../calendar/gui/dialogs/comp-editor.c:1546
+#: ../calendar/gui/dialogs/comp-editor.c:1589
 msgid "Edit Appointment"
 msgstr "Rediger avtale"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1505
-#: ../calendar/gui/dialogs/comp-editor.c:1548
+#: ../calendar/gui/dialogs/comp-editor.c:1552
+#: ../calendar/gui/dialogs/comp-editor.c:1595
 #, c-format
 msgid "Meeting - %s"
 msgstr "Møte- %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1507
-#: ../calendar/gui/dialogs/comp-editor.c:1550
+#: ../calendar/gui/dialogs/comp-editor.c:1554
+#: ../calendar/gui/dialogs/comp-editor.c:1597
 #, c-format
 msgid "Appointment - %s"
 msgstr "Avtale - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1511
-#: ../calendar/gui/dialogs/comp-editor.c:1554
+#: ../calendar/gui/dialogs/comp-editor.c:1558
+#: ../calendar/gui/dialogs/comp-editor.c:1601
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tildelt oppgave - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1513
-#: ../calendar/gui/dialogs/comp-editor.c:1556
+#: ../calendar/gui/dialogs/comp-editor.c:1560
+#: ../calendar/gui/dialogs/comp-editor.c:1603
 #, c-format
 msgid "Task - %s"
 msgstr "Oppgave - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1516
-#: ../calendar/gui/dialogs/comp-editor.c:1559
+#: ../calendar/gui/dialogs/comp-editor.c:1563
+#: ../calendar/gui/dialogs/comp-editor.c:1606
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journaloppføring - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1527
-#: ../calendar/gui/dialogs/comp-editor.c:1569
+#: ../calendar/gui/dialogs/comp-editor.c:1574
+#: ../calendar/gui/dialogs/comp-editor.c:1616
 msgid "No summary"
 msgstr "Ingen sammendrag"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2003
-#: ../calendar/gui/dialogs/comp-editor.c:2036
-#: ../calendar/gui/dialogs/comp-editor.c:2060
+#: ../calendar/gui/dialogs/comp-editor.c:2054
+#: ../calendar/gui/dialogs/comp-editor.c:2087
+#: ../calendar/gui/dialogs/comp-editor.c:2111
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Endringer som gjøres i denne oppføringen kan bli forkastet hvis det kommer "
 "enoppdatering"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2084
+#: ../calendar/gui/dialogs/comp-editor.c:2135
 msgid "Unable to use current version!"
 msgstr "Kan ikke bruke denne versjonen!"
 
@@ -5602,44 +5551,48 @@ msgstr "Deleger til:"
 msgid "Enter Delegate"
 msgstr "Skriv inn delegat"
 
-#: ../calendar/gui/dialogs/event-editor.c:149
+#: ../calendar/gui/dialogs/event-editor.c:141 ../calendar/gui/print.c:2298
+msgid "Appointment"
+msgstr "Avtale"
+
+#: ../calendar/gui/dialogs/event-editor.c:150
 msgid "Recurrence"
 msgstr "Gjeninntreffelse"
 
-#: ../calendar/gui/dialogs/event-editor.c:161
-#: ../calendar/gui/dialogs/event-editor.c:233
-#: ../calendar/gui/dialogs/event-editor.c:379
+#: ../calendar/gui/dialogs/event-editor.c:166
+#: ../calendar/gui/dialogs/event-editor.c:238
+#: ../calendar/gui/dialogs/event-editor.c:402
 msgid "Scheduling"
 msgstr "Møteplanlegging"
 
-#: ../calendar/gui/dialogs/event-editor.c:168
-#: ../calendar/gui/dialogs/event-editor.c:236
-#: ../calendar/gui/dialogs/event-editor.c:382
+#: ../calendar/gui/dialogs/event-editor.c:173
+#: ../calendar/gui/dialogs/event-editor.c:241
+#: ../calendar/gui/dialogs/event-editor.c:405
 msgid "Invitations"
 msgstr "Invitasjoner"
 
-#: ../calendar/gui/dialogs/event-page.c:725
+#: ../calendar/gui/dialogs/event-page.c:720
 msgid "Event with no start date"
 msgstr "Hendelse uten startdato"
 
-#: ../calendar/gui/dialogs/event-page.c:728
+#: ../calendar/gui/dialogs/event-page.c:723
 msgid "Event with no end date"
 msgstr "Hendelse uten sluttdato"
 
-#: ../calendar/gui/dialogs/event-page.c:894
-#: ../calendar/gui/dialogs/task-page.c:561
+#: ../calendar/gui/dialogs/event-page.c:889
+#: ../calendar/gui/dialogs/task-page.c:556
 msgid "Start date is wrong"
 msgstr "Startdato er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:904
+#: ../calendar/gui/dialogs/event-page.c:899
 msgid "End date is wrong"
 msgstr "Sluttdato er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:927
+#: ../calendar/gui/dialogs/event-page.c:922
 msgid "Start time is wrong"
 msgstr "Tid for start er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:934
+#: ../calendar/gui/dialogs/event-page.c:929
 msgid "End time is wrong"
 msgstr "Tid for slutt er feil"
 
@@ -5701,7 +5654,8 @@ msgid "A_ll day event"
 msgstr "Varer hele _dagen"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:9
-msgid "Ad_vanced  send options"
+#: ../calendar/gui/dialogs/task-page.glade.h:4
+msgid "Ad_vanced send options"
 msgstr "A_vanserte alternativer for sending"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:10
@@ -5790,37 +5744,37 @@ msgstr "_Start-tid:"
 #: ../calendar/gui/dialogs/meeting-page.c:296
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/e-cal-model-tasks.c:652
-#: ../calendar/gui/e-itip-control.c:1104 ../composer/e-msg-composer.c:2117
-#: ../filter/filter-rule.c:878 ../mail/em-account-editor.c:684
-#: ../mail/em-account-editor.c:1290 ../mail/em-account-prefs.c:421
-#: ../mail/em-folder-view.c:993
+#: ../calendar/gui/e-itip-control.c:1104 ../composer/e-msg-composer.c:2112
+#: ../filter/filter-rule.c:881 ../mail/em-account-editor.c:683
+#: ../mail/em-account-editor.c:1346 ../mail/em-account-prefs.c:437
+#: ../mail/em-folder-view.c:1062
 #: ../plugins/calendar-weather/calendar-weather.c:371
 #: ../plugins/calendar-weather/calendar-weather.c:425
-#: ../plugins/itip-formatter/itip-formatter.c:1376
+#: ../plugins/itip-formatter/itip-formatter.c:1390
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:190
-#: ../widgets/misc/e-cell-date-edit.c:248 ../widgets/misc/e-dateedit.c:458
-#: ../widgets/misc/e-dateedit.c:1497 ../widgets/misc/e-dateedit.c:1651
+#: ../widgets/misc/e-cell-date-edit.c:248 ../widgets/misc/e-dateedit.c:465
+#: ../widgets/misc/e-dateedit.c:1504 ../widgets/misc/e-dateedit.c:1673
 msgid "None"
 msgstr "Ingen"
 
-#: ../calendar/gui/dialogs/meeting-page.c:432
+#: ../calendar/gui/dialogs/meeting-page.c:435
 msgid "The organizer selected no longer has an account."
 msgstr "Valgt organisator har ingen konto lenger."
 
-#: ../calendar/gui/dialogs/meeting-page.c:438
+#: ../calendar/gui/dialogs/meeting-page.c:441
 msgid "An organizer is required."
 msgstr "En organisator kreves."
 
-#: ../calendar/gui/dialogs/meeting-page.c:453
+#: ../calendar/gui/dialogs/meeting-page.c:456
 msgid "At least one attendee is required."
 msgstr "Minst en deltaker kreves."
 
-#: ../calendar/gui/dialogs/meeting-page.c:778
+#: ../calendar/gui/dialogs/meeting-page.c:781
 msgid "_Delegate To..."
 msgstr "_Deleger til..."
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:1
-#: ../calendar/gui/e-meeting-list-view.c:308
+#: ../calendar/gui/e-meeting-list-view.c:309
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Deltaker"
@@ -5856,15 +5810,15 @@ msgid "Member"
 msgstr "Medlem"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:8
-#: ../calendar/gui/e-meeting-list-view.c:333
+#: ../calendar/gui/e-meeting-list-view.c:334
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:10
-#: ../calendar/gui/dialogs/task-editor.c:146
+#: ../calendar/gui/dialogs/task-editor.c:147
 #: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:340
+#: ../calendar/gui/e-meeting-list-view.c:341
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
 #: ../mail/message-list.etspec.h:12
 msgid "Status"
@@ -5974,43 +5928,43 @@ msgstr "Gjenintreffingsdato er ugyldig"
 msgid "on"
 msgstr "på"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:984
+#: ../calendar/gui/dialogs/recurrence-page.c:983
 msgid "first"
 msgstr "første"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:985
+#: ../calendar/gui/dialogs/recurrence-page.c:984
 msgid "second"
 msgstr "sekund"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:986
+#: ../calendar/gui/dialogs/recurrence-page.c:985
 msgid "third"
 msgstr "tredje"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:987
+#: ../calendar/gui/dialogs/recurrence-page.c:986
 msgid "fourth"
 msgstr "fjerde"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:988
+#: ../calendar/gui/dialogs/recurrence-page.c:987
 msgid "last"
 msgstr "siste"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1011
+#: ../calendar/gui/dialogs/recurrence-page.c:1010
 msgid "Other Date"
 msgstr "Annen dato"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1039
+#: ../calendar/gui/dialogs/recurrence-page.c:1038
 msgid "day"
 msgstr "dag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1176
+#: ../calendar/gui/dialogs/recurrence-page.c:1175
 msgid "on the"
 msgstr "den"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1362
+#: ../calendar/gui/dialogs/recurrence-page.c:1364
 msgid "occurrences"
 msgstr "gjentakelser"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2315
+#: ../calendar/gui/dialogs/recurrence-page.c:2317
 msgid "Date/Time"
 msgstr "Dato/klokkeslett"
 
@@ -6084,13 +6038,13 @@ msgstr "<span weight=\"bold\">Status</span>"
 #: ../calendar/gui/e-cal-model-tasks.c:658
 #: ../calendar/gui/e-calendar-table.c:457 ../calendar/gui/e-itip-control.c:896
 #: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
-#: ../calendar/gui/print.c:2349
+#: ../calendar/gui/print.c:2361 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "Fullført"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
 #: ../calendar/gui/e-cal-component-preview.c:248
-#: ../calendar/gui/e-calendar-table.c:382 ../mail/message-list.c:1006
+#: ../calendar/gui/e-calendar-table.c:382 ../mail/message-list.c:1008
 msgid "High"
 msgstr "Høy"
 
@@ -6099,20 +6053,20 @@ msgstr "Høy"
 #: ../calendar/gui/e-cal-model-tasks.c:343
 #: ../calendar/gui/e-cal-model-tasks.c:656
 #: ../calendar/gui/e-cal-model-tasks.c:731
-#: ../calendar/gui/e-calendar-table.c:456 ../calendar/gui/print.c:2346
+#: ../calendar/gui/e-calendar-table.c:456 ../calendar/gui/print.c:2358
 msgid "In Progress"
 msgstr "Under arbeid"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-calendar-table.c:384 ../mail/message-list.c:1004
+#: ../calendar/gui/e-calendar-table.c:384 ../mail/message-list.c:1006
 msgid "Low"
 msgstr "Lav"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:250
 #: ../calendar/gui/e-cal-model.c:899 ../calendar/gui/e-calendar-table.c:383
-#: ../mail/message-list.c:1005
+#: ../mail/message-list.c:1007
 msgid "Normal"
 msgstr "Normal"
 
@@ -6120,7 +6074,7 @@ msgstr "Normal"
 #: ../calendar/gui/e-cal-component-preview.c:236
 #: ../calendar/gui/e-cal-model-tasks.c:341
 #: ../calendar/gui/e-cal-model-tasks.c:654
-#: ../calendar/gui/e-calendar-table.c:455 ../calendar/gui/print.c:2343
+#: ../calendar/gui/e-calendar-table.c:455 ../calendar/gui/print.c:2355
 msgid "Not Started"
 msgstr "Ikke startet"
 
@@ -6138,7 +6092,7 @@ msgid "_Date completed:"
 msgstr "Fullført _dato:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:13
-#: ../widgets/misc/e-send-options.glade.h:34
+#: ../widgets/misc/e-send-options.glade.h:31
 msgid "_Priority:"
 msgstr "_Prioritet:"
 
@@ -6150,29 +6104,25 @@ msgstr "_Status:"
 msgid "_Web Page:"
 msgstr "_Nettside:"
 
-#: ../calendar/gui/dialogs/task-editor.c:137 ../calendar/gui/print.c:2300
+#: ../calendar/gui/dialogs/task-editor.c:138 ../calendar/gui/print.c:2300
 msgid "Task"
 msgstr "Oppgave"
 
-#: ../calendar/gui/dialogs/task-editor.c:157
-#: ../calendar/gui/dialogs/task-editor.c:219
-#: ../calendar/gui/dialogs/task-editor.c:359
+#: ../calendar/gui/dialogs/task-editor.c:163
+#: ../calendar/gui/dialogs/task-editor.c:225
+#: ../calendar/gui/dialogs/task-editor.c:379
 msgid "Assignment"
 msgstr "Tildeling"
 
-#: ../calendar/gui/dialogs/task-page.c:534
+#: ../calendar/gui/dialogs/task-page.c:529
 msgid "Due date is wrong"
 msgstr "Ferdigdato er feil"
 
-#: ../calendar/gui/dialogs/task-page.c:878
+#: ../calendar/gui/dialogs/task-page.c:873
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Kan ikke åpne oppgaver i «%s»."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:4
-msgid "Ad_vanced send options"
-msgstr "A_vanserte alternativer for sending"
-
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "D_escription:"
 msgstr "B_eskrivelse:"
@@ -6272,52 +6222,58 @@ msgstr[1] "%d sekunder"
 msgid "Unknown action to be performed"
 msgstr "Ukjent handling som skal utføres"
 
-#: ../calendar/gui/e-alarm-list.c:474
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
+#: ../calendar/gui/e-alarm-list.c:476
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s før avtalen starter"
 
-#: ../calendar/gui/e-alarm-list.c:477
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
+#: ../calendar/gui/e-alarm-list.c:481
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s etter avtalen har startet"
 
-#: ../calendar/gui/e-alarm-list.c:482
+#. Translator: The %s refers to the base, which would be actions like
+#. * "Play a sound"
+#: ../calendar/gui/e-alarm-list.c:488
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s ved avtalens start"
 
-#: ../calendar/gui/e-alarm-list.c:491
+#: ../calendar/gui/e-alarm-list.c:497
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s før avtalen slutter"
 
-#: ../calendar/gui/e-alarm-list.c:494
+#: ../calendar/gui/e-alarm-list.c:500
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s etter avtalens slutt"
 
-#: ../calendar/gui/e-alarm-list.c:499
+#: ../calendar/gui/e-alarm-list.c:505
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s ved avtalens slutt"
 
-#: ../calendar/gui/e-alarm-list.c:521
+#: ../calendar/gui/e-alarm-list.c:527
 #, c-format
 msgid "%s at %s"
 msgstr "%s ved %s"
 
-#: ../calendar/gui/e-alarm-list.c:527
+#: ../calendar/gui/e-alarm-list.c:533
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s for en ukjent utløsertype"
 
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2573
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2693
 #, c-format
 msgid "Click to open %s"
 msgstr "Klikk for å åpne %s"
 
-#: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:795
+#: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:796
 msgid "Untitled"
 msgstr "Uten navn"
 
@@ -6341,7 +6297,7 @@ msgstr "Ferdig-dato:"
 #. Status
 #: ../calendar/gui/e-cal-component-preview.c:222
 #: ../calendar/gui/e-itip-control.c:1132
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:129
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:209
 #: ../plugins/itip-formatter/itip-view.c:884
 msgid "Status:"
 msgstr "Status:"
@@ -6364,7 +6320,7 @@ msgstr "Startdato"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:5
 #: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../mail/mail-dialogs.glade.h:21
+#: ../mail/mail-dialogs.glade.h:17 ../plugins/save-calendar/csv-format.c:386
 msgid "Summary"
 msgstr "Sammendrag"
 
@@ -6379,22 +6335,6 @@ msgstr "Ledig"
 msgid "Busy"
 msgstr "Opptatt"
 
-#: ../calendar/gui/e-cal-model-tasks.c:297
-msgid "N"
-msgstr "N"
-
-#: ../calendar/gui/e-cal-model-tasks.c:297
-msgid "S"
-msgstr "S"
-
-#: ../calendar/gui/e-cal-model-tasks.c:299 ../smime/lib/e-cert.c:681
-msgid "E"
-msgstr "Ø"
-
-#: ../calendar/gui/e-cal-model-tasks.c:299
-msgid "W"
-msgstr "V"
-
 #: ../calendar/gui/e-cal-model-tasks.c:606
 msgid ""
 "The geographical position must be entered in the format: \n"
@@ -6424,11 +6364,11 @@ msgstr "Nei"
 #: ../calendar/gui/e-meeting-list-view.c:139
 #: ../calendar/gui/e-meeting-list-view.c:153
 #: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:224 ../mail/em-utils.c:1173
+#: ../calendar/gui/e-meeting-store.c:224 ../mail/em-utils.c:1175
 #: ../plugins/itip-formatter/itip-formatter.c:251
-#: ../plugins/itip-formatter/itip-formatter.c:1398
+#: ../plugins/itip-formatter/itip-formatter.c:1412
 #: ../plugins/plugin-manager/plugin-manager.c:72
-#: ../shell/e-component-registry.c:201 ../shell/e-component-registry.c:205
+#: ../shell/e-component-registry.c:205 ../shell/e-component-registry.c:211
 #: ../widgets/misc/e-charset-picker.c:62
 msgid "Unknown"
 msgstr "Ukjent"
@@ -6495,17 +6435,17 @@ msgid "Deleting selected objects"
 msgstr "Sletter valgte objekter"
 
 #: ../calendar/gui/e-calendar-table.c:873
-#: ../calendar/gui/e-calendar-view.c:756
+#: ../calendar/gui/e-calendar-view.c:779
 msgid "Updating objects"
 msgstr "Oppdaterer objekter"
 
 #: ../calendar/gui/e-calendar-table.c:1014
-#: ../calendar/gui/e-calendar-view.c:1064 ../composer/e-msg-composer.c:1241
+#: ../calendar/gui/e-calendar-view.c:1082 ../composer/e-msg-composer.c:1241
 msgid "Save as..."
 msgstr "Lagre som..."
 
 #: ../calendar/gui/e-calendar-table.c:1156
-#: ../calendar/gui/e-calendar-view.c:1395 ../ui/evolution-addressbook.xml.h:37
+#: ../calendar/gui/e-calendar-view.c:1419 ../ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Åpne"
 
@@ -6514,30 +6454,30 @@ msgid "Open _Web Page"
 msgstr "_Åpne nettside"
 
 #: ../calendar/gui/e-calendar-table.c:1158
-#: ../calendar/gui/e-calendar-view.c:1396 ../mail/em-folder-view.c:976
-#: ../mail/em-popup.c:494 ../ui/evolution-mail-message.xml.h:124
+#: ../calendar/gui/e-calendar-view.c:1420 ../mail/em-folder-view.c:1043
+#: ../mail/em-popup.c:494
 msgid "_Save As..."
 msgstr "Lagre _som..."
 
 #: ../calendar/gui/e-calendar-table.c:1159
-#: ../calendar/gui/e-calendar-view.c:1376
-#: ../calendar/gui/e-calendar-view.c:1397 ../ui/evolution-addressbook.xml.h:40
-#: ../ui/evolution-calendar.xml.h:44 ../ui/evolution-mail-message.xml.h:121
-#: ../ui/evolution-tasks.xml.h:25
+#: ../calendar/gui/e-calendar-view.c:1400
+#: ../calendar/gui/e-calendar-view.c:1421 ../mail/em-folder-view.c:1044
+#: ../ui/evolution-addressbook.xml.h:40 ../ui/evolution-calendar.xml.h:44
+#: ../ui/evolution-mail-message.xml.h:117 ../ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "S_kriv ut..."
 
 #: ../calendar/gui/e-calendar-table.c:1163
-#: ../calendar/gui/e-calendar-view.c:1401 ../ui/evolution-addressbook.xml.h:1
+#: ../calendar/gui/e-calendar-view.c:1425 ../ui/evolution-addressbook.xml.h:1
 #: ../ui/evolution-calendar.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Kli_pp ut"
 
 #: ../calendar/gui/e-calendar-table.c:1165
-#: ../calendar/gui/e-calendar-view.c:1379
-#: ../calendar/gui/e-calendar-view.c:1403 ../ui/evolution-addressbook.xml.h:38
+#: ../calendar/gui/e-calendar-view.c:1403
+#: ../calendar/gui/e-calendar-view.c:1427 ../ui/evolution-addressbook.xml.h:38
 #: ../ui/evolution-calendar.xml.h:43 ../ui/evolution-composer-entries.xml.h:9
-#: ../ui/evolution-mail-message.xml.h:119 ../ui/evolution-tasks.xml.h:24
+#: ../ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Lim inn"
 
@@ -6559,9 +6499,9 @@ msgstr "_Merk valgte oppgaver som fullført"
 
 #. FIXME: need to disable for undeletable folders
 #: ../calendar/gui/e-calendar-table.c:1176
-#: ../calendar/gui/e-calendar-view.c:1414 ../mail/em-folder-tree.c:2814
-#: ../mail/em-folder-view.c:980 ../ui/evolution-addressbook.xml.h:33
-#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-message.xml.h:108
+#: ../calendar/gui/e-calendar-view.c:1438 ../mail/em-folder-tree.c:2119
+#: ../mail/em-folder-view.c:1047 ../ui/evolution-addressbook.xml.h:33
+#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:26
 #: ../ui/evolution-tasks.xml.h:21
 msgid "_Delete"
 msgstr "_Slett"
@@ -6593,6 +6533,7 @@ msgid "Due date"
 msgstr "Ferdigdato"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:8
+#: ../plugins/save-calendar/csv-format.c:397
 msgid "Priority"
 msgstr "Prioritet"
 
@@ -6604,69 +6545,69 @@ msgstr "Startdato"
 msgid "Task sort"
 msgstr "Oppgavesortering"
 
-#: ../calendar/gui/e-calendar-view.c:1185
+#: ../calendar/gui/e-calendar-view.c:1203
 msgid "Moving items"
 msgstr "Flytter oppføringer"
 
-#: ../calendar/gui/e-calendar-view.c:1187
+#: ../calendar/gui/e-calendar-view.c:1205
 msgid "Copying items"
 msgstr "Kopierer oppføringer"
 
-#: ../calendar/gui/e-calendar-view.c:1370
+#: ../calendar/gui/e-calendar-view.c:1394
 msgid "New _Appointment..."
 msgstr "Ny _avtale..."
 
-#: ../calendar/gui/e-calendar-view.c:1371
+#: ../calendar/gui/e-calendar-view.c:1395
 msgid "New All Day _Event"
 msgstr "Ny avtale som varer h_ele dagen"
 
-#: ../calendar/gui/e-calendar-view.c:1373
+#: ../calendar/gui/e-calendar-view.c:1397
 msgid "New Task"
 msgstr "Ny oppgave"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1383
+#: ../calendar/gui/e-calendar-view.c:1407
 msgid "Current View"
 msgstr "Aktiv visning"
 
-#: ../calendar/gui/e-calendar-view.c:1385 ../ui/evolution-calendar.xml.h:26
+#: ../calendar/gui/e-calendar-view.c:1409 ../ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "Velg i _dag"
 
-#: ../calendar/gui/e-calendar-view.c:1386
+#: ../calendar/gui/e-calendar-view.c:1410
 msgid "_Select Date..."
 msgstr "_Velg dato..."
 
 #. TODO: Why is this in a context menu when it applies globally?
-#: ../calendar/gui/e-calendar-view.c:1391 ../ui/evolution-calendar.xml.h:45
+#: ../calendar/gui/e-calendar-view.c:1415 ../ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publiser ledig/opptatt-informasjon"
 
-#: ../calendar/gui/e-calendar-view.c:1407
+#: ../calendar/gui/e-calendar-view.c:1431
 msgid "Cop_y to Calendar..."
 msgstr "Kop_ier til kalender..."
 
-#: ../calendar/gui/e-calendar-view.c:1408
+#: ../calendar/gui/e-calendar-view.c:1432
 msgid "Mo_ve to Calendar..."
 msgstr "Fl_ytt til kalender..."
 
-#: ../calendar/gui/e-calendar-view.c:1409
+#: ../calendar/gui/e-calendar-view.c:1433
 msgid "_Schedule Meeting..."
 msgstr "_Sett opp møte..."
 
-#: ../calendar/gui/e-calendar-view.c:1410
+#: ../calendar/gui/e-calendar-view.c:1434
 msgid "_Forward as iCalendar..."
 msgstr "_Videresend som iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1415
+#: ../calendar/gui/e-calendar-view.c:1439
 msgid "Make this Occurrence _Movable"
 msgstr "Gjør denne hendelsen _flyttbar"
 
-#: ../calendar/gui/e-calendar-view.c:1416
+#: ../calendar/gui/e-calendar-view.c:1440
 msgid "Delete this _Occurrence"
 msgstr "Slett denne _hendelsen"
 
-#: ../calendar/gui/e-calendar-view.c:1417
+#: ../calendar/gui/e-calendar-view.c:1441
 msgid "Delete _All Occurrences"
 msgstr "Slett _alle hendelser"
 
@@ -6701,7 +6642,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../calendar/gui/e-day-view-time-item.c:527
+#: ../calendar/gui/e-day-view-time-item.c:553
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minutters oppdeling"
@@ -6712,19 +6653,19 @@ msgstr "%02i minutters oppdeling"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1494
+#: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1499
 #: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1517
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:748 ../calendar/gui/e-week-view.c:512
+#: ../calendar/gui/e-day-view.c:752 ../calendar/gui/e-week-view.c:512
 #: ../calendar/gui/print.c:841
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:751 ../calendar/gui/e-week-view.c:515
+#: ../calendar/gui/e-day-view.c:755 ../calendar/gui/e-week-view.c:515
 #: ../calendar/gui/print.c:843
 msgid "pm"
 msgstr "pm"
@@ -6802,6 +6743,7 @@ msgid "Ends"
 msgstr "Slutter"
 
 #: ../calendar/gui/e-itip-control.c:909
+#: ../plugins/save-calendar/csv-format.c:395
 msgid "Due"
 msgstr "Ferdig"
 
@@ -6835,21 +6777,21 @@ msgstr ""
 #: ../calendar/gui/e-itip-control.c:1137
 #: ../calendar/gui/e-meeting-list-view.c:175
 #: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
-#: ../calendar/gui/itip-utils.c:422
-#: ../plugins/itip-formatter/itip-formatter.c:1389
+#: ../calendar/gui/itip-utils.c:421
+#: ../plugins/itip-formatter/itip-formatter.c:1403
 msgid "Accepted"
 msgstr "Godtatt"
 
-#: ../calendar/gui/e-itip-control.c:1141 ../calendar/gui/itip-utils.c:425
-#: ../plugins/itip-formatter/itip-formatter.c:1392
+#: ../calendar/gui/e-itip-control.c:1141 ../calendar/gui/itip-utils.c:424
+#: ../plugins/itip-formatter/itip-formatter.c:1406
 msgid "Tentatively Accepted"
 msgstr "Akseptert tentativt"
 
 #: ../calendar/gui/e-itip-control.c:1145
 #: ../calendar/gui/e-meeting-list-view.c:176
 #: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
-#: ../calendar/gui/itip-utils.c:428 ../calendar/gui/itip-utils.c:454
-#: ../plugins/itip-formatter/itip-formatter.c:1395
+#: ../calendar/gui/itip-utils.c:427 ../calendar/gui/itip-utils.c:453
+#: ../plugins/itip-formatter/itip-formatter.c:1409
 msgid "Declined"
 msgstr "Avslått"
 
@@ -7115,7 +7057,7 @@ msgstr "Oppdater status for respondent"
 msgid "Send Latest Information"
 msgstr "Send siste informasjon"
 
-#: ../calendar/gui/e-itip-control.c:2375 ../calendar/gui/itip-utils.c:442
+#: ../calendar/gui/e-itip-control.c:2375 ../calendar/gui/itip-utils.c:441
 #: ../mail/mail-send-recv.c:414 ../mail/mail-send-recv.c:466
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
@@ -7264,7 +7206,7 @@ msgstr "%a %d.%m.%Y"
 #. This is a strftime() format for a short date. %m = month,
 #. %d = day of month, %Y = year (all digits).
 #: ../calendar/gui/e-meeting-time-sel-item.c:452 ../e-util/e-time-utils.c:238
-#: ../e-util/e-time-utils.c:299 ../widgets/misc/e-dateedit.c:1660
+#: ../e-util/e-time-utils.c:299 ../widgets/misc/e-dateedit.c:1682
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
@@ -7325,7 +7267,7 @@ msgstr "Obligatoriske personer _og en ressurs"
 msgid "Enter the password for %s"
 msgstr "Oppgi passord for %s"
 
-#: ../calendar/gui/e-tasks.c:763 ../calendar/gui/gnome-cal.c:2372
+#: ../calendar/gui/e-tasks.c:763 ../calendar/gui/gnome-cal.c:2412
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7366,39 +7308,39 @@ msgstr "Tidssone-knapp"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:718
+#: ../calendar/gui/gnome-cal.c:723
 msgid "Updating query"
 msgstr "Oppdaterer spørring"
 
 #. bonobo displays this string so it must be in locale
-#: ../calendar/gui/gnome-cal.c:2057 ../widgets/menus/gal-view-menus.c:351
+#: ../calendar/gui/gnome-cal.c:2089 ../widgets/menus/gal-view-menus.c:350
 msgid "Custom View"
 msgstr "Egendefinert visning"
 
-#: ../calendar/gui/gnome-cal.c:2058
+#: ../calendar/gui/gnome-cal.c:2090
 msgid "Save Custom View"
 msgstr "Lagre egendefinert visning"
 
-#: ../calendar/gui/gnome-cal.c:2063 ../widgets/menus/gal-view-menus.c:373
+#: ../calendar/gui/gnome-cal.c:2095 ../widgets/menus/gal-view-menus.c:372
 msgid "Define Views..."
 msgstr "Definer visninger..."
 
-#: ../calendar/gui/gnome-cal.c:2222
+#: ../calendar/gui/gnome-cal.c:2258
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Laster avtaler på %s"
 
-#: ../calendar/gui/gnome-cal.c:2241
+#: ../calendar/gui/gnome-cal.c:2277
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Laster oppgaver på %s"
 
-#: ../calendar/gui/gnome-cal.c:2338
+#: ../calendar/gui/gnome-cal.c:2378
 #, c-format
 msgid "Opening %s"
 msgstr "Åpner %s"
 
-#: ../calendar/gui/gnome-cal.c:3228
+#: ../calendar/gui/gnome-cal.c:3268
 msgid "Purging"
 msgstr "Sletter"
 
@@ -7458,57 +7400,57 @@ msgstr "September"
 msgid "_Select Today"
 msgstr "_Velg i dag"
 
-#: ../calendar/gui/itip-utils.c:271 ../calendar/gui/itip-utils.c:319
-#: ../calendar/gui/itip-utils.c:351
+#: ../calendar/gui/itip-utils.c:270 ../calendar/gui/itip-utils.c:318
+#: ../calendar/gui/itip-utils.c:350
 msgid "An organizer must be set."
 msgstr "En organisator må oppgis."
 
-#: ../calendar/gui/itip-utils.c:306
+#: ../calendar/gui/itip-utils.c:305
 msgid "At least one attendee is necessary"
 msgstr "Minst en deltaker kreves"
 
-#: ../calendar/gui/itip-utils.c:394 ../calendar/gui/itip-utils.c:503
+#: ../calendar/gui/itip-utils.c:393 ../calendar/gui/itip-utils.c:502
 msgid "Event information"
 msgstr "Hendelsesinformasjon"
 
-#: ../calendar/gui/itip-utils.c:396 ../calendar/gui/itip-utils.c:505
+#: ../calendar/gui/itip-utils.c:395 ../calendar/gui/itip-utils.c:504
 msgid "Task information"
 msgstr "Oppgaveinformasjon"
 
-#: ../calendar/gui/itip-utils.c:398 ../calendar/gui/itip-utils.c:507
+#: ../calendar/gui/itip-utils.c:397 ../calendar/gui/itip-utils.c:506
 msgid "Journal information"
 msgstr "Journalinformasjon"
 
-#: ../calendar/gui/itip-utils.c:400 ../calendar/gui/itip-utils.c:525
+#: ../calendar/gui/itip-utils.c:399 ../calendar/gui/itip-utils.c:524
 msgid "Free/Busy information"
 msgstr "Ledig/opptatt-informasjon"
 
-#: ../calendar/gui/itip-utils.c:402
+#: ../calendar/gui/itip-utils.c:401
 msgid "Calendar information"
 msgstr "Kalenderinformasjon"
 
-#: ../calendar/gui/itip-utils.c:438
+#: ../calendar/gui/itip-utils.c:437
 msgid "Updated"
 msgstr "Oppdatert"
 
-#: ../calendar/gui/itip-utils.c:446
+#: ../calendar/gui/itip-utils.c:445
 msgid "Refresh"
 msgstr "Oppdater"
 
-#: ../calendar/gui/itip-utils.c:450
+#: ../calendar/gui/itip-utils.c:449
 msgid "Counter-proposal"
 msgstr "Motforslag"
 
-#: ../calendar/gui/itip-utils.c:521
+#: ../calendar/gui/itip-utils.c:520
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Ledig/opptatt-informasjon (%s til %s)"
 
-#: ../calendar/gui/itip-utils.c:531
+#: ../calendar/gui/itip-utils.c:530
 msgid "iCalendar information"
 msgstr "iCalendar-informasjon"
 
-#: ../calendar/gui/itip-utils.c:673
+#: ../calendar/gui/itip-utils.c:672
 msgid "You must be an attendee of the event."
 msgstr "Du må være en deltager i hendelsen."
 
@@ -7537,18 +7479,18 @@ msgstr ""
 "Vennligst vent mens Evolution migrere dine mapper..."
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:745 ../calendar/gui/migration.c:912
+#: ../calendar/gui/migration.c:748 ../calendar/gui/migration.c:915
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "Kan ikke migrere gamle innstillinger fra evolution/config.xmldb"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:774
+#: ../calendar/gui/migration.c:777
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "Kan ikke migrere kalender «%s»"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:941
+#: ../calendar/gui/migration.c:944
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Kan ikke migrere oppgaver «%s»"
@@ -7738,112 +7680,122 @@ msgstr "Valgt måned (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Valgt år (%Y)"
 
-#: ../calendar/gui/print.c:2359
+#: ../calendar/gui/print.c:2320
+#, c-format
+msgid "Summary: %s"
+msgstr "Sammendrag: %s"
+
+#: ../calendar/gui/print.c:2328
+#, c-format
+msgid "Location: %s"
+msgstr "Plassering: %s"
+
+#: ../calendar/gui/print.c:2371
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: ../calendar/gui/print.c:2376
+#: ../calendar/gui/print.c:2388
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioritet: %s"
 
-#: ../calendar/gui/print.c:2388
+#: ../calendar/gui/print.c:2400
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Prosent fullført: %i"
 
-#: ../calendar/gui/print.c:2400
+#: ../calendar/gui/print.c:2412
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2414
+#: ../calendar/gui/print.c:2426
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorier: %s"
 
-#: ../calendar/gui/print.c:2425
+#: ../calendar/gui/print.c:2437
 msgid "Contacts: "
 msgstr "Kontakter: "
 
-#: ../calendar/gui/print.c:2565 ../calendar/gui/print.c:2653
-#: ../calendar/gui/print.c:2779 ../mail/em-format-html-print.c:178
+#: ../calendar/gui/print.c:2577 ../calendar/gui/print.c:2665
+#: ../calendar/gui/print.c:2791 ../mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Forhåndsvisning av utskrift"
 
-#: ../calendar/gui/print.c:2600
+#: ../calendar/gui/print.c:2612
 msgid "Print Item"
 msgstr "Skriv ut oppføring"
 
-#: ../calendar/gui/tasks-component.c:428
+#: ../calendar/gui/tasks-component.c:439
 msgid "New Task List"
 msgstr "Ny oppgaveliste"
 
-#: ../calendar/gui/tasks-component.c:504
+#: ../calendar/gui/tasks-component.c:515
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d oppgave"
 msgstr[1] "%d oppgaver"
 
-#: ../calendar/gui/tasks-component.c:506 ../mail/mail-component.c:544
+#: ../calendar/gui/tasks-component.c:517 ../mail/mail-component.c:545
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", %d valgt"
 msgstr[1] ", %d valgt"
 
-#: ../calendar/gui/tasks-component.c:553
+#: ../calendar/gui/tasks-component.c:564
 msgid "Failed upgrading tasks."
 msgstr "Feil under oppgradering av oppgaver."
 
-#: ../calendar/gui/tasks-component.c:847
+#: ../calendar/gui/tasks-component.c:860
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "Kan ikke åpne oppgaveliste «%s» for oppretting av hendelser og møter"
 
-#: ../calendar/gui/tasks-component.c:862
+#: ../calendar/gui/tasks-component.c:875
 msgid "There is no calendar available for creating tasks"
 msgstr "Ingen kalender tilgjengelig for opppretting av oppgaver"
 
-#: ../calendar/gui/tasks-component.c:956
+#: ../calendar/gui/tasks-component.c:969
 msgid "Task Source Selector"
 msgstr "Valgt av oppgavekilde"
 
-#: ../calendar/gui/tasks-component.c:1139
+#: ../calendar/gui/tasks-component.c:1152
 msgid "New task"
 msgstr "Ny oppgave"
 
-#: ../calendar/gui/tasks-component.c:1140
+#: ../calendar/gui/tasks-component.c:1153
 msgid "_Task"
 msgstr "_Oppgave"
 
-#: ../calendar/gui/tasks-component.c:1141
+#: ../calendar/gui/tasks-component.c:1154
 msgid "Create a new task"
 msgstr "Opprett en ny oppgave"
 
-#: ../calendar/gui/tasks-component.c:1147
+#: ../calendar/gui/tasks-component.c:1160
 msgid "New assigned task"
 msgstr "Ny tildelt oppgave"
 
-#: ../calendar/gui/tasks-component.c:1148
+#: ../calendar/gui/tasks-component.c:1161
 msgid "Assigne_d Task"
 msgstr "Til_delt oppgave"
 
-#: ../calendar/gui/tasks-component.c:1149
+#: ../calendar/gui/tasks-component.c:1162
 msgid "Create a new assigned task"
 msgstr "Opprett en ny tildelt oppgave"
 
-#: ../calendar/gui/tasks-component.c:1155
+#: ../calendar/gui/tasks-component.c:1168
 msgid "New task list"
 msgstr "Ny oppgaveliste"
 
-#: ../calendar/gui/tasks-component.c:1156
+#: ../calendar/gui/tasks-component.c:1169
 msgid "Task l_ist"
 msgstr "Oppgave_liste"
 
-#: ../calendar/gui/tasks-component.c:1157
+#: ../calendar/gui/tasks-component.c:1170
 msgid "Create a new task list"
 msgstr "Opprett en ny oppgaveliste"
 
@@ -9442,15 +9394,15 @@ msgstr "Stillehavet/Wallis"
 msgid "Pacific/Yap"
 msgstr "Stillahavet/Yap"
 
-#: ../composer/e-msg-composer-hdrs.c:519
+#: ../composer/e-msg-composer-hdrs.c:520
 msgid "Posting destination"
 msgstr "Destinasjon for post"
 
-#: ../composer/e-msg-composer-hdrs.c:520
+#: ../composer/e-msg-composer-hdrs.c:521
 msgid "Choose folders to post the message to."
 msgstr "Velg mapper meldingen skal postes til."
 
-#: ../composer/e-msg-composer-hdrs.c:554
+#: ../composer/e-msg-composer-hdrs.c:555
 msgid "Click here for the address book"
 msgstr "Klikk her for å få opp adresseboken"
 
@@ -9461,45 +9413,45 @@ msgstr "Klikk her for å få opp adresseboken"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: ../composer/e-msg-composer-hdrs.c:584
+#: ../composer/e-msg-composer-hdrs.c:585
 msgid "_Reply-To:"
 msgstr "Sva_r-til:"
 
 #.
 #. * From
 #.
-#: ../composer/e-msg-composer-hdrs.c:591
+#: ../composer/e-msg-composer-hdrs.c:592
 msgid "Fr_om:"
 msgstr "Fr_a:"
 
 #.
 #. * Subject
 #.
-#: ../composer/e-msg-composer-hdrs.c:598
+#: ../composer/e-msg-composer-hdrs.c:599
 msgid "S_ubject:"
 msgstr "Em_ne:"
 
-#: ../composer/e-msg-composer-hdrs.c:608
+#: ../composer/e-msg-composer-hdrs.c:609
 msgid "_To:"
 msgstr "_Til:"
 
-#: ../composer/e-msg-composer-hdrs.c:609
+#: ../composer/e-msg-composer-hdrs.c:610
 msgid "Enter the recipients of the message"
 msgstr "Skriv inn mottakerene for meldingen"
 
-#: ../composer/e-msg-composer-hdrs.c:612
+#: ../composer/e-msg-composer-hdrs.c:613
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-msg-composer-hdrs.c:613
+#: ../composer/e-msg-composer-hdrs.c:614
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Skriv inn adressene som skal motta en kopi av meldingen"
 
-#: ../composer/e-msg-composer-hdrs.c:616
+#: ../composer/e-msg-composer-hdrs.c:617
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-msg-composer-hdrs.c:617
+#: ../composer/e-msg-composer-hdrs.c:618
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9510,26 +9462,30 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: ../composer/e-msg-composer-hdrs.c:624
+#: ../composer/e-msg-composer-hdrs.c:625
 msgid "_Post To:"
 msgstr "_Post til:"
 
-#: ../composer/e-msg-composer-hdrs.c:629
+#: ../composer/e-msg-composer-hdrs.c:630
 msgid "Click here to select folders to post to"
 msgstr "Klikk her for å velge mapper å poste til"
 
-#: ../composer/e-msg-composer-hdrs.c:635
+#: ../composer/e-msg-composer-hdrs.c:636
 msgid "Post To:"
 msgstr "Post til:"
 
-#: ../composer/e-msg-composer.c:730
+#: ../composer/e-msg-composer-select-file.c:80
+msgid "A_ttach"
+msgstr "Le_gg ved"
+
+#: ../composer/e-msg-composer.c:737
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Kan ikke signere utgående melding: Ingen sertifikat for signering satt for "
 "denne kontoen"
 
-#: ../composer/e-msg-composer.c:737
+#: ../composer/e-msg-composer.c:744
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -9558,21 +9514,21 @@ msgstr "Melding uten navn"
 msgid "Open File"
 msgstr "Åpne fil"
 
-#: ../composer/e-msg-composer.c:2001 ../mail/em-account-editor.c:587
-#: ../mail/em-account-editor.c:632 ../mail/em-account-editor.c:699
+#: ../composer/e-msg-composer.c:1996 ../mail/em-account-editor.c:588
+#: ../mail/em-account-editor.c:633 ../mail/em-account-editor.c:698
 msgid "Autogenerated"
 msgstr "Generert automatisk"
 
-#: ../composer/e-msg-composer.c:2100
+#: ../composer/e-msg-composer.c:2095
 msgid "Si_gnature:"
 msgstr "Si_gnatur:"
 
-#: ../composer/e-msg-composer.c:2359 ../composer/e-msg-composer.c:3360
-#: ../composer/e-msg-composer.c:3361
+#: ../composer/e-msg-composer.c:2336 ../composer/e-msg-composer.c:3366
+#: ../composer/e-msg-composer.c:3367
 msgid "Compose a message"
 msgstr "Skriv en melding"
 
-#: ../composer/e-msg-composer.c:4542
+#: ../composer/e-msg-composer.c:4537
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -9580,100 +9536,33 @@ msgstr ""
 "<b>(Redigering inneholder en meldingskropp som ikke er tekst, og derfor ikke "
 "kan redigeres.)<b>"
 
-#. mail-composer:no-attach primary
-#: ../composer/mail-composer-errors.xml.h:2
-msgid "You cannot attach the file `{0}' to this message."
-msgstr "Du kan ikke legge ved filen «{0}» i denne meldingen."
-
-#. mail-composer:attach-notfile primary
-#: ../composer/mail-composer-errors.xml.h:6
-msgid "The file `{0}' is not a regular file and cannot be sent in a message."
-msgstr "Filen «{0}» er ikke en vanlig fil og kan ikke sendes i en melding."
-
-#. mail-composer:attach-directory primary
-#: ../composer/mail-composer-errors.xml.h:8
-msgid "Directories can not be attached to Messages."
-msgstr "Kataloger kan ikke legges ved meldinger."
-
-#. mail-composer:attach-directory secondary
-#: ../composer/mail-composer-errors.xml.h:10
-msgid ""
-"To attach the contents of this directory, either attach the files in this "
-"directory individually, or create an archive of the directory and attach it."
-msgstr ""
-"For å legge til innholdet i denne katalogen må du enten legge ved filene "
-"hver for seg eller opprette et arkiv av katalogen og legge ved dette."
-
-#. mail-composer:attach-nomessages primary
-#: ../composer/mail-composer-errors.xml.h:12
-msgid "Could not retrieve messages to attach from {0}."
-msgstr "Kunne ikke hente meldinger som skal legges ved fra {0}."
-
-#. mail-composer:attach-nomessages secondary
-#. mail-composer:no-sig-file secondary
-#. mail:no-create-tmp-path secondary
-#. mail:no-delete-folder secondary
-#. system:no-save-file secondary
-#. system:no-load-file secondary
-#: ../composer/mail-composer-errors.xml.h:14
-#: ../composer/mail-composer-errors.xml.h:42 ../mail/mail-errors.xml.h:105
-#: ../mail/mail-errors.xml.h:117 ../widgets/misc/e-system-errors.xml.h:11
-#: ../widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr "pga «{1}»."
-
-#. mail-composer:recover-autosave title
-#: ../composer/mail-composer-errors.xml.h:16
-msgid "Unfinished messages found"
-msgstr "Uferdige meldinger funnet"
-
-#. mail-composer:recover-autosave primary
-#: ../composer/mail-composer-errors.xml.h:18
-msgid "Do you want to recover unfinished messages?"
-msgstr "Vil du gjenopprette uferdige meldinger?"
-
-#. mail-composer:recover-autosave secondary
-#: ../composer/mail-composer-errors.xml.h:20
+#: ../composer/mail-composer.error.xml.h:1
 msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
+" There are few attachments getting downloaded. Sending the mail will cause "
+"the mail to be sent without those pending attachments "
 msgstr ""
-"Evolution avsluttet uventet mens du skrev en ny melding. Gjenoppretting av "
-"meldingen vil la deg fortsette der du slapp."
 
-#: ../composer/mail-composer-errors.xml.h:21
-msgid "Don't Recover"
-msgstr "Ikke gjenopprett"
-
-#: ../composer/mail-composer-errors.xml.h:22
-msgid "Recover"
-msgstr "Gjenopprett"
-
-#. mail-composer:no-autosave primary
-#: ../composer/mail-composer-errors.xml.h:24
-msgid "Could not save to autosave file \"{0}\"."
-msgstr "Kunne ikke lagre til fil for autolagring: «{0}»."
-
-#. mail-composer:no-autosave secondary
-#: ../composer/mail-composer-errors.xml.h:26
-msgid "Error saving to autosave because \"{1}\"."
-msgstr "Feil under automatisk lagring pga «{1}»."
-
-#. mail-composer:exit-unsaved title
-#: ../composer/mail-composer-errors.xml.h:28
-msgid "Warning: Modified Message"
-msgstr "Advarsel: Endret melding"
+#: ../composer/mail-composer.error.xml.h:2
+msgid "All accounts have been removed."
+msgstr "Alle kontoer er fjernet."
 
-#. mail-composer:exit-unsaved primary
-#: ../composer/mail-composer-errors.xml.h:30
+#: ../composer/mail-composer.error.xml.h:3
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
 msgstr ""
 "Er du sikker på at du vil forkaste meldingen du skriver med tittel «{0}?"
 
-#. mail-composer:exit-unsaved secondary
-#: ../composer/mail-composer-errors.xml.h:32
+#: ../composer/mail-composer.error.xml.h:4
+msgid "Because &quot;{0}&quot;, you may need to select different mail options."
+msgstr "Du vil kanskje måtte velge andre alternativer for e-post pga &quot;{0}&quot;."
+
+#: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
+#: ../mail/mail.error.xml.h:16
+msgid "Because &quot;{1}&quot;."
+msgstr "Pga &quot;{1}&quot;."
+
+#: ../composer/mail-composer.error.xml.h:6
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
@@ -9683,53 +9572,71 @@ msgstr ""
 "velger å lagre meldingen i mappen Skisser. Dette vil la deg fortsette å "
 "skrive på meldingen på et senere tidspunkt."
 
-#: ../composer/mail-composer-errors.xml.h:33
-msgid "_Discard Changes"
-msgstr "_Forkast endringer"
-
-#: ../composer/mail-composer-errors.xml.h:34
-msgid "_Save Message"
-msgstr "_Lagre melding"
+#: ../composer/mail-composer.error.xml.h:7
+msgid "Could not create composer window."
+msgstr "Kunne ikke opprette vindu for å skrive melding."
 
-#. mail-composer:no-build-message primary
-#: ../composer/mail-composer-errors.xml.h:36
+#: ../composer/mail-composer.error.xml.h:8
 msgid "Could not create message."
 msgstr "Kunne ikke opprette melding."
 
-#. mail-composer:no-build-message secondary
-#: ../composer/mail-composer-errors.xml.h:38
-msgid "Because \"{0}\", you may need to select different mail options."
-msgstr "Pga «{0}» vil du kanskje måtte velge andre alternativer for e-post."
+#: ../composer/mail-composer.error.xml.h:9
+msgid "Could not read signature file &quot;{0}&quot;."
+msgstr "Kunne ikke lese signaturfil &quot;{0}&quot;."
 
-#. mail-composer:no-sig-file primary
-#: ../composer/mail-composer-errors.xml.h:40
-msgid "Could not read signature file \"{0}\"."
-msgstr "Kunne ikke lagre signaturfil «{0}»."
+#: ../composer/mail-composer.error.xml.h:10
+msgid "Could not retrieve messages to attach from {0}."
+msgstr "Kunne ikke hente meldinger som skal legges ved fra {0}."
 
-#. mail-composer:all-accounts-deleted primary
-#: ../composer/mail-composer-errors.xml.h:44
-msgid "All accounts have been removed."
-msgstr "Alle kontoer er fjernet."
+#: ../composer/mail-composer.error.xml.h:11
+msgid "Could not save to autosave file &quot;{0}&quot;."
+msgstr "Kunne ikke lagre til fil for automatisk lagring: &quot;{0}&quot;."
 
-#. mail-composer:all-accounts-deleted secondary
-#: ../composer/mail-composer-errors.xml.h:46
-msgid "You need to configure an account before you can compose mail."
-msgstr "Du må konfigurere en konto før du kan skrive meldinger."
+#: ../composer/mail-composer.error.xml.h:12
+msgid "Directories can not be attached to Messages."
+msgstr "Kataloger kan ikke legges ved meldinger."
 
-#. mail-composer:no-address-control primary
-#. mail-composer:no-editor-control primary
-#: ../composer/mail-composer-errors.xml.h:48
-#: ../composer/mail-composer-errors.xml.h:52
-msgid "Could not create composer window."
-msgstr "Kunne ikke opprette vindu for å skrive melding."
+#: ../composer/mail-composer.error.xml.h:13
+msgid "Do you want to recover unfinished messages?"
+msgstr "Vil du gjenopprette uferdige meldinger?"
 
-#. mail-composer:no-address-control secondary
-#: ../composer/mail-composer-errors.xml.h:50
-msgid "Unable to activate the address selector control."
-msgstr "Klarte ikke å aktivere kontroll for adressevelger."
+#: ../composer/mail-composer.error.xml.h:14
+msgid "Don't Recover"
+msgstr "Ikke gjenopprett"
+
+#: ../composer/mail-composer.error.xml.h:15
+msgid "Download in progress. Do you want to send the mail?"
+msgstr "Nedlasting pågår. Vil du sende meldingen?"
+
+#: ../composer/mail-composer.error.xml.h:16
+msgid "Error saving to autosave because &quot;{1}&quot;."
+msgstr "Feil under automatisk lagring pga &quot;{1}&quot;."
 
-#. mail-composer:no-editor-control secondary
-#: ../composer/mail-composer-errors.xml.h:54
+#: ../composer/mail-composer.error.xml.h:17
+msgid ""
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
+msgstr ""
+"Evolution avsluttet uventet mens du skrev en ny melding. Gjenoppretting av "
+"meldingen vil la deg fortsette der du slapp."
+
+#: ../composer/mail-composer.error.xml.h:18
+msgid "Recover"
+msgstr "Gjenopprett"
+
+#: ../composer/mail-composer.error.xml.h:19
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
+msgstr "Filen «{0}» er ikke en vanlig fil og kan ikke sendes i en melding."
+
+#: ../composer/mail-composer.error.xml.h:20
+msgid ""
+"To attach the contents of this directory, either attach the files in this "
+"directory individually, or create an archive of the directory and attach it."
+msgstr ""
+"For å legge til innholdet i denne katalogen må du enten legge ved filene "
+"hver for seg eller opprette et arkiv av katalogen og legge ved dette."
+
+#: ../composer/mail-composer.error.xml.h:21
 msgid ""
 "Unable to activate the HTML editor control.\n"
 "\n"
@@ -9740,7 +9647,35 @@ msgstr ""
 "Vennligst sjekk at du har installert korrekt versjon av gtkhtml og "
 "libgtkhtml."
 
-#: ../data/evolution.desktop.in.in.h:1 ../shell/main.c:520
+#: ../composer/mail-composer.error.xml.h:24
+msgid "Unable to activate the address selector control."
+msgstr "Klarte ikke å aktivere kontroll for adressevelger."
+
+#: ../composer/mail-composer.error.xml.h:25
+msgid "Unfinished messages found"
+msgstr "Uferdige meldinger funnet"
+
+#: ../composer/mail-composer.error.xml.h:26
+msgid "Warning: Modified Message"
+msgstr "Advarsel: Endret melding"
+
+#: ../composer/mail-composer.error.xml.h:27
+msgid "You cannot attach the file `{0}' to this message."
+msgstr "Du kan ikke legge ved filen «{0}» i denne meldingen."
+
+#: ../composer/mail-composer.error.xml.h:28
+msgid "You need to configure an account before you can compose mail."
+msgstr "Du må konfigurere en konto før du kan skrive meldinger."
+
+#: ../composer/mail-composer.error.xml.h:29
+msgid "_Discard Changes"
+msgstr "_Forkast endringer"
+
+#: ../composer/mail-composer.error.xml.h:30
+msgid "_Save Message"
+msgstr "_Lagre melding"
+
+#: ../data/evolution.desktop.in.in.h:1 ../shell/main.c:509
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -9829,8 +9764,8 @@ msgstr ""
 "kvittering ra deg.</small>"
 
 #: ../designs/read_receipts/read.glade.h:6
-msgid "Always send back a read reciept"
-msgstr "Alltid send en kvittering tilbake"
+msgid "Always send back a read receipt"
+msgstr "Alltid send en lesekvittering tilbake"
 
 #: ../designs/read_receipts/read.glade.h:7
 msgid "Ask me if I want to send back a read receipt"
@@ -9869,18 +9804,52 @@ msgstr ""
 "En fil med samme navn eksisterer allerede.\n"
 "Overskriv den?"
 
-#. system:ask-save-file-exists-overwrite title
-#: ../e-util/e-dialog-utils.c:269 ../widgets/misc/e-system-errors.xml.h:2
+#: ../e-util/e-dialog-utils.c:269 ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
 msgstr "Overskriv fil?"
 
-#: ../e-util/e-passwords.c:472
-msgid "_Remember this password"
-msgstr "Husk dette passo_rdet"
+#: ../e-util/e-error.c:84 ../e-util/e-error.c:85 ../e-util/e-error.c:127
+msgid "Evolution Error"
+msgstr "Evolution feil"
+
+#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:125
+msgid "Evolution Warning"
+msgstr "Evolution advarsel"
+
+#: ../e-util/e-error.c:124
+msgid "Evolution Information"
+msgstr "Evolution informasjon"
 
-#: ../e-util/e-passwords.c:473
-msgid "_Remember this password for the remainder of this session"
-msgstr "Husk dette passo_rdet for resten av denne sesjonen"
+#: ../e-util/e-error.c:126
+msgid "Evolution Query"
+msgstr "Evolution spørring"
+
+#. setup a dummy error
+#: ../e-util/e-error.c:438
+#, c-format
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr "<span weight=\"bold\">Intern feil, ukjent feil «%s» etterspurt</span>"
+
+#: ../e-util/e-system.error.xml.h:2
+msgid "Cannot open file &quot;{0}&quot;."
+msgstr "Kan ikke åpne fil &quot;{0}&quot;."
+
+#: ../e-util/e-system.error.xml.h:3
+msgid "Cannot save file &quot;{0}&quot;."
+msgstr "Kan ikke lagre fil &quot;{0}&quot;."
+
+#: ../e-util/e-system.error.xml.h:4
+msgid "Do you wish to overwrite it?"
+msgstr "Vil du overskrive den?"
+
+#: ../e-util/e-system.error.xml.h:5
+msgid "File exists &quot;{0}&quot;."
+msgstr "Filen &quot;{0}&quot; eksisterer."
+
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:117
+msgid "_Overwrite"
+msgstr "_Overskriv"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
@@ -9962,7 +9931,7 @@ msgstr "%H.%M.%S"
 #. without seconds.
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
 #: ../e-util/e-time-utils.c:348 ../e-util/e-time-utils.c:435
-#: ../widgets/misc/e-dateedit.c:1431 ../widgets/misc/e-dateedit.c:1697
+#: ../widgets/misc/e-dateedit.c:1438 ../widgets/misc/e-dateedit.c:1720
 msgid "%I:%M %p"
 msgstr "%H.%M"
 
@@ -9971,7 +9940,7 @@ msgstr "%H.%M"
 #. without seconds.
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
 #: ../e-util/e-time-utils.c:352 ../e-util/e-time-utils.c:427
-#: ../widgets/misc/e-dateedit.c:1428 ../widgets/misc/e-dateedit.c:1694
+#: ../widgets/misc/e-dateedit.c:1435 ../widgets/misc/e-dateedit.c:1717
 msgid "%H:%M"
 msgstr "%H.%M"
 
@@ -9984,6 +9953,50 @@ msgstr "%H"
 msgid "The orientation of the tray."
 msgstr "Orientering for trauet."
 
+#: ../filter/filter.error.xml.h:1
+msgid "Bad regular expression &quot;{0}&quot;."
+msgstr "Ugyldig regulært uttrykk &quot;{0}&quot;."
+
+#: ../filter/filter.error.xml.h:2
+msgid "Could not compile regular expression &quot;{1}&quot;."
+msgstr "Kunne ikke sette sammen regulært uttrykk &quot;{1}&quot;."
+
+#: ../filter/filter.error.xml.h:3
+msgid "File &quot;{0}&quot; does not exist or is not a regular file."
+msgstr "Filen &quot;{0}&quot; eksisterer ikke eller er ikke en vanlig fil."
+
+#: ../filter/filter.error.xml.h:4
+msgid "Missing date."
+msgstr "Mangler dato."
+
+#: ../filter/filter.error.xml.h:5
+msgid "Missing file name."
+msgstr "Mangler filnavn."
+
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:62
+msgid "Missing name."
+msgstr "Mangler navn."
+
+#: ../filter/filter.error.xml.h:7
+msgid "Name &quot;{0}&quot; already used."
+msgstr "Navnet &quot;{0}&quot; er allerede i bruk."
+
+#: ../filter/filter.error.xml.h:8
+msgid "Please choose another name."
+msgstr "Vennligst velg et annet navn."
+
+#: ../filter/filter.error.xml.h:9
+msgid "You must choose a date."
+msgstr "Du må velge en dato."
+
+#: ../filter/filter.error.xml.h:10
+msgid "You must name this filter."
+msgstr "Du må gi navn til dette filteret."
+
+#: ../filter/filter.error.xml.h:11
+msgid "You must specify a file name."
+msgstr "Du må oppgi et filnavn."
+
 #: ../filter/filter-datespec.c:73
 #, c-format
 msgid "1 second ago"
@@ -10050,82 +10063,25 @@ msgstr "%d.%b.%Y"
 msgid "Select a time to compare against"
 msgstr "Velg en tid å sammenligne mot"
 
-#. filter:no-date primary
-#: ../filter/filter-errors.xml.h:2
-msgid "Missing date."
-msgstr "Mangler dato."
-
-#. filter:no-date secondary
-#: ../filter/filter-errors.xml.h:4
-msgid "You must choose a date."
-msgstr "Du må velge en dato."
-
-#. filter:no-file primary
-#: ../filter/filter-errors.xml.h:6
-msgid "Missing file name."
-msgstr "Mangler filnavn."
-
-#. filter:no-file secondary
-#. filter:bad-file secondary
-#: ../filter/filter-errors.xml.h:8 ../filter/filter-errors.xml.h:12
-msgid "You must specify a file name."
-msgstr "Du må oppgi et filnavn."
-
-#. filter:bad-file primary
-#: ../filter/filter-errors.xml.h:10
-msgid "File \"{0}\" does not exist or is not a regular file."
-msgstr "Filen «{0}» eksisterer ikke eller er ikke en vanlig fil."
-
-#. filter:bad-regexp primary
-#: ../filter/filter-errors.xml.h:14
-msgid "Bad regular expression \"{0}\"."
-msgstr "Ugyldig regulært uttrykk «{0}»."
-
-#. filter:bad-regexp secondary
-#: ../filter/filter-errors.xml.h:16
-msgid "Could not compile regular expression \"{1}\"."
-msgstr "Kunne ikke sette sammen regulært uttrykk «{1}»."
-
-#. filter:no-name primary
-#. mail:no-name-vfolder primary
-#: ../filter/filter-errors.xml.h:18 ../mail/mail-errors.xml.h:219
-msgid "Missing name."
-msgstr "Mangler navn."
-
-#. filter:no-name secondary
-#: ../filter/filter-errors.xml.h:20
-msgid "You must name this filter."
-msgstr "Du må gi navn til dette filteret."
-
-#. filter:bad-name-notunique primary
-#: ../filter/filter-errors.xml.h:22
-msgid "Name \"{0}\" already used."
-msgstr "Navn «{0}» er allerede brukt."
-
-#. filter:bad-name-notunique secondary
-#: ../filter/filter-errors.xml.h:24
-msgid "Please choose another name."
-msgstr "Vennligst velg et annet navn."
-
 #: ../filter/filter-file.c:288
 msgid "Choose a file"
 msgstr "Velg en fil"
 
 #: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1011 ../mail/mail-config.c:75
-#: ../mail/mail-config.glade.h:90
+#: ../mail/em-migrate.c:1041 ../mail/mail-config.c:76
+#: ../mail/mail-config.glade.h:91
 msgid "Important"
 msgstr "Viktig"
 
 #. forest green
-#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1014
-#: ../mail/mail-config.c:78 ../mail/mail-config.glade.h:140
+#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1044
+#: ../mail/mail-config.c:79 ../mail/mail-config.glade.h:145
 msgid "To Do"
 msgstr "Oppgaver"
 
 #. blue
-#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1015
-#: ../mail/mail-config.c:79 ../mail/mail-config.glade.h:93
+#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1045
+#: ../mail/mail-config.c:80 ../mail/mail-config.glade.h:95
 msgid "Later"
 msgstr "Senere"
 
@@ -10133,47 +10089,47 @@ msgstr "Senere"
 msgid "Test"
 msgstr "Test"
 
-#: ../filter/filter-rule.c:790
+#: ../filter/filter-rule.c:791
 msgid "_Rule name:"
 msgstr "_Regelnavn:"
 
-#: ../filter/filter-rule.c:818
-msgid "<b>If</b>"
-msgstr "<b>Hvis</b> "
+#: ../filter/filter-rule.c:819
+msgid "If"
+msgstr "Hvis"
 
-#: ../filter/filter-rule.c:855
+#: ../filter/filter-rule.c:858
 msgid "if all criteria are met"
 msgstr "hvis alle kriterier er møtt"
 
-#: ../filter/filter-rule.c:855
+#: ../filter/filter-rule.c:858
 msgid "if any criteria are met"
 msgstr "hvis ethvert kriterie er møtt"
 
-#: ../filter/filter-rule.c:857
+#: ../filter/filter-rule.c:860
 msgid "Execute actions"
 msgstr "Utfør handlinger"
 
-#: ../filter/filter-rule.c:878
+#: ../filter/filter-rule.c:881
 msgid "All related"
 msgstr "Alle relaterte"
 
-#: ../filter/filter-rule.c:878
+#: ../filter/filter-rule.c:881
 msgid "Replies"
 msgstr "Svar"
 
-#: ../filter/filter-rule.c:878
+#: ../filter/filter-rule.c:881
 msgid "Replies and parents"
 msgstr "Svar med opphav"
 
-#: ../filter/filter-rule.c:880
+#: ../filter/filter-rule.c:883
 msgid "Include threads"
 msgstr "Ta med tråder"
 
-#: ../filter/filter-rule.c:975 ../filter/filter.glade.h:3
+#: ../filter/filter-rule.c:978 ../filter/filter.glade.h:3
 msgid "Incoming"
 msgstr "Innkommende"
 
-#: ../filter/filter-rule.c:975
+#: ../filter/filter-rule.c:978
 msgid "Outgoing"
 msgstr "Utgående"
 
@@ -10225,7 +10181,7 @@ msgstr "siden"
 msgid "months"
 msgstr "måneder"
 
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:172
+#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:177
 msgid "seconds"
 msgstr " sekunder"
 
@@ -10295,11 +10251,11 @@ msgstr "Konfigurasjonskontroll for Evolution e-postredigering"
 msgid "Evolution Mail preferences control"
 msgstr "Brukervalg-kontroll for Evolution e-post"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:469
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:493
 #: ../mail/importers/elm-importer.c:418
 #: ../mail/importers/netscape-importer.c:1902
-#: ../mail/importers/pine-importer.c:474 ../mail/mail-component.c:557
-#: ../mail/mail-component.c:608
+#: ../mail/importers/pine-importer.c:474 ../mail/mail-component.c:558
+#: ../mail/mail-component.c:609
 msgid "Mail"
 msgstr "E-post"
 
@@ -10308,7 +10264,7 @@ msgid "Mail Accounts"
 msgstr "E-post-konti"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:95
+#: ../mail/mail-config.glade.h:98
 msgid "Mail Preferences"
 msgstr "Brukervalg for e-post"
 
@@ -10316,12 +10272,12 @@ msgstr "Brukervalg for e-post"
 msgid "_Mail"
 msgstr "_E-post"
 
-#: ../mail/em-account-editor.c:386
+#: ../mail/em-account-editor.c:387
 #, c-format
 msgid "%s License Agreement"
 msgstr "Lisensavtale for %s"
 
-#: ../mail/em-account-editor.c:393
+#: ../mail/em-account-editor.c:394
 #, c-format
 msgid ""
 "\n"
@@ -10334,67 +10290,75 @@ msgstr ""
 "under nøye\n"
 "og kryss av i ruten for å akseptere den\n"
 
-#: ../mail/em-account-editor.c:463 ../mail/em-filter-folder-element.c:237
+#: ../mail/em-account-editor.c:464 ../mail/em-filter-folder-element.c:237
 #: ../mail/em-vfolder-rule.c:494
 msgid "Select Folder"
 msgstr "Velg mappe"
 
-#: ../mail/em-account-editor.c:1663 ../mail/mail-config.glade.h:89
+#: ../mail/em-account-editor.c:758
+msgid "Ask for each message"
+msgstr "Spør for hver melding"
+
+#: ../mail/em-account-editor.c:1719 ../mail/mail-config.glade.h:90
 msgid "Identity"
 msgstr "Identitet"
 
-#: ../mail/em-account-editor.c:1699 ../mail/mail-config.glade.h:114
+#: ../mail/em-account-editor.c:1755 ../mail/mail-config.glade.h:117
 msgid "Receiving Email"
 msgstr "Innkommende e-post"
 
-#: ../mail/em-account-editor.c:1876
+#: ../mail/em-account-editor.c:1932
 msgid "Automatically check for _new mail every"
 msgstr "Se etter _nye meldinger automatisk"
 
-#: ../mail/em-account-editor.c:2040 ../mail/mail-config.glade.h:124
+#: ../mail/em-account-editor.c:2100 ../mail/mail-config.glade.h:128
 msgid "Sending Email"
 msgstr "Utgående e-post"
 
-#: ../mail/em-account-editor.c:2084 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2148 ../mail/mail-config.glade.h:68
 msgid "Defaults"
 msgstr "Forvalg"
 
-#: ../mail/em-account-editor.c:2143 ../mail/mail-config.glade.h:119
+#: ../mail/em-account-editor.c:2207 ../mail/mail-config.glade.h:122
 msgid "Security"
 msgstr "Sikkerhet"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2180 ../mail/em-account-editor.c:2255
+#: ../mail/em-account-editor.c:2244 ../mail/em-account-editor.c:2318
 msgid "Receiving Options"
 msgstr "Alternativer for mottak"
 
-#: ../mail/em-account-editor.c:2181 ../mail/em-account-editor.c:2256
+#: ../mail/em-account-editor.c:2245 ../mail/em-account-editor.c:2319
 msgid "Checking for New Mail"
 msgstr "Ser etter nye meldinger"
 
-#: ../mail/em-account-editor.c:2596 ../mail/mail-config.glade.h:33
+#: ../mail/em-account-editor.c:2643 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Kontoredigering"
 
-#: ../mail/em-account-editor.c:2596 ../mail/mail-config.glade.h:79
+#: ../mail/em-account-editor.c:2643 ../mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr "Evolution kontoassistent"
 
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:412
+#: ../mail/em-account-prefs.c:428
 msgid "[Default]"
 msgstr "[Forvalg]"
 
-#: ../mail/em-account-prefs.c:466
+#: ../mail/em-account-prefs.c:482
 msgid "Account name"
 msgstr "Kontonavn"
 
-#: ../mail/em-account-prefs.c:468
+#: ../mail/em-account-prefs.c:484
 msgid "Protocol"
 msgstr "Protokoll"
 
+#: ../mail/em-account-prefs.c:489
+msgid "Mail Accounts Table"
+msgstr "Tabell med e-post-konti"
+
 #: ../mail/em-composer-prefs.c:306 ../mail/em-composer-prefs.c:429
-#: ../mail/mail-config.c:934
+#: ../mail/mail-config.c:935
 msgid "Unnamed"
 msgstr "Uten navn"
 
@@ -10410,18 +10374,18 @@ msgstr "Legg til signaturskript"
 msgid "Signature(s)"
 msgstr "Signatur(er)"
 
-#: ../mail/em-composer-utils.c:910
+#: ../mail/em-composer-utils.c:852
 msgid "-------- Forwarded Message --------"
 msgstr "---------Videresendt melding-------"
 
-#: ../mail/em-composer-utils.c:1526
+#: ../mail/em-composer-utils.c:1644
 msgid "an unknown sender"
 msgstr "en ukjent avsender"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1573
+#: ../mail/em-composer-utils.c:1691
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10558,8 +10522,8 @@ msgstr "er ikke"
 msgid "is not Flagged"
 msgstr "er ikke merket"
 
-#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:92
-#: ../ui/evolution-mail-message.xml.h:48
+#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:93
+#: ../ui/evolution-mail-message.xml.h:47
 msgid "Junk"
 msgstr "Søppel"
 
@@ -10567,7 +10531,7 @@ msgstr "Søppel"
 msgid "Junk Test"
 msgstr "Søppeltest"
 
-#: ../mail/em-filter-i18n.h:37 ../mail/em-folder-view.c:992
+#: ../mail/em-filter-i18n.h:37 ../mail/em-folder-view.c:1061
 #: ../widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Etikett"
@@ -10676,11 +10640,12 @@ msgstr "starter med"
 msgid "Stop Processing"
 msgstr "Stopp behandling"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1533
-#: ../mail/em-format-quote.c:306 ../mail/em-format.c:853
+#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1541
+#: ../mail/em-format-quote.c:310 ../mail/em-format.c:848
 #: ../mail/em-mailer-prefs.c:88 ../mail/message-list.etspec.h:13
 #: ../mail/message-tag-followup.c:330
-#: ../plugins/shared-folder/properties.glade.h:7 ../smime/lib/e-cert.c:1131
+#: ../plugins/groupwise-features/properties.glade.h:7
+#: ../smime/lib/e-cert.c:1131
 msgid "Subject"
 msgstr "Emne"
 
@@ -10693,7 +10658,7 @@ msgstr "Nullstill status"
 msgid "<b>Then</b>"
 msgstr "<b>Så</b> "
 
-#: ../mail/em-folder-browser.c:133
+#: ../mail/em-folder-browser.c:134
 msgid "Create _vFolder From Search..."
 msgstr "Lag _virtuell mappe fra søk..."
 
@@ -10711,7 +10676,7 @@ msgstr[0] "Ulest melding:"
 msgstr[1] "Uleste meldinger:"
 
 #: ../mail/em-folder-properties.c:278
-#: ../plugins/shared-folder/properties.glade.h:3
+#: ../plugins/groupwise-features/properties.glade.h:3
 msgid "Folder Properties"
 msgstr "Egenskaper for mappe"
 
@@ -10719,26 +10684,16 @@ msgstr "Egenskaper for mappe"
 msgid "<click here to select a folder>"
 msgstr "<klikk her for å velge en mappe>"
 
-#: ../mail/em-folder-selector.c:166
-msgid "Create New Folder"
-msgstr "Opprett ny mappe"
-
-#: ../mail/em-folder-selector.c:166 ../mail/em-folder-tree.c:2527
-#: ../mail/mail-component.c:760 ../plugins/shared-folder/install-shared.c:144
-#: ../plugins/shared-folder/share-folder-common.c:345
-msgid "Specify where to create the folder:"
-msgstr "Spesifiser hvor mappen skal opprettes:"
-
-#: ../mail/em-folder-selector.c:304
+#: ../mail/em-folder-selector.c:261
 msgid "Create"
 msgstr "Opprett"
 
-#: ../mail/em-folder-selector.c:308
+#: ../mail/em-folder-selector.c:265
 msgid "Folder _name:"
 msgstr "Mappe_navn:"
 
 #: ../mail/em-folder-tree-model.c:201 ../mail/em-folder-tree-model.c:203
-#: ../mail/mail-vfolder.c:899 ../mail/mail-vfolder.c:969
+#: ../mail/mail-vfolder.c:900 ../mail/mail-vfolder.c:970
 msgid "vFolders"
 msgstr "Virtuelle mapper"
 
@@ -10747,20 +10702,20 @@ msgstr "Virtuelle mapper"
 msgid "UNMATCHED"
 msgstr "UTEN TREFF"
 
-#: ../mail/em-folder-tree-model.c:468 ../mail/mail-component.c:142
+#: ../mail/em-folder-tree-model.c:468 ../mail/mail-component.c:143
 msgid "Drafts"
 msgstr "Skisser"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:471 ../mail/mail-component.c:141
+#: ../mail/em-folder-tree-model.c:471 ../mail/mail-component.c:142
 msgid "Inbox"
 msgstr "Innboks"
 
-#: ../mail/em-folder-tree-model.c:474 ../mail/mail-component.c:143
+#: ../mail/em-folder-tree-model.c:474 ../mail/mail-component.c:144
 msgid "Outbox"
 msgstr "Utboks"
 
-#: ../mail/em-folder-tree-model.c:476 ../mail/mail-component.c:144
+#: ../mail/em-folder-tree-model.c:476 ../mail/mail-component.c:145
 msgid "Sent"
 msgstr "Sendt"
 
@@ -10768,255 +10723,228 @@ msgstr "Sendt"
 msgid "Loading..."
 msgstr "Laster..."
 
-#: ../mail/em-folder-tree.c:688
+#: ../mail/em-folder-tree.c:689
 msgid "Mail Folder Tree"
 msgstr "Tre for e-postmapper"
 
-#: ../mail/em-folder-tree.c:921
+#: ../mail/em-folder-tree.c:922
 #, c-format
 msgid "Moving folder %s"
 msgstr "Flytter mappe %s"
 
-#: ../mail/em-folder-tree.c:923
+#: ../mail/em-folder-tree.c:924
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopierer mappe %s"
 
-#: ../mail/em-folder-tree.c:930 ../mail/message-list.c:1612
+#: ../mail/em-folder-tree.c:931 ../mail/message-list.c:1613
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Flytter meldinger til mappe %s"
 
-#: ../mail/em-folder-tree.c:932 ../mail/message-list.c:1614
+#: ../mail/em-folder-tree.c:933 ../mail/message-list.c:1615
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopierer meldinger til mappe %s"
 
-#: ../mail/em-folder-tree.c:948
+#: ../mail/em-folder-tree.c:949
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Kan ikke slippe melding(er) toppnivå for lageret"
 
-#: ../mail/em-folder-tree.c:1044 ../ui/evolution-mail-message.xml.h:106
+#: ../mail/em-folder-tree.c:1045 ../ui/evolution-mail-message.xml.h:101
 msgid "_Copy to Folder"
 msgstr "_Kopier til mappe"
 
-#: ../mail/em-folder-tree.c:1045 ../ui/evolution-mail-message.xml.h:115
+#: ../mail/em-folder-tree.c:1046 ../ui/evolution-mail-message.xml.h:111
 msgid "_Move to Folder"
 msgstr "_Flytt til mappe"
 
-#: ../mail/em-folder-tree.c:1750 ../mail/mail-ops.c:1026
+#: ../mail/em-folder-tree.c:1751 ../mail/mail-ops.c:1055
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanner mapper i «%s»"
 
-#: ../mail/em-folder-tree.c:2023
-#, c-format
-msgid "Copying `%s' to `%s'"
-msgstr "Kopierer «%s» til «%s»"
-
-#: ../mail/em-folder-tree.c:2297 ../mail/em-folder-tree.c:2311
-#: ../mail/em-folder-view.c:862 ../mail/em-folder-view.c:877
-#: ../mail/importers/evolution-mbox-importer.c:120
-#: ../mail/importers/evolution-outlook-importer.c:134
-msgid "Select folder"
-msgstr "Velg mappe"
-
-#: ../mail/em-folder-tree.c:2297 ../mail/em-folder-view.c:877
-msgid "C_opy"
-msgstr "K_opier"
-
-#: ../mail/em-folder-tree.c:2338
-#: ../plugins/shared-folder/share-folder-common.c:138
-#, c-format
-msgid "Creating folder `%s'"
-msgstr "Oppretter mappe «%s»"
-
-#: ../mail/em-folder-tree.c:2527 ../mail/mail-component.c:760
-#: ../plugins/shared-folder/install-shared.c:144
-#: ../plugins/shared-folder/share-folder-common.c:345
-msgid "Create folder"
-msgstr "Opprett mappe"
-
-#: ../mail/em-folder-tree.c:2720
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "Endre navn på mappe «%s» til:"
-
-#: ../mail/em-folder-tree.c:2722
-msgid "Rename Folder"
-msgstr "Endre navn på mappe"
-
-#: ../mail/em-folder-tree.c:2728
-msgid "Folder names cannot contain '/'"
-msgstr "Mappenavn kan ikke inneholde tegnet «/»"
-
-#: ../mail/em-folder-tree.c:2802 ../ui/evolution-addressbook.xml.h:44
-#: ../ui/evolution-mail-global.xml.h:17
+#: ../mail/em-folder-tree.c:2107 ../ui/evolution-addressbook.xml.h:44
+#: ../ui/evolution-mail-global.xml.h:23
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:53 ../ui/evolution.xml.h:49
+#: ../ui/evolution-message-composer.xml.h:52 ../ui/evolution.xml.h:46
 msgid "_View"
 msgstr "_Vis"
 
-#: ../mail/em-folder-tree.c:2803
+#: ../mail/em-folder-tree.c:2108
 msgid "Open in _New Window"
 msgstr "Åpne i _nytt vindu"
 
-#: ../mail/em-folder-tree.c:2807
+#: ../mail/em-folder-tree.c:2112
 msgid "_Copy..."
 msgstr "_Kopier..."
 
-#: ../mail/em-folder-tree.c:2808
+#: ../mail/em-folder-tree.c:2113
 msgid "_Move..."
 msgstr "_Flytt..."
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2812
+#: ../mail/em-folder-tree.c:2117
 msgid "_New Folder..."
 msgstr "_Ny mappe..."
 
-#: ../mail/em-folder-tree.c:2815
+#: ../mail/em-folder-tree.c:2120 ../ui/evolution-mail-list.xml.h:29
 msgid "_Rename..."
 msgstr "End_re navn..."
 
-#: ../mail/em-folder-view.c:970 ../mail/em-popup.c:499
-#: ../ui/evolution-mail-message.xml.h:87
+#: ../mail/em-folder-view.c:929 ../mail/em-folder-view.c:944
+#: ../mail/importers/evolution-mbox-importer.c:120
+#: ../mail/importers/evolution-outlook-importer.c:134
+msgid "Select folder"
+msgstr "Velg mappe"
+
+#: ../mail/em-folder-view.c:944
+msgid "C_opy"
+msgstr "K_opier"
+
+#: ../mail/em-folder-view.c:1037 ../mail/em-popup.c:499
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: ../mail/em-folder-view.c:971 ../ui/evolution-mail-message.xml.h:123
+#: ../mail/em-folder-view.c:1038 ../ui/evolution-mail-message.xml.h:119
 msgid "_Reply to Sender"
 msgstr "Sva_r til avsender"
 
-#: ../mail/em-folder-view.c:972 ../mail/em-popup.c:501
-#: ../ui/evolution-mail-message.xml.h:110
+#: ../mail/em-folder-view.c:1039 ../mail/em-popup.c:501
+#: ../ui/evolution-mail-message.xml.h:105
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: ../mail/em-folder-view.c:975 ../ui/evolution-mail-message.xml.h:109
+#: ../mail/em-folder-view.c:1042 ../ui/evolution-mail-message.xml.h:103
 msgid "_Edit as New Message..."
 msgstr "R_ediger som ny melding..."
 
-#: ../mail/em-folder-view.c:977
-msgid "_Print"
-msgstr "S_kriv ut"
-
-#: ../mail/em-folder-view.c:981
+#: ../mail/em-folder-view.c:1048
 msgid "U_ndelete"
 msgstr "A_ngre slett"
 
-#: ../mail/em-folder-view.c:982
+#: ../mail/em-folder-view.c:1049
 msgid "Mo_ve to Folder..."
 msgstr "Fl_ytt til mappe..."
 
-#: ../mail/em-folder-view.c:983 ../ui/evolution-addressbook.xml.h:32
+#: ../mail/em-folder-view.c:1050 ../ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "K_opier til mappe..."
 
-#: ../mail/em-folder-view.c:986
+#: ../mail/em-folder-view.c:1053
+msgid "Mar_k as Read"
+msgstr "Mer_k som lest"
+
+#: ../mail/em-folder-view.c:1054
+msgid "Mark as U_nread"
+msgstr "Merk som _ulest"
+
+#: ../mail/em-folder-view.c:1055
 msgid "Mark as _Important"
 msgstr "Merk som v_iktig"
 
-#: ../mail/em-folder-view.c:987
+#: ../mail/em-folder-view.c:1056
 msgid "_Mark as Unimportant"
 msgstr "_Merk som uviktig"
 
-#: ../mail/em-folder-view.c:988 ../ui/evolution-mail-message.xml.h:54
+#: ../mail/em-folder-view.c:1057
 msgid "Mark as _Junk"
 msgstr "Merk som _søppel"
 
-#: ../mail/em-folder-view.c:989 ../ui/evolution-mail-message.xml.h:55
+#: ../mail/em-folder-view.c:1058
 msgid "Mark as _Not Junk"
 msgstr "Merk som _gyldig melding"
 
-#: ../mail/em-folder-view.c:990
+#: ../mail/em-folder-view.c:1059
 msgid "Mark for Follo_w Up..."
 msgstr "Merk for oppføl_ging..."
 
-#: ../mail/em-folder-view.c:998
+#: ../mail/em-folder-view.c:1067
 msgid "Fla_g Completed"
 msgstr "Mer_k som fullført"
 
-#: ../mail/em-folder-view.c:999
+#: ../mail/em-folder-view.c:1068
 msgid "Cl_ear Flag"
 msgstr "Fj_ern flagg"
 
-#: ../mail/em-folder-view.c:1002
+#: ../mail/em-folder-view.c:1071
 msgid "Crea_te Rule From Message"
 msgstr "Oppre_tt regel fra melding"
 
-#: ../mail/em-folder-view.c:1003
+#: ../mail/em-folder-view.c:1072
 msgid "vFolder on _Subject"
 msgstr "Virtuell mappe på e_mne"
 
-#: ../mail/em-folder-view.c:1004
+#: ../mail/em-folder-view.c:1073
 msgid "vFolder on Se_nder"
 msgstr "Virtuell mappe på se_nder"
 
-#: ../mail/em-folder-view.c:1005
+#: ../mail/em-folder-view.c:1074
 msgid "vFolder on _Recipients"
 msgstr "Virtuell mappe på mottake_re"
 
-#: ../mail/em-folder-view.c:1006
+#: ../mail/em-folder-view.c:1075
 msgid "vFolder on Mailing _List"
 msgstr "Virtuell mappe på e-post_liste"
 
-#: ../mail/em-folder-view.c:1010
+#: ../mail/em-folder-view.c:1079
 msgid "Filter on Sub_ject"
 msgstr "Filtrer på em_ne"
 
-#: ../mail/em-folder-view.c:1011
+#: ../mail/em-folder-view.c:1080
 msgid "Filter on Sen_der"
 msgstr "Filtrer på sen_der"
 
-#: ../mail/em-folder-view.c:1012
+#: ../mail/em-folder-view.c:1081
 msgid "Filter on Re_cipients"
 msgstr "Filtrer på motta_ker"
 
-#: ../mail/em-folder-view.c:1013
+#: ../mail/em-folder-view.c:1082
 msgid "Filter on _Mailing List"
 msgstr "Filtrer på e-_postliste"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:1844 ../mail/em-folder-view.c:1888
+#: ../mail/em-folder-view.c:1922 ../mail/em-folder-view.c:1966
 msgid "Default"
 msgstr "Forvalgt"
 
-#: ../mail/em-folder-view.c:1987
+#: ../mail/em-folder-view.c:2065
+#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 msgid "Print Message"
 msgstr "Skriv ut melding"
 
-#: ../mail/em-folder-view.c:2295
+#: ../mail/em-folder-view.c:2403
 msgid "_Copy Link Location"
 msgstr "_Kopier lokasjon for lenke"
 
-#: ../mail/em-folder-view.c:2297
+#: ../mail/em-folder-view.c:2405
 msgid "Create _vFolder"
 msgstr "Opprett _virtuell mappe"
 
-#: ../mail/em-folder-view.c:2298
+#: ../mail/em-folder-view.c:2406
 msgid "_From this Address"
 msgstr "_Fra denne adressen"
 
-#: ../mail/em-folder-view.c:2299
+#: ../mail/em-folder-view.c:2407
 msgid "_To this Address"
 msgstr "_Til denne adressen"
 
-#: ../mail/em-folder-view.c:2568
+#: ../mail/em-folder-view.c:2688
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klikk for å sende melding til %s"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:412
+#: ../mail/em-format-html-display.c:406
 #, c-format
 msgid "Matches: %d"
 msgstr "Treff: %d"
 
-#: ../mail/em-format-html-display.c:680 ../mail/em-format-html.c:579
+#: ../mail/em-format-html-display.c:653 ../mail/em-format-html.c:578
 msgid "Unsigned"
 msgstr "Usignert"
 
-#: ../mail/em-format-html-display.c:680
+#: ../mail/em-format-html-display.c:653
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -11024,11 +10952,11 @@ msgstr ""
 "Denne meldingen er ikke signert. Du har ingen garanti for at meldingen er "
 "autentisk."
 
-#: ../mail/em-format-html-display.c:681 ../mail/em-format-html.c:580
+#: ../mail/em-format-html-display.c:654 ../mail/em-format-html.c:579
 msgid "Valid signature"
 msgstr "Gyldig signatur"
 
-#: ../mail/em-format-html-display.c:681
+#: ../mail/em-format-html-display.c:654
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11036,11 +10964,11 @@ msgstr ""
 "Denne meldingen er signert og gyldig hvilket betyr denne meldingen høyst "
 "sannsynlig er autentisk."
 
-#: ../mail/em-format-html-display.c:682 ../mail/em-format-html.c:581
+#: ../mail/em-format-html-display.c:655 ../mail/em-format-html.c:580
 msgid "Invalid signature"
 msgstr "Ugyldig signatur"
 
-#: ../mail/em-format-html-display.c:682
+#: ../mail/em-format-html-display.c:655
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11048,11 +10976,11 @@ msgstr ""
 "Signaturen for denne meldingen kan ikke verifiseres. Den kan være endret "
 "under overføring."
 
-#: ../mail/em-format-html-display.c:683
+#: ../mail/em-format-html-display.c:656
 msgid "Valid signature, cannot verify sender"
 msgstr "Gyldig signatur. Kan ikke verifisere avsender"
 
-#: ../mail/em-format-html-display.c:683
+#: ../mail/em-format-html-display.c:656
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11060,11 +10988,11 @@ msgstr ""
 "Denne meldingen er signert med en gyldig signatur, men avsender av meldingen "
 "kan ikke verifiseres."
 
-#: ../mail/em-format-html-display.c:689 ../mail/em-format-html.c:588
+#: ../mail/em-format-html-display.c:662 ../mail/em-format-html.c:587
 msgid "Unencrypted"
 msgstr "Ukryptert"
 
-#: ../mail/em-format-html-display.c:689
+#: ../mail/em-format-html-display.c:662
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
@@ -11072,11 +11000,11 @@ msgstr ""
 "Denne meldingen er ikke kryptert. Innholdet kan vises under overføring over "
 "Internett."
 
-#: ../mail/em-format-html-display.c:690 ../mail/em-format-html.c:589
+#: ../mail/em-format-html-display.c:663 ../mail/em-format-html.c:588
 msgid "Encrypted, weak"
 msgstr "Kryptert, svak"
 
-#: ../mail/em-format-html-display.c:690
+#: ../mail/em-format-html-display.c:663
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm.  It would "
 "be difficult, but not impossible for an outsider to view the content of this "
@@ -11086,11 +11014,11 @@ msgstr ""
 "vanskelig, men ikke umulig for en utenforstående å se innholdet i denne "
 "meldingen på noenlunde kort tid."
 
-#: ../mail/em-format-html-display.c:691 ../mail/em-format-html.c:590
+#: ../mail/em-format-html-display.c:664 ../mail/em-format-html.c:589
 msgid "Encrypted"
 msgstr "Kryptert"
 
-#: ../mail/em-format-html-display.c:691
+#: ../mail/em-format-html-display.c:664
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -11098,11 +11026,11 @@ msgstr ""
 "Denne meldingen er kryptert. Det vil være vanskelig for en utenforstående å "
 "se innholdet i denne meldingen."
 
-#: ../mail/em-format-html-display.c:692 ../mail/em-format-html.c:591
+#: ../mail/em-format-html-display.c:665 ../mail/em-format-html.c:590
 msgid "Encrypted, strong"
 msgstr "Kryptert, sterk"
 
-#: ../mail/em-format-html-display.c:692
+#: ../mail/em-format-html-display.c:665
 msgid ""
 "This message is encrypted, with a strong encryption algorithm.  It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -11111,35 +11039,35 @@ msgstr ""
 "Denne meldingen er kryptert med en sterk algoritme. Det vil være meget "
 "vanskelig for en utenforstående å se innholdet i denne meldingen på kort tid."
 
-#: ../mail/em-format-html-display.c:793 ../smime/gui/smime-ui.glade.h:47
+#: ../mail/em-format-html-display.c:766 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Vis sertifikat"
 
-#: ../mail/em-format-html-display.c:808
+#: ../mail/em-format-html-display.c:781
 msgid "This certificate is not viewable"
 msgstr "Dette sertifikatet kan ikke vises"
 
-#: ../mail/em-format-html-display.c:1037
+#: ../mail/em-format-html-display.c:1011
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Ferdigstilt på %d %B, %Y, %H.%M"
 
-#: ../mail/em-format-html-display.c:1045
+#: ../mail/em-format-html-display.c:1019
 msgid "Overdue:"
 msgstr "Utgått:"
 
-#: ../mail/em-format-html-display.c:1048
+#: ../mail/em-format-html-display.c:1022
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "til %d %B %Y %H.%M"
 
-#: ../mail/em-format-html-display.c:1095
+#: ../mail/em-format-html-display.c:1064
 msgid "_View Inline"
 msgstr "_Vis i meldingsteksten"
 
-#: ../mail/em-format-html-display.c:1096
+#: ../mail/em-format-html-display.c:1065
 msgid "_Hide"
 msgstr "_Skjul"
 
-#: ../mail/em-format-html-display.c:1340
+#: ../mail/em-format-html-display.c:1309
 msgid "Attachment Button"
 msgstr "Vedleggsknapp"
 
@@ -11148,128 +11076,128 @@ msgstr "Vedleggsknapp"
 msgid "Page %d of %d"
 msgstr "Side %d av %d"
 
-#: ../mail/em-format-html.c:472 ../mail/em-format-html.c:474
+#: ../mail/em-format-html.c:471 ../mail/em-format-html.c:473
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Henter «%s»"
 
-#: ../mail/em-format-html.c:582
+#: ../mail/em-format-html.c:581
 msgid "Valid signature but cannot verify sender"
 msgstr "Gyldig signatur, men ikke verifisere avsender"
 
-#: ../mail/em-format-html.c:840
+#: ../mail/em-format-html.c:839
 msgid "Malformed external-body part."
 msgstr "Feilutformet del for ekstern kropp."
 
-#: ../mail/em-format-html.c:870
+#: ../mail/em-format-html.c:869
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Peker til FTP-tjener (%s)"
 
-#: ../mail/em-format-html.c:881
+#: ../mail/em-format-html.c:880
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Peker til lokal fil (%s) gyldig på nettsted «%s»"
 
-#: ../mail/em-format-html.c:883
+#: ../mail/em-format-html.c:882
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Peker til lokal fil (%s)"
 
-#: ../mail/em-format-html.c:904
+#: ../mail/em-format-html.c:903
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Peker til eksterne data (%s)"
 
-#: ../mail/em-format-html.c:915
+#: ../mail/em-format-html.c:914
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Peker til ukjente eksterne data («%s»-type)"
 
-#: ../mail/em-format-html.c:1137
+#: ../mail/em-format-html.c:1140
 msgid "Formatting message"
 msgstr "Formatterer melding"
 
-#: ../mail/em-format-html.c:1424 ../mail/em-format-quote.c:193
-#: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:83
+#: ../mail/em-format-html.c:1433 ../mail/em-format-quote.c:197
+#: ../mail/em-format.c:843 ../mail/em-mailer-prefs.c:83
 #: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:326
 msgid "From"
 msgstr "Fra"
 
-#: ../mail/em-format-html.c:1424 ../mail/em-format-quote.c:193
-#: ../mail/em-format.c:849 ../mail/em-mailer-prefs.c:84
+#: ../mail/em-format-html.c:1433 ../mail/em-format-quote.c:197
+#: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:84
 msgid "Reply-To"
 msgstr "Svar-til"
 
-#: ../mail/em-format-html.c:1424 ../mail/em-format-quote.c:193
-#: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:85
+#: ../mail/em-format-html.c:1433 ../mail/em-format-quote.c:197
+#: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:85
 #: ../mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Til"
 
-#: ../mail/em-format-html.c:1424 ../mail/em-format-quote.c:193
-#: ../mail/em-format.c:851 ../mail/em-mailer-prefs.c:86
+#: ../mail/em-format-html.c:1433 ../mail/em-format-quote.c:197
+#: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:86
 msgid "Cc"
 msgstr "Cc"
 
-#: ../mail/em-format-html.c:1424 ../mail/em-format-quote.c:193
-#: ../mail/em-format.c:852 ../mail/em-mailer-prefs.c:87
+#: ../mail/em-format-html.c:1433 ../mail/em-format-quote.c:197
+#: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:87
 msgid "Bcc"
 msgstr "Bcc"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1537 ../mail/em-format-quote.c:315
+#: ../mail/em-format-html.c:1545 ../mail/em-format-quote.c:319
 #: ../mail/em-mailer-prefs.c:986
 msgid "Mailer"
 msgstr "E-postprogram"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1564
+#: ../mail/em-format-html.c:1572
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1567
+#: ../mail/em-format-html.c:1575
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: ../mail/em-format-html.c:1577 ../mail/em-format-quote.c:322
-#: ../mail/em-format.c:854 ../mail/em-mailer-prefs.c:89
+#: ../mail/em-format-html.c:1585 ../mail/em-format-quote.c:326
+#: ../mail/em-format.c:849 ../mail/em-mailer-prefs.c:89
 #: ../mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Dato"
 
-#: ../mail/em-format-html.c:1600 ../mail/em-format.c:855
+#: ../mail/em-format-html.c:1608 ../mail/em-format.c:850
 #: ../mail/em-mailer-prefs.c:90
 msgid "Newsgroups"
 msgstr "Nyhetsgrupper"
 
-#: ../mail/em-format.c:1104
+#: ../mail/em-format.c:1099
 #, c-format
 msgid "%s attachment"
 msgstr "%s-vedlegg"
 
-#: ../mail/em-format.c:1143 ../mail/em-format.c:1276
+#: ../mail/em-format.c:1138 ../mail/em-format.c:1271
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Kunne ikke lese S/MIME-melding: Ukjent feil"
 
-#: ../mail/em-format.c:1266
+#: ../mail/em-format.c:1261
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Krypteringstype for multipart/encrypted som ikke er støttet"
 
-#: ../mail/em-format.c:1414
+#: ../mail/em-format.c:1409
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Kunne ikke lese MIME-melding. Viser ren meldingstekst."
 
-#: ../mail/em-format.c:1433
+#: ../mail/em-format.c:1428
 msgid "Unsupported signature format"
 msgstr "Ustøttet signaturformat"
 
-#: ../mail/em-format.c:1441
+#: ../mail/em-format.c:1436
 msgid "Error verifying signature"
 msgstr "Feil under verifisering av signatur"
 
-#: ../mail/em-format.c:1441
+#: ../mail/em-format.c:1436
 msgid "Unknown error verifying signature"
 msgstr "Ukjent feil under verifisering av signatur"
 
@@ -11293,7 +11221,7 @@ msgstr "En gang i uken"
 msgid "Once per month"
 msgstr "En gang i måneden"
 
-#: ../mail/em-migrate.c:1168
+#: ../mail/em-migrate.c:1198
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -11305,50 +11233,50 @@ msgstr ""
 "\n"
 "Vennligst vent mens Evolution migrere dine mapper..."
 
-#: ../mail/em-migrate.c:1602
+#: ../mail/em-migrate.c:1632
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Kan ikke opprette ny mappe «%s»: %s"
 
-#: ../mail/em-migrate.c:1628
+#: ../mail/em-migrate.c:1658
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Kan ikke kopiere mappe «%s» til «%s»: %s"
 
-#: ../mail/em-migrate.c:1813
+#: ../mail/em-migrate.c:1843
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Kan ikke søke etter eksisterende postbokser på «%s»: %s"
 
-#: ../mail/em-migrate.c:2017
+#: ../mail/em-migrate.c:2047
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr ""
 "Kunne ikke åpne gamle data om meldinger som er beholdt på tjeneren for POP-"
 "tjener «%s»: %s"
 
-#: ../mail/em-migrate.c:2031
+#: ../mail/em-migrate.c:2061
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr ""
 "Klarte ikke å opprette katalog for bevaring av data på POP3-tjener «%s»: %s"
 
-#: ../mail/em-migrate.c:2060
+#: ../mail/em-migrate.c:2090
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "Kan ikke kopiere data for bevaring på POP3-tjener: «%s»: %s"
 
-#: ../mail/em-migrate.c:2494 ../mail/em-migrate.c:2506
+#: ../mail/em-migrate.c:2561 ../mail/em-migrate.c:2573
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Klarte ikke å opprette lokalt e-postlager «%s»: %s"
 
-#: ../mail/em-migrate.c:2657
+#: ../mail/em-migrate.c:2693
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Kunne ikke opprette lokale e-postmapper i «%s»: %s"
 
-#: ../mail/em-migrate.c:2675
+#: ../mail/em-migrate.c:2711
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -11373,7 +11301,7 @@ msgstr "Sett som _bakgrunn"
 msgid "_Reply to sender"
 msgstr "Sva_r til avsender"
 
-#: ../mail/em-popup.c:498 ../ui/evolution-mail-message.xml.h:88
+#: ../mail/em-popup.c:498 ../ui/evolution-mail-message.xml.h:81
 msgid "Reply to _List"
 msgstr "Svar til _listen"
 
@@ -11424,20 +11352,20 @@ msgstr "Ikke vis denne meldingen igjen."
 msgid "Filters"
 msgstr "Filtre"
 
-#: ../mail/em-utils.c:434
+#: ../mail/em-utils.c:436
 msgid "message"
 msgstr "melding"
 
-#: ../mail/em-utils.c:543
+#: ../mail/em-utils.c:545
 msgid "Save Message..."
 msgstr "Lagre melding..."
 
-#: ../mail/em-utils.c:592
+#: ../mail/em-utils.c:594
 msgid "Add address"
 msgstr "Legg til adresse"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1071
+#: ../mail/em-utils.c:1073
 #, c-format
 msgid "Messages from %s"
 msgstr "Meldinger fra %s"
@@ -11614,8 +11542,8 @@ msgstr "Last bilder for HTML-meldinger og http"
 #: ../mail/evolution-mail.schemas.in.in.h:39
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
-"load images off the net 1 - Load images if sender is in the addressbook 2 - "
-"Always load images off the net"
+"load images off the net 1 - Load images in mail from contacts 2 - Always "
+"load images off the net"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.in.h:40
@@ -11906,14 +11834,6 @@ msgid ""
 "not contain In-Reply-To or References headers."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:109
-msgid "port for starting user runned spamd"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.in.h:110
-msgid "spamd port"
-msgstr "port for spamd"
-
 #: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
 msgid "Evolution Elm importer"
 msgstr "Import fra Elm for Evolution"
@@ -12102,108 +12022,108 @@ msgstr ""
 msgid "Pine"
 msgstr "Pine"
 
-#: ../mail/mail-autofilter.c:74
+#: ../mail/mail-autofilter.c:78
 #, c-format
 msgid "Mail to %s"
 msgstr "Send til %s"
 
-#: ../mail/mail-autofilter.c:238 ../mail/mail-autofilter.c:277
+#: ../mail/mail-autofilter.c:242 ../mail/mail-autofilter.c:281
 #, c-format
 msgid "Mail from %s"
 msgstr "E-post fra %s"
 
-#: ../mail/mail-autofilter.c:261
+#: ../mail/mail-autofilter.c:265
 #, c-format
 msgid "Subject is %s"
 msgstr "Emne er %s"
 
-#: ../mail/mail-autofilter.c:296
+#: ../mail/mail-autofilter.c:300
 #, c-format
 msgid "%s mailing list"
 msgstr "%s e-postliste"
 
-#: ../mail/mail-autofilter.c:365
+#: ../mail/mail-autofilter.c:369
 msgid "Add Filter Rule"
 msgstr "Legg til filterregel"
 
-#: ../mail/mail-component.c:505
+#: ../mail/mail-component.c:506
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d slettet"
 msgstr[1] "%d slettet"
 
-#: ../mail/mail-component.c:507
+#: ../mail/mail-component.c:508
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d søppel"
 msgstr[1] "%d søppel"
 
-#: ../mail/mail-component.c:530
+#: ../mail/mail-component.c:531
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d skisse"
 msgstr[1] "%d skisser"
 
-#: ../mail/mail-component.c:532
+#: ../mail/mail-component.c:533
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d sendt"
 msgstr[1] "%d sendt"
 
-#: ../mail/mail-component.c:534
+#: ../mail/mail-component.c:535
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d usendt"
 msgstr[1] "%d usendte"
 
-#: ../mail/mail-component.c:538
+#: ../mail/mail-component.c:539
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d totalt"
 msgstr[1] "%d totalt"
 
-#: ../mail/mail-component.c:540
+#: ../mail/mail-component.c:541
 #, c-format
 msgid ", %d unread"
 msgid_plural ", %d unread"
 msgstr[0] ", %d ulest"
 msgstr[1] ", %d uleste"
 
-#: ../mail/mail-component.c:712
+#: ../mail/mail-component.c:723
 msgid "New Mail Message"
 msgstr "Ny e-post melding"
 
-#: ../mail/mail-component.c:713
+#: ../mail/mail-component.c:724
 msgid "_Mail Message"
 msgstr "Send _melding"
 
-#: ../mail/mail-component.c:714
+#: ../mail/mail-component.c:725
 msgid "Compose a new mail message"
 msgstr "Skriv en ny e-postmelding"
 
-#: ../mail/mail-component.c:720
+#: ../mail/mail-component.c:731
 msgid "New Mail Folder"
 msgstr "Ny e-postmappe"
 
-#: ../mail/mail-component.c:721
+#: ../mail/mail-component.c:732
 msgid "Mail _Folder"
 msgstr "_E-postmappe"
 
-#: ../mail/mail-component.c:722
+#: ../mail/mail-component.c:733
 msgid "Create a new mail folder"
 msgstr "Opprett en ny e-postmappe"
 
-#: ../mail/mail-component.c:869
+#: ../mail/mail-component.c:855
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Feil under oppgradering av innstillinger eller mapper for e-post."
 
-#: ../mail/mail-config.glade.h:1 ../mail/mail-dialogs.glade.h:5
+#: ../mail/mail-config.glade.h:1 ../mail/mail-dialogs.glade.h:1
 msgid "    "
 msgstr "    "
 
@@ -12268,7 +12188,7 @@ msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr "<span weight=\"bold\">Alternativer for filtre</span>"
 
 #: ../mail/mail-config.glade.h:18
-#: ../plugins/itip-formatter/itip-formatter.c:1667
+#: ../plugins/itip-formatter/itip-formatter.c:1681
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">Generelt</span>"
 
@@ -12289,147 +12209,151 @@ msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr "<span weight=\"bold\">Skrifter for meldinger</span>"
 
 #: ../mail/mail-config.glade.h:23
+msgid "<span weight=\"bold\">Message Receipts</span>"
+msgstr "<span weight=\"bold\">Kvitteringer for meldinger</span>"
+
+#: ../mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "<span weight=\"bold\">Melding om ny e-post</span>"
 
-#: ../mail/mail-config.glade.h:24
+#: ../mail/mail-config.glade.h:25
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr "<span weight=\"bold\">Tilleggsinformasjon</span>"
 
-#: ../mail/mail-config.glade.h:25
+#: ../mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<span weight=\"bold\">Alternativer</span>"
 
-#: ../mail/mail-config.glade.h:26
+#: ../mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 
-#: ../mail/mail-config.glade.h:27
+#: ../mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">Skrifter for utskrift</span>"
 
-#: ../mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">Nødvendig informasjon</span>"
 
-#: ../mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 
-#: ../mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">Sikkerhet</span>"
 
-#: ../mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">Sendte meldinger og skisser</span>"
 
-#: ../mail/mail-config.glade.h:32
+#: ../mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">Tjenerkonfigurasjon</span>"
 
-#: ../mail/mail-config.glade.h:34
+#: ../mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Håndtering av konti"
 
-#: ../mail/mail-config.glade.h:35
+#: ../mail/mail-config.glade.h:36
 msgid "Add Ne_w Signature..."
 msgstr "Legg til n_y signatur..."
 
-#: ../mail/mail-config.glade.h:36
+#: ../mail/mail-config.glade.h:37
 msgid "Add _Script"
 msgstr "Legg til _skript"
 
-#: ../mail/mail-config.glade.h:37
+#: ../mail/mail-config.glade.h:38
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "All_tid signer utgående meldinger når denne kontoen brukes"
 
-#: ../mail/mail-config.glade.h:38
+#: ../mail/mail-config.glade.h:39
 msgid "Also encrypt to sel_f when sending encrypted mail"
 msgstr ""
 "Send krypterte me_ldinger til meg selv også ved sending av kryptert e-post"
 
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.glade.h:40
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "All_tid _kopi (cc) til:"
 
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.glade.h:41
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Alltid _blindkopi (bcc) til:"
 
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.glade.h:42
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Alltid s_tol på nøkler i min nøkkelring ved kryptering"
 
-#: ../mail/mail-config.glade.h:42
+#: ../mail/mail-config.glade.h:43
 msgid "Always encrypt to _myself when sending encrypted mail"
 msgstr "Alltid krypter til _meg selv ved sending av kryptert e-post"
 
-#: ../mail/mail-config.glade.h:43
+#: ../mail/mail-config.glade.h:44
 msgid "Attach original message"
 msgstr "Legg ved opprinnelig melding"
 
-#: ../mail/mail-config.glade.h:44 ../mail/message-list.etspec.h:1
+#: ../mail/mail-config.glade.h:45 ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Vedlegg"
 
-#: ../mail/mail-config.glade.h:45
+#: ../mail/mail-config.glade.h:46
 msgid "Automatically _insert smiley images"
 msgstr "Sett _inn smilefjes automatisk"
 
-#: ../mail/mail-config.glade.h:46
+#: ../mail/mail-config.glade.h:47
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltisk (ISO-8859-13)"
 
-#: ../mail/mail-config.glade.h:47
+#: ../mail/mail-config.glade.h:48
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltisk (ISO-8859-4)"
 
-#: ../mail/mail-config.glade.h:48
+#: ../mail/mail-config.glade.h:49
 msgid "Beep w_hen new mail arrives"
 msgstr "_Pip når nye meldinger ankommer"
 
-#: ../mail/mail-config.glade.h:49
+#: ../mail/mail-config.glade.h:50
 msgid "C_haracter set:"
 msgstr "Te_gnsett:"
 
-#: ../mail/mail-config.glade.h:50
+#: ../mail/mail-config.glade.h:51
 msgid "Ch_eck for Supported Types "
 msgstr "Sj_ekk støttede typer "
 
-#: ../mail/mail-config.glade.h:51
+#: ../mail/mail-config.glade.h:52
 msgid "Check _incoming mail for junk"
 msgstr "Sjekk om innkommende meldinger er søppel"
 
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.glade.h:53
 msgid "Check spelling while I _type"
 msgstr "Sjekk s_taving mens jeg skriver"
 
-#: ../mail/mail-config.glade.h:53
+#: ../mail/mail-config.glade.h:54
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Sjekker om innkommende meldinger er søppel"
 
-#: ../mail/mail-config.glade.h:54
+#: ../mail/mail-config.glade.h:55
 msgid "Cle_ar"
 msgstr "_Tøm"
 
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.glade.h:56
 msgid "Clea_r"
 msgstr "Tø_m"
 
-#: ../mail/mail-config.glade.h:56
+#: ../mail/mail-config.glade.h:57
 msgid "Color for _misspelled words:"
 msgstr "_Farge for feilstavede ord:"
 
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:58
 msgid "Colors"
 msgstr "Farger"
 
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.glade.h:59
 msgid "Confirm _when expunging a folder"
 msgstr "_Bekreft ved tømming av en mappe"
 
-#: ../mail/mail-config.glade.h:59
+#: ../mail/mail-config.glade.h:60
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12445,118 +12369,126 @@ msgstr ""
 "\n"
 "Klikk «Fullfør» for å lagre dine innstillinger."
 
-#: ../mail/mail-config.glade.h:65
+#: ../mail/mail-config.glade.h:66
 msgid "De_fault"
 msgstr "_Forvalgt"
 
-#: ../mail/mail-config.glade.h:66
+#: ../mail/mail-config.glade.h:67
 msgid "Default character e_ncoding:"
 msgstr "Forvalgt teg_nkoding:"
 
-#: ../mail/mail-config.glade.h:69
+#: ../mail/mail-config.glade.h:70
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "_Signer utgående meldinger digitalt (som forvalg)"
 
-#: ../mail/mail-config.glade.h:70
+#: ../mail/mail-config.glade.h:71
 msgid "Do not quote original message"
 msgstr "Ikke siter opprinnelig melding"
 
-#: ../mail/mail-config.glade.h:71 ../shell/evolution-startup-wizard.glade.h:1
+#: ../mail/mail-config.glade.h:72
 msgid "Done"
 msgstr "Ferdig"
 
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.glade.h:73
 msgid "Drafts _Folder:"
 msgstr "Mappe _for skisser:"
 
-#: ../mail/mail-config.glade.h:74
+#: ../mail/mail-config.glade.h:75
 msgid "Email Accounts"
 msgstr "E-post kontoer"
 
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:76
 msgid "Email _Address:"
 msgstr "E-post_adresse:"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:77
 msgid "Empty trash folders on e_xit"
 msgstr "_Tøm søppelkurven når programmet avsluttes"
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:78
 msgid "Encry_ption certificate:"
 msgstr "Sertifikat for kry_ptering:"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:79
 msgid "Encrypt out_going messages (by default)"
 msgstr "Krypter ut_gående meldinger (som forvalg)"
 
-#: ../mail/mail-config.glade.h:80
+#: ../mail/mail-config.glade.h:81
 msgid "Execute Command..."
 msgstr "Kjør kommando..."
 
-#: ../mail/mail-config.glade.h:81
+#: ../mail/mail-config.glade.h:82
 msgid "Fi_xed-width:"
 msgstr "Fast _bredde:"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:83
 msgid "Font Properties"
 msgstr "Egenskaper for skrift"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:84
 msgid "Format messages in _HTML"
 msgstr "Formater meldinger med _HTML"
 
-#: ../mail/mail-config.glade.h:85
+#: ../mail/mail-config.glade.h:86
 msgid "HTML Mail"
 msgstr "HTML-e-post"
 
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:87
 msgid "Headers"
 msgstr "Meldingshoder"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:88
 msgid "Highlight _quotations with"
 msgstr "_Merk sitering med"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:89
 msgid "I_nclude remote tests"
 msgstr "Inkluder eksterne tester"
 
-#: ../mail/mail-config.glade.h:91
+#: ../mail/mail-config.glade.h:92
 msgid "Inline"
 msgstr "Inline"
 
 #: ../mail/mail-config.glade.h:94
+msgid "Languages Table"
+msgstr "Språktabell"
+
+#: ../mail/mail-config.glade.h:96
 msgid "Mail Configuration"
 msgstr "E-post-konfigurasjon"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:97
+msgid "Mail Headers Table"
+msgstr "Tabell med meldingshoder"
+
+#: ../mail/mail-config.glade.h:99
 msgid "Mailbox location"
 msgstr "Plassering av postboks"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:100
 msgid "Message Composer"
 msgstr "Meldingsredigering"
 
-#: ../mail/mail-config.glade.h:98
+#: ../mail/mail-config.glade.h:101
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 "Merk: du vil ikke bli spurt etter et passord før du kobler til første gang"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:102
 msgid "Or_ganization:"
 msgstr "Or_ganisasjon:"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:103
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG-nø_kkel ID:"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:106
 msgid "Play sound file when new mail arri_ves"
 msgstr "Spill en l_ydfil når nye meldinger ankommer"
 
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:107
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -12564,7 +12496,7 @@ msgstr ""
 "Vennligst oppgi et beskrivende navn for denne kontoen i feltet under.\n"
 "Dette navnet vil kun bli brukt som et visningsnavn."
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:109
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -12572,7 +12504,7 @@ msgstr ""
 "Vennligst skriv inn informasjon om måten du sender e-post. Hvis du ikke er "
 "sikker, kontakt din systemadministrator eller din Internett tjenestetilbyder."
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:110
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -12582,107 +12514,115 @@ msgstr ""
 "under må ikke nødvendigvis fylles ut, hvis du ikke ønsker å inkludere denne "
 "informasjonen i meldingene du sender."
 
-#: ../mail/mail-config.glade.h:108
+#: ../mail/mail-config.glade.h:111
 msgid "Please select among the following options"
 msgstr "Vennligst velg mellom følgende alternativer"
 
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:112
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Spø_r ved sending av meldinger med kun Bcc-mottakere definert"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:113
 msgid "Quote original message"
 msgstr "Siter opprinnelig melding"
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:114
 msgid "Quoted"
 msgstr "Sitert"
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:115
 msgid "Re_member password"
 msgstr "_Husk passord"
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:116
 msgid "Re_ply-To:"
 msgstr "S_var-til:"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:118
 msgid "Remember _password"
 msgstr "Husk _passord"
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:119
 msgid "S_elect..."
 msgstr "V_elg..."
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:120
 msgid "S_tandard Font:"
 msgstr "Forvalg_t skrift:"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:121
 msgid "Se_lect..."
 msgstr "Ve_lg..."
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:123
 msgid "Select HTML fixed width font"
 msgstr "Velg skrift med fast bredde for HTML"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:124
 msgid "Select HTML fixed width font for printing"
 msgstr "Velg skrift med fast bredde for bruk ved utskrift av HTML"
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:125
 msgid "Select HTML variable width font"
 msgstr "Velg skrift med variabel bredde for HTML"
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:126
 msgid "Select HTML variable width font for printing"
 msgstr "Velg skrift med variabel bredde for bruk ved utskrift av HTML"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:127
+msgid "Send message receipts:"
+msgstr "Send kvittering for meldinger:"
+
+#: ../mail/mail-config.glade.h:129
 msgid "Sending Mail"
 msgstr "Utgående e-post"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:130
 msgid "Sent _Messages Folder:"
 msgstr "Mappe for sendte _meldinger:"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:131
 msgid "Ser_ver requires authentication"
 msgstr "Tjener kre_ver autentisering"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:132
 msgid "Server _Type: "
 msgstr "Tjener_type: "
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:133
 msgid "Sig_ning certificate:"
 msgstr "Sertifikat for sig_nering:"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:134
 msgid "Signat_ure:"
 msgstr "Signat_ur:"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:135
 msgid "Signatures"
 msgstr "Signaturer"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:136
+msgid "Signatures Table"
+msgstr "Tabell med signaturer"
+
+#: ../mail/mail-config.glade.h:137
 msgid "Specify _filename:"
 msgstr "Spesifiser _filnavn:"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:138
 msgid "Spell Checking"
 msgstr "Stavekontroll"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:139
 msgid "T_erminal Font:"
 msgstr "T_erminalskrift:"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:140
 msgid "T_ype: "
 msgstr "T_ype:"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:141
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -12690,7 +12630,7 @@ msgstr ""
 "Språklisten som vises her reflekterer kun de språkene du har installert en "
 "ordbok for."
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:142
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12700,7 +12640,7 @@ msgstr ""
 "signatur. Navnet du oppgir vil kun brukes for\n"
 "visning på skjermen."
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:146
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12708,15 +12648,15 @@ msgstr ""
 "Skriv navnet du vil referere til denne kontoen.\n"
 "For eksempel «Arbeid» eller «Personlig»"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:148
 msgid "User_name:"
 msgstr "Bruker_navn:"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:149
 msgid "V_ariable-width:"
 msgstr "V_ariabel bredde:"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:150
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12726,154 +12666,144 @@ msgstr ""
 "\n"
 "Klikk «Neste» for å begynne. "
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:154
 msgid "_Add Signature"
 msgstr "_Legg til signatur"
 
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:155
 msgid "_Always load images from the Internet"
 msgstr "_Alltid last bilder fra Internett"
 
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:156
 msgid "_Do not notify me when new mail arrives"
 msgstr "Ikke gi beskjed når nye meldinger ankommer"
 
-#: ../mail/mail-config.glade.h:152
+#: ../mail/mail-config.glade.h:157
 msgid "_Don't sign meeting requests (for Outlook compatibility)"
 msgstr "Ikke signer _møteforespørsler (for kompatibilitet med Outlook)"
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:159
 msgid "_Forward style:"
 msgstr "_Videresendingsstil:"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:160
 msgid "_Full Name:"
 msgstr "_Fullt navn:"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:161
 msgid "_Host:"
 msgstr "_Vert:"
 
-#: ../mail/mail-config.glade.h:157
-msgid "_Load images if sender is in address book"
-msgstr "_Last bilder hvis avsender er i adresseboken"
+#: ../mail/mail-config.glade.h:162
+msgid "_Load images in mail from contacts"
+msgstr "_Last bilder i meldinger fra kontakter"
 
-#: ../mail/mail-config.glade.h:158
+#: ../mail/mail-config.glade.h:163
 msgid "_Make this my default account"
 msgstr "_Bruk denne som forvalgt konto"
 
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:164
 msgid "_Mark messages as read after"
 msgstr "_Merk meldinger som lest etter"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:166
 msgid "_Never load images from the Internet"
 msgstr "Aldri last bilder fra Internett"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:167
 msgid "_Path:"
 msgstr "S_ti:"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:168
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "S_pør ved sending av HTML-meldinger til kontakter som ikke ønsker dem"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:169
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "S_pør ved sending av meldinger med tomt emnefelt"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:170
 msgid "_Reply style:"
 msgstr "Sva_rstil:"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:171
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:172
 msgid "_Show animated images"
 msgstr "Vi_s animerte bilder"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:173
 msgid "_Use Secure Connection:"
 msgstr "Br_uk sikker forbindelse:"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:174
 msgid "_Use the same fonts as other applications"
 msgstr "Br_uk samme skrifter som andre applikasjoner"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:175
 msgid "color"
 msgstr "farge"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:176
 msgid "description"
 msgstr "beskrivelse"
 
-#: ../mail/mail-dialogs.glade.h:1
-msgid ""
-"\n"
-" Please read carefully the license agreement displayed\n"
-" below and tick the check box for accepting it\n"
-msgstr ""
-"\n"
-"Vennligst les lisensavtalen som vises under nøye\n"
-"og kryss av i ruten for å akseptere den\n"
-
-#: ../mail/mail-dialogs.glade.h:7
+#: ../mail/mail-dialogs.glade.h:3
 msgid "<b>vFolder Sources</b>"
 msgstr "<b>Kilder for virtuelle mapper</b>"
 
-#: ../mail/mail-dialogs.glade.h:8
+#: ../mail/mail-dialogs.glade.h:4
 msgid "<span weight=\"bold\">Digital Signature</span>"
 msgstr "<span weight=\"bold\">Digital signatur</span>"
 
-#: ../mail/mail-dialogs.glade.h:9
+#: ../mail/mail-dialogs.glade.h:5
 msgid "<span weight=\"bold\">Encryption</span>"
 msgstr "<span weight=\"bold\">Kryptering</span>"
 
-#: ../mail/mail-dialogs.glade.h:10
+#: ../mail/mail-dialogs.glade.h:6
 msgid "Case _Sensitive"
 msgstr "_Skill mellom store/små bokstaver"
 
-#: ../mail/mail-dialogs.glade.h:11 ../mail/message-tags.glade.h:2
+#: ../mail/mail-dialogs.glade.h:7 ../mail/message-tags.glade.h:2
 msgid "Co_mpleted"
 msgstr "Fu_llført"
 
-#: ../mail/mail-dialogs.glade.h:13
+#: ../mail/mail-dialogs.glade.h:9
 msgid "F_ind:"
 msgstr "F_inn:"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:10
 msgid "Find in Message"
 msgstr "Finn i melding"
 
-#: ../mail/mail-dialogs.glade.h:15 ../mail/message-tag-followup.c:295
+#: ../mail/mail-dialogs.glade.h:11 ../mail/message-tag-followup.c:295
 #: ../mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "Merk for oppfølging"
 
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:12
 msgid "Folder Subscriptions"
 msgstr "Abonnement på mapper"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:13
 msgid "License Agreement"
 msgstr "Lisensavtale"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:14
 msgid "None Selected"
 msgstr "Ingen valgt"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:15
 msgid "S_erver:"
 msgstr "Tj_ener:"
 
-#: ../mail/mail-dialogs.glade.h:20
+#: ../mail/mail-dialogs.glade.h:16
 msgid "Security Information"
 msgstr "Sikkerhetsinformasjon"
 
-#: ../mail/mail-dialogs.glade.h:22 ../mail/message-tags.glade.h:4
+#: ../mail/mail-dialogs.glade.h:18 ../mail/message-tags.glade.h:4
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -12881,99 +12811,67 @@ msgstr ""
 "Meldingene du har valgt for oppfølging er listet under.\n"
 "Vennligst velg en handling for oppfølging fra menyen «Flagg»."
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:20
 msgid "_Accept License"
 msgstr "Godt_a lisensen"
 
-#: ../mail/mail-dialogs.glade.h:25 ../mail/message-tags.glade.h:6
+#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:6
 msgid "_Due By:"
 msgstr "_Ferdig til:"
 
-#: ../mail/mail-dialogs.glade.h:26 ../mail/message-tags.glade.h:7
+#: ../mail/mail-dialogs.glade.h:22 ../mail/message-tags.glade.h:7
 msgid "_Flag:"
 msgstr "_Flagg:"
 
-#: ../mail/mail-dialogs.glade.h:27
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Subscribe"
 msgstr "_Abonner"
 
-#: ../mail/mail-dialogs.glade.h:28
+#: ../mail/mail-dialogs.glade.h:24
 msgid "_Tick this to accept the license agreement"
 msgstr "_Kryss av her for å godta lisensen"
 
-#: ../mail/mail-dialogs.glade.h:29
+#: ../mail/mail-dialogs.glade.h:25
+#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
 msgid "_Unsubscribe"
 msgstr "_Fjern abonnement"
 
-#: ../mail/mail-dialogs.glade.h:30
+#: ../mail/mail-dialogs.glade.h:26
 msgid "specific folders only"
 msgstr "kun spesifikke mapper"
 
-#: ../mail/mail-dialogs.glade.h:31
+#: ../mail/mail-dialogs.glade.h:27
 msgid "with all active remote folders"
 msgstr "med alle aktive eksterne mapper"
 
-#: ../mail/mail-dialogs.glade.h:32
+#: ../mail/mail-dialogs.glade.h:28
 msgid "with all local and active remote folders"
 msgstr "med alle lokale og aktive eksterne mapper"
 
-#: ../mail/mail-dialogs.glade.h:33
+#: ../mail/mail-dialogs.glade.h:29
 msgid "with all local folders"
 msgstr "med alle lokale mapper"
 
-#. mail:camel-service-auth-invalid primary
-#: ../mail/mail-errors.xml.h:2
-msgid "Invalid authentication"
-msgstr "Ugyldig autentisering"
-
-#. mail:camel-service-auth-invalid secondary
-#: ../mail/mail-errors.xml.h:4
+#: ../mail/mail.error.xml.h:1
 msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
-msgstr ""
-"Tjener støtter ikke denne typen autentisering. Det kan hende den ikke "
-"støtter autentisering i det hele tatt."
-
-#. mail:camel-service-auth-failed primary
-#: ../mail/mail-errors.xml.h:6
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
-msgstr "Din pålogging på tjener «{0}» som «{0}» feilet."
+"A folder named &quot;{1}&quot; already exists. Please use a different name."
+msgstr "En mappe med navn &quot;{1}&quot; eksisterer allerede. Vennligst bruk et annet navn."
 
-#. mail:camel-service-auth-failed secondary
-#: ../mail/mail-errors.xml.h:8
+#: ../mail/mail.error.xml.h:2
 msgid ""
-"Check to make sure your password is spelled correctly.  Remember that many "
-"passwords are case sensitive; your caps lock might be on."
+"A non-empty folder at &quot;{1}&quot; already exists.\n"
+"\n"
+"You can choose to ignore this folder, overwrite or append its contents, or "
+"quit.\n"
 msgstr ""
-"Sjekk at passordet ditt er skrevet korrekt. Husk at mange passord skiller "
-"mellom store og små bokstaver. Caps lock kan være på."
 
-#. mail:ask-send-html primary
-#: ../mail/mail-errors.xml.h:10
-msgid "Are you sure you want to send a message in HTML format?"
-msgstr "Er du sikker på at du vil sende en melding i HTML-format?"
-
-#. mail:ask-send-html secondary
-#: ../mail/mail-errors.xml.h:12
+#: ../mail/mail.error.xml.h:6
 msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email:\n"
-"{0}\n"
-"Send anyway?"
+"A read receipt notification has been requested for &quot;{1}&quot;.  Send "
+"the reciept notification to {0}?"
 msgstr ""
-"Vennligst sjekk at følgende mottakere kan og ønsker å motta e-post som "
-"HTML:\n"
-"{0}\n"
-"Send likevel?"
 
-#. mail:ask-send-no-subject primary
-#: ../mail/mail-errors.xml.h:17
-msgid "Are you sure you want to send a message without a subject?"
-msgstr "Er du sikker på at du vil sende en melding uten emne?"
-
-#. mail:ask-send-no-subject secondary
-#: ../mail/mail-errors.xml.h:19
+#: ../mail/mail.error.xml.h:7
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
@@ -12981,529 +12879,466 @@ msgstr ""
 "Hvis du gir dine meldinger en meningsfylt emnelinje vil mottakerene lettere "
 "forstå hva meldingen din handler om."
 
-#. mail:ask-send-only-bcc-contact primary
-#. mail:ask-send-only-bcc primary
-#: ../mail/mail-errors.xml.h:22 ../mail/mail-errors.xml.h:29
-msgid "Are you sure you want to send a message with only BCC recipients?"
-msgstr "Er du sikker på at du ønsker å sende en melding med kun BCB-mottakere?"
+#: ../mail/mail.error.xml.h:8
+msgid "Are you sure you want to delete this account?"
+msgstr "Er du sikker på at du vil slette denne kontoen?"
 
-#. mail:ask-send-only-bcc-contact secondary
-#: ../mail/mail-errors.xml.h:24
-msgid ""
-"The contact list you are sending to is configured to hide list recipients.\n"
-"\n"
-"Many email systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients in "
-"your message. To avoid this, you should add at least one To: or CC: "
-"recipient. "
-msgstr ""
+#: ../mail/mail.error.xml.h:9
+msgid "Are you sure you want to open {0} messages at once?"
+msgstr "Er du sikker på at du vil åpne {0} meldinger samtidig?"
 
-#. mail:ask-send-only-bcc secondary
-#: ../mail/mail-errors.xml.h:31
+#: ../mail/mail.error.xml.h:10
 msgid ""
-"Many email systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients to "
-"your message anyway. To avoid this, you should add at least one To: or CC: "
-"recipient."
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
 msgstr ""
+"Er du sikker på at du vil fjerne alle slettede meldinger fra alle mapper "
+"permanent?"
 
-#. mail:send-no-recipients primary
-#: ../mail/mail-errors.xml.h:34
+#: ../mail/mail.error.xml.h:11
 msgid ""
-"This message cannot be sent because you have not specified any Recipients"
-msgstr "Denne meldingen kan ikke sendes da du ikke har oppgitt noen mottakere"
+"Are you sure you want to permanently remove all the deleted messages in "
+"folder &quot;{0}&quot;?"
+msgstr "Er du sikker på at du vil fjerne alle slettede meldinger fra mappe &quot;{0}&quot; permanent?"
 
-#. mail:send-no-recipients secondary
-#: ../mail/mail-errors.xml.h:36
-msgid ""
-"Please enter a valid email address in the To: field. You can search for "
-"email addresses by clicking on the To: button next to the entry box."
-msgstr ""
-"Vennligst oppgi en gyldig e-postadresse i Til:-feltet. Du kan søke etter e-"
-"postadresser ved å klikke på Til:-knappen ved siden av inntastingsfeltet."
+#: ../mail/mail.error.xml.h:12
+msgid "Are you sure you want to send a message in HTML format?"
+msgstr "Er du sikker på at du vil sende en melding i HTML-format?"
 
-#. mail:ask-default-drafts primary
-#: ../mail/mail-errors.xml.h:38
-msgid "Use default drafts folder?"
-msgstr "Bruk forvalgt mappe for skisser?"
+#: ../mail/mail.error.xml.h:13
+msgid "Are you sure you want to send a message with only BCC recipients?"
+msgstr "Er du sikker på at du ønsker å sende en melding med kun BCB-mottakere?"
 
-#. mail:ask-default-drafts secondary
-#: ../mail/mail-errors.xml.h:40
-msgid ""
-"Unable to open the drafts folder for this account.  Use the system drafts "
-"folder instead?"
-msgstr ""
-"Kunne ikke åpne skisse-mappen for denne kontoen. Vil du bruke standard "
-"skisse-mappe?"
+#: ../mail/mail.error.xml.h:14
+msgid "Are you sure you want to send a message without a subject?"
+msgstr "Er du sikker på at du vil sende en melding uten emne?"
 
-#: ../mail/mail-errors.xml.h:41
-msgid "Use _Default"
-msgstr "Bruk _forvalg"
+#: ../mail/mail.error.xml.h:15
+msgid "Because &quot;{0}&quot;."
+msgstr "Fordi &quot;{0}&quot;."
 
-#. mail:ask-expunge primary
-#: ../mail/mail-errors.xml.h:43
-msgid ""
-"Are you sure you want to permanently remove all the deleted message in "
-"folder \"{0}\"?"
-msgstr ""
-"Er du sikker på at du vil fjerne alle slettede meldinger fra mappe «{0}» "
-"permanent?"
+#: ../mail/mail.error.xml.h:17
+msgid "Because &quot;{2}&quot;."
+msgstr "Fordi &quot;{2}&quot;."
 
-#. mail:ask-expunge secondary
-#. mail:ask-empty-trash secondary
-#: ../mail/mail-errors.xml.h:45 ../mail/mail-errors.xml.h:50
-msgid "If you continue, you will not be able to recover these messages."
-msgstr "Hvis du fortsetter vil du ikke kunne gjenopprette disse meldingene."
+#: ../mail/mail.error.xml.h:18
+msgid "Cannot add vFolder &quot;{0}&quot;."
+msgstr "Kan ikke legge til virtuell mappe &quot;{0}&quot;."
 
-#: ../mail/mail-errors.xml.h:46
-msgid "_Expunge"
-msgstr "T_øm"
+#: ../mail/mail.error.xml.h:19
+msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
+msgstr "Kan ikke kopiere mappe &quot;{0}&quot; til &quot;{1}&quot;."
 
-#. mail:ask-empty-trash primary
-#: ../mail/mail-errors.xml.h:48
-msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
-msgstr ""
-"Er du sikker på at du vil fjerne alle slettede meldinger fra alle mapper "
-"permanent?"
+#: ../mail/mail.error.xml.h:20
+msgid "Cannot create folder &quot;{0}&quot;."
+msgstr "Kan ikke opprette mappe &quot;{0}&quot;."
 
-#: ../mail/mail-errors.xml.h:51
-msgid "_Empty Trash"
-msgstr "Tøm søpp_elkurven"
+#: ../mail/mail.error.xml.h:21
+msgid "Cannot create temporary save directory."
+msgstr "Kan ikke opprette midlertidig katalog."
 
-#. mail:ask-open-many primary
-#: ../mail/mail-errors.xml.h:53
-msgid "Are you sure you want to open {0} messages at once?"
-msgstr "Er du sikker på at du vil åpne {0} meldinger samtidig?"
+#: ../mail/mail.error.xml.h:22
+msgid "Cannot create the save directory, because &quot;{1}&quot;"
+msgstr "Kan ikke opprette katalog for lagring fordi &quot{1}&quot;"
 
-#. mail:ask-open-many secondary
-#: ../mail/mail-errors.xml.h:55
-msgid "Opening too many messages at once may take a long time."
-msgstr "Hvis du åpner for mange meldinger på en gang kan dette ta lang tid."
+#: ../mail/mail.error.xml.h:23
+msgid "Cannot delete folder &quot;{0}&quot;."
+msgstr "Kunne ikke slette mappe &quot;{0}&quot;."
 
-#: ../mail/mail-errors.xml.h:56
-msgid "_Open Messages"
-msgstr "_Åpne meldinger"
+#: ../mail/mail.error.xml.h:24
+msgid "Cannot delete system folder &quot;{0}&quot;."
+msgstr "Kan ikke slette systemmappe &quot;{0}&quot;."
 
-#. mail:exit-unsaved primary
-#: ../mail/mail-errors.xml.h:58
-msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr "Du har usendte meldinger. Vil du avslutte likevel?"
+#: ../mail/mail.error.xml.h:25
+msgid "Cannot edit vFolder &quot;{0}&quot; as it does not exist."
+msgstr "Kan ikke redigere virtuell mappe &quot;{0}&quot; da den ikke eksisterer."
+
+#: ../mail/mail.error.xml.h:26
+msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
+msgstr "Kunne ikke flytte mappe &quot;{0}&quot; til &quot;{1}&quot;."
 
-#. mail:exit-unsaved secondary
-#: ../mail/mail-errors.xml.h:60
+#: ../mail/mail.error.xml.h:27
+msgid "Cannot open source &quot;{1}&quot;"
+msgstr "Kan ikke åpne kilde &quot;{1}&quot;"
+
+#: ../mail/mail.error.xml.h:28
+msgid "Cannot open source &quot;{2}&quot;."
+msgstr "Kan ikke åpne kilde &quot;{2}&quot;."
+
+#: ../mail/mail.error.xml.h:29
+msgid "Cannot open target &quot;{2}&quot;."
+msgstr "Kan ikke åpne mål &quot;{2}&quot;."
+
+#: ../mail/mail.error.xml.h:30
 msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+"Cannot read the license file &quot;{0}&quot;, due to an installation "
+"problem.  You will not be able to use this provider until you can accept its "
+"license."
 msgstr ""
-"Hvis du avslutter vil ikke disse meldingene sendes før Evolution startes "
-"igjen."
 
-#. mail:camel-exception primary
-#: ../mail/mail-errors.xml.h:62
-msgid "Your message with the subject \"{0}\" was not delivered."
-msgstr "Din melding med emne «{0}» ble ikke levert."
+#: ../mail/mail.error.xml.h:31
+msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
+msgstr "Kan ikke endre navn på &quot;{0}&quot; til &quot;{1}&quot;."
+
+#: ../mail/mail.error.xml.h:32
+msgid "Cannot rename or move system folder &quot;{0}&quot;."
+msgstr "Kan ikke endre navn på eller flytte systemmappe &quot;{0}&quot;."
+
+#: ../mail/mail.error.xml.h:33
+msgid "Cannot save changes to account."
+msgstr "Kan ikke lagre endringer for kontoen."
+
+#: ../mail/mail.error.xml.h:34
+msgid "Cannot save to directory &quot;{0}&quot;."
+msgstr "Kan ikke lagre til katalog &quot;{0}&quot;."
+
+#: ../mail/mail.error.xml.h:35
+msgid "Cannot save to file &quot;{0}&quot;."
+msgstr "Kan ikke lagre til fil &quot;{0}&quot;."
 
-#. mail:camel-exception secondary
-#: ../mail/mail-errors.xml.h:64
+#: ../mail/mail.error.xml.h:36
+msgid "Cannot set signature script &quot;{0}&quot;."
+msgstr "Kan ikke sette signaturskript &quot;{0}&quot;."
+
+#: ../mail/mail.error.xml.h:37
 msgid ""
-"The message was sent via the \"sendmail\" external application.  Sendmail "
-"reports the following error: status 67: mail not sent.\n"
-"The message is stored in the Outbox folder.  Check the message for errors "
-"and resend."
+"Check to make sure your password is spelled correctly.  Remember that many "
+"passwords are case sensitive; your caps lock might be on."
 msgstr ""
+"Sjekk at passordet ditt er skrevet korrekt. Husk at mange passord skiller "
+"mellom store og små bokstaver. Caps lock kan være på."
 
-#. mail:async-error primary
-#: ../mail/mail-errors.xml.h:67
-msgid "Error while {0}."
-msgstr "Feil under {0}."
+#: ../mail/mail.error.xml.h:38
+msgid "Could not save signature file."
+msgstr "Kunne ikke lagre signaturfil."
 
-#. mail:async-error secondary
-#: ../mail/mail-errors.xml.h:69
-msgid "{1}."
-msgstr "{1}."
+#: ../mail/mail.error.xml.h:39
+msgid "Delete &quot;{0}&quot;?"
+msgstr "Slett &quot;{0}&quot;?"
 
-#. mail:async-error-nodescribe primary
-#: ../mail/mail-errors.xml.h:71
-msgid "Error while performing operation."
-msgstr "Feil under utføring av operasjon."
+#: ../mail/mail.error.xml.h:40
+msgid "Delete account?"
+msgstr "Slett konto?"
 
-#. mail:async-error-nodescribe secondary
-#: ../mail/mail-errors.xml.h:73
-msgid "{0}."
-msgstr "{0}."
+#: ../mail/mail.error.xml.h:41
+msgid "Discard changed?"
+msgstr "Forkast endringer?"
+
+#: ../mail/mail.error.xml.h:42
+msgid "Do you want the operation to be performed in the sub folders ?"
+msgstr "Vil du at operasjonen skal utføres i undermapper?"
+
+#: ../mail/mail.error.xml.h:43
+msgid "Do you wish to save your changes?"
+msgstr "Vil du lagre dine endringer?"
 
-#. mail:ask-session-password primary
-#: ../mail/mail-errors.xml.h:87
+#: ../mail/mail.error.xml.h:44
+msgid "Don't delete"
+msgstr "Ikke slett"
+
+#: ../mail/mail.error.xml.h:45
 msgid "Enter password."
 msgstr "Oppgi passord."
 
-#. mail:filter-load-error primary
-#: ../mail/mail-errors.xml.h:91
+#: ../mail/mail.error.xml.h:46
 msgid "Error loading filter definitions."
 msgstr "Feil under lasting av filterdefinisjoner."
 
-#. mail:no-save-path primary
-#: ../mail/mail-errors.xml.h:95
-msgid "Cannot save to directory \"{0}\"."
-msgstr "Kan ikke lagre til katalog «{0}»."
-
-#. mail:no-create-path primary
-#. mail:no-write-path-exists primary
-#. mail:no-write-path-notfile primary
-#: ../mail/mail-errors.xml.h:99 ../mail/mail-errors.xml.h:107
-#: ../mail/mail-errors.xml.h:111
-msgid "Cannot save to file \"{0}\"."
-msgstr "Kan ikke lagre til fil «{0}»."
-
-#. mail:no-create-path secondary
-#: ../mail/mail-errors.xml.h:101
-msgid "Cannot create the save directory, because \"{1}\""
-msgstr "Kan ikke opprette katalog for lagring pga «{1}»"
-
-#. mail:no-create-tmp-path primary
-#: ../mail/mail-errors.xml.h:103
-msgid "Cannot create temporary save directory."
-msgstr "Kan ikke opprette midlertidig katalog."
+#: ../mail/mail.error.xml.h:47
+msgid "Error while performing operation."
+msgstr "Feil under utføring av operasjon."
+
+#: ../mail/mail.error.xml.h:48
+msgid "Error while {0}."
+msgstr "Feil under {0}."
 
-#. mail:no-write-path-exists secondary
-#: ../mail/mail-errors.xml.h:109
+#: ../mail/mail.error.xml.h:49
 msgid "File exists but cannot overwrite it."
 msgstr "Filen eksisterer men kan ikke overskrives."
 
-#. mail:no-write-path-notfile secondary
-#: ../mail/mail-errors.xml.h:113
+#: ../mail/mail.error.xml.h:50
 msgid "File exists but is not a regular file."
 msgstr "Filen eksisterer, men den er ikke en vanlig fil."
 
-#. mail:no-delete-folder primary
-#: ../mail/mail-errors.xml.h:115
-msgid "Cannot delete folder \"{0}\"."
-msgstr "Kunne ikke slette mappe «{0}»."
+#: ../mail/mail.error.xml.h:51
+msgid "If you continue, you will not be able to recover these messages."
+msgstr "Hvis du fortsetter vil du ikke kunne gjenopprette disse meldingene."
 
-#. mail:no-delete-special-folder primary
-#: ../mail/mail-errors.xml.h:119
-msgid "Cannot delete system folder \"{0}\"."
-msgstr "Kan ikke slette systemmappe «{0}»."
+#: ../mail/mail.error.xml.h:52
+msgid ""
+"If you delete the folder, all of its contents and its subfolders contents "
+"will be deleted permanently."
+msgstr ""
+"Hvis du sletter mappen vil alt innhold i denne og undermapper slettes "
+"permanent."
+
+#: ../mail/mail.error.xml.h:53
+msgid "If you proceed, the account information will be deleted permanently."
+msgstr "Hvis du fortsetter vil kontoinformasjonen bli slettet permanent."
 
-#. mail:no-delete-special-folder secondary
-#. mail:no-rename-special-folder secondary
-#: ../mail/mail-errors.xml.h:121 ../mail/mail-errors.xml.h:125
+#: ../mail/mail.error.xml.h:54
 msgid ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
 msgstr ""
-"Systemmapper kreves for at Evolution skal fungere korrekt og du kan ikke "
-"endre navn på, flytte eller slette disse."
+"Hvis du avslutter vil ikke disse meldingene sendes før Evolution startes "
+"igjen."
 
-#. mail:no-rename-special-folder primary
-#: ../mail/mail-errors.xml.h:123
-msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "Kan ikke endre navn på eller flytte systemmappe «{0}»."
+#: ../mail/mail.error.xml.h:55
+msgid "Ignore"
+msgstr "Ignorer"
 
-#. mail:ask-delete-folder title
-#: ../mail/mail-errors.xml.h:127
-msgid "Delete \"{0}\"?"
-msgstr "Slett «{0}»?"
+#: ../mail/mail.error.xml.h:56
+msgid "Invalid authentication"
+msgstr "Ugyldig autentisering"
 
-#. mail:ask-delete-folder primary
-#: ../mail/mail-errors.xml.h:129
-msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr "Vil du virkelig slette mappen «{0}» og alle dens undermapper?"
+#: ../mail/mail.error.xml.h:57
+msgid "Mail filters automatically updated."
+msgstr "E-postfiltre oppdatert automatisk."
 
-#. mail:ask-delete-folder secondary
-#: ../mail/mail-errors.xml.h:131
+#: ../mail/mail.error.xml.h:58
 msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
-"will be deleted permanently."
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients to "
+"your message anyway. To avoid this, you should add at least one To: or CC: "
+"recipient."
 msgstr ""
-"Hvis du sletter mappen vil alt innhold i denne og undermapper slettes "
-"permanent."
 
-#. mail:no-rename-folder-exists primary
-#. mail:no-rename-folder primary
-#: ../mail/mail-errors.xml.h:133 ../mail/mail-errors.xml.h:137
-msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr "Kan ikke endre navn på «{0}» til {1}."
-
-#. mail:no-rename-folder-exists secondary
-#. mail:vfolder-notunique secondary
-#: ../mail/mail-errors.xml.h:135 ../mail/mail-errors.xml.h:197
-msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr ""
-"En mappe med navn «{1}» eksisterer allerede. Vennligst bruk et annet navn."
-
-#. mail:no-rename-folder secondary
-#: ../mail/mail-errors.xml.h:139
-msgid "Because \"{2}\"."
-msgstr "fordi «{2}»."
-
-#. mail:no-move-folder-nostore primary
-#. mail:no-move-folder-to-nostore primary
-#: ../mail/mail-errors.xml.h:141 ../mail/mail-errors.xml.h:145
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
-msgstr "Kunne ikke flytte mappe «{0}» til «{1}»."
-
-#. mail:no-move-folder-nostore secondary
-#. mail:no-copy-folder-nostore secondary
-#: ../mail/mail-errors.xml.h:143 ../mail/mail-errors.xml.h:151
-msgid "Cannot open source \"{2}\"."
-msgstr "Kan ikke åpne kilde «{2}»."
-
-#. mail:no-move-folder-to-nostore secondary
-#. mail:no-copy-folder-to-nostore secondary
-#: ../mail/mail-errors.xml.h:147 ../mail/mail-errors.xml.h:155
-msgid "Cannot open target \"{2}\"."
-msgstr "Kan ikke åpne mål «{2}»."
-
-#. mail:no-copy-folder-nostore primary
-#. mail:no-copy-folder-to-nostore primary
-#: ../mail/mail-errors.xml.h:149 ../mail/mail-errors.xml.h:153
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "Kan ikke kopiere mappe «{0}» til «{1}»."
-
-#. mail:no-create-folder-nostore primary
-#: ../mail/mail-errors.xml.h:157
-msgid "Cannot create folder \"{0}\"."
-msgstr "Kan ikke opprette mappe «{0}»."
-
-#. mail:no-create-folder-nostore secondary
-#: ../mail/mail-errors.xml.h:159
-msgid "Cannot open source \"{1}\""
-msgstr "Kan ikke åpne kilde «{1}»"
-
-#. mail:account-incomplete primary
-#. mail:account-notunique primary
-#: ../mail/mail-errors.xml.h:161 ../mail/mail-errors.xml.h:165
-msgid "Cannot save changes to account."
-msgstr "Kan ikke lagre endringer for kontoen."
+#: ../mail/mail.error.xml.h:59
+msgid "Mark all messages as read"
+msgstr "Merk alle meldinger som lest"
 
-#. mail:account-incomplete secondary
-#: ../mail/mail-errors.xml.h:163
-msgid "You have not filled in all of the required information."
-msgstr "Du har ikke fylt ut all nødvendig informasjon."
+#: ../mail/mail.error.xml.h:60
+msgid "Mark all messages as read in the selected folder"
+msgstr "Merk alle meldinger i valgt mappe som lest"
 
-#. mail:account-notunique secondary
-#: ../mail/mail-errors.xml.h:167
-msgid "You may not create two accounts with the same name."
-msgstr "Du kan ikke opprette to kontoer med samme navn."
+#: ../mail/mail.error.xml.h:61
+msgid "Missing folder."
+msgstr "Mangler mappe."
 
-#. mail:ask-delete-account title
-#: ../mail/mail-errors.xml.h:169
-msgid "Delete account?"
-msgstr "Slett konto?"
+#: ../mail/mail.error.xml.h:63
+msgid "No sources selected."
+msgstr "Ingen kilder valgt."
 
-#. mail:ask-delete-account primary
-#: ../mail/mail-errors.xml.h:171
-msgid "Are you sure you want to delete this account?"
-msgstr "Er du sikker på at du vil slette denne kontoen?"
+#: ../mail/mail.error.xml.h:64
+msgid "Opening too many messages at once may take a long time."
+msgstr "Hvis du åpner for mange meldinger på en gang kan dette ta lang tid."
 
-#. mail:ask-delete-account secondary
-#: ../mail/mail-errors.xml.h:173
-msgid "If you proceed, the account information will be deleted permanently."
-msgstr "Hvis du fortsetter vil kontoinformasjonen bli slettet permanent."
+#: ../mail/mail.error.xml.h:65
+msgid "Please check your account settings and try again."
+msgstr "Vennligst sjekk innstillingene for kontoen og prøv igjen."
 
-#: ../mail/mail-errors.xml.h:174
-msgid "Don't delete"
-msgstr "Ikke slett"
+#: ../mail/mail.error.xml.h:66
+msgid ""
+"Please enter a valid email address in the To: field. You can search for "
+"email addresses by clicking on the To: button next to the entry box."
+msgstr ""
+"Vennligst oppgi en gyldig e-postadresse i Til:-feltet. Du kan søke etter e-"
+"postadresser ved å klikke på Til:-knappen ved siden av inntastingsfeltet."
 
-#. mail:no-save-signature primary
-#: ../mail/mail-errors.xml.h:176
-msgid "Could not save signature file."
-msgstr "Kunne ikke lagre signaturfil."
+#: ../mail/mail.error.xml.h:67
+msgid ""
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}\n"
+"Send anyway?"
+msgstr ""
+"Vennligst sjekk at følgende mottakere kan og ønsker å motta e-post som "
+"HTML:\n"
+"{0}\n"
+"Send likevel?"
 
-#. mail:no-save-signature secondary
-#: ../mail/mail-errors.xml.h:178
-msgid "Because \"{0}\"."
-msgstr "Fordi «{0}»."
+#: ../mail/mail.error.xml.h:70
+msgid "Please wait."
+msgstr "Vennligst vent."
 
-#. mail:signature-notscript primary
-#: ../mail/mail-errors.xml.h:180
-msgid "Cannot set signature script \"{0}\"."
-msgstr "Kan ikke sette signaturskript «{0}»."
+#: ../mail/mail.error.xml.h:71
+msgid "Problem migrating old mail folder &quot;{0}&quot;."
+msgstr "Det oppsto et problem under migrering av gammel meldingsmappe &quot;{0}&quot;."
 
-#. mail:signature-notscript secondary
-#: ../mail/mail-errors.xml.h:182
-msgid "The script file must exist and be executable."
-msgstr "Skriptfilen må eksistere og være kjørbar."
+#: ../mail/mail.error.xml.h:72
+msgid "Querying server"
+msgstr "Spør tjener"
 
-#. mail:ask-signature-changed title
-#: ../mail/mail-errors.xml.h:184
-msgid "Discard changed?"
-msgstr "Forkast endringer?"
+#: ../mail/mail.error.xml.h:73
+msgid "Querying server for a list of supported authentication mechanisms."
+msgstr "Spør tjener etter en liste med støttede autentiseringsmekanismer."
 
-#. mail:ask-signature-changed primary
-#: ../mail/mail-errors.xml.h:186
-msgid "Do you wish to save your changes?"
-msgstr "Vil du lagre dine endringer?"
+#: ../mail/mail.error.xml.h:74
+msgid "Read receipt requested."
+msgstr "Lesekvittering etterspurt."
 
-#. mail:ask-signature-changed secondary
-#: ../mail/mail-errors.xml.h:188
-msgid "This signature has been changed, but has not been saved."
-msgstr "Denne signaturen er endret, men er ikke lagret."
+#: ../mail/mail.error.xml.h:75
+msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
+msgstr "Vil du virkelig slette mappen &quot;{0}&quot; og alle dens undermapper?"
 
-#: ../mail/mail-errors.xml.h:189
-msgid "_Discard changes"
-msgstr "_Forkast endringene"
-
-#. mail:vfolder-notexist primary
-#: ../mail/mail-errors.xml.h:191
-msgid "Cannot edit vFolder \"{0}\" as it does not exist."
-msgstr "Kan ikke redigere virtuell mappe «{0}» da den ikke eksisterer."
+#: ../mail/mail.error.xml.h:76
+msgid "Send Receipt"
+msgstr "Send kvittering"
 
-#. mail:vfolder-notexist secondary
-#: ../mail/mail-errors.xml.h:193
+#: ../mail/mail.error.xml.h:77
 msgid ""
-"This folder may have been added implicitly, go to the vFolder editor to add "
-"it explicitly, if required."
+"System folders are required for Ximian Evolution to function correctly and "
+"cannot be renamed, moved, or deleted."
 msgstr ""
+"Systemmapper kreves for at Evolution skal fungere korrekt og du kan ikke "
+"endre navn på, flytte eller slette disse."
 
-#. mail:vfolder-notunique primary
-#: ../mail/mail-errors.xml.h:195
-msgid "Cannot add vFolder \"{0}\"."
-msgstr "Kan ikke legge til virtuell mappe «{0}»."
-
-#. mail:vfolder-updated primary
-#: ../mail/mail-errors.xml.h:199
-msgid "vFolders automatically updated."
-msgstr "Virtuelle mapper oppdatert automatisk."
+#: ../mail/mail.error.xml.h:78
+msgid ""
+"The contact list you are sending to is configured to hide list recipients.\n"
+"\n"
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients in "
+"your message. To avoid this, you should add at least one To: or CC: "
+"recipient. "
+msgstr ""
 
-#. mail:vfolder-updated secondary
-#: ../mail/mail-errors.xml.h:201
+#: ../mail/mail.error.xml.h:81
 msgid ""
-"The following vFolder(s):\n"
+"The following filter rule(s):\n"
 "{0}\n"
 "Used the now removed folder:\n"
-"    \"{1}\"\n"
+"    &quot;{1}&quot;\n"
 "And have been updated."
 msgstr ""
-"Følgende virtuelle mapper:\n"
+"Følgende filterregler:\n"
 "{0}\n"
-"brukte nå fjernet mappe:\n"
-"    «{1}»\n"
-"og ble oppdatert."
-
-#. mail:filter-updated primary
-#: ../mail/mail-errors.xml.h:207
-msgid "Mail filters automatically updated."
-msgstr "E-postfiltre oppdatert automatisk."
+"brukte fjernet mappe:\n"
+"    &quot;{1}&quot;\n"
+"og er nå oppdatert."
 
-#. mail:filter-updated secondary
-#: ../mail/mail-errors.xml.h:209
+#: ../mail/mail.error.xml.h:86
 msgid ""
-"The following filter rule(s):\n"
+"The following vFolder(s):\n"
 "{0}\n"
 "Used the now removed folder:\n"
-"    \"{1}\"\n"
+"    &quot;{1}&quot;\n"
 "And have been updated."
 msgstr ""
-"Følgende filterregler:\n"
+"Følgende virtuelle mapper:\n"
 "{0}\n"
-"brukte nå fjernet mappe:\n"
-"    «{1}»\n"
-"og ble oppdatert."
+"brukte fjernet mappe:\n"
+"    &quot;{1}&quot;\n"
+"og er nå oppdatert."
 
-#. mail:no-folder primary
-#: ../mail/mail-errors.xml.h:215
-msgid "Missing folder."
-msgstr "Mangler mappe."
-
-#. mail:no-folder secondary
-#: ../mail/mail-errors.xml.h:217
-msgid "You must specify a folder."
-msgstr "Du må oppgi en mappe."
-
-#. mail:no-name-vfolder secondary
-#: ../mail/mail-errors.xml.h:221
-msgid "You must name this vFolder."
-msgstr "Du må gi navn til denne virtuelle mappen."
+#: ../mail/mail.error.xml.h:91
+msgid ""
+"The message was sent via the &quot;sendmail&quot; external application.  "
+"Sendmail reports the following error: status 67: mail not sent.\n"
+"The message is stored in the Outbox folder.  Check the message for errors "
+"and resend."
+msgstr ""
 
-#. mail:vfolder-no-source primary
-#: ../mail/mail-errors.xml.h:223
-msgid "No sources selected."
-msgstr "Ingen kilder valgt."
+#: ../mail/mail.error.xml.h:93
+msgid "The script file must exist and be executable."
+msgstr "Skriptfilen må eksistere og være kjørbar."
 
-#. mail:vfolder-no-source secondary
-#: ../mail/mail-errors.xml.h:225
+#: ../mail/mail.error.xml.h:94
 msgid ""
-"You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting\n"
-"all local folders, all remote folders, or both."
+"This folder may have been added implicitly, go to the vFolder editor to add "
+"it explicitly, if required."
 msgstr ""
 
-#. mail:ask-migrate-existing primary
-#: ../mail/mail-errors.xml.h:229
-msgid "Problem migrating old mail folder \"{0}\"."
-msgstr "Det oppsto et problem under migrering av gammel meldingsmappe «{0}»."
+#: ../mail/mail.error.xml.h:95
+msgid ""
+"This message cannot be sent because you have not specified any Recipients"
+msgstr "Denne meldingen kan ikke sendes da du ikke har oppgitt noen mottakere"
 
-#. mail:ask-migrate-existing secondary
-#: ../mail/mail-errors.xml.h:231
+#: ../mail/mail.error.xml.h:96
 msgid ""
-"A non-empty folder at \"{1}\" already exists.\n"
-"\n"
-"You can choose to ignore this folder, overwrite or append its contents, or "
-"quit.\n"
+"This server does not support this type of authentication and may not support "
+"authentication at all."
 msgstr ""
+"Tjener støtter ikke denne typen autentisering. Det kan hende den ikke "
+"støtter autentisering i det hele tatt."
 
-#: ../mail/mail-errors.xml.h:235
-msgid "Ignore"
-msgstr "Ignorer"
+#: ../mail/mail.error.xml.h:97
+msgid "This signature has been changed, but has not been saved."
+msgstr "Denne signaturen er endret, men er ikke lagret."
 
-#: ../mail/mail-errors.xml.h:236 ../widgets/misc/e-system-errors.xml.h:7
-msgid "_Overwrite"
-msgstr "_Overskriv"
+#: ../mail/mail.error.xml.h:98
+msgid "Unable to connect to the GroupWise server."
+msgstr "Kunne ikke koble til GroupWise-tjener."
 
-#: ../mail/mail-errors.xml.h:237
-msgid "_Append"
-msgstr "_Legg til"
+#: ../mail/mail.error.xml.h:99
+msgid ""
+"Unable to open the drafts folder for this account.  Use the system drafts "
+"folder instead?"
+msgstr ""
+"Kunne ikke åpne skisse-mappen for denne kontoen. Vil du bruke standard "
+"skisse-mappe?"
 
-#. mail:no-load-license primary
-#: ../mail/mail-errors.xml.h:239
+#: ../mail/mail.error.xml.h:100
 msgid "Unable to read license file."
 msgstr "Kan ikke lese lisensfilen."
 
-#. mail:no-load-license secondary
-#: ../mail/mail-errors.xml.h:241
-msgid ""
-"Cannot read the license file \"{0}\", due to an\n"
-"      installation problem.  You will not be able to use this provider "
-"until\n"
-"      you can accept its license."
-msgstr ""
+#: ../mail/mail.error.xml.h:101
+msgid "Use _Default"
+msgstr "Bruk _forvalg"
 
-#. mail:checking-service title
-#: ../mail/mail-errors.xml.h:245
-msgid "Querying server"
-msgstr "Spør tjener"
+#: ../mail/mail.error.xml.h:102
+msgid "Use default drafts folder?"
+msgstr "Bruk forvalgt mappe for skisser?"
 
-#. mail:checking-service primary
-#: ../mail/mail-errors.xml.h:247
-msgid "Please wait."
-msgstr "Vennligst vent."
+#: ../mail/mail.error.xml.h:103
+msgid "You have not filled in all of the required information."
+msgstr "Du har ikke fylt ut all nødvendig informasjon."
 
-#. mail:checking-service secondary
-#: ../mail/mail-errors.xml.h:249
-msgid "Querying server for a list of supported authentication mechanisms."
-msgstr "Spør tjener etter en liste med støttede autentiseringsmekanismer."
+#: ../mail/mail.error.xml.h:104
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr "Du har usendte meldinger. Vil du avslutte likevel?"
 
-#. mail:gw-accountsetup-error primary
-#: ../mail/mail-errors.xml.h:251
-msgid ""
-"Unable to connect to the GroupWise\n"
-"server."
-msgstr ""
-"Kunne ikke koble til GroupWise-\n"
-"tjener."
+#: ../mail/mail.error.xml.h:105
+msgid "You may not create two accounts with the same name."
+msgstr "Du kan ikke opprette to kontoer med samme navn."
+
+#: ../mail/mail.error.xml.h:106
+msgid "You must name this vFolder."
+msgstr "Du må gi navn til denne virtuelle mappen."
+
+#: ../mail/mail.error.xml.h:107
+msgid "You must specify a folder."
+msgstr "Du må oppgi en mappe."
 
-#. mail:gw-accountsetup-error secondary
-#: ../mail/mail-errors.xml.h:254
+#: ../mail/mail.error.xml.h:108
 msgid ""
-"\n"
-"Please check your account settings and try again.\n"
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting all local "
+"folders, all remote folders, or both."
 msgstr ""
-"\n"
-"Vennligst sjekk dine kontoinnstillinger og prøv igjen.\n"
+
+#: ../mail/mail.error.xml.h:110
+msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
+msgstr "Din pålogging på tjener &quot;{0}&quot; som &quot;{0}&quot; feilet."
+
+#: ../mail/mail.error.xml.h:111
+msgid "Your message with the subject &quot;{0}&quot; was not delivered."
+msgstr "Din melding med emne &quot;{0}&quot; ble ikke levert."
+
+#: ../mail/mail.error.xml.h:112
+msgid "_Append"
+msgstr "_Legg til"
+
+#: ../mail/mail.error.xml.h:113
+msgid "_Discard changes"
+msgstr "_Forkast endringene"
+
+#: ../mail/mail.error.xml.h:114
+msgid "_Empty Trash"
+msgstr "Tøm søpp_elkurven"
+
+#: ../mail/mail.error.xml.h:115
+msgid "_Expunge"
+msgstr "T_øm"
+
+#: ../mail/mail.error.xml.h:116
+msgid "_Open Messages"
+msgstr "_Åpne meldinger"
+
+#: ../mail/mail.error.xml.h:119
+msgid "vFolders automatically updated."
+msgstr "Virtuelle mapper oppdatert automatisk."
 
 #: ../mail/mail-folder-cache.c:813
 #, c-format
@@ -13518,7 +13353,13 @@ msgstr "Filtrerer mappe"
 msgid "Fetching Mail"
 msgstr "Henter e-post"
 
-#: ../mail/mail-ops.c:542 ../mail/mail-ops.c:585
+#. sending mail, filtering failed
+#: ../mail/mail-ops.c:562
+#, c-format
+msgid "Failed to apply outgoing filters: %s"
+msgstr "Feil under påføring av utgående filtre: %s"
+
+#: ../mail/mail-ops.c:573 ../mail/mail-ops.c:602
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13527,120 +13368,114 @@ msgstr ""
 "Kunne ikke legge til i %s: %s\n"
 "Legger til i lokal «Sendt»-mappe i stedet."
 
-#. sending mail, filtering failed
-#: ../mail/mail-ops.c:564
-#, c-format
-msgid "Failed to apply outgoing filters: %s"
-msgstr "Feil under påføring av utgående filtre: %s"
-
-#: ../mail/mail-ops.c:602
+#: ../mail/mail-ops.c:619
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Kunne ikke legge til i lokal Sendt-mappe: %s"
 
-#: ../mail/mail-ops.c:702
+#: ../mail/mail-ops.c:731
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sender melding %d av %d"
 
-#: ../mail/mail-ops.c:727
+#: ../mail/mail-ops.c:756
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Feil under sending av %d av %d meldinger"
 
-#: ../mail/mail-ops.c:729 ../mail/mail-send-recv.c:613
+#: ../mail/mail-ops.c:758 ../mail/mail-send-recv.c:613
 msgid "Cancelled."
 msgstr "Avbrutt."
 
-#: ../mail/mail-ops.c:731
+#: ../mail/mail-ops.c:760
 msgid "Complete."
 msgstr "Fullført."
 
-#: ../mail/mail-ops.c:828
+#: ../mail/mail-ops.c:857
 msgid "Saving message to folder"
 msgstr "Lagrer melding til mappe"
 
-#: ../mail/mail-ops.c:913
+#: ../mail/mail-ops.c:942
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flytter melding(er) til %s"
 
-#: ../mail/mail-ops.c:913
+#: ../mail/mail-ops.c:942
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopierer meldinger til %s"
 
-#: ../mail/mail-ops.c:1139
+#: ../mail/mail-ops.c:1168
 msgid "Forwarded messages"
 msgstr "Videresendte meldinger"
 
-#: ../mail/mail-ops.c:1182
+#: ../mail/mail-ops.c:1211
 #, c-format
 msgid "Opening folder %s"
 msgstr "Åpner mappe %s"
 
-#: ../mail/mail-ops.c:1254
+#: ../mail/mail-ops.c:1283
 #, c-format
 msgid "Opening store %s"
 msgstr "Åpner lager %s"
 
-#: ../mail/mail-ops.c:1332
+#: ../mail/mail-ops.c:1361
 #, c-format
 msgid "Removing folder %s"
 msgstr "Fjerner mappe %s"
 
-#: ../mail/mail-ops.c:1426
+#: ../mail/mail-ops.c:1455
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Lagrer mappe «%s»"
 
-#: ../mail/mail-ops.c:1491
+#: ../mail/mail-ops.c:1520
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Tømmer og lagrer konto «%s»"
 
-#: ../mail/mail-ops.c:1492
+#: ../mail/mail-ops.c:1521
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Lagrer konto «%s»"
 
-#: ../mail/mail-ops.c:1547
+#: ../mail/mail-ops.c:1576
 msgid "Refreshing folder"
 msgstr "Oppdaterer mappe"
 
-#: ../mail/mail-ops.c:1583 ../mail/mail-ops.c:1634
+#: ../mail/mail-ops.c:1612 ../mail/mail-ops.c:1663
 msgid "Expunging folder"
 msgstr "Tømmer mappe"
 
-#: ../mail/mail-ops.c:1631
+#: ../mail/mail-ops.c:1660
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Tømmer søppel i «%s»"
 
-#: ../mail/mail-ops.c:1632
+#: ../mail/mail-ops.c:1661
 msgid "Local Folders"
 msgstr "Lokale mapper"
 
-#: ../mail/mail-ops.c:1715
+#: ../mail/mail-ops.c:1744
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Henter melding %s"
 
-#: ../mail/mail-ops.c:1787
+#: ../mail/mail-ops.c:1816
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Henter %d melding"
 msgstr[1] "Henter %d melding(er)"
 
-#: ../mail/mail-ops.c:1873
+#: ../mail/mail-ops.c:1902
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Lagrer %d melding"
 msgstr[1] "Lagrer %d melding(er)"
 
-#: ../mail/mail-ops.c:1923
+#: ../mail/mail-ops.c:1952
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13649,7 +13484,7 @@ msgstr ""
 "Kunne ikke opprette utdatafil: %s\n"
 " %s"
 
-#: ../mail/mail-ops.c:1951
+#: ../mail/mail-ops.c:1980
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13658,11 +13493,11 @@ msgstr ""
 "Feil under lagring av av meldinger til: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2022
+#: ../mail/mail-ops.c:2051
 msgid "Saving attachment"
 msgstr "Lagrer vedlegg"
 
-#: ../mail/mail-ops.c:2034
+#: ../mail/mail-ops.c:2063
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13671,22 +13506,22 @@ msgstr ""
 "Kunne ikke opprette utdatafil: %s\n"
 " %s"
 
-#: ../mail/mail-ops.c:2044
+#: ../mail/mail-ops.c:2073
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kan ikke skrive data: %s"
 
-#: ../mail/mail-ops.c:2194
+#: ../mail/mail-ops.c:2223
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Kobler fra %s"
 
-#: ../mail/mail-ops.c:2194
+#: ../mail/mail-ops.c:2223
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Kobler til %s på nytt"
 
-#: ../mail/mail-ops.c:2310
+#: ../mail/mail-ops.c:2339
 msgid "Checking Service"
 msgstr "Sjekker tjeneste"
 
@@ -13747,124 +13582,124 @@ msgid "Enter a name for this signature."
 msgstr "Oppgi et navn for denne signaturen."
 
 #: ../mail/mail-signature-editor.c:415
-#: ../plugins/shared-folder/properties.glade.h:5
+#: ../plugins/groupwise-features/properties.glade.h:5
 msgid "Name:"
 msgstr "Navn:"
 
-#: ../mail/mail-tools.c:115
+#: ../mail/mail-tools.c:116
 #, c-format
 msgid "Could not create spool directory `%s': %s"
 msgstr "Kan ikke opprette spool-katalog «%s»: %s"
 
-#: ../mail/mail-tools.c:142
+#: ../mail/mail-tools.c:143
 #, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
 msgstr "Prøver å bruke movemail på en kilde som ikke er i mbox-format «%s»"
 
-#: ../mail/mail-tools.c:277
+#: ../mail/mail-tools.c:242
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Videresendt melding - %s"
 
-#: ../mail/mail-tools.c:279
+#: ../mail/mail-tools.c:244
 msgid "Forwarded message"
 msgstr "Videresendt melding"
 
-#: ../mail/mail-tools.c:320
+#: ../mail/mail-tools.c:284
 #, c-format
 msgid "Invalid folder: `%s'"
 msgstr "Ugyldig mappe: «%s»"
 
-#: ../mail/mail-vfolder.c:90
+#: ../mail/mail-vfolder.c:91
 #, c-format
 msgid "Setting up vFolder: %s"
 msgstr "Setter opp virtuell mappe: %s"
 
-#: ../mail/mail-vfolder.c:239
+#: ../mail/mail-vfolder.c:240
 #, c-format
 msgid "Updating vFolders for '%s:%s'"
 msgstr "Oppdaterer virtuelle mapper for «%s:%s»"
 
-#: ../mail/mail-vfolder.c:246
+#: ../mail/mail-vfolder.c:247
 #, c-format
 msgid "Updating vFolders for '%s'"
 msgstr "Oppdaterer virtuelle mapper for «%s»"
 
-#: ../mail/mail-vfolder.c:1008
+#: ../mail/mail-vfolder.c:1009
 msgid "Edit vFolder"
 msgstr "Rediger virtuell mappe"
 
-#: ../mail/mail-vfolder.c:1092
+#: ../mail/mail-vfolder.c:1093
 msgid "New vFolder"
 msgstr "Ny virtuell mappe"
 
-#: ../mail/message-list.c:994
+#: ../mail/message-list.c:996
 msgid "Unseen"
 msgstr "Ulest"
 
-#: ../mail/message-list.c:995
+#: ../mail/message-list.c:997
 msgid "Seen"
 msgstr "Lest"
 
-#: ../mail/message-list.c:996
+#: ../mail/message-list.c:998
 msgid "Answered"
 msgstr "Besvart"
 
-#: ../mail/message-list.c:997
+#: ../mail/message-list.c:999
 msgid "Multiple Unseen Messages"
 msgstr "Flere uleste meldinger"
 
-#: ../mail/message-list.c:998
+#: ../mail/message-list.c:1000
 msgid "Multiple Messages"
 msgstr "Flere meldinger"
 
-#: ../mail/message-list.c:1002
+#: ../mail/message-list.c:1004
 msgid "Lowest"
 msgstr "Lavest"
 
-#: ../mail/message-list.c:1003
+#: ../mail/message-list.c:1005
 msgid "Lower"
 msgstr "Lavere"
 
-#: ../mail/message-list.c:1007
+#: ../mail/message-list.c:1009
 msgid "Higher"
 msgstr "Høyere"
 
-#: ../mail/message-list.c:1008
+#: ../mail/message-list.c:1010
 msgid "Highest"
 msgstr "Høyest"
 
-#: ../mail/message-list.c:1336
+#: ../mail/message-list.c:1338
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1343 ../plugins/itip-formatter/itip-view.c:189
+#: ../mail/message-list.c:1345 ../plugins/itip-formatter/itip-view.c:189
 msgid "Today %l:%M %p"
 msgstr "I dag %l:%M %p"
 
-#: ../mail/message-list.c:1352
+#: ../mail/message-list.c:1354
 msgid "Yesterday %l:%M %p"
 msgstr "I går %l:%M %p"
 
-#: ../mail/message-list.c:1364
+#: ../mail/message-list.c:1366
 msgid "%a %l:%M %p"
 msgstr "%a %H.%M"
 
-#: ../mail/message-list.c:1372
+#: ../mail/message-list.c:1374
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H.%M"
 
-#: ../mail/message-list.c:1374
+#: ../mail/message-list.c:1376
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../mail/message-list.c:2041
+#: ../mail/message-list.c:2042
 msgid "Message List"
 msgstr "Meldingsliste"
 
-#: ../mail/message-list.c:3384
+#: ../mail/message-list.c:3387
 msgid "Generating message list"
 msgstr "Genererer meldingsliste"
 
@@ -13912,7 +13747,7 @@ msgstr "Følg opp"
 msgid "For Your Information"
 msgstr "Til din informasjon"
 
-#: ../mail/message-tag-followup.c:78 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:78 ../ui/evolution-mail-message.xml.h:41
 msgid "Forward"
 msgstr "Videresend"
 
@@ -13920,11 +13755,11 @@ msgstr "Videresend"
 msgid "No Response Necessary"
 msgstr "Ingen respons nødvendig"
 
-#: ../mail/message-tag-followup.c:81 ../ui/evolution-mail-message.xml.h:85
+#: ../mail/message-tag-followup.c:81 ../ui/evolution-mail-message.xml.h:79
 msgid "Reply"
 msgstr "Svar"
 
-#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:86
+#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply to All"
 msgstr "Svar til alle"
 
@@ -13956,6 +13791,16 @@ msgstr "Emne inneholder"
 msgid "Subject or Sender contains"
 msgstr "Emne eller avsender inneholder"
 
+#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
+msgid ""
+"A formatter plugin which displays audio attachments inline and allows you to "
+"play them directly from evolution."
+msgstr ""
+
+#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
+msgid "Audio inline plugin"
+msgstr ""
+
 #: ../plugins/backup-restore/backup-restore.c:51
 msgid "Select name of Evolution archive"
 msgstr "Velg navn på Evolution-arkiv"
@@ -13988,6 +13833,14 @@ msgstr "Sjekk arkiv for Evolution"
 msgid "Restart Evolution"
 msgstr "Start Evolution på nytt"
 
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
+msgid "A plugin for backing up and restore Evolution data and settings."
+msgstr "Et tillegg for sikkerhetskopiering og gjenoppretting av data og innstillinger for Evolution."
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
+msgid "Backup and restore plugin"
+msgstr "Tillegg for sikkerhetskopiering og gjenoppretting"
+
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
 msgid "Backup Settings..."
 msgstr "Innstillinger for sikkerhetskopiering..."
@@ -14001,36 +13854,66 @@ msgstr ""
 msgid "Restore Settings..."
 msgstr "Gjenopprett innstillinger..."
 
-#: ../plugins/bbdb/bbdb.c:388
+#: ../plugins/bbdb/bbdb.c:398
 msgid "Automatic Contacts"
 msgstr "Automatiske kontakter"
 
-#: ../plugins/bbdb/bbdb.c:397
+#: ../plugins/bbdb/bbdb.c:407
 msgid "<span weight=\"bold\">Automatic Contacts</span>"
 msgstr "<span weight=\"bold\">Automatiske kontakter</span>"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:410
+#: ../plugins/bbdb/bbdb.c:420
 msgid ""
 "_Automatically create entries in the addressbook when responding to mail"
 msgstr "Opprett oppføringer i adresseboken _automatisk når du svarer på e-post"
 
-#: ../plugins/bbdb/bbdb.c:428
+#: ../plugins/bbdb/bbdb.c:438
 msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
 msgstr "<span weight=\"bold\">Kontakter for lynmeldinger</span>"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:441
+#: ../plugins/bbdb/bbdb.c:451
 msgid ""
 "Periodically synchronize contact information and images from my _instant "
 "messenger"
 msgstr "Synkroniser kontaktinformasjon og bilder fra Ga_im periodisk"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:448
+#: ../plugins/bbdb/bbdb.c:458
 msgid "Synchronize with _buddy list now"
 msgstr "Synkroniser med _vennelisten nå"
 
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
+msgid "Automatic contacts"
+msgstr "Automatiske kontakter"
+
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
+msgid ""
+"Automatically fills your addressbook with names and email addresses as you "
+"reply to mails. Also fills in IM contact information from your buddy lists."
+msgstr ""
+
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
+msgid "BBDB"
+msgstr "BBDB"
+
+#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
+msgid "Local Calendars"
+msgstr "Lokale kalender"
+
+#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
+msgid "Provides core functionality for local calendars."
+msgstr "Gir kjernefunksjoner for lokale kalendere."
+
+#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
+msgid "HTTP Calendars"
+msgstr "HTTP-kalendere"
+
+#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
+msgid "Provides core functionality for webcal and http calendars."
+msgstr "Gir kjernefunksjoner for webcal- og HTTP-kalendere."
+
 #: ../plugins/calendar-weather/calendar-weather.c:54
 #: ../plugins/calendar-weather/calendar-weather.c:60
 msgid "Weather: Cloudy"
@@ -14076,21 +13959,40 @@ msgstr "Metrisk (celcius, cm, osv)"
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "Imerisk (Fahrenheit, tommer, osv)"
 
-#: ../plugins/default-source/default-source.c:82
-msgid "Mark  as default folder"
-msgstr "Sett som forvalgt mappe"
+#: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1
+msgid "Provides core functionality for weather calendars."
+msgstr ""
+
+#: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
+msgid "Weather Calendars"
+msgstr "Værkalendere"
+
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:1
+msgid ""
+"A test plugin which demonstrates a popup menu plugin which lets you copy "
+"things to the clipboard."
+msgstr ""
+
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
+msgid "Copy _Email Address"
+msgstr "Kopier _e-postadresse"
+
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
+msgid "Copy tool"
+msgstr "Kopieringsverktøy"
 
+#: ../plugins/default-source/default-source.c:82
 #: ../plugins/default-source/default-source.c:108
 msgid "Mark as default folder"
 msgstr "Sett som forvalgt mappe"
 
 #. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:53
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:59
 msgid "Secure Password"
 msgstr "Sikkert passord"
 
 #. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:56
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:62
 msgid ""
 "This option will connect to the Exchange server using secure password (NTLM) "
 "authentication."
@@ -14098,11 +14000,11 @@ msgstr ""
 "Dette alternativet kobler til Exchange-tjeneren ved bruk av autentisering "
 "med sikkert passord (NTLM)."
 
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:64
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:70
 msgid "Plaintext Password"
 msgstr "Klartekst-passord"
 
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:66
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:72
 msgid ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
@@ -14111,7 +14013,7 @@ msgstr ""
 "passord."
 
 #. Description section
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:113
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:193
 msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
@@ -14119,37 +14021,39 @@ msgstr ""
 "Meldingen spesifisert under vil sendes automatisk til alle \n"
 "som sender deg e-post mens du er borte fra kontoret."
 
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:140
-msgid "I am in the office"
-msgstr "Jeg er på kontoret"
-
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:154
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:221
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:231
 msgid "I am out of the office"
 msgstr "Jeg er ute av kontoret"
 
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:168
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:224
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:228
+msgid "I am in the office"
+msgstr "Jeg er på kontoret"
+
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:257
 msgid "Out of office Message:"
 msgstr "Melding ved fravær fra kontoret"
 
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:194
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:302
 msgid "Exchange Settings"
 msgstr "Innstillinger for Exchange"
 
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:342
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:475
 #: ../plugins/exchange-account-setup/exchange-ask-password.c:200
 msgid "_OWA Url:"
 msgstr "_OWA-URL:"
 
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:350
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:500
 #: ../plugins/exchange-account-setup/exchange-ask-password.c:193
 msgid "A_uthenticate"
 msgstr "A_utentiser"
 
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:467
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:722
 msgid "Authentication Type"
 msgstr "Autentiseringstype"
 
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:481
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:736
 msgid "Ch_eck for Supported Types"
 msgstr "Sj_ekk støttede typer"
 
@@ -14158,16 +14062,24 @@ msgstr "Sj_ekk støttede typer"
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Fjerner abonnement på mappe «%s»"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:413
+#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1
+msgid "Allows unsubscribing of mail folders in the folder tree context menu."
+msgstr ""
+
+#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
+msgid "Unsubscribe Folders"
+msgstr "Fjern abonnement på mapper"
+
+#: ../plugins/groupwise-features/camel-gw-listener.c:413
 msgid "Checklist"
 msgstr "Sjekkliste"
 
-#: ../plugins/groupwise-send-options/org-gnome-compose-send-options.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
 msgid "Add Send Options to groupwise messages"
 msgstr "Legg til sendingsalternativer for GroupWise-meldinger"
 
-#: ../plugins/groupwise-send-options/org-gnome-compose-send-options.xml.h:2
-#: ../widgets/misc/e-send-options.glade.h:20
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../widgets/misc/e-send-options.glade.h:17
 msgid "Send Options"
 msgstr "Alternativer for sending"
 
@@ -14226,12 +14138,14 @@ msgstr ""
 "gyldig iCalendar."
 
 #: ../plugins/itip-formatter/itip-formatter.c:1008
-#: ../plugins/itip-formatter/itip-formatter.c:1064
+#: ../plugins/itip-formatter/itip-formatter.c:1023
+#: ../plugins/itip-formatter/itip-formatter.c:1078
 msgid "The item in the calendar is not valid"
 msgstr "Oppføringen i kalenderen er ikke gyldig"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1009
-#: ../plugins/itip-formatter/itip-formatter.c:1065
+#: ../plugins/itip-formatter/itip-formatter.c:1024
+#: ../plugins/itip-formatter/itip-formatter.c:1079
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -14239,38 +14153,42 @@ msgstr ""
 "Meldingen inneholder en kalender, men kalenderen inneholder ingen hendelser, "
 "oppgaver eller ledig/opptatt-informasjon"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1020
+#: ../plugins/itip-formatter/itip-formatter.c:1034
 msgid "The calendar attached contains multiple items"
 msgstr "Vedlagt kalender inneholder flere oppføringer"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1021
+#: ../plugins/itip-formatter/itip-formatter.c:1035
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1658
+#: ../plugins/itip-formatter/itip-formatter.c:1672
 msgid "Meetings and Tasks"
 msgstr "Møter og oppgaver"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:1681
+#: ../plugins/itip-formatter/itip-formatter.c:1695
 msgid "_Delete message after acting"
 msgstr "_Slett melding etter utført handling"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1691
+#: ../plugins/itip-formatter/itip-formatter.c:1705
 msgid "<span weight=\"bold\">Conflict Search</span>"
 msgstr "<span weight=\"bold\">Søk etter konflikter</span>"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:1704
+#: ../plugins/itip-formatter/itip-formatter.c:1718
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Velg kalendere som skal gjennomsøkes for å finne møtekonflikter"
 
+#: ../plugins/itip-formatter/itip-formatter.c:1735
+msgid "Conflict Search Table"
+msgstr ""
+
 #. strftime format of a weekday and a date.
 #: ../plugins/itip-formatter/itip-view.c:175 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:240 ../widgets/misc/e-dateedit.c:450
+#: ../widgets/misc/e-cell-date-edit.c:240 ../widgets/misc/e-dateedit.c:457
 msgid "Today"
 msgstr "I dag"
 
@@ -14558,98 +14476,247 @@ msgstr "<b>%s</b> har via %s avslått følgende tildelt oppgave:"
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> har avslått følgende tildelt oppgave:"
 
+#. Start time
+#: ../plugins/itip-formatter/itip-view.c:867
+msgid "Start time:"
+msgstr "Start-tid:"
+
+#. End time
+#: ../plugins/itip-formatter/itip-view.c:876
+msgid "End time:"
+msgstr "Slutt-tid:"
+
 #. Comment
 #: ../plugins/itip-formatter/itip-view.c:892
 #: ../plugins/itip-formatter/itip-view.c:942
 msgid "Comment:"
 msgstr "Kommentar:"
 
-#. org.gnome.mailing-list-actions:no-header primary
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:2
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
+#, fuzzy
+msgid "Displays text/calendar parts in messages."
+msgstr "Vis neste viktige melding"
+
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
+msgid "Itip Formatter"
+msgstr "Formattering av iTip"
+
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
+#, fuzzy
+msgid ""
+"This response is not from a current attendee. Add the sender as an attendee?"
+msgstr "Dette svaret er ikke fra en aktiv deltaker. Legg til som deltaker?"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
+msgid "Contact list _owner"
+msgstr "Eier av k_ontaktliste"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:2
+#, fuzzy
+msgid "Contact the owner of the mailing list this message belongs to"
+msgstr "Skriv et svar til e-postlisten for den valgte meldingen"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
+msgid "Get an archive of the list this message belongs to"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
+msgid "Get information about the usage of the list this message belongs to"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
+msgid "Get list _archive"
+msgstr "Hent liste_arkiv"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:3
+msgid "Get list _usage information"
+msgstr "Hent informasjon om br_uk av liste"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:7
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:5
+msgid "Mailing _List"
+msgstr "E-post_liste"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:8
+#, fuzzy
+msgid "Post a message to the mailing list this message belongs to"
+msgstr "Skriv et svar til e-postlisten for den valgte meldingen"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:9
+#, fuzzy
+msgid "Subscribe to the mailing list this message belongs to"
+msgstr "Skriv et svar til e-postlisten for den valgte meldingen"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:10
+#, fuzzy
+msgid "Unsubscribe to the mailing list this message belongs to"
+msgstr "Skriv et svar til e-postlisten for den valgte meldingen"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
+#, fuzzy
+msgid "_Post message to list"
+msgstr "Legg ut en melding til en ny offentlig mappe"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8
+msgid "_Subscribe to list"
+msgstr "_Abonner på listen"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:9
+msgid "_Un-subscribe to list"
+msgstr "_Fjern abonnement på listen"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:4
+msgid "Mailing List Actions"
+msgstr "Handlinger for e-postliste"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
+msgid ""
+"Provide actions for common mailing list commands (subscribe, "
+"unsubscribe, ...)."
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
 msgid "Action not available"
 msgstr "Handlingen er ikke tilgjengelig"
 
-#. org.gnome.mailing-list-actions:no-header secondary
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:4
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
 msgid ""
-"This message does not contain the header information required for this "
-"action."
+"An e-mail message will be sent to the URL \"{0}\". You can either send the "
+"message automatically, or see and change it first.\n"
+"\n"
+"You should receive an answer from the mailing list shortly after the message "
+"has been sent."
 msgstr ""
 
-#. org.gnome.mailing-list-actions:posting-not-allowed primary
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:6
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:5
+msgid "Malformed header"
+msgstr "Feilutformet hode"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:6
+msgid "No e-mail action"
+msgstr "Ingen handling for e-post"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:7
 msgid "Posting not allowed"
 msgstr "Posting er ikke tillatt"
 
-#. org.gnome.mailing-list-actions:posting-not-allowed secondary
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:8
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:8
 msgid ""
 "Posting to this mailing list is not allowed. Possibly, this is a read-only "
 "mailing list. Contact the list owner for details."
 msgstr ""
 
-#. org.gnome.mailing-list-actions:ask-send-message primary
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:10
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
 msgid "Send e-mail message to mailing list?"
 msgstr "Send melding til e-postliste?"
 
-#. org.gnome.mailing-list-actions:ask-send-message secondary
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:12
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 msgid ""
-"An e-mail message will be sent to the URL \"{0}\". You can either send the "
-"message automatically, or see and change it first.\n"
+"The action could not be performed. This means the header for this action did "
+"not contain any action we could handle.\n"
 "\n"
-"You should receive an answer from the mailing list shortly after the message "
-"has been sent."
+"Header: {0}"
 msgstr ""
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:15
-msgid "_Send message"
-msgstr "_Send melding"
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:13
+msgid ""
+"The {0} header of this message is malformed and could not be processed.\n"
+"\n"
+"Header: {1}"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
+msgid ""
+"This message does not contain the header information required for this "
+"action."
+msgstr ""
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:16
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
 msgid "_Edit message"
 msgstr "R_ediger melding"
 
-#. org.gnome.mailing-list-actions:malformed-header primary
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:18
-msgid "Malformed header"
-msgstr "Feilutformet hode"
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:18
+msgid "_Send message"
+msgstr "_Send melding"
 
-#. org.gnome.mailing-list-actions:malformed-header secondary
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:20
+#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:1
 msgid ""
-"The {0} header of this message is malformed and could not be processed.\n"
-"\n"
-"Header: {1}"
+"A plugin which allows the creation of meetings from the contents of a mail "
+"message."
 msgstr ""
 
-#. org.gnome.mailing-list-actions:no-action primary
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:24
-msgid "No e-mail action"
-msgstr "Ingen handling for e-post"
+#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:2
+msgid "Con_vert to Meeting"
+msgstr "Kon_verter til møte"
+
+#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:3
+msgid "Mail to meeting"
+msgstr "E-post til møte"
 
-#. org.gnome.mailing-list-actions:no-action secondary
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:26
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
 msgid ""
-"The action could not be performed. This means the header for this action did "
-"not contain any action we could handle.\n"
-"\n"
-"Header: {0}"
+"A plugin which allows the creation of tasks from the contents of a mail "
+"message."
 msgstr ""
 
-#. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
-#: ../plugins/new-mail-notify/new-mail-notify.c:66
-msgid "_Generates a D-BUS message when new mail arrives"
-msgstr "_Genererer en D-BUS-melding når nye meldinger ankommer"
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
+msgid "Con_vert to Task"
+msgstr "Kon_verter til oppgave"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3
+msgid "Mail to task"
+msgstr "E-post til oppgave"
+
+#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:1
+msgid "Mark calendar offline"
+msgstr "Marker kalender som frakoblet"
+
+#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:2
+#, fuzzy
+msgid "Marks the selected calendar for offline viewing."
+msgstr "Merk valgte meldinger for sletting"
+
+#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:3
+msgid "_Do not make this available offline"
+msgstr "_Ikke gjør denne tilgjengelig i frakoblet modus"
+
+#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:4
+msgid "_Mark Calendar for offline use"
+msgstr "_Merk kalender for bruk i frakoblet modus"
+
+#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:1
+msgid "Generates a D-BUS message when new mail arrives."
+msgstr "Genererer en D-BUS-melding når nye meldinger ankommer."
+
+#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:2
+msgid "New Mail Notification"
+msgstr "Varsling for ny e-post"
+
+#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:3
+msgid "New mail notify"
+msgstr "Varsle ny e-post"
+
+#: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
+msgid "A plugin for managing which plugins are enabled or disabled."
+msgstr ""
+
+#: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
+msgid "Plugin manager"
+msgstr "Tilleggshåndterer"
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:1
 msgid "Enable and disable plugins"
 msgstr "Aktiver og deaktiver tillegg"
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
-msgid "Manage Plugins..."
-msgstr "Håndter tillegg..."
+msgid "Plugins"
+msgstr "Tillegg"
 
 #: ../plugins/plugin-manager/plugin-manager.c:45
 msgid "Author(s)"
@@ -14681,6 +14748,23 @@ msgstr ""
 msgid "Plugin"
 msgstr "Tillegg"
 
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:1
+msgid ""
+"A test plugin which demonstrates a formatter plugin which lets you choose to "
+"disable HTML mails.\n"
+"\n"
+"This plugin is unsupported demonstration code only.\n"
+msgstr ""
+
+#. but then we also need to create our own section frame
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:6
+msgid "Plain Text Mode"
+msgstr "Tekstmodus"
+
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:7
+msgid "Prefer plain-text"
+msgstr "Foretrekk vanlig tekst"
+
 #: ../plugins/prefer-plain/prefer-plain.c:105
 msgid "Show HTML if present"
 msgstr "Vis HTML hvis det finnes"
@@ -14705,6 +14789,14 @@ msgstr "Lagre vedlegg..."
 msgid "Save all attachments"
 msgstr "Lagre alle vedlegg"
 
+#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
+msgid "A plugin for saving all attachments or parts of a message at once."
+msgstr ""
+
+#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:2
+msgid "Save attachments"
+msgstr "Lagre vedlegg"
+
 #: ../plugins/save-attachments/save-attachments.c:331
 msgid "Select save base name"
 msgstr "Velg basisnavn for lagring"
@@ -14714,158 +14806,294 @@ msgid "MIME Type"
 msgstr "MIME-type"
 
 #: ../plugins/save-attachments/save-attachments.c:359
-#: ../ui/evolution-message-composer.xml.h:16
+#: ../ui/evolution-message-composer.xml.h:18
 #: ../ui/evolution-signature-editor.xml.h:6
 msgid "Save"
 msgstr "Lagre"
 
-#: ../plugins/save-calendar/csv-format.c:167
-#, c-format
-msgid "%s%d/%s%d/%s%d %s%d:%s%d:%s%d"
-msgstr "%s%d/%s%d/%s%d %s%d:%s%d:%s%d"
+#.
+#. * Translator: the %F %T is the thirth argument for a strftime function.
+#. * It lets you define the formatting of the date in the csv-file.
+#. *
+#: ../plugins/save-calendar/csv-format.c:171
+msgid "%F %T"
+msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:370
-#, c-format
-msgid ""
-"Uid%sSummary%sDescription List%sCategories List%sComment List%sCompleted%"
-"sCreated%sContact List%sStart%sEnd%sDue%sPercent Done%sPriority%sUrl%"
-"sAttendees List%sLocation%sModified%s"
-msgstr ""
+#: ../plugins/save-calendar/csv-format.c:385
+msgid "Uid"
+msgstr "Uid"
 
-#: ../plugins/save-calendar/csv-format.c:519
+#: ../plugins/save-calendar/csv-format.c:387
+msgid "Description List"
+msgstr "Beskrivelsesliste"
+
+#: ../plugins/save-calendar/csv-format.c:388
+msgid "Categories List"
+msgstr "Liste med kategorier"
+
+#: ../plugins/save-calendar/csv-format.c:389
+msgid "Comment List"
+msgstr "Liste med kommentarer"
+
+#: ../plugins/save-calendar/csv-format.c:391
+msgid "Created"
+msgstr "Opprettet"
+
+#: ../plugins/save-calendar/csv-format.c:392
+msgid "Contact List"
+msgstr "Kontaktliste"
+
+#: ../plugins/save-calendar/csv-format.c:393
+msgid "Start"
+msgstr "Start"
+
+#: ../plugins/save-calendar/csv-format.c:394
+msgid "End"
+msgstr "Slutt"
+
+#: ../plugins/save-calendar/csv-format.c:396
+msgid "percent Done"
+msgstr "Prosent fullført"
+
+#: ../plugins/save-calendar/csv-format.c:398
+msgid "Url"
+msgstr "URL"
+
+#: ../plugins/save-calendar/csv-format.c:399
+msgid "Attendees List"
+msgstr "Deltakerliste"
+
+#: ../plugins/save-calendar/csv-format.c:401
+msgid "Modified"
+msgstr "Endret"
+
+#: ../plugins/save-calendar/csv-format.c:552
 msgid "Advanced options for the CSV format"
 msgstr "Avanserte alternativer for CVS-format"
 
-#: ../plugins/save-calendar/csv-format.c:526
+#: ../plugins/save-calendar/csv-format.c:559
 msgid "Prepend a header"
 msgstr "Legg til et hode"
 
-#: ../plugins/save-calendar/csv-format.c:535
+#: ../plugins/save-calendar/csv-format.c:568
 msgid "Value delimiter:"
 msgstr "Skilletegn for verdier:"
 
-#: ../plugins/save-calendar/csv-format.c:541
+#: ../plugins/save-calendar/csv-format.c:574
 msgid "Record delimiter:"
 msgstr "Skilletegn for poster:"
 
-#: ../plugins/save-calendar/csv-format.c:547
+#: ../plugins/save-calendar/csv-format.c:580
 msgid "Encapsulate values with:"
 msgstr "Pakk inn verdier med:"
 
-#: ../plugins/save-calendar/csv-format.c:569
+#: ../plugins/save-calendar/csv-format.c:602
 msgid "Comma separated value format (.csv)"
 msgstr "Kommaseparert verdiformat (.csv)"
 
-#: ../plugins/save-calendar/ical-format.c:120
+#: ../plugins/save-calendar/ical-format.c:136
 msgid "iCalendar format (.ics)"
 msgstr "iCalendar-format (.ics)"
 
-#: ../plugins/save-calendar/rdf-format.c:390
+#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
+msgid "Save Selected"
+msgstr "Lagre valgte"
+
+#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
+msgid "Save to _Disk"
+msgstr "Lagre til _disk"
+
+#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
+msgid "Saves selected calendar or tasks list to disk."
+msgstr "Lagrer valgt kalender eller oppgaveliste til disk."
+
+#.
+#. * Translator: the %FT%T is the thirth argument for a strftime function.
+#. * It lets you define the formatting of the date in the rdf-file.
+#. * Also check out http://www.w3.org/2002/12/cal/tzd
+#. *
+#: ../plugins/save-calendar/rdf-format.c:158
+msgid "%FT%T"
+msgstr "%FT%T"
+
+#: ../plugins/save-calendar/rdf-format.c:396
 msgid "RDF format (.rdf)"
 msgstr "RDF-format (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:172
-#: ../plugins/save-calendar/save-calendar.c:182
+#: ../plugins/save-calendar/save-calendar.c:171
+#: ../plugins/save-calendar/save-calendar.c:181
 msgid "Select destination file"
 msgstr "Velg målfil"
 
-#: ../plugins/save-calendar/save-calendar.c:217
+#: ../plugins/save-calendar/save-calendar.c:216
 #, c-format
 msgid ""
 "The suggested filename extension of this filetype (%s) is unused in the "
 "chosen filename. Do you want to continue?"
 msgstr ""
 
-#: ../plugins/send-options/send-options.c:82
+#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
+msgid "Select one source"
+msgstr "Velg en kilde"
+
+#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:2
+#, fuzzy
+msgid "Selects a single calendar or task source for viewing."
+msgstr "Velg kalendere som skal gjennomsøkes for å finne møtekonflikter"
+
+#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
+msgid "_Show only this Calendar"
+msgstr "Vi_s kun denne kalenderen"
+
+#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:4
+msgid "_Show only this Task List"
+msgstr "Vi_s kun denne oppgavelisten"
+
+#: ../plugins/groupwise-features/send-options.c:82
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sSkriv inn passord for %s (bruker %s)"
 
-#. org.gnome.evolution.mail_shared_folder:invalid-user primary
-#: ../plugins/shared-folder/org-gnome-shared-folder-errors.xml.h:2
-msgid "Invalid user"
-msgstr "Ugyldig bruker"
+#: ../plugins/groupwise-features/install-shared.c:156
+#: ../plugins/groupwise-features/share-folder-common.c:382
+msgid "Create folder"
+msgstr "Opprett mappe"
 
-#. org.gnome.evolution.mail_shared_folder:invalid-user secondary
-#: ../plugins/shared-folder/org-gnome-shared-folder-errors.xml.h:4
-msgid ""
-"\n"
-"You cannot share folder with specified user \"{0}\" \n"
-msgstr ""
-"\n"
-"Du kan ikke dele en mappe med oppgitt bruker «{0}» \n"
+#: ../plugins/groupwise-features/install-shared.c:156
+#: ../plugins/groupwise-features/share-folder-common.c:382
+msgid "Specify where to create the folder:"
+msgstr "Spesifiser hvor mappen skal opprettes:"
 
-#. org.gnome.evolution.mail_shared_folder:no-user primary
-#: ../plugins/shared-folder/org-gnome-shared-folder-errors.xml.h:8
-msgid "Specify User"
-msgstr "Oppgi bruker"
+#: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
+msgid "A plugin for the features in Groupwise accounts."
+msgstr "Tillegg for funksjoner vedrørende GroupWise-kontoer."
 
-#. org.gnome.evolution.mail_shared_folder:no-user secondary
-#: ../plugins/shared-folder/org-gnome-shared-folder-errors.xml.h:10
-msgid ""
-"\n"
-"\tYou have to specify a user name whom you want to add to the list \n"
-msgstr ""
-"\n"
-"\tDu må oppgi et brukernavn for brukeren du ønsker å legge til på listen \n"
+#: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
+msgid "Groupwise Features"
+msgstr "Funksjoner for GroupWise"
 
-#: ../plugins/shared-folder/properties.glade.h:2
+#: ../plugins/groupwise-features/properties.glade.h:2
 msgid "<b>Users :</b>"
 msgstr "<b>Brukere:</b> "
 
-#: ../plugins/shared-folder/properties.glade.h:4
+#: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Message"
 msgstr "Melding"
 
-#: ../plugins/shared-folder/properties.glade.h:6
+#: ../plugins/groupwise-features/properties.glade.h:6
 msgid "Shared Folder Notification"
 msgstr "Melding om delte mapper"
 
-#: ../plugins/shared-folder/properties.glade.h:8
+#: ../plugins/groupwise-features/properties.glade.h:8
 msgid "The participants will receive the following notification.\n"
 msgstr "Deltakerene  vil motta følgende varsel.\n"
 
-#: ../plugins/shared-folder/properties.glade.h:11
+#: ../plugins/groupwise-features/properties.glade.h:11
 msgid "_Contacts..."
 msgstr "_Kontakter..."
 
-#: ../plugins/shared-folder/properties.glade.h:12
+#: ../plugins/groupwise-features/properties.glade.h:12
 msgid "_Cutomize notification message"
 msgstr "_Tilpass varslingsmelding"
 
-#: ../plugins/shared-folder/properties.glade.h:13
+#: ../plugins/groupwise-features/properties.glade.h:13
 msgid "_Not Shared"
 msgstr "_Ikke delt"
 
-#: ../plugins/shared-folder/properties.glade.h:15
+#: ../plugins/groupwise-features/properties.glade.h:15
 msgid "_Shared With ..."
 msgstr "_Delt med..."
 
-#: ../plugins/shared-folder/properties.glade.h:16
+#: ../plugins/groupwise-features/properties.glade.h:16
 msgid "_Sharing"
 msgstr "_Deling"
 
-#: ../plugins/shared-folder/share-folder-common.c:315
+#: ../plugins/groupwise-features/share-folder-common.c:140
+#, c-format
+msgid "Creating folder `%s'"
+msgstr "Oppretter mappe «%s»"
+
+#: ../plugins/groupwise-features/share-folder-common.c:317
 msgid "Users"
 msgstr "Brukere"
 
-#: ../plugins/shared-folder/share-folder-common.c:316
+#: ../plugins/groupwise-features/share-folder-common.c:318
 msgid "Enter the users and set permissions"
 msgstr "Oppgi brukere og sett rettigheter"
 
-#: ../plugins/shared-folder/share-folder-common.c:401
+#: ../plugins/groupwise-features/share-folder-common.c:337
+msgid "New _Shared Folder..."
+msgstr "Ny _delt mappe..."
+
+#: ../plugins/groupwise-features/share-folder-common.c:440
 msgid "Sharing"
 msgstr "Deling"
 
+#: ../plugins/startup-wizard/startup-wizard.c:255
+msgid "Evolution Setup Assistant"
+msgstr "Konfigurasjonsassistent for Evolution"
+
+#: ../plugins/startup-wizard/startup-wizard.c:260
+msgid "Welcome"
+msgstr "Velkommen"
+
+#: ../plugins/startup-wizard/startup-wizard.c:261
+msgid ""
+"Welcome to Evolution. The next few screens will allow Evolution to connect "
+"to your email accounts, and to import files from other applications. \n"
+"\n"
+"Please click the \"Forward\" button to continue. "
+msgstr ""
+"Velkommen til Evolution. De neste skjermene lar deg konfigurere Evolution "
+"til å koble til dine e-post kontoer, og importere filer fra andre "
+"applikasjoner. \n"
+"\n"
+"Vennligst klikk «Fremover» for å fortsette. "
+
+#: ../plugins/startup-wizard/startup-wizard.c:306
+#: ../shell/e-shell-importer.c:159
+msgid "Please select the information that you would like to import:"
+msgstr "Vennligst velg informasjon du ønsker å importere:"
+
+#: ../plugins/startup-wizard/startup-wizard.c:321
+#: ../shell/e-shell-importer.c:905
+#, c-format
+msgid "From %s:"
+msgstr "Fra %s:"
+
+#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
+msgid "Startup wizard"
+msgstr "Oppstartsveiviser"
+
+#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
+msgid "Indicates if threading of messages should fall back to subject."
+msgstr ""
+
+#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
+msgid "Subject Threading"
+msgstr "Meldingstråder på emne"
+
+#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:3
+msgid "Thread messages by subject"
+msgstr "Vis meldingstråder etter emne"
+
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
 #: ../plugins/subject-thread/subject-thread.c:54
 msgid "Fall back to threading messages by sub_ject"
 msgstr ""
 
+#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:1
+msgid "Gives an option to print mail from composer"
+msgstr ""
+
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Evolution Shell"
 msgstr "Evolution skall"
 
+#: ../shell/GNOME_Evolution_Shell.server.in.in.h:2
+msgid "Evolution Shell Config factory"
+msgstr "Konfigurasjonsfabrikk for Evolution skall"
+
 #: ../shell/GNOME_Evolution_Test.server.in.in.h:1
 msgid "Evolution Test"
 msgstr "Evolution test"
@@ -14915,7 +15143,7 @@ msgstr "Innstillinger for skriver"
 msgid "Skip development warning dialog"
 msgstr "Hopp over varseldialogen om utviklingsversjonen"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:11 ../shell/main.c:475
+#: ../shell/apps_evolution_shell.schemas.in.in.h:11 ../shell/main.c:468
 msgid "Start in offline mode"
 msgstr "Start i frakoblet modus"
 
@@ -14945,7 +15173,7 @@ msgstr ""
 #: ../shell/apps_evolution_shell.schemas.in.in.h:17
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
-"\"toolbar\". If \"toolbar\" is set, the style of the buutons is determined "
+"\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
 "by the GNOME toolbar setting."
 msgstr ""
 
@@ -15019,15 +15247,11 @@ msgstr ""
 msgid "Choose the destination for this import"
 msgstr "Velg mål det skal importeres til"
 
-#: ../shell/e-shell-importer.c:159 ../shell/e-shell-startup-wizard.c:750
-msgid "Please select the information that you would like to import:"
-msgstr "Vennligst velg informasjon du ønsker å importere:"
-
 #: ../shell/e-shell-importer.c:162
 msgid ""
 "Evolution checked for settings to import from the following\n"
-"applications: Pine, Netscape, Elm, iCalendar. No settings\n"
-"that could be imported where found. If you would like to\n"
+"applications: Pine, Netscape, Elm, iCalendar. No importable\n"
+"settings found. If you would like to\n"
 "try again, please click the \"Back\" button.\n"
 msgstr ""
 "Evolution så etter innstillinger å importere for følgende\n"
@@ -15044,30 +15268,30 @@ msgstr ""
 "Importerer %s\n"
 "Importerer oppføring %d."
 
-#: ../shell/e-shell-importer.c:341
+#: ../shell/e-shell-importer.c:347
 msgid "Select importer"
 msgstr "Velg importerer"
 
-#: ../shell/e-shell-importer.c:462 ../shell/e-shell-importer.c:1086
+#: ../shell/e-shell-importer.c:468 ../shell/e-shell-importer.c:1092
 #, c-format
 msgid "File %s does not exist"
 msgstr "Filen %s eksisterer ikke"
 
-#: ../shell/e-shell-importer.c:470
+#: ../shell/e-shell-importer.c:476
 msgid "Importing"
 msgstr "Importerer"
 
-#: ../shell/e-shell-importer.c:478
+#: ../shell/e-shell-importer.c:484
 #, c-format
 msgid "Importing %s.\n"
 msgstr "Importerer %s.\n"
 
-#: ../shell/e-shell-importer.c:488 ../shell/e-shell-importer.c:489
+#: ../shell/e-shell-importer.c:494 ../shell/e-shell-importer.c:495
 #, c-format
 msgid "Error loading %s"
 msgstr "Feil under lasting av %s"
 
-#: ../shell/e-shell-importer.c:507
+#: ../shell/e-shell-importer.c:513
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -15076,31 +15300,31 @@ msgstr ""
 "Importerer %s\n"
 "Importerer oppføring 1."
 
-#: ../shell/e-shell-importer.c:583
+#: ../shell/e-shell-importer.c:589
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: ../shell/e-shell-importer.c:639
+#: ../shell/e-shell-importer.c:645
 msgid "F_ilename:"
 msgstr "F_ilnavn:"
 
-#: ../shell/e-shell-importer.c:644
+#: ../shell/e-shell-importer.c:650
 msgid "Select a file"
 msgstr "Velg en fil"
 
-#: ../shell/e-shell-importer.c:656
+#: ../shell/e-shell-importer.c:662
 msgid "File _type:"
 msgstr "Fil_type:"
 
-#: ../shell/e-shell-importer.c:695
+#: ../shell/e-shell-importer.c:701
 msgid "Import data and settings from _older programs"
 msgstr "Importer data og innstillinger fra _eldre programmer"
 
-#: ../shell/e-shell-importer.c:698
+#: ../shell/e-shell-importer.c:704
 msgid "Import a _single file"
 msgstr "Importer en en_kelt fil"
 
-#: ../shell/e-shell-importer.c:766 ../shell/e-shell-startup-wizard.c:571
+#: ../shell/e-shell-importer.c:772
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -15108,54 +15332,27 @@ msgstr ""
 "Vennligst vent...\n"
 "Søker etter eksisterende oppsett"
 
-#: ../shell/e-shell-importer.c:773
+#: ../shell/e-shell-importer.c:779
 msgid "Starting Intelligent Importers"
 msgstr "Starter intelligent import"
 
-#: ../shell/e-shell-importer.c:899 ../shell/e-shell-startup-wizard.c:700
-#, c-format
-msgid "From %s:"
-msgstr "Fra %s:"
-
-#: ../shell/e-shell-importer.c:1105
+#: ../shell/e-shell-importer.c:1111
 #, c-format
 msgid "No importer available for file %s"
 msgstr "Ingen importfunksjon tilgjengelig for fil %s"
 
-#: ../shell/e-shell-importer.c:1119
+#: ../shell/e-shell-importer.c:1125
 msgid "Unable to execute importer"
 msgstr "Kan ikke kjøre importprogram"
 
-#: ../shell/e-shell-importer.c:1235
+#: ../shell/e-shell-importer.c:1241
 msgid "_Import"
 msgstr "_Importer"
 
-#: ../shell/e-shell-offline-handler.c:589
-msgid "Closing connections..."
-msgstr "Lukker forbindelser..."
-
 #: ../shell/e-shell-settings-dialog.c:318
 msgid "Evolution Settings"
 msgstr "Innstillinger for Evolution"
 
-#: ../shell/e-shell-startup-wizard.c:577
-msgid "Starting import"
-msgstr "Starter import"
-
-#: ../shell/e-shell-startup-wizard.c:797
-msgid ""
-"If you quit the Evolution Setup Assistant now, all of the information that "
-"you have entered will be forgotten. You will need to run this assistant "
-"again before using Evolution.\n"
-"\n"
-"Do you want to quit using the Assistant now?"
-msgstr ""
-"Hvis du avslutter veiviser for oppsett av Evolution nå vil all informasjon "
-"du har oppgitt hittil bli glemt. Du vil måtte kjøre denne veiviseren igjen "
-"før du kan bruke Evolution.\n"
-"\n"
-"Vil du avslutte veiviseren nå?"
-
 #: ../shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "Ingen mappenavn spesifisert."
@@ -15176,44 +15373,44 @@ msgstr "Mappenavn kan ikke inneholde tegnet «#»."
 msgid "'.' and '..' are reserved folder names."
 msgstr "«.» og «..» er reserverte mappenavn."
 
-#: ../shell/e-shell-window-commands.c:68
+#: ../shell/e-shell-window-commands.c:69
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 "GNOME pilot verktøyene ser ikke ut til å være installert på dette systemet."
 
-#: ../shell/e-shell-window-commands.c:76
+#: ../shell/e-shell-window-commands.c:77
 #, c-format
 msgid "Error executing %s."
 msgstr "Feil under kjøring av %s."
 
-#: ../shell/e-shell-window-commands.c:125
+#: ../shell/e-shell-window-commands.c:126
 msgid "Bug buddy is not installed."
 msgstr "Bug buddy er ikke installert."
 
-#: ../shell/e-shell-window-commands.c:133
+#: ../shell/e-shell-window-commands.c:134
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy kunne ikke kjøres."
 
 #. The translator-credits string is for translators to list
 #. * per language credits for translation, displayed in the
 #. * about box
-#: ../shell/e-shell-window-commands.c:427
+#: ../shell/e-shell-window-commands.c:507
 msgid "translator-credits"
 msgstr "Kjartan Maraas <kmaraas@gnome.org>"
 
-#: ../shell/e-shell-window-commands.c:441
+#: ../shell/e-shell-window-commands.c:521
 msgid "Groupware Suite"
 msgstr "Gruppevareløsning"
 
-#: ../shell/e-shell-window-commands.c:668
+#: ../shell/e-shell-window-commands.c:748
 msgid "_Work Online"
 msgstr "Ar_beid tilkoblet"
 
-#: ../shell/e-shell-window-commands.c:681 ../ui/evolution.xml.h:51
+#: ../shell/e-shell-window-commands.c:761 ../ui/evolution.xml.h:47
 msgid "_Work Offline"
 msgstr "Ar_beid frakoblet"
 
-#: ../shell/e-shell-window-commands.c:694 ../ui/evolution.xml.h:34
+#: ../shell/e-shell-window-commands.c:774
 msgid "Work Offline"
 msgstr "Arbeid frakoblet"
 
@@ -15231,7 +15428,7 @@ msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Evolution er frakoblet. Klikk på denne knappen for å arbeide tilkoblet."
 
-#: ../shell/e-shell-window.c:713
+#: ../shell/e-shell-window.c:712
 #, c-format
 msgid "Switch to %s"
 msgstr "Bytt til %s"
@@ -15240,28 +15437,28 @@ msgstr "Bytt til %s"
 msgid "Uknown system error."
 msgstr "Ukjent systemfeil."
 
-#: ../shell/e-shell.c:805 ../shell/e-shell.c:806
+#: ../shell/e-shell.c:799 ../shell/e-shell.c:800
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1249 ../widgets/misc/e-cell-date-edit.c:256
+#: ../shell/e-shell.c:1253 ../widgets/misc/e-cell-date-edit.c:256
 msgid "OK"
 msgstr "OK"
 
-#: ../shell/e-shell.c:1251
+#: ../shell/e-shell.c:1255
 msgid "Invalid arguments"
 msgstr "Ugyldige argumenter"
 
-#: ../shell/e-shell.c:1253
+#: ../shell/e-shell.c:1257
 msgid "Cannot register on OAF"
 msgstr "Kan ikke registrere i OAF"
 
-#: ../shell/e-shell.c:1255
+#: ../shell/e-shell.c:1259
 msgid "Configuration Database not found"
 msgstr "Konfigurasjonsdatabase ikke funnet"
 
-#: ../shell/e-shell.c:1257
+#: ../shell/e-shell.c:1261
 msgid "Generic error"
 msgstr "Vanlig feil"
 
@@ -15269,47 +15466,6 @@ msgstr "Vanlig feil"
 msgid "New"
 msgstr "Ny"
 
-#: ../shell/evolution-startup-wizard.glade.h:2
-msgid "Evolution Setup Assistant"
-msgstr "Konfigurasjonsassistent for Evolution"
-
-#: ../shell/evolution-startup-wizard.glade.h:3
-msgid "Importing Files"
-msgstr "Importerer filer"
-
-#: ../shell/evolution-startup-wizard.glade.h:4
-msgid "Timezone "
-msgstr "Tidssone "
-
-#: ../shell/evolution-startup-wizard.glade.h:5
-msgid "Welcome"
-msgstr "Velkommen"
-
-#: ../shell/evolution-startup-wizard.glade.h:6
-msgid ""
-"Welcome to Evolution. The next few screens will allow Evolution to connect "
-"to your email accounts, and to import files from other applications. \n"
-"\n"
-"Please click the \"Forward\" button to continue. "
-msgstr ""
-"Velkommen til Evolution. De neste skjermene lar deg konfigurere Evolution "
-"til å koble til dine e-post kontoer, og importere filer fra andre "
-"applikasjoner. \n"
-"\n"
-"Vennligst klikk «Fremover» for å fortsette. "
-
-#: ../shell/evolution-startup-wizard.glade.h:9
-msgid ""
-"You have successfully entered all of the information needed to set up "
-"Evolution. \n"
-"\n"
-"Click the \"Apply\" button to save your settings. "
-msgstr ""
-"Du har fullført inntasting av all informasjon som trengs for å konfigurere "
-"Evolution.\n"
-"\n"
-"Klikk på «Bruk» for å lagre dine innstillinger. "
-
 #: ../shell/evolution-test-component.c:140
 msgid "New Test"
 msgstr "Ny test"
@@ -15364,7 +15520,7 @@ msgstr ""
 msgid "Importers"
 msgstr "Importerere"
 
-#: ../shell/importer/intelligent.c:195 ../smime/gui/smime-ui.glade.h:28
+#: ../shell/importer/intelligent.c:195 ../smime/gui/smime-ui.glade.h:29
 msgid "Import"
 msgstr "Importer"
 
@@ -15381,7 +15537,7 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution kan importere data fra følgende filer:"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:237
+#: ../shell/main.c:230
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -15416,7 +15572,7 @@ msgstr ""
 "Vi håper at du nyter resultatene av vårt harde arbeid, og vi venter i\n"
 "spenning på at du tilbyr din hjelp!\n"
 
-#: ../shell/main.c:261
+#: ../shell/main.c:254
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -15424,39 +15580,35 @@ msgstr ""
 "Takk\n"
 "Evolution utviklerene\n"
 
-#: ../shell/main.c:268
+#: ../shell/main.c:261
 msgid "Don't tell me again"
 msgstr "Ikke gi beskjed igjen"
 
-#: ../shell/main.c:473
+#: ../shell/main.c:466
 msgid "Start Evolution activating the specified component"
 msgstr "Aktiver oppgitt komponent ved oppstart av Evolution"
 
-#: ../shell/main.c:477
+#: ../shell/main.c:470
 msgid "Start in online mode"
 msgstr "Start i tilkoblet modus"
 
-#: ../shell/main.c:480
+#: ../shell/main.c:473
 msgid "Forcibly shut down all Evolution components"
 msgstr "Steng ned alle komponenter i Evolution"
 
-#: ../shell/main.c:484
+#: ../shell/main.c:477
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Tvungen ommigrering fra Evolution 1.4"
 
-#: ../shell/main.c:487
+#: ../shell/main.c:480
 msgid "Send the debugging output of all components to a file."
 msgstr "Send feilsøkingsutskrift for alle komponentene til en fil."
 
-#: ../shell/main.c:490
-msgid "Disable the mono plugin environment."
-msgstr "Deaktiver mono-tilleggsmiljø."
-
-#: ../shell/main.c:493
+#: ../shell/main.c:482
 msgid "Disable loading of any plugins."
 msgstr "Slå av lasting av tillegg."
 
-#: ../shell/main.c:524
+#: ../shell/main.c:513
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -15465,86 +15617,29 @@ msgstr ""
 "%s: --online og --offline kan ikke brukes samtidig.\n"
 "  Bruk %s --help for mer informasjon.\n"
 
-#. shell:upgrade-nospace primary
-#: ../shell/shell-errors.xml.h:2
-msgid "Insufficient disk space for upgrade."
-msgstr "Ikke nok diskplass for oppgraderingen."
-
-#. shell:upgrade-nospace secondary
-#: ../shell/shell-errors.xml.h:4
-msgid ""
-"Upgrading your data and settings will require upto {0} of disk space, but "
-"you only have {1} available.\n"
-"\n"
-"You will need to make more space available in your home directory before you "
-"can continue."
-msgstr ""
-"Oppgradering av dine data og innstillinger vil kreve opptil {0} diskplass, "
-"men du har kun {1} tilgjengelig.\n"
-"\n"
-"Du må gjøre mer plass tilgjengelig i din hjemmekatalog før du kan fortsette."
-
-#. shell:upgrade-failed primary
-#: ../shell/shell-errors.xml.h:8
-msgid ""
-"Upgrade from previous version failed:\n"
-"{0}"
-msgstr ""
-"Oppgradering fra forrige versjon feilet:\n"
-"{0}"
-
-#. shell:upgrade-failed secondary
-#: ../shell/shell-errors.xml.h:11
-msgid ""
-"{1}\n"
-"\n"
-"If you choose to continue, you may not have access to some of your old "
-"data.\n"
-msgstr ""
-"{1}\n"
-"\n"
-"Hvis du velger å fortsette vil du kanskje ikke få tilgang til alle dine "
-"gamle data.\n"
-
-#: ../shell/shell-errors.xml.h:15
+#: ../shell/shell.error.xml.h:1
 msgid "Continue"
 msgstr "Fortsett"
 
-#. shell:upgrade-remove-1-4 title
-#. shell:upgrade-remove-1-4 primary
-#: ../shell/shell-errors.xml.h:17 ../shell/shell-errors.xml.h:19
+#: ../shell/shell.error.xml.h:2
 msgid "Delete old data from version {0}?"
 msgstr "Slett gamle data fra versjon {0}?"
 
-#. shell:upgrade-remove-1-4 secondary
-#: ../shell/shell-errors.xml.h:21
-msgid ""
-"The previous version of evolution stored its data in a different location.\n"
-"\n"
-"If you choose to remove this data, the entire contents of the \"evolution\" "
-"directory will be removed permanently.  If you choose to keep this data, "
-"then you may manually remove the contents of \"evolution\" at your "
-"convenience.\n"
-msgstr ""
-
-#: ../shell/shell-errors.xml.h:25
-msgid "_Remind Me Later"
-msgstr "_Vis påminnelse senere"
+#: ../shell/shell.error.xml.h:3
+msgid "Evolution can not start."
+msgstr "Evolution kan ikke starte."
 
-#: ../shell/shell-errors.xml.h:26
-msgid "_Keep Data"
-msgstr "_Behold data"
+#: ../shell/shell.error.xml.h:4
+msgid "Insufficient disk space for upgrade."
+msgstr "Ikke nok diskplass for oppgraderingen."
 
-#. shell:upgrade-remove-1-4-confirm title
-#. shell:upgrade-remove-1-4-confirm primary
-#: ../shell/shell-errors.xml.h:28 ../shell/shell-errors.xml.h:30
+#: ../shell/shell.error.xml.h:5
 msgid "Really delete old data?"
 msgstr "Vil du virkelig slette gamle data?"
 
-#. shell:upgrade-remove-1-4-confirm secondary
-#: ../shell/shell-errors.xml.h:32
+#: ../shell/shell.error.xml.h:6
 msgid ""
-"The entire contents of the \"evolution\" directory is about to be be "
+"The entire contents of the &quot;evolution&quot; directory is about to be be "
 "permanently removed.\n"
 "\n"
 "It is suggested you manually verify that all of your mail, contact, and "
@@ -15555,28 +15650,44 @@ msgid ""
 "without manual intervention.\n"
 msgstr ""
 
-#. shell:noshell title
-#. shell:noshell-reason title
-#: ../shell/shell-errors.xml.h:39 ../shell/shell-errors.xml.h:47
-msgid "Cannot start Evolution"
-msgstr "Kan ikke starte Evolution."
+#: ../shell/shell.error.xml.h:12
+msgid ""
+"The previous version of evolution stored its data in a different location.\n"
+"\n"
+"If you choose to remove this data, the entire contents of the &quot;"
+"evolution&quot; directory will be removed permanently.  If you choose to "
+"keep this data, then you may manually remove the contents of &quot;"
+"evolution&quot; at your convenience.\n"
+msgstr ""
 
-#. shell:noshell primary
-#. shell:noshell-reason primary
-#: ../shell/shell-errors.xml.h:41 ../shell/shell-errors.xml.h:49
-msgid "Evolution can not start."
-msgstr "Evolution kan ikke starte."
+#: ../shell/shell.error.xml.h:16
+msgid "Upgrade from previous version failed: {0}"
+msgstr "Oppgradering fra forrige versjon feilet: {0}"
 
-#. shell:noshell secondary
-#: ../shell/shell-errors.xml.h:43
+#: ../shell/shell.error.xml.h:17
+msgid ""
+"Upgrading your data and settings will require upto {0} of disk space, but "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"can continue."
+msgstr ""
+"Oppgradering av dine data og innstillinger vil kreve opptil {0} diskplass, "
+"men du har kun {1} tilgjengelig.\n"
+"\n"
+"Du må gjøre mer plass tilgjengelig i din hjemmekatalog før du kan fortsette."
+
+#: ../shell/shell.error.xml.h:20
 msgid ""
 "Your system configuration does not match your Evolution configuration.\n"
 "\n"
 "Click help for details"
 msgstr ""
+"Systemkonfigurasjonen stemmer ikke overens med konfigurasjonen i Evolution.\n"
+"\n"
+"Klikk på hjelp for detaljer"
 
-#. shell:noshell-reason secondary
-#: ../shell/shell-errors.xml.h:51
+#: ../shell/shell.error.xml.h:23
 msgid ""
 "Your system configuration does not match your Evolution configuration:\n"
 "\n"
@@ -15585,6 +15696,26 @@ msgid ""
 "Click help for details."
 msgstr ""
 
+#: ../shell/shell.error.xml.h:28
+msgid "_Keep Data"
+msgstr "_Behold data"
+
+#: ../shell/shell.error.xml.h:29
+msgid "_Remind Me Later"
+msgstr "_Vis påminnelse senere"
+
+#: ../shell/shell.error.xml.h:30
+msgid ""
+"{1}\n"
+"\n"
+"If you choose to continue, you may not have access to some of your old "
+"data.\n"
+msgstr ""
+"{1}\n"
+"\n"
+"Hvis du velger å fortsette vil du kanskje ikke få tilgang til alle dine "
+"gamle data.\n"
+
 #: ../smime/gui/ca-trust-dialog.c:96
 #, c-format
 msgid ""
@@ -15612,34 +15743,34 @@ msgstr ""
 
 #: ../smime/gui/certificate-manager.c:134
 #: ../smime/gui/certificate-manager.c:142
-#: ../smime/gui/certificate-manager.c:375
-#: ../smime/gui/certificate-manager.c:383
-#: ../smime/gui/certificate-manager.c:595
-#: ../smime/gui/certificate-manager.c:603
-msgid "Select a cert to import..."
+#: ../smime/gui/certificate-manager.c:377
+#: ../smime/gui/certificate-manager.c:385
+#: ../smime/gui/certificate-manager.c:597
+#: ../smime/gui/certificate-manager.c:605
+msgid "Select a certificate to import..."
 msgstr "Velg et sertifikat som skal importeres..."
 
-#: ../smime/gui/certificate-manager.c:263
-#: ../smime/gui/certificate-manager.c:472
-#: ../smime/gui/certificate-manager.c:690
+#: ../smime/gui/certificate-manager.c:265
+#: ../smime/gui/certificate-manager.c:474
+#: ../smime/gui/certificate-manager.c:692
 msgid "Certificate Name"
 msgstr "Navn på sertifikat"
 
-#: ../smime/gui/certificate-manager.c:272
-#: ../smime/gui/certificate-manager.c:490
+#: ../smime/gui/certificate-manager.c:274
+#: ../smime/gui/certificate-manager.c:492
 msgid "Purposes"
 msgstr "Hensikter"
 
-#: ../smime/gui/certificate-manager.c:281 ../smime/gui/smime-ui.glade.h:36
+#: ../smime/gui/certificate-manager.c:283 ../smime/gui/smime-ui.glade.h:37
 #: ../smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr "Serienummer"
 
-#: ../smime/gui/certificate-manager.c:289
+#: ../smime/gui/certificate-manager.c:291
 msgid "Expires"
 msgstr "Utgår"
 
-#: ../smime/gui/certificate-manager.c:481
+#: ../smime/gui/certificate-manager.c:483
 msgid "E-Mail Address"
 msgstr "E-postadresse"
 
@@ -15754,117 +15885,121 @@ msgid "Certificate details"
 msgstr "Detaljer om sertifikat"
 
 #: ../smime/gui/smime-ui.glade.h:17
+msgid "Certificates Table"
+msgstr "Tabell med sertifikater"
+
+#: ../smime/gui/smime-ui.glade.h:18
 msgid "Common Name (CN)"
 msgstr "Vanlig navn (CN)"
 
-#: ../smime/gui/smime-ui.glade.h:18
+#: ../smime/gui/smime-ui.glade.h:19
 msgid "Contact Certificates"
 msgstr "Kontaktsertifikater"
 
-#: ../smime/gui/smime-ui.glade.h:20
+#: ../smime/gui/smime-ui.glade.h:21
 msgid "Do not trust the authenticity of this certificate"
 msgstr "Ikke stol på at dette sertifikatet er autentisk"
 
-#: ../smime/gui/smime-ui.glade.h:21
+#: ../smime/gui/smime-ui.glade.h:22
 msgid "Dummy window only"
 msgstr "Dummyvindu"
 
-#: ../smime/gui/smime-ui.glade.h:22
+#: ../smime/gui/smime-ui.glade.h:23
 msgid "Edit"
 msgstr "Rediger"
 
-#: ../smime/gui/smime-ui.glade.h:23
+#: ../smime/gui/smime-ui.glade.h:24
 msgid "Email Certificate Trust Settings"
 msgstr "Innstillinger for tillit til e-postsertifikater"
 
-#: ../smime/gui/smime-ui.glade.h:24
+#: ../smime/gui/smime-ui.glade.h:25
 msgid "Email Recipient Certificate"
 msgstr "Sertifikat for e-postmottaker"
 
-#: ../smime/gui/smime-ui.glade.h:25
+#: ../smime/gui/smime-ui.glade.h:26
 msgid "Email Signer Certificate"
 msgstr "Sertifikat for signering av e-post"
 
-#: ../smime/gui/smime-ui.glade.h:26
+#: ../smime/gui/smime-ui.glade.h:27
 msgid "Expires On"
 msgstr "Utgår"
 
-#: ../smime/gui/smime-ui.glade.h:29
+#: ../smime/gui/smime-ui.glade.h:30
 msgid "Issued On"
 msgstr "Utstedt"
 
-#: ../smime/gui/smime-ui.glade.h:30
+#: ../smime/gui/smime-ui.glade.h:31
 msgid "MD5 Fingerprint"
 msgstr "MD5-fingeravtrykk"
 
-#: ../smime/gui/smime-ui.glade.h:31
+#: ../smime/gui/smime-ui.glade.h:32
 msgid "Organization (O)"
 msgstr "Organisasjon (O)"
 
-#: ../smime/gui/smime-ui.glade.h:32
+#: ../smime/gui/smime-ui.glade.h:33
 msgid "Organizational Unit (OU)"
 msgstr "Organisasjonsenhet (OU)"
 
-#: ../smime/gui/smime-ui.glade.h:33
+#: ../smime/gui/smime-ui.glade.h:34
 msgid "SHA1 Fingerprint"
 msgstr "SHA1-fingeravtrykk"
 
-#: ../smime/gui/smime-ui.glade.h:34 ../smime/lib/e-cert.c:818
+#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr "SSL-klientsertifikat"
 
-#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:822
+#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr "SSL-tjenersertifikat"
 
-#: ../smime/gui/smime-ui.glade.h:37
+#: ../smime/gui/smime-ui.glade.h:38
 msgid "Trust the authenticity of this certificate"
 msgstr "Stol på at dette sertifikatet er autentisk"
 
-#: ../smime/gui/smime-ui.glade.h:38
+#: ../smime/gui/smime-ui.glade.h:39
 msgid "Trust this CA to identify email users."
 msgstr "Stol på denne CAen for å identifisere e-postbrukere."
 
-#: ../smime/gui/smime-ui.glade.h:39
+#: ../smime/gui/smime-ui.glade.h:40
 msgid "Trust this CA to identify software developers."
 msgstr "Stol på denne CAen for å identifisere programvareutviklere."
 
-#: ../smime/gui/smime-ui.glade.h:40
+#: ../smime/gui/smime-ui.glade.h:41
 msgid "Trust this CA to identify web sites."
 msgstr "Stol på denne CAen for identifisering av nettsteder."
 
-#: ../smime/gui/smime-ui.glade.h:41
+#: ../smime/gui/smime-ui.glade.h:42
 msgid "View"
 msgstr "Vis"
 
-#: ../smime/gui/smime-ui.glade.h:42
+#: ../smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr "Du har sertifikater som identifiserer deg fra disse organisasjonene:"
 
-#: ../smime/gui/smime-ui.glade.h:43
+#: ../smime/gui/smime-ui.glade.h:44
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 "Du har sertifikater på lager som identifiserer disse sertifikatmyndighetene:"
 
-#: ../smime/gui/smime-ui.glade.h:44
+#: ../smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
 msgstr "Du har sertifikater som identifiserer disse menneskene på lager:"
 
-#: ../smime/gui/smime-ui.glade.h:45
+#: ../smime/gui/smime-ui.glade.h:46
 msgid "Your Certificates"
 msgstr "Dine sertifikater"
 
-#: ../smime/gui/smime-ui.glade.h:46
+#: ../smime/gui/smime-ui.glade.h:47
 msgid "_Edit CA Trust"
 msgstr "R_ediger tillit til CA"
 
-#: ../smime/gui/smime-ui.glade.h:48
+#: ../smime/gui/smime-ui.glade.h:49
 msgid "dialog1"
 msgstr "dialog1"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:612
+#: ../smime/lib/e-cert-db.c:642
 msgid "Certificate already exists"
 msgstr "Sertifikatet eksisterer allerede"
 
@@ -15961,6 +16096,10 @@ msgstr "Nøkkelidentifikator for sertifikatmyndighet"
 msgid "UID"
 msgstr "UID"
 
+#: ../smime/lib/e-cert.c:681
+msgid "E"
+msgstr "Ø"
+
 #: ../smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
@@ -16153,7 +16292,7 @@ msgid "Previews the contacts to be printed"
 msgstr "Forhåndsviser kontaktene som skal skrives ut"
 
 #: ../ui/evolution-addressbook.xml.h:17 ../ui/evolution-calendar.xml.h:20
-#: ../ui/evolution-mail-message.xml.h:81 ../ui/evolution-tasks.xml.h:15
+#: ../ui/evolution-mail-message.xml.h:75 ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "Forhåndsvisning av utskrift"
 
@@ -16202,10 +16341,7 @@ msgid "View the current contact"
 msgstr "Vis aktiv kontakt"
 
 #: ../ui/evolution-addressbook.xml.h:30 ../ui/evolution-calendar.xml.h:38
-#: ../ui/evolution-mail-global.xml.h:14 ../ui/evolution-mail-list.xml.h:23
-#: ../ui/evolution-mail-message.xml.h:103
-#: ../ui/evolution-mail-messagedisplay.xml.h:4 ../ui/evolution-tasks.xml.h:19
-#: ../ui/evolution.xml.h:36
+#: ../ui/evolution-mail-list.xml.h:24 ../ui/evolution-tasks.xml.h:19
 msgid "_Actions"
 msgstr "H_andlinger"
 
@@ -16217,7 +16353,7 @@ msgstr "_Videresend kontakt..."
 msgid "_Move to Folder..."
 msgstr "Fl_ytt til mappe..."
 
-#: ../ui/evolution-addressbook.xml.h:39 ../ui/evolution-mail-global.xml.h:16
+#: ../ui/evolution-addressbook.xml.h:39
 msgid "_Preview Pane"
 msgstr "_Forhåndsvisningsvindu"
 
@@ -16273,7 +16409,7 @@ msgstr "Liste"
 msgid "Month"
 msgstr "Måned"
 
-#: ../ui/evolution-calendar.xml.h:15 ../ui/evolution-mail-message.xml.h:65
+#: ../ui/evolution-calendar.xml.h:15 ../ui/evolution-mail-message.xml.h:59
 msgid "Next"
 msgstr "Neste"
 
@@ -16281,7 +16417,7 @@ msgstr "Neste"
 msgid "Previews the calendar to be printed"
 msgstr "Forhåndsviser av kalenderen som skal skrives ut"
 
-#: ../ui/evolution-calendar.xml.h:18 ../ui/evolution-mail-message.xml.h:79
+#: ../ui/evolution-calendar.xml.h:18 ../ui/evolution-mail-message.xml.h:73
 msgid "Previous"
 msgstr "Forrige"
 
@@ -16354,7 +16490,6 @@ msgid "Copy selected text to the clipboard"
 msgstr "Kopier valgt tekst til utklippstavlen"
 
 #: ../ui/evolution-composer-entries.xml.h:2
-#: ../ui/evolution-mail-message.xml.h:21
 msgid "Cu_t"
 msgstr "Klipp u_t"
 
@@ -16366,8 +16501,7 @@ msgstr "Klipp ut valgt tekst til utklippstavlen"
 msgid "Paste text from the clipboard"
 msgstr "Lim inn tekst fra utklippstavlen"
 
-#: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-mail-list.xml.h:13
-#: ../ui/evolution-subscribe.xml.h:6
+#: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Velg _alle"
 
@@ -16384,99 +16518,125 @@ msgid "Cancel the current mail operation"
 msgstr "Avbryt aktiv e-postoperasjon"
 
 #: ../ui/evolution-mail-global.xml.h:3
-msgid "Compose _New Message"
-msgstr "Skriv _ny melding"
+msgid "Copy the selected folder into another folder"
+msgstr "Kopier valgt mappe til en annen mappe"
 
 #: ../ui/evolution-mail-global.xml.h:4
+msgid "Create a new folder for storing mail"
+msgstr "Lag en ny mappe for lagring av meldinger"
+
+#: ../ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr "Opprett eller rediger regler for filtrering av ny e-post"
 
-#: ../ui/evolution-mail-global.xml.h:5
+#: ../ui/evolution-mail-global.xml.h:6
 msgid "Create or edit vFolder definitions"
 msgstr "Opprett eller rediger definisjoner av virtuelle mapper"
 
-#: ../ui/evolution-mail-global.xml.h:6
+#: ../ui/evolution-mail-global.xml.h:7
 msgid "Empty _Trash"
 msgstr "Tø_m søppelkurven"
 
-#: ../ui/evolution-mail-global.xml.h:7
-msgid "Open a window for composing a mail message"
-msgstr "Åpne et vindu for å skrive en e-post melding"
-
-#: ../ui/evolution-mail-global.xml.h:8
-msgid "Permanently remove all deleted messages from all folders"
-msgstr "Fjern alle slettede meldinger fra alle mapper permanent"
+#: ../ui/evolution-mail-global.xml.h:8 ../ui/evolution-mail-list.xml.h:6
+#: ../ui/evolution-subscribe.xml.h:2
+msgid "F_older"
+msgstr "M_appe"
 
 #: ../ui/evolution-mail-global.xml.h:9
-msgid "Post Ne_w Message"
-msgstr "Legg ut n_y melding"
+msgid "Message F_ilters"
+msgstr "Meldingsfiltre"
 
 #: ../ui/evolution-mail-global.xml.h:10
-msgid "Post a message to a Public folder"
-msgstr "Legg ut en melding til en ny offentlig mappe"
+#, fuzzy
+msgid "Message _List As"
+msgstr "Meldingsliste"
 
 #: ../ui/evolution-mail-global.xml.h:11
-msgid "S_ubscribe to Folders..."
-msgstr "_Abonnerer på mapper..."
+msgid "Message _Preview"
+msgstr "Forhåndsvisning av _melding"
 
 #: ../ui/evolution-mail-global.xml.h:12
+msgid "Move the selected folder into another folder"
+msgstr "Flytt valgt mappe til en annen mappe"
+
+#: ../ui/evolution-mail-global.xml.h:13
+msgid "Permanently remove all deleted messages from all folders"
+msgstr "Fjern alle slettede meldinger fra alle mapper permanent"
+
+#: ../ui/evolution-mail-global.xml.h:14
+msgid "Post a message to a Public folder"
+msgstr "Legg ut en melding til en ny offentlig mappe"
+
+#: ../ui/evolution-mail-global.xml.h:15
+msgid "Search F_olders"
+msgstr "Søk i _mapper"
+
+#: ../ui/evolution-mail-global.xml.h:16
 msgid "Show message preview window"
 msgstr "Vis vindu for forhåndsvisning av melding"
 
-#: ../ui/evolution-mail-global.xml.h:13
+#: ../ui/evolution-mail-global.xml.h:17
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Abonner eller fjern abonnement på mapper på eksterne tjenere"
 
-#: ../ui/evolution-mail-global.xml.h:15
-msgid "_Filters..."
-msgstr "_Filtre..."
-
 #: ../ui/evolution-mail-global.xml.h:18
-msgid "vFolder _Editor..."
-msgstr "R_edigering av virtuelle mapper..."
+msgid "_Copy Folder To..."
+msgstr "_Kopier mappe til..."
+
+#: ../ui/evolution-mail-global.xml.h:19
+msgid "_Move Folder To..."
+msgstr "Flytt _mappe til..."
+
+#: ../ui/evolution-mail-global.xml.h:20
+msgid "_New Search _Folder (FIXME)"
+msgstr "_Ny søkemappe"
+
+#: ../ui/evolution-mail-global.xml.h:21
+msgid "_New..."
+msgstr "_Ny..."
+
+#: ../ui/evolution-mail-global.xml.h:22
+msgid "_Subscriptions"
+msgstr "_Abonnement"
 
 #: ../ui/evolution-mail-list.xml.h:1
+msgid "Change the name of this folder"
+msgstr "Endre navn på denne mappen"
+
+#: ../ui/evolution-mail-list.xml.h:2
 msgid "Change the properties of this folder"
 msgstr "Endre egenskaper for denne mappen"
 
-#: ../ui/evolution-mail-list.xml.h:2 ../ui/evolution-mail-message.xml.h:10
+#: ../ui/evolution-mail-list.xml.h:3 ../ui/evolution-mail-message.xml.h:12
 msgid "Copy selected message(s) to the clipboard"
 msgstr "Kopier valgt(e) melding(er) til utklippstavlen"
 
-#: ../ui/evolution-mail-list.xml.h:3 ../ui/evolution-mail-message.xml.h:22
+#: ../ui/evolution-mail-list.xml.h:4 ../ui/evolution-mail-message.xml.h:23
 msgid "Cut selected message(s) to the clipboard"
 msgstr "Klipp ut valgt(e) melding(er) til utklippstavlen"
 
-#: ../ui/evolution-mail-list.xml.h:4
+#: ../ui/evolution-mail-list.xml.h:5
 msgid "E_xpunge"
 msgstr "T_øm"
 
-#: ../ui/evolution-mail-list.xml.h:5
-msgid "Hide S_elected Messages"
-msgstr "Skjul valgt_e meldinger"
+#: ../ui/evolution-mail-list.xml.h:7
+msgid "Group By _Threads"
+msgstr "Grupper etter _tråder"
 
-#: ../ui/evolution-mail-list.xml.h:6
+#: ../ui/evolution-mail-list.xml.h:8
 msgid "Hide _Deleted Messages"
 msgstr "Skjul slette_de meldinger"
 
-#: ../ui/evolution-mail-list.xml.h:7
-msgid "Hide _Read Messages"
-msgstr "Skjul leste meldinge_r"
-
-#: ../ui/evolution-mail-list.xml.h:8
+#: ../ui/evolution-mail-list.xml.h:9
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr "Skjul slettede meldinger heller enn å vise dem gjennomstreket"
 
-#: ../ui/evolution-mail-list.xml.h:9
-msgid "Mark All as _Read"
-msgstr "Me_rk alle som lest"
-
 #: ../ui/evolution-mail-list.xml.h:10
-msgid "Mark all visible messages as read"
-msgstr "Merk alle synlige meldinger som lest"
+msgid "Mark Me_ssages as Read"
+msgstr "Merk meldinger som le_st"
 
-#: ../ui/evolution-mail-list.xml.h:11 ../ui/evolution-mail-message.xml.h:74
+#: ../ui/evolution-mail-list.xml.h:11 ../ui/evolution-mail-message.xml.h:68
 msgid "Paste message(s) from the clipboard"
 msgstr "Lim inn melding(er) fra utklippstavlen"
 
@@ -16484,9 +16644,13 @@ msgstr "Lim inn melding(er) fra utklippstavlen"
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Fjern alle slettede meldinger fra denne mappen permanent"
 
+#: ../ui/evolution-mail-list.xml.h:13
+msgid "Permanently remove this folder"
+msgstr "Fjern denne mappen permanent"
+
 #: ../ui/evolution-mail-list.xml.h:14
-msgid "Select _Thread"
-msgstr "Velg _tråd"
+msgid "Select _All Messages"
+msgstr "Velg _alle meldinger"
 
 #: ../ui/evolution-mail-list.xml.h:15
 msgid "Select all and only the messages that are not currently selected"
@@ -16501,8 +16665,8 @@ msgid "Select all visible messages"
 msgstr "Velg alle synlige meldinger"
 
 #: ../ui/evolution-mail-list.xml.h:18
-msgid "Sh_ow Hidden Messages"
-msgstr "_Vis skjulte meldinger"
+msgid "Show _Messages"
+msgstr "Vis _meldinger"
 
 #: ../ui/evolution-mail-list.xml.h:19
 msgid "Show messages that have been temporarily hidden"
@@ -16520,17 +16684,22 @@ msgstr "Skjul valgte meldinger midlertidig"
 msgid "Threaded Message list"
 msgstr "Meldingsliste med tråder"
 
+#: ../ui/evolution-mail-list.xml.h:23
+msgid "Un_read Messages"
+msgstr "_Uleste meldinger"
+
 #: ../ui/evolution-mail-list.xml.h:25
-msgid "_Folder"
-msgstr "M_appe"
+msgid "_All"
+msgstr "_Alle"
 
-#: ../ui/evolution-mail-list.xml.h:26 ../ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "_Reverser utvalg"
+#: ../ui/evolution-mail-list.xml.h:27 ../ui/evolution-mail-message.xml.h:110
+#: ../ui/evolution-mail-messagedisplay.xml.h:7
+msgid "_Message"
+msgstr "_Melding"
 
-#: ../ui/evolution-mail-list.xml.h:28
-msgid "_Threaded Message List"
-msgstr "Meldingsliste med _tråder"
+#: ../ui/evolution-mail-list.xml.h:30
+msgid "_Selected Messages"
+msgstr "_Valgte meldinger"
 
 #: ../ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
@@ -16545,421 +16714,420 @@ msgid "Add Sender to Address Book"
 msgstr "Legg til avsender i adressebok"
 
 #: ../ui/evolution-mail-message.xml.h:4
-msgid "Apply filter rules to the selected messages"
-msgstr "Aktiver filterregler på de valgte meldingene"
+msgid "All Message _Headers"
+msgstr "Alle meldings_hoder"
 
 #: ../ui/evolution-mail-message.xml.h:5
-msgid "Caret _Mode"
-msgstr "Markør_modus"
+msgid "Apply filter rules to the selected messages"
+msgstr "Aktiver filterregler på de valgte meldingene"
 
 #: ../ui/evolution-mail-message.xml.h:6
+msgid "Check for _Junk"
+msgstr "Sjekk _søppel"
+
+#: ../ui/evolution-mail-message.xml.h:7
+msgid "Compose _New Message"
+msgstr "Skriv _ny melding"
+
+#: ../ui/evolution-mail-message.xml.h:8
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "Skriv et svar til alle mottakere av den valgte meldingen"
 
-#: ../ui/evolution-mail-message.xml.h:7
+#: ../ui/evolution-mail-message.xml.h:9
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Skriv et svar til e-postlisten for den valgte meldingen"
 
-#: ../ui/evolution-mail-message.xml.h:8
+#: ../ui/evolution-mail-message.xml.h:10
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Skriv et svar til avsender av den valgte meldingen"
 
-#: ../ui/evolution-mail-message.xml.h:11
+#: ../ui/evolution-mail-message.xml.h:13
 msgid "Copy selected messages to another folder"
 msgstr "Kopier valgte meldinger til en annen mappe"
 
-#: ../ui/evolution-mail-message.xml.h:12
-msgid "Create _vFolder From Message"
-msgstr "Lag _virtuell mappe fra melding"
+#: ../ui/evolution-mail-message.xml.h:14
+msgid "Create R_ule"
+msgstr "Opprett _regel"
 
-#: ../ui/evolution-mail-message.xml.h:13
+#: ../ui/evolution-mail-message.xml.h:15
 msgid "Create a rule to filter messages from this sender"
 msgstr "Lag en regel for å filtrere meldinger fra denne avsenderen"
 
-#: ../ui/evolution-mail-message.xml.h:14
+#: ../ui/evolution-mail-message.xml.h:16
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Lag en regel for å filtrere meldinger til disse mottakerene"
 
-#: ../ui/evolution-mail-message.xml.h:15
+#: ../ui/evolution-mail-message.xml.h:17
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Lag en regel for å filtrere meldinger til denne meldingslisten"
 
-#: ../ui/evolution-mail-message.xml.h:16
+#: ../ui/evolution-mail-message.xml.h:18
 msgid "Create a rule to filter messages with this subject"
 msgstr "Lag en regel for filtrering av meldinger med dette emnet"
 
-#: ../ui/evolution-mail-message.xml.h:17
+#: ../ui/evolution-mail-message.xml.h:19
 msgid "Create a vFolder for these recipients"
 msgstr "Lag en virtuell mappe for disse mottakerene"
 
-#: ../ui/evolution-mail-message.xml.h:18
+#: ../ui/evolution-mail-message.xml.h:20
 msgid "Create a vFolder for this mailing list"
 msgstr "Lag en virtuell mappe for denne e-postlisten"
 
-#: ../ui/evolution-mail-message.xml.h:19
+#: ../ui/evolution-mail-message.xml.h:21
 msgid "Create a vFolder for this sender"
 msgstr "Lag en virtuell mappe for denne avsenderen"
 
-#: ../ui/evolution-mail-message.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:22
 msgid "Create a vFolder for this subject"
 msgstr "Lag en virtuell mappe for dette emnet"
 
-#: ../ui/evolution-mail-message.xml.h:23
+#: ../ui/evolution-mail-message.xml.h:24
 msgid "Decrease the text size"
 msgstr "Mindre skrift"
 
-#: ../ui/evolution-mail-message.xml.h:25
+#: ../ui/evolution-mail-message.xml.h:26
 msgid "Display the next important message"
 msgstr "Vis neste viktige melding"
 
-#: ../ui/evolution-mail-message.xml.h:26
+#: ../ui/evolution-mail-message.xml.h:27
 msgid "Display the next message"
 msgstr "Vis neste melding"
 
-#: ../ui/evolution-mail-message.xml.h:27
+#: ../ui/evolution-mail-message.xml.h:28
 msgid "Display the next unread message"
 msgstr "Vis neste uleste melding"
 
-#: ../ui/evolution-mail-message.xml.h:28
+#: ../ui/evolution-mail-message.xml.h:29
 msgid "Display the next unread thread"
 msgstr "Vis neste uleste tråd"
 
-#: ../ui/evolution-mail-message.xml.h:29
+#: ../ui/evolution-mail-message.xml.h:30
 msgid "Display the previous important message"
 msgstr "Vis forrige viktige melding"
 
-#: ../ui/evolution-mail-message.xml.h:30
+#: ../ui/evolution-mail-message.xml.h:31
 msgid "Display the previous message"
 msgstr "Vis forrige melding"
 
-#: ../ui/evolution-mail-message.xml.h:31
+#: ../ui/evolution-mail-message.xml.h:32
 msgid "Display the previous unread message"
 msgstr "Vis forrige uleste melding"
 
-#: ../ui/evolution-mail-message.xml.h:32
-msgid "F_orward As..."
-msgstr "V_ideresend som..."
-
 #: ../ui/evolution-mail-message.xml.h:33
-msgid "Filter _Junk"
-msgstr "Filtrer s_øppel"
-
-#: ../ui/evolution-mail-message.xml.h:34
 msgid "Filter on Mailing _List..."
 msgstr "Filtrer på e-post_liste..."
 
-#: ../ui/evolution-mail-message.xml.h:35
+#: ../ui/evolution-mail-message.xml.h:34
 msgid "Filter on Se_nder..."
 msgstr "Filtrer på se_nder..."
 
-#: ../ui/evolution-mail-message.xml.h:36
+#: ../ui/evolution-mail-message.xml.h:35
 msgid "Filter on _Recipients..."
 msgstr "Filtrer på mottake_re..."
 
-#: ../ui/evolution-mail-message.xml.h:37
+#: ../ui/evolution-mail-message.xml.h:36
 msgid "Filter on _Subject..."
 msgstr "Filtrer på e_mne..."
 
-#: ../ui/evolution-mail-message.xml.h:38
+#: ../ui/evolution-mail-message.xml.h:37
 msgid "Filter the selected messages for junk status"
 msgstr "Filtrer valgte meldinger etter søppelstatus"
 
-#: ../ui/evolution-mail-message.xml.h:39
+#: ../ui/evolution-mail-message.xml.h:38
 msgid "Flag selected message(s) for follow-up"
 msgstr "Merk valgt(e) melding(er) for oppfølging"
 
-#: ../ui/evolution-mail-message.xml.h:40
+#: ../ui/evolution-mail-message.xml.h:39
 msgid "Follow _Up..."
 msgstr "Følg _opp..."
 
-#: ../ui/evolution-mail-message.xml.h:41
+#: ../ui/evolution-mail-message.xml.h:40
 msgid "Force images in HTML mail to be loaded"
 msgstr "Tvungen lasting av bilder i HTML e-post"
 
-#: ../ui/evolution-mail-message.xml.h:43
+#: ../ui/evolution-mail-message.xml.h:42
 msgid "Forward the selected message in the body of a new message"
 msgstr "Videresend den valgte meldingen i kroppen av en ny melding"
 
-#: ../ui/evolution-mail-message.xml.h:44
+#: ../ui/evolution-mail-message.xml.h:43
 msgid "Forward the selected message quoted like a reply"
 msgstr "Videresend den valgte meldingen sitert som et svar"
 
-#: ../ui/evolution-mail-message.xml.h:45
+#: ../ui/evolution-mail-message.xml.h:44
 msgid "Forward the selected message to someone"
 msgstr "Videresend den valgte meldingen til noen"
 
-#: ../ui/evolution-mail-message.xml.h:46
+#: ../ui/evolution-mail-message.xml.h:45
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Videresend den valgte meldingen til noen som et vedlegg"
 
-#: ../ui/evolution-mail-message.xml.h:47
+#: ../ui/evolution-mail-message.xml.h:46
 msgid "Increase the text size"
 msgstr "Større tekst"
 
-#: ../ui/evolution-mail-message.xml.h:49
-msgid "Load _Images"
-msgstr "Last b_ilder"
-
-#: ../ui/evolution-mail-message.xml.h:50
-msgid "Mar_k as Read"
-msgstr "Mer_k som lest"
-
-#: ../ui/evolution-mail-message.xml.h:51
-msgid "Mark as I_mportant"
-msgstr "Merk som _viktig"
-
-#: ../ui/evolution-mail-message.xml.h:52
-msgid "Mark as U_nread"
-msgstr "Merk som _ulest"
-
-#: ../ui/evolution-mail-message.xml.h:53
-msgid "Mark as Unimp_ortant"
-msgstr "Merk som uv_iktig"
+#: ../ui/evolution-mail-message.xml.h:48
+msgid "Mar_k as"
+msgstr "Mer_k som"
 
-#: ../ui/evolution-mail-message.xml.h:56
+#: ../ui/evolution-mail-message.xml.h:49
 msgid "Mark the selected message(s) as having been read"
 msgstr "Merk valgt(e) melding(er) som lest"
 
-#: ../ui/evolution-mail-message.xml.h:57
+#: ../ui/evolution-mail-message.xml.h:50
 msgid "Mark the selected message(s) as important"
 msgstr "Merk valgt(e) melding(er) som viktige"
 
-#: ../ui/evolution-mail-message.xml.h:58
+#: ../ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected message(s) as junk"
 msgstr "Merk valgt(e) melding(er) som søppel"
 
-#: ../ui/evolution-mail-message.xml.h:59
+#: ../ui/evolution-mail-message.xml.h:52
 msgid "Mark the selected message(s) as not being junk"
 msgstr "Merk valgt(e) melding(er) som ikke søppel"
 
-#: ../ui/evolution-mail-message.xml.h:60
+#: ../ui/evolution-mail-message.xml.h:53
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Merk valgt(e) melding(er) som ulest"
 
-#: ../ui/evolution-mail-message.xml.h:61
+#: ../ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Merk valgt(e) melding(er) som uviktige"
 
-#: ../ui/evolution-mail-message.xml.h:62
+#: ../ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected messages for deletion"
 msgstr "Merk valgte meldinger for sletting"
 
-#: ../ui/evolution-mail-message.xml.h:63
+#: ../ui/evolution-mail-message.xml.h:56
+msgid "Message Source"
+msgstr "Meldingskilde"
+
+#: ../ui/evolution-mail-message.xml.h:57
 msgid "Move"
 msgstr "Flytt"
 
-#: ../ui/evolution-mail-message.xml.h:64
+#: ../ui/evolution-mail-message.xml.h:58
 msgid "Move selected message(s) to another folder"
 msgstr "Flytt valgt(e) melding(er) til en annen mappe"
 
-#: ../ui/evolution-mail-message.xml.h:66
+#: ../ui/evolution-mail-message.xml.h:60
 msgid "Next _Important Message"
 msgstr "Neste v_iktige melding"
 
-#: ../ui/evolution-mail-message.xml.h:67
+#: ../ui/evolution-mail-message.xml.h:61
 msgid "Next _Thread"
 msgstr "Neste _tråd"
 
-#: ../ui/evolution-mail-message.xml.h:68
+#: ../ui/evolution-mail-message.xml.h:62
 msgid "Next _Unread Message"
 msgstr "Neste _uleste melding"
 
-#: ../ui/evolution-mail-message.xml.h:69
+#: ../ui/evolution-mail-message.xml.h:63
 msgid "Not Junk"
 msgstr "Ikke søppel"
 
-#: ../ui/evolution-mail-message.xml.h:70
+#: ../ui/evolution-mail-message.xml.h:64
+msgid "Open a window for composing a mail message"
+msgstr "Åpne et vindu for å skrive en e-post melding"
+
+#: ../ui/evolution-mail-message.xml.h:65
 msgid "Open the selected message in a new window"
 msgstr "Åpne valgt melding i et nytt vindu"
 
-#: ../ui/evolution-mail-message.xml.h:71
+#: ../ui/evolution-mail-message.xml.h:66
 msgid "Open the selected message in the composer for editing"
 msgstr "Åpne valgt melding for redigering"
 
-#: ../ui/evolution-mail-message.xml.h:72
-msgid "Original Si_ze"
-msgstr "Opprinnelig st_ørrelse"
-
-#: ../ui/evolution-mail-message.xml.h:73
+#: ../ui/evolution-mail-message.xml.h:67
 msgid "P_revious Unread Message"
 msgstr "Fo_rrige uleste melding"
 
-#: ../ui/evolution-mail-message.xml.h:75
+#: ../ui/evolution-mail-message.xml.h:69
 msgid "Post a Repl_y"
 msgstr "Legg ut et s_var"
 
-#: ../ui/evolution-mail-message.xml.h:76
+#: ../ui/evolution-mail-message.xml.h:70
 msgid "Post a reply to a message in a Public folder"
 msgstr "Post et svar på en melding i en offentlig mappe"
 
-#: ../ui/evolution-mail-message.xml.h:77
+#: ../ui/evolution-mail-message.xml.h:71
 msgid "Pr_evious Important Message"
 msgstr "Forrig_e viktige melding"
 
-#: ../ui/evolution-mail-message.xml.h:78
+#: ../ui/evolution-mail-message.xml.h:72
 msgid "Preview the message to be printed"
 msgstr "Forhåndsvis meldingen som skal skrives ut"
 
-#: ../ui/evolution-mail-message.xml.h:82
+#: ../ui/evolution-mail-message.xml.h:76
 msgid "Print this message"
 msgstr "Skriv ut denne meldingen"
 
-#: ../ui/evolution-mail-message.xml.h:83
+#: ../ui/evolution-mail-message.xml.h:77
 msgid "Re_direct"
 msgstr "Om_diriger"
 
-#: ../ui/evolution-mail-message.xml.h:84
+#: ../ui/evolution-mail-message.xml.h:78
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Omdiriger (bounce) den valgte meldingen til noen"
 
-#: ../ui/evolution-mail-message.xml.h:89
+#: ../ui/evolution-mail-message.xml.h:82
 msgid "Reset the text to its original size"
 msgstr "Ta teksten tilbake til sin opprinnelige størrelse"
 
-#: ../ui/evolution-mail-message.xml.h:90
-msgid "S_earch in Message..."
-msgstr "Søk i m_elding..."
-
-#: ../ui/evolution-mail-message.xml.h:91
-msgid "S_maller"
-msgstr "_Mindre"
-
-#: ../ui/evolution-mail-message.xml.h:92
+#: ../ui/evolution-mail-message.xml.h:83
 msgid "Save the message as a text file"
 msgstr "Lagre meldingen som en tekstfil"
 
-#: ../ui/evolution-mail-message.xml.h:93
+#: ../ui/evolution-mail-message.xml.h:84
 msgid "Search for text in the body of the displayed message"
 msgstr "Søk etter tekst i kroppen av vist melding"
 
-#: ../ui/evolution-mail-message.xml.h:94
-msgid "Set up the page settings for your current printer"
-msgstr "Sett opp sideinnstillinger for din skriver"
+#: ../ui/evolution-mail-message.xml.h:85
+msgid "Select _All Text"
+msgstr "Marker _all tekst"
 
-#: ../ui/evolution-mail-message.xml.h:95
-msgid "Show Email _Source"
-msgstr "Vis e-post-kilde"
+#: ../ui/evolution-mail-message.xml.h:86
+msgid "Select all the text in a message"
+msgstr "Marker all tekst i meldingen"
 
-#: ../ui/evolution-mail-message.xml.h:96
-msgid "Show Full _Headers"
-msgstr "Vis fulle _headere"
+#: ../ui/evolution-mail-message.xml.h:87
+msgid "Set up the page settings for your current printer"
+msgstr "Sett opp sideinnstillinger for din skriver"
 
-#: ../ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:88
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Vis en blinkende markør i kroppen av meldinger som vises"
 
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:89
 msgid "Show message in the normal style"
 msgstr "Vis melding i normal stil"
 
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:90
 msgid "Show message with all email headers"
 msgstr "Vis melding med fulle e-post headere"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:91
 msgid "Show the raw email source of the message"
 msgstr "Vis e-post meldingen i sin råe form"
 
-#: ../ui/evolution-mail-message.xml.h:101
-msgid "Text Si_ze"
-msgstr "Tekstst_ørrelse"
+#: ../ui/evolution-mail-message.xml.h:92
+msgid "Un-delete the selected messages"
+msgstr "Angre sletting av valgte meldinger"
+
+#: ../ui/evolution-mail-message.xml.h:93
+msgid "Uni_mportant"
+msgstr "_Ikke viktig"
+
+#: ../ui/evolution-mail-message.xml.h:94
+msgid "VFolder on Recipients..."
+msgstr "Virtuell mappe for mottakere..."
+
+#: ../ui/evolution-mail-message.xml.h:95
+msgid "VFolder on S_ubject..."
+msgstr "Virtuell mappe for _emne..."
+
+#: ../ui/evolution-mail-message.xml.h:96
+msgid "VFolder on Sen_der..."
+msgstr "Virtuell mappe for avsen_der..."
+
+#: ../ui/evolution-mail-message.xml.h:97
+msgid "VFolder on _Mailing _List..."
+msgstr "Virtuell mappe på e-post_liste..."
+
+#: ../ui/evolution-mail-message.xml.h:98
+msgid "Zoom _Out"
+msgstr "Zoom _ut"
+
+#: ../ui/evolution-mail-message.xml.h:99
+msgid "_Caret Mode"
+msgstr "Markør_modus"
 
 #: ../ui/evolution-mail-message.xml.h:102
-msgid "Un-delete the selected messages"
-msgstr "Angre slett av den valgte meldingen"
+msgid "_Delete Message"
+msgstr "_Slett melding"
 
 #: ../ui/evolution-mail-message.xml.h:104
-msgid "_Attached"
-msgstr "Vedl_agt"
+msgid "_Find in Message..."
+msgstr "_Finn i melding..."
 
-#: ../ui/evolution-mail-message.xml.h:107
-msgid "_Create Filter From Message"
-msgstr "La_g filter fra melding"
-
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:106
 msgid "_Go To"
 msgstr "_Gå til"
 
-#: ../ui/evolution-mail-message.xml.h:112
-msgid "_Inline"
-msgstr "_Inline"
+#: ../ui/evolution-mail-message.xml.h:107
+msgid "_Important"
+msgstr "V_iktig"
 
-#: ../ui/evolution-mail-message.xml.h:113
-msgid "_Larger"
-msgstr "_Større"
+#: ../ui/evolution-mail-message.xml.h:108
+msgid "_Junk"
+msgstr "_Søppel"
 
-#: ../ui/evolution-mail-message.xml.h:114
-msgid "_Message Display"
-msgstr "_Meldingsvisning"
+#: ../ui/evolution-mail-message.xml.h:109
+msgid "_Load Images"
+msgstr "_Last bilder"
 
-#: ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Next Message"
 msgstr "_Neste melding"
 
-#: ../ui/evolution-mail-message.xml.h:117
-msgid "_Normal Display"
-msgstr "_Normal visning"
+#: ../ui/evolution-mail-message.xml.h:113
+msgid "_Normal Size"
+msgstr "_Normal størrelse"
 
-#: ../ui/evolution-mail-message.xml.h:118
-msgid "_Open Message"
-msgstr "_Åpne melding"
+#: ../ui/evolution-mail-message.xml.h:114
+msgid "_Not Junk"
+msgstr "_Ikke søppel"
 
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:115
+msgid "_Open in New Window"
+msgstr "_Åpne i _nytt vindu"
+
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Previous Message"
 msgstr "_Forrige melding"
 
-#: ../ui/evolution-mail-message.xml.h:122
-msgid "_Quoted"
-msgstr "_Sitert"
-
-#: ../ui/evolution-mail-message.xml.h:125 ../ui/evolution.xml.h:48
-msgid "_Tools"
-msgstr "Ve_rktøy"
-
-#: ../ui/evolution-mail-message.xml.h:126
-msgid "_Undelete"
-msgstr "A_ngre slett"
+#: ../ui/evolution-mail-message.xml.h:118
+msgid "_Read"
+msgstr "_Les"
 
-#: ../ui/evolution-mail-message.xml.h:127
-msgid "vFolder on Mailing _List..."
-msgstr "Virtuell mappe på e-post_liste..."
+#: ../ui/evolution-mail-message.xml.h:120
+msgid "_Save Message..."
+msgstr "_Lagre melding..."
 
-#: ../ui/evolution-mail-message.xml.h:128
-msgid "vFolder on Se_nder..."
-msgstr "Virtuell mappe på avse_nder..."
+#: ../ui/evolution-mail-message.xml.h:121
+msgid "_Undelete Message"
+msgstr "_Angre sletting av melding"
 
-#: ../ui/evolution-mail-message.xml.h:129
-msgid "vFolder on _Recipients..."
-msgstr "Virtuell mappe på mottake_re..."
+#: ../ui/evolution-mail-message.xml.h:122
+msgid "_Unread"
+msgstr "_Ulest"
 
-#: ../ui/evolution-mail-message.xml.h:130
-msgid "vFolder on _Subject..."
-msgstr "Virtuell mappe på e_mne..."
+#: ../ui/evolution-mail-message.xml.h:123
+msgid "_Zoom In"
+msgstr "_Zoom inn"
 
 #: ../ui/evolution-mail-messagedisplay.xml.h:1
-#: ../ui/evolution-message-composer.xml.h:3
-#: ../ui/evolution-signature-editor.xml.h:2 ../ui/evolution.xml.h:4
+#: ../ui/evolution-message-composer.xml.h:4
+#: ../ui/evolution-signature-editor.xml.h:2
 msgid "Close"
 msgstr "Lukk"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:5
+#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "Lukk dette vinduet"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:19
+#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:17
 msgid "Main toolbar"
 msgstr "Hovedverktøylinje"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:5
-#: ../ui/evolution-message-composer.xml.h:41 ../ui/evolution-subscribe.xml.h:9
-#: ../ui/evolution.xml.h:37
+#: ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../ui/evolution-message-composer.xml.h:40 ../ui/evolution-subscribe.xml.h:9
 msgid "_Close"
 msgstr "L_ukk"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:7
-#: ../ui/evolution-message-composer.xml.h:44
+#: ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution-message-composer.xml.h:43
 #: ../ui/evolution-signature-editor.xml.h:13
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:39
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:33
 msgid "_File"
 msgstr "_Fil"
 
@@ -16971,181 +17139,172 @@ msgstr "Legg ved"
 msgid "Attach a file"
 msgstr "Legg ved en fil"
 
-#: ../ui/evolution-message-composer.xml.h:4
+#: ../ui/evolution-message-composer.xml.h:3
+msgid "Check to get delivery notification when your message is read"
+msgstr "Kryss av for å be om melding når meldingen blir lest"
+
+#: ../ui/evolution-message-composer.xml.h:5
 #: ../ui/evolution-signature-editor.xml.h:3
 msgid "Close the current file"
 msgstr "Lukk aktiv fil"
 
-#: ../ui/evolution-message-composer.xml.h:5
+#: ../ui/evolution-message-composer.xml.h:6
 msgid "Delete all but signature"
 msgstr "Slett alt unntatt signatur"
 
-#: ../ui/evolution-message-composer.xml.h:6
+#: ../ui/evolution-message-composer.xml.h:7
 msgid "Encrypt this message with PGP"
 msgstr "Krypter denne meldingen med PGP"
 
-#: ../ui/evolution-message-composer.xml.h:7
-msgid "Encrypt this message with your S/MIME Encryption Cetificate"
-msgstr "Krypter denne meldingen med ditt S/MIME krypteringssertifikat"
-
 #: ../ui/evolution-message-composer.xml.h:8
+msgid "Encrypt this message with your S/MIME Encryption Certificate"
+msgstr "Krypter denne meldingen med ditt S/MIME-krypteringssertifikat"
+
+#: ../ui/evolution-message-composer.xml.h:9
 #: ../ui/evolution-signature-editor.xml.h:4
 msgid "For_mat"
 msgstr "For_mat"
 
-#: ../ui/evolution-message-composer.xml.h:9
+#: ../ui/evolution-message-composer.xml.h:10
 msgid "HT_ML"
 msgstr "HT_ML"
 
-#: ../ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-message-composer.xml.h:12
 msgid "Open a file"
 msgstr "Åpne en fil"
 
-#: ../ui/evolution-message-composer.xml.h:12
+#: ../ui/evolution-message-composer.xml.h:13
 msgid "PGP Encrypt"
 msgstr "Krypter med PGP"
 
-#: ../ui/evolution-message-composer.xml.h:13
+#: ../ui/evolution-message-composer.xml.h:14
 msgid "PGP Sign"
 msgstr "Signer med PGP"
 
-#: ../ui/evolution-message-composer.xml.h:14
+#: ../ui/evolution-message-composer.xml.h:15
+msgid "Request read receipt"
+msgstr "Spør om lesekvittering"
+
+#: ../ui/evolution-message-composer.xml.h:16
 msgid "S/MIME Encrypt"
 msgstr "Krypter med S/MIME"
 
-#: ../ui/evolution-message-composer.xml.h:15
+#: ../ui/evolution-message-composer.xml.h:17
 msgid "S/MIME Sign"
 msgstr "Signer med S/MIME"
 
-#: ../ui/evolution-message-composer.xml.h:17
+#: ../ui/evolution-message-composer.xml.h:19
 msgid "Save As"
 msgstr "Lagre som"
 
-#: ../ui/evolution-message-composer.xml.h:18
+#: ../ui/evolution-message-composer.xml.h:20
 msgid "Save _As..."
 msgstr "L_agre som..."
 
-#: ../ui/evolution-message-composer.xml.h:19
+#: ../ui/evolution-message-composer.xml.h:21
 msgid "Save _Draft"
 msgstr "L_agre utkast"
 
-#: ../ui/evolution-message-composer.xml.h:20
+#: ../ui/evolution-message-composer.xml.h:22
 msgid "Save in folder..."
 msgstr "Lagre i mappe..."
 
-#: ../ui/evolution-message-composer.xml.h:21
+#: ../ui/evolution-message-composer.xml.h:23
 #: ../ui/evolution-signature-editor.xml.h:9
 msgid "Save the current file"
 msgstr "Lagre aktiv fil"
 
-#: ../ui/evolution-message-composer.xml.h:22
+#: ../ui/evolution-message-composer.xml.h:24
 msgid "Save the current file with a different name"
 msgstr "Lagre aktiv fil med et nytt navn"
 
-#: ../ui/evolution-message-composer.xml.h:23
+#: ../ui/evolution-message-composer.xml.h:25
 msgid "Save the message in a specified folder"
 msgstr "Lagre meldingen i en spesifisert mappe"
 
-#: ../ui/evolution-message-composer.xml.h:25
+#: ../ui/evolution-message-composer.xml.h:27
 #: ../ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
 msgstr "Send meldingen i HTML-format"
 
-#: ../ui/evolution-message-composer.xml.h:26
+#: ../ui/evolution-message-composer.xml.h:28
 msgid "Send this message"
 msgstr "Send denne meldingen"
 
-#: ../ui/evolution-message-composer.xml.h:27
-msgid "Show / hide attachments"
-msgstr "Vis/skjul vedlegg"
-
-#: ../ui/evolution-message-composer.xml.h:28
-msgid "Show _attachments"
-msgstr "Vis _vedlegg"
-
 #: ../ui/evolution-message-composer.xml.h:29
-msgid "Show attachments"
-msgstr "Vis vedlegg"
-
-#: ../ui/evolution-message-composer.xml.h:30
 msgid "Sign this message with your PGP key"
 msgstr "Signer denne meldingen med din PGP-nøkkel"
 
-#: ../ui/evolution-message-composer.xml.h:31
+#: ../ui/evolution-message-composer.xml.h:30
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Signer denne meldingen med ditt S/MIME signatursertifikat"
 
-#: ../ui/evolution-message-composer.xml.h:32
+#: ../ui/evolution-message-composer.xml.h:31
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Slå av/på visning av BCC-feltet"
 
-#: ../ui/evolution-message-composer.xml.h:33
+#: ../ui/evolution-message-composer.xml.h:32
 msgid "Toggles whether the CC field is displayed"
 msgstr "Slå av/på visning av CC-feltet"
 
-#: ../ui/evolution-message-composer.xml.h:34
+#: ../ui/evolution-message-composer.xml.h:33
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Slå av/på visning av Fra-feltet"
 
-#: ../ui/evolution-message-composer.xml.h:35
+#: ../ui/evolution-message-composer.xml.h:34
 msgid "Toggles whether the Post-To field is displayed"
 msgstr "Slå av/på visning av Post-til feltet"
 
-#: ../ui/evolution-message-composer.xml.h:36
+#: ../ui/evolution-message-composer.xml.h:35
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Slå av/på visning av Svar-til feltet"
 
-#: ../ui/evolution-message-composer.xml.h:37
+#: ../ui/evolution-message-composer.xml.h:36
 msgid "Toggles whether the To field is displayed"
 msgstr "Slå av/på visning av Til-feltet"
 
-#: ../ui/evolution-message-composer.xml.h:38
+#: ../ui/evolution-message-composer.xml.h:37
 msgid "_Attachment..."
 msgstr "_Vedlegg..."
 
-#: ../ui/evolution-message-composer.xml.h:39
+#: ../ui/evolution-message-composer.xml.h:38
 msgid "_Bcc Field"
 msgstr "_Bcc-felt"
 
-#: ../ui/evolution-message-composer.xml.h:40
+#: ../ui/evolution-message-composer.xml.h:39
 msgid "_Cc Field"
 msgstr "_Cc-felt"
 
-#: ../ui/evolution-message-composer.xml.h:42
+#: ../ui/evolution-message-composer.xml.h:41
 msgid "_Delete all"
 msgstr "_Slett alle"
 
-#: ../ui/evolution-message-composer.xml.h:45
+#: ../ui/evolution-message-composer.xml.h:44
 msgid "_From Field"
 msgstr "_Fra-felt"
 
-#: ../ui/evolution-message-composer.xml.h:46
+#: ../ui/evolution-message-composer.xml.h:45
 #: ../ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr "Sett _inn"
 
-#: ../ui/evolution-message-composer.xml.h:47
+#: ../ui/evolution-message-composer.xml.h:46
 msgid "_Open..."
 msgstr "_Åpne..."
 
-#: ../ui/evolution-message-composer.xml.h:48
+#: ../ui/evolution-message-composer.xml.h:47
 msgid "_Post-To Field"
 msgstr "_Post-til-felt"
 
-#: ../ui/evolution-message-composer.xml.h:49
+#: ../ui/evolution-message-composer.xml.h:48
 msgid "_Reply-To Field"
 msgstr "Svar-til felt"
 
 #: ../ui/evolution-message-composer.xml.h:50
-#: ../ui/evolution-signature-editor.xml.h:15
-msgid "_Save"
-msgstr "_Lagre"
-
-#: ../ui/evolution-message-composer.xml.h:51
 msgid "_Security"
 msgstr "_Sikkerhet"
 
-#: ../ui/evolution-message-composer.xml.h:52
+#: ../ui/evolution-message-composer.xml.h:51
 msgid "_To Field"
 msgstr "_Til-felt"
 
@@ -17173,10 +17332,6 @@ msgstr "Lagre aktiv fil og lukk vinduet"
 msgid "Add folder to your list of subscribed folders"
 msgstr "Legg til mappe på listen over abonnerte mapper"
 
-#: ../ui/evolution-subscribe.xml.h:2
-msgid "F_older"
-msgstr "M_appe"
-
 #: ../ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "Les listen på nytt"
@@ -17197,6 +17352,10 @@ msgstr "Abonner"
 msgid "Unsubscribe"
 msgstr "Fjern abonnement"
 
+#: ../ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
+msgstr "_Reverser utvalg"
+
 #: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "Kopier valgt oppgave"
@@ -17253,153 +17412,157 @@ msgstr "Endre innstillinger for Evolution"
 msgid "Change the visibility of the toolbar"
 msgstr "Endre synlighet for verktøylinjen"
 
-#: ../ui/evolution.xml.h:6
+#: ../ui/evolution.xml.h:5
 msgid "Create a new window displaying this folder"
 msgstr "Opprett et nytt vindu som viser denne mappen"
 
-#: ../ui/evolution.xml.h:7
+#: ../ui/evolution.xml.h:6
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr ""
 
-#: ../ui/evolution.xml.h:8
+#: ../ui/evolution.xml.h:7
 msgid "Display window buttons with icons and text"
 msgstr ""
 
-#: ../ui/evolution.xml.h:9
+#: ../ui/evolution.xml.h:8
 msgid "Display window buttons with icons only"
 msgstr ""
 
-#: ../ui/evolution.xml.h:10
+#: ../ui/evolution.xml.h:9
 msgid "Display window buttons with text only"
 msgstr ""
 
-#: ../ui/evolution.xml.h:11
-msgid "E_xit"
-msgstr "A_vslutt"
-
-#: ../ui/evolution.xml.h:12
+#: ../ui/evolution.xml.h:10
 msgid "Evolution _FAQ"
 msgstr "Evolution _FAQ"
 
-#: ../ui/evolution.xml.h:13
+#: ../ui/evolution.xml.h:11
 msgid "Exit the program"
 msgstr "Avslutt programmet"
 
-#: ../ui/evolution.xml.h:14
+#: ../ui/evolution.xml.h:12
 msgid "Forget _Passwords"
 msgstr "Glem passor_d"
 
-#: ../ui/evolution.xml.h:15
+#: ../ui/evolution.xml.h:13
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Glem alle passord slik at du vil bli spurt om å oppgi dem igjen"
 
-#: ../ui/evolution.xml.h:16
+#: ../ui/evolution.xml.h:14
 msgid "Hide window buttons"
 msgstr "Skjul vindusknapper"
 
-#: ../ui/evolution.xml.h:17
+#: ../ui/evolution.xml.h:15
 msgid "Icons _and text"
 msgstr "Ikoner _og tekst"
 
-#: ../ui/evolution.xml.h:18
+#: ../ui/evolution.xml.h:16
 msgid "Import data from other programs"
 msgstr "Importer data fra andre programmer"
 
-#: ../ui/evolution.xml.h:20
+#: ../ui/evolution.xml.h:18
 msgid "New _Window"
 msgstr "Nytt _vindu"
 
-#: ../ui/evolution.xml.h:21
-msgid "Pi_lot Settings..."
-msgstr "Innstillinger for pi_lot..."
-
-#: ../ui/evolution.xml.h:22
+#: ../ui/evolution.xml.h:19
 msgid "Prefere_nces"
 msgstr "_Brukervalg"
 
-#: ../ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:20
 msgid "Send / Receive"
 msgstr "Send / motta"
 
-#: ../ui/evolution.xml.h:24
+#: ../ui/evolution.xml.h:21
 msgid "Send queued items and retrieve new items"
 msgstr "Send kølagte oppføringer og hent nye oppføringer"
 
-#: ../ui/evolution.xml.h:25
+#: ../ui/evolution.xml.h:22
 msgid "Set up Pilot configuration"
 msgstr "Konfigurer Pilot"
 
-#: ../ui/evolution.xml.h:26
+#: ../ui/evolution.xml.h:23
 msgid "Show information about Evolution"
 msgstr "Vis informasjon om Evolution"
 
-#: ../ui/evolution.xml.h:27
+#: ../ui/evolution.xml.h:24
 msgid "Submit Bug Report"
 msgstr "Send inn feilrapport"
 
-#: ../ui/evolution.xml.h:28
+#: ../ui/evolution.xml.h:25
 msgid "Submit _Bug Report"
 msgstr "Sen_d inn feilrapport"
 
-#: ../ui/evolution.xml.h:29
+#: ../ui/evolution.xml.h:26
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Send inn en feilrapport med Bug Buddy"
 
-#: ../ui/evolution.xml.h:30
+#: ../ui/evolution.xml.h:27
 msgid "Toggle whether we are working offline."
 msgstr "Skift til frakoblet arbeidsmodus."
 
-#: ../ui/evolution.xml.h:31
+#: ../ui/evolution.xml.h:28
 msgid "Tool_bar"
 msgstr "_Verktøylinje"
 
-#: ../ui/evolution.xml.h:32
+#: ../ui/evolution.xml.h:29
 msgid "Tool_bar style"
 msgstr "S_til for verktøylinje"
 
-#: ../ui/evolution.xml.h:33
-msgid "Window B_uttons"
-msgstr "Vinduskn_apper"
-
-#: ../ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:30
 msgid "_About Evolution..."
 msgstr "_Om Evolution..."
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:31
+msgid "_Close Window"
+msgstr "_Lukk vindu"
+
+#: ../ui/evolution.xml.h:34
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ../ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:35
 msgid "_Hide buttons"
 msgstr "_Skjul knapper"
 
-#: ../ui/evolution.xml.h:42
+#: ../ui/evolution.xml.h:36
 msgid "_Icons only"
 msgstr "Kun _ikoner"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:37
 msgid "_Import..."
 msgstr "_Importer..."
 
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:38
 msgid "_New"
 msgstr "_Ny"
 
-#: ../ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:39
 msgid "_Quick Reference"
 msgstr "_Hurtigreferanse"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:40
+msgid "_Quit"
+msgstr "A_vslutt"
+
+#: ../ui/evolution.xml.h:41
 msgid "_Send / Receive"
 msgstr "_Send / motta"
 
-#: ../ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:42
+msgid "_Switcher Appearance"
+msgstr ""
+
+#: ../ui/evolution.xml.h:43
+msgid "_Synchronization Options..."
+msgstr "Alternativer for _synkronisering..."
+
+#: ../ui/evolution.xml.h:44
 msgid "_Text only"
 msgstr "Kun _tekst"
 
-#: ../ui/evolution.xml.h:50
-msgid "_Window"
-msgstr "_Vindu"
+#: ../ui/evolution.xml.h:45
+msgid "_Tools"
+msgstr "Ve_rktøy"
 
 #: ../views/addressbook/galview.xml.h:1
 msgid "By _Company"
@@ -17496,11 +17659,11 @@ msgstr ""
 "tidssone.\n"
 "Bru høyre musknapp til å zoome ut."
 
-#: ../widgets/menus/gal-view-menus.c:292
+#: ../widgets/menus/gal-view-menus.c:291
 msgid "_Current View"
 msgstr "_Aktiv visning"
 
-#: ../widgets/menus/gal-view-menus.c:360
+#: ../widgets/menus/gal-view-menus.c:359
 msgid "Save Custom View..."
 msgstr "Lagre egendefinert visning..."
 
@@ -17511,7 +17674,7 @@ msgid "MTWTFSS"
 msgstr "MTOTFLS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1123
+#: ../widgets/misc/e-calendar-item.c:1099
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -17523,7 +17686,7 @@ msgstr "Forrige knapp"
 msgid "Month Calendar"
 msgstr "Månedskalender"
 
-#: ../widgets/misc/e-cell-date-edit.c:232 ../widgets/misc/e-dateedit.c:444
+#: ../widgets/misc/e-cell-date-edit.c:232 ../widgets/misc/e-dateedit.c:451
 msgid "Now"
 msgstr "Nå"
 
@@ -17624,59 +17787,34 @@ msgstr "Andre..."
 msgid "..."
 msgstr "..."
 
-#: ../widgets/misc/e-dateedit.c:313
+#: ../widgets/misc/e-dateedit.c:316
 msgid "Date and Time Entry"
 msgstr "Felt for dato & klokkeslett"
 
-#: ../widgets/misc/e-dateedit.c:332
+#: ../widgets/misc/e-dateedit.c:335
 msgid "Text entry to input date"
 msgstr ""
 
-#: ../widgets/misc/e-dateedit.c:333
+#: ../widgets/misc/e-dateedit.c:336
 msgid "Text Date Entry"
 msgstr ""
 
-#: ../widgets/misc/e-dateedit.c:350
+#: ../widgets/misc/e-dateedit.c:353
 msgid "Click this button to show a calendar"
 msgstr "Klikk på denne knappen for å vise en kalender"
 
-#: ../widgets/misc/e-dateedit.c:351
+#: ../widgets/misc/e-dateedit.c:354
 msgid "Date Button"
 msgstr "Datoknapp"
 
-#: ../widgets/misc/e-dateedit.c:371
+#: ../widgets/misc/e-dateedit.c:374
 msgid "Combo box to select time"
 msgstr ""
 
-#: ../widgets/misc/e-dateedit.c:372
+#: ../widgets/misc/e-dateedit.c:375
 msgid "Time Combo Box"
 msgstr ""
 
-#: ../widgets/misc/e-error.c:84 ../widgets/misc/e-error.c:85
-#: ../widgets/misc/e-error.c:127
-msgid "Evolution Error"
-msgstr "Evolution feil"
-
-#: ../widgets/misc/e-error.c:86 ../widgets/misc/e-error.c:87
-#: ../widgets/misc/e-error.c:125
-msgid "Evolution Warning"
-msgstr "Evolution advarsel"
-
-#: ../widgets/misc/e-error.c:124
-msgid "Evolution Information"
-msgstr "Evolution informasjon"
-
-#: ../widgets/misc/e-error.c:126
-msgid "Evolution Query"
-msgstr "Evolution spørring"
-
-#. setup a dummy error
-#: ../widgets/misc/e-error.c:438
-#, c-format
-msgid ""
-"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
-msgstr "<span weight=\"bold\">Intern feil, ukjent feil «%s» etterspurt</span>"
-
 #: ../widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr "Utvidet"
@@ -17753,8 +17891,8 @@ msgid "_Edit Saved Searches..."
 msgstr "R_ediger lagrede søk..."
 
 #: ../widgets/misc/e-filter-bar.h:94 ../widgets/misc/e-filter-bar.h:101
-msgid "_Advanced..."
-msgstr "_Avansert..."
+msgid "_Advanced Search..."
+msgstr "_Avansert søk..."
 
 #: ../widgets/misc/e-image-chooser.c:172
 msgid "Choose Image"
@@ -17784,43 +17922,43 @@ msgstr "Synkroniser kategorier:"
 
 #. To translators: This is the accessibility name of
 #. the search bar's text entry widget
-#: ../widgets/misc/e-search-bar.c:343
+#: ../widgets/misc/e-search-bar.c:345
 msgid "Search Text Entry"
 msgstr "Felt for søketekst"
 
-#: ../widgets/misc/e-search-bar.c:547
+#: ../widgets/misc/e-search-bar.c:549
 msgid "_Search"
 msgstr "_Søk"
 
-#: ../widgets/misc/e-search-bar.c:553
+#: ../widgets/misc/e-search-bar.c:555
 msgid "_Find Now"
 msgstr "_Finn nå "
 
-#: ../widgets/misc/e-search-bar.c:554 ../widgets/misc/e-search-bar.c:941
+#: ../widgets/misc/e-search-bar.c:556 ../widgets/misc/e-search-bar.c:943
 msgid "_Clear"
 msgstr "_Tøm"
 
-#: ../widgets/misc/e-search-bar.c:645
+#: ../widgets/misc/e-search-bar.c:647
 msgid "Search Type"
 msgstr "Type søk"
 
-#: ../widgets/misc/e-search-bar.c:849
+#: ../widgets/misc/e-search-bar.c:851
 msgid "Item ID"
 msgstr "ID for oppføring"
 
-#: ../widgets/misc/e-search-bar.c:856
+#: ../widgets/misc/e-search-bar.c:858
 msgid "Subitem ID"
 msgstr "ID for underoppføring"
 
-#: ../widgets/misc/e-search-bar.c:863
+#: ../widgets/misc/e-search-bar.c:865
 msgid "Text"
 msgstr "Tekst"
 
-#: ../widgets/misc/e-search-bar.c:943
+#: ../widgets/misc/e-search-bar.c:945
 msgid "Find _Now"
 msgstr "Finn _nå "
 
-#: ../widgets/misc/e-send-options.c:505
+#: ../widgets/misc/e-send-options.c:515
 msgid "When de_leted:"
 msgstr "Når s_lettet:"
 
@@ -17870,14 +18008,6 @@ msgstr ""
 
 #: ../widgets/misc/e-send-options.glade.h:12
 msgid ""
-"None\n"
-"Mail Receipt\n"
-msgstr ""
-"Ingen\n"
-"E-postkvittering\n"
-
-#: ../widgets/misc/e-send-options.glade.h:15
-msgid ""
 "Public\n"
 "Private\n"
 "Confidential\n"
@@ -17886,15 +18016,15 @@ msgstr ""
 "Privat\n"
 "Konfidensiell\n"
 
-#: ../widgets/misc/e-send-options.glade.h:19
+#: ../widgets/misc/e-send-options.glade.h:16
 msgid "R_eply requested"
 msgstr "Svar for_espurt"
 
-#: ../widgets/misc/e-send-options.glade.h:21
-msgid "Sta_tus  Tracking"
+#: ../widgets/misc/e-send-options.glade.h:18
+msgid "Sta_tus Tracking"
 msgstr "Sta_tusoppfølging"
 
-#: ../widgets/misc/e-send-options.glade.h:22
+#: ../widgets/misc/e-send-options.glade.h:19
 msgid ""
 "Undefined\n"
 "High\n"
@@ -17906,73 +18036,53 @@ msgstr ""
 "Standard\n"
 "Lav"
 
-#: ../widgets/misc/e-send-options.glade.h:26
+#: ../widgets/misc/e-send-options.glade.h:23
 msgid "W_ithin"
 msgstr "_Innen"
 
-#: ../widgets/misc/e-send-options.glade.h:27
-msgid "When acce_pted: "
-msgstr "Når go_dtatt: "
+#: ../widgets/misc/e-send-options.glade.h:24
+msgid "When acce_pted:"
+msgstr "Ved go_dkjenning:"
 
-#: ../widgets/misc/e-send-options.glade.h:28
+#: ../widgets/misc/e-send-options.glade.h:25
 msgid "When co_mpleted:"
-msgstr "Når full_ført:"
+msgstr "Ved full_føring:"
 
-#: ../widgets/misc/e-send-options.glade.h:29
-msgid "When decli_ned:    "
-msgstr "Når _avslått:"
+#: ../widgets/misc/e-send-options.glade.h:26
+msgid "When decli_ned:"
+msgstr "Ved _avslag:"
 
-#: ../widgets/misc/e-send-options.glade.h:30
+#: ../widgets/misc/e-send-options.glade.h:27
 msgid "_After:"
 msgstr "_Etter:"
 
-#: ../widgets/misc/e-send-options.glade.h:31
+#: ../widgets/misc/e-send-options.glade.h:28
 msgid "_All information"
 msgstr "_All informasjon"
 
-#: ../widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.glade.h:29
 msgid "_Delay message delivery"
 msgstr "_Utsett meldingslevering"
 
-#: ../widgets/misc/e-send-options.glade.h:33
+#: ../widgets/misc/e-send-options.glade.h:30
 msgid "_Delivered"
 msgstr "_Levert"
 
-#: ../widgets/misc/e-send-options.glade.h:35
-msgid "_Set expiration  date"
+#: ../widgets/misc/e-send-options.glade.h:32
+msgid "_Set expiration date"
 msgstr "_Sett utløpsdato"
 
-#: ../widgets/misc/e-send-options.glade.h:36
+#: ../widgets/misc/e-send-options.glade.h:33
 msgid "_Until:"
 msgstr "_Inntil:"
 
-#: ../widgets/misc/e-send-options.glade.h:37
+#: ../widgets/misc/e-send-options.glade.h:34
 msgid "_When convenient"
 msgstr "_Når det passer"
 
-#: ../widgets/misc/e-send-options.glade.h:38
-msgid "_When opened:     "
-msgstr "_Når den åpnes:"
-
-#. system:ask-save-file-exists-overwrite primary
-#: ../widgets/misc/e-system-errors.xml.h:4
-msgid "File exists \"{0}\"."
-msgstr "Filen eksisterer «{0}»."
-
-#. system:ask-save-file-exists-overwrite secondary
-#: ../widgets/misc/e-system-errors.xml.h:6
-msgid "Do you wish to overwrite it?"
-msgstr "Vil du overskrive den?"
-
-#. system:no-save-file primary
-#: ../widgets/misc/e-system-errors.xml.h:9
-msgid "Cannot save file \"{0}\"."
-msgstr "Kan ikke lagre fil «{0}»."
-
-#. system:no-load-file primary
-#: ../widgets/misc/e-system-errors.xml.h:13
-msgid "Cannot open file \"{0}\"."
-msgstr "Kan ikke åpne filen «{0}»."
+#: ../widgets/misc/e-send-options.glade.h:35
+msgid "_When opened:"
+msgstr "_Ved åpning:"
 
 #: ../widgets/misc/e-task-widget.c:208
 #, c-format
@@ -17987,3 +18097,256 @@ msgstr "%s (%d%% fullført)"
 #: ../widgets/misc/e-url-entry.c:107
 msgid "click here to go to url"
 msgstr "klikk her for å gå til lokasjonen"
+
+#~ msgid "end-time"
+#~ msgstr "slutt-tid"
+
+#~ msgid "location"
+#~ msgstr "lokasjon"
+
+#~ msgid "start-time"
+#~ msgstr "start-tid"
+
+#~ msgid "Show _Attachment Bar (drop attachments here)"
+#~ msgstr "Vis _vedleggsfeltet (slipp vedlegg her)"
+
+#~ msgid "Attachment Button: Press space key to toggle attachment bar"
+#~ msgstr "Vedleggsknapp: Trykk mellomrom for å slå av/på vedleggsfeletet"
+
+#~ msgid "Ad_vanced  send options"
+#~ msgstr "A_vanserte alternativer for sending"
+
+#~ msgid "N"
+#~ msgstr "N"
+
+#~ msgid "S"
+#~ msgstr "S"
+
+#~ msgid "W"
+#~ msgstr "V"
+
+#~ msgid "_Remember this password"
+#~ msgstr "Husk dette passo_rdet"
+
+#~ msgid "_Remember this password for the remainder of this session"
+#~ msgstr "Husk dette passo_rdet for resten av denne sesjonen"
+
+#~ msgid "<b>If</b>"
+#~ msgstr "<b>Hvis</b> "
+
+#~ msgid "Create New Folder"
+#~ msgstr "Opprett ny mappe"
+
+#~ msgid "Copying `%s' to `%s'"
+#~ msgstr "Kopierer «%s» til «%s»"
+
+#~ msgid "Rename the \"%s\" folder to:"
+#~ msgstr "Endre navn på mappe «%s» til:"
+
+#~ msgid "Rename Folder"
+#~ msgstr "Endre navn på mappe"
+
+#~ msgid "Folder names cannot contain '/'"
+#~ msgstr "Mappenavn kan ikke inneholde tegnet «/»"
+
+#~ msgid "_Print"
+#~ msgstr "S_kriv ut"
+
+#~ msgid "spamd port"
+#~ msgstr "port for spamd"
+
+#~ msgid "_Load images if sender is in address book"
+#~ msgstr "_Last bilder hvis avsender er i adresseboken"
+
+#~ msgid ""
+#~ "\n"
+#~ " Please read carefully the license agreement displayed\n"
+#~ " below and tick the check box for accepting it\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Vennligst les lisensavtalen som vises under nøye\n"
+#~ "og kryss av i ruten for å akseptere den\n"
+
+#~ msgid "{1}."
+#~ msgstr "{1}."
+
+#~ msgid "Mark  as default folder"
+#~ msgstr "Sett som forvalgt mappe"
+
+#~ msgid "Manage Plugins..."
+#~ msgstr "Håndter tillegg..."
+
+#~ msgid "%s%d/%s%d/%s%d %s%d:%s%d:%s%d"
+#~ msgstr "%s%d/%s%d/%s%d %s%d:%s%d:%s%d"
+
+#~ msgid "Invalid user"
+#~ msgstr "Ugyldig bruker"
+
+#~ msgid ""
+#~ "\n"
+#~ "You cannot share folder with specified user \"{0}\" \n"
+#~ msgstr ""
+#~ "\n"
+#~ "Du kan ikke dele en mappe med oppgitt bruker «{0}» \n"
+
+#~ msgid "Specify User"
+#~ msgstr "Oppgi bruker"
+
+#~ msgid ""
+#~ "\n"
+#~ "\tYou have to specify a user name whom you want to add to the list \n"
+#~ msgstr ""
+#~ "\n"
+#~ "\tDu må oppgi et brukernavn for brukeren du ønsker å legge til på "
+#~ "listen \n"
+
+#~ msgid "Closing connections..."
+#~ msgstr "Lukker forbindelser..."
+
+#~ msgid "Starting import"
+#~ msgstr "Starter import"
+
+#~ msgid ""
+#~ "If you quit the Evolution Setup Assistant now, all of the information "
+#~ "that you have entered will be forgotten. You will need to run this "
+#~ "assistant again before using Evolution.\n"
+#~ "\n"
+#~ "Do you want to quit using the Assistant now?"
+#~ msgstr ""
+#~ "Hvis du avslutter veiviser for oppsett av Evolution nå vil all "
+#~ "informasjon du har oppgitt hittil bli glemt. Du vil måtte kjøre denne "
+#~ "veiviseren igjen før du kan bruke Evolution.\n"
+#~ "\n"
+#~ "Vil du avslutte veiviseren nå?"
+
+#~ msgid "Importing Files"
+#~ msgstr "Importerer filer"
+
+#~ msgid "Timezone "
+#~ msgstr "Tidssone "
+
+#~ msgid ""
+#~ "You have successfully entered all of the information needed to set up "
+#~ "Evolution. \n"
+#~ "\n"
+#~ "Click the \"Apply\" button to save your settings. "
+#~ msgstr ""
+#~ "Du har fullført inntasting av all informasjon som trengs for å "
+#~ "konfigurere Evolution.\n"
+#~ "\n"
+#~ "Klikk på «Bruk» for å lagre dine innstillinger. "
+
+#~ msgid "Disable the mono plugin environment."
+#~ msgstr "Deaktiver mono-tilleggsmiljø."
+
+#~ msgid "Cannot start Evolution"
+#~ msgstr "Kan ikke starte Evolution."
+
+#~ msgid "Post Ne_w Message"
+#~ msgstr "Legg ut n_y melding"
+
+#~ msgid "_Filters..."
+#~ msgstr "_Filtre..."
+
+#~ msgid "vFolder _Editor..."
+#~ msgstr "R_edigering av virtuelle mapper..."
+
+#~ msgid "Hide _Read Messages"
+#~ msgstr "Skjul leste meldinge_r"
+
+#~ msgid "Mark All as _Read"
+#~ msgstr "Me_rk alle som lest"
+
+#~ msgid "Sh_ow Hidden Messages"
+#~ msgstr "_Vis skjulte meldinger"
+
+#~ msgid "_Folder"
+#~ msgstr "M_appe"
+
+#~ msgid "_Threaded Message List"
+#~ msgstr "Meldingsliste med _tråder"
+
+#~ msgid "Create _vFolder From Message"
+#~ msgstr "Lag _virtuell mappe fra melding"
+
+#~ msgid "F_orward As..."
+#~ msgstr "V_ideresend som..."
+
+#~ msgid "Filter _Junk"
+#~ msgstr "Filtrer s_øppel"
+
+#~ msgid "Mark as I_mportant"
+#~ msgstr "Merk som _viktig"
+
+#~ msgid "Mark as Unimp_ortant"
+#~ msgstr "Merk som uv_iktig"
+
+#~ msgid "Original Si_ze"
+#~ msgstr "Opprinnelig st_ørrelse"
+
+#~ msgid "S_earch in Message..."
+#~ msgstr "Søk i m_elding..."
+
+#~ msgid "S_maller"
+#~ msgstr "_Mindre"
+
+#~ msgid "Show Email _Source"
+#~ msgstr "Vis e-post-kilde"
+
+#~ msgid "Show Full _Headers"
+#~ msgstr "Vis fulle _headere"
+
+#~ msgid "Text Si_ze"
+#~ msgstr "Tekstst_ørrelse"
+
+#~ msgid "_Attached"
+#~ msgstr "Vedl_agt"
+
+#~ msgid "_Create Filter From Message"
+#~ msgstr "La_g filter fra melding"
+
+#~ msgid "_Inline"
+#~ msgstr "_Inline"
+
+#~ msgid "_Larger"
+#~ msgstr "_Større"
+
+#~ msgid "_Message Display"
+#~ msgstr "_Meldingsvisning"
+
+#~ msgid "_Open Message"
+#~ msgstr "_Åpne melding"
+
+#~ msgid "_Undelete"
+#~ msgstr "A_ngre slett"
+
+#~ msgid "Show / hide attachments"
+#~ msgstr "Vis/skjul vedlegg"
+
+#~ msgid "Show _attachments"
+#~ msgstr "Vis _vedlegg"
+
+#~ msgid "Show attachments"
+#~ msgstr "Vis vedlegg"
+
+#~ msgid "E_xit"
+#~ msgstr "A_vslutt"
+
+#~ msgid "Pi_lot Settings..."
+#~ msgstr "Innstillinger for pi_lot..."
+
+#~ msgid "Window B_uttons"
+#~ msgstr "Vinduskn_apper"
+
+#~ msgid "_Window"
+#~ msgstr "_Vindu"
+
+#~ msgid "_Advanced..."
+#~ msgstr "_Avansert..."
+
+#~ msgid ""
+#~ "None\n"
+#~ "Mail Receipt\n"
+#~ msgstr ""
+#~ "Ingen\n"
+#~ "E-postkvittering\n"
diff --git a/po/no.po b/po/no.po
index 27b4abd3db..2ac6a3675c 100644
--- a/po/no.po
+++ b/po/no.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-23 15:21+0100\n"
-"PO-Revision-Date: 2005-02-23 15:26+0100\n"
+"POT-Creation-Date: 2005-06-01 15:23+0200\n"
+"PO-Revision-Date: 2005-06-01 16:07+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <i18n-nb@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:166
+#: ../a11y/addressbook/ea-minicard-view.c:169
 msgid "evolution addressbook"
 msgstr "evolution adressebok"
 
@@ -31,7 +31,7 @@ msgstr "Ny kontakt"
 msgid "New Contact List"
 msgstr "Ny kontaktliste"
 
-#: ../a11y/addressbook/ea-minicard-view.c:149
+#: ../a11y/addressbook/ea-minicard-view.c:152
 #, c-format
 msgid "current addressbook folder has %d card"
 msgid_plural "current addressbook folder has %d cards"
@@ -39,20 +39,20 @@ msgstr[0] "aktiv adressebokmappe har %d kontakt"
 msgstr[1] "aktiv adressebokmappe har %d kontakter"
 
 #: ../a11y/addressbook/ea-minicard.c:31
-#: ../calendar/gui/alarm-notify/alarm-queue.c:863
-#: ../ui/evolution-message-composer.xml.h:10
+#: ../calendar/gui/alarm-notify/alarm-queue.c:953
+#: ../ui/evolution-message-composer.xml.h:11
 msgid "Open"
 msgstr "Åpne"
 
-#: ../a11y/addressbook/ea-minicard.c:138
+#: ../a11y/addressbook/ea-minicard.c:141
 msgid "Contact List: "
 msgstr "Kontaktliste: "
 
-#: ../a11y/addressbook/ea-minicard.c:139
+#: ../a11y/addressbook/ea-minicard.c:142
 msgid "Contact: "
 msgstr "Kontakt: "
 
-#: ../a11y/addressbook/ea-minicard.c:165
+#: ../a11y/addressbook/ea-minicard.c:168
 msgid "evolution minicard"
 msgstr "evolution minikort"
 
@@ -93,7 +93,7 @@ msgstr "Ny avtale"
 msgid "New All Day Event"
 msgstr "Ny avtale som varer hele dagen"
 
-#: ../a11y/calendar/ea-cal-view.c:308 ../calendar/gui/e-calendar-view.c:1372
+#: ../a11y/calendar/ea-cal-view.c:308 ../calendar/gui/e-calendar-view.c:1396
 msgid "New Meeting"
 msgstr "Nytt møte"
 
@@ -152,7 +152,7 @@ msgstr "%A %d %b %Y"
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:190
 #: ../calendar/gui/calendar-component.c:663
-#: ../calendar/gui/e-day-view-top-item.c:719 ../calendar/gui/e-day-view.c:1511
+#: ../calendar/gui/e-day-view-top-item.c:719 ../calendar/gui/e-day-view.c:1516
 #: ../calendar/gui/e-week-view-main-item.c:321
 msgid "%a %d %b"
 msgstr "%a %d %b"
@@ -184,7 +184,7 @@ msgstr "%d %b %Y"
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:220
 #: ../calendar/gui/calendar-component.c:689
-#: ../calendar/gui/e-day-view-top-item.c:723 ../calendar/gui/e-day-view.c:1527
+#: ../calendar/gui/e-day-view-top-item.c:723 ../calendar/gui/e-day-view.c:1532
 #: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%d %b"
 msgstr "%d %b"
@@ -229,17 +229,17 @@ msgstr "kalendervisning for en måned"
 msgid "calendar view for one or more weeks"
 msgstr "kalendervisning for en eller flere uker"
 
-#: ../a11y/widgets/ea-calendar-item.c:290
 #: ../a11y/widgets/ea-calendar-item.c:296
+#: ../a11y/widgets/ea-calendar-item.c:302
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
-#: ../a11y/widgets/ea-calendar-item.c:298
+#: ../a11y/widgets/ea-calendar-item.c:304
 #, c-format
 msgid "Calendar: from %s to %s"
 msgstr "Kalender (fra %s til %s)"
 
-#: ../a11y/widgets/ea-calendar-item.c:333
+#: ../a11y/widgets/ea-calendar-item.c:339
 msgid "evolution calendar item"
 msgstr "Evolution kalenderoppføring"
 
@@ -255,212 +255,163 @@ msgstr "Bruk forvalg"
 msgid "Popup Menu"
 msgstr "Sprettoppmeny"
 
-#. addressbook:ldap-init primary
-#: ../addressbook/addressbook-errors.xml.h:2
-msgid "This addressbook could not be opened."
-msgstr "Denne adresseboken kunne ikke åpnes."
-
-#. addressbook:ldap-init secondary
-#: ../addressbook/addressbook-errors.xml.h:4
+#: ../addressbook/addressbook.error.xml.h:1
 msgid ""
-"This addressbook server might be unreachable or the server name may be "
-"misspelled or your network connection could be down."
+"A contact already exists with this address. Would you like to add a new card "
+"with the same address anyway?"
 msgstr ""
+"En kontakt med denne adressen eksisterer allerede. Vil du legge til en ny "
+"kontakt med samme adresse likevel?"
 
-#. addressbook:ldap-auth primary
-#: ../addressbook/addressbook-errors.xml.h:6
-msgid "Failed to authenticate with LDAP server."
-msgstr "Kunne ikke autentisere mot LDAP-tjener."
+#: ../addressbook/addressbook.error.xml.h:2
+msgid "Address '{0}' already exists."
+msgstr "Adressen «{0}» eksisterer allerede."
+
+#: ../addressbook/addressbook.error.xml.h:3
+msgid "Cannot move contact."
+msgstr "Kan ikke flytte kontakt."
 
-#. addressbook:ldap-auth secondary
-#: ../addressbook/addressbook-errors.xml.h:8
+#: ../addressbook/addressbook.error.xml.h:4
+msgid "Category editor not available."
+msgstr "Kategori editor ikke tilgjengelig."
+
+#: ../addressbook/addressbook.error.xml.h:5
 msgid ""
 "Check to make sure your password is spelled correctly and that you are using "
 "a supported login method. Remember that many passwords are case sensitive; "
 "your caps lock might be on."
 msgstr ""
 
-#. addressbook:ldap-search-base primary
-#: ../addressbook/addressbook-errors.xml.h:10
-msgid "This addressbook server does not have any suggested search bases."
-msgstr "Denne adresseboktjeneren har ingen foreslått søkebase."
-
-#. addressbook:ldap-search-base secondary
-#: ../addressbook/addressbook-errors.xml.h:12
-msgid ""
-"This LDAP server may use an older version of LDAP, which does not support "
-"this functionality or it may be misconfigured. Ask your administrator for "
-"supported search bases."
-msgstr ""
-
-#. addressbook:ldap-v3-schema primary
-#: ../addressbook/addressbook-errors.xml.h:14
-msgid "This server does not support LDAPv3 schema information."
-msgstr "Denne tjeneren støtter ikke LDAPv3 schema-informasjon."
-
-#. addressbook:ldap-get-schema primary
-#: ../addressbook/addressbook-errors.xml.h:16
+#: ../addressbook/addressbook.error.xml.h:6
 msgid "Could not get schema information for LDAP server."
 msgstr "Kunne ikke hente schema-informasjon fra LDAP-tjener."
 
-#. addressbook:ldap-invalid-schema primary
-#: ../addressbook/addressbook-errors.xml.h:18
-msgid "LDAP server did not respond with valid schema information."
-msgstr "LDAP-tjener svarte ikke med gyldig schema-informasjon."
-
-#. addressbook:remove-addressbook primary
-#: ../addressbook/addressbook-errors.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:7
 msgid "Could not remove addressbook."
 msgstr "Kunne ikke fjerne adressebok."
 
-#. addressbook:ask-delete-addressbook primary
-#: ../addressbook/addressbook-errors.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:8
 msgid "Delete address book '{0}'?"
 msgstr "Slett adressebok «{0}»?"
 
-#. addressbook:ask-delete-addressbook secondary
-#: ../addressbook/addressbook-errors.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:9
+msgid "Error loading addressbook."
+msgstr "Feil under lasting av adressebok."
+
+#: ../addressbook/addressbook.error.xml.h:10
+msgid "Error saving {0} to {1}: {2}"
+msgstr "Feil under lagring av {0} til {1}: {2}"
+
+#: ../addressbook/addressbook.error.xml.h:11
+msgid "Failed to authenticate with LDAP server."
+msgstr "Kunne ikke autentisere mot LDAP-tjener."
+
+#: ../addressbook/addressbook.error.xml.h:12
+msgid "LDAP server did not respond with valid schema information."
+msgstr "LDAP-tjener svarte ikke med gyldig schema-informasjon."
+
+#: ../addressbook/addressbook.error.xml.h:13
+msgid "Server Version"
+msgstr "Versjon av tjener"
+
+#: ../addressbook/addressbook.error.xml.h:14
+#: ../calendar/calendar.error.xml.h:44
+msgid "Some features may not work properly with your current server"
+msgstr "Noen funksjoner vil kanskje ikke fungere med denne tjeneren "
+
+#: ../addressbook/addressbook.error.xml.h:15
+msgid "The Evolution addressbook has quit unexpectedly."
+msgstr "Evolution adressebok avsluttet uventet."
+
+#: ../addressbook/addressbook.error.xml.h:16
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "This address book will be removed permanently."
 msgstr "Denne adresseboken vil bli slettet for godt."
 
-#. addressbook:edit-categories primary
-#: ../addressbook/addressbook-errors.xml.h:26
-msgid "Category editor not available."
-msgstr "Kategori editor ikke tilgjengelig."
+#: ../addressbook/addressbook.error.xml.h:18
+msgid "This addressbook could not be opened."
+msgstr "Denne adresseboken kunne ikke åpnes."
 
-#. addressbook:generic-error primary
-#. addressbook:load-error secondary
-#. addressbook:search-error secondary
-#. mail:session-message-info secondary
-#. mail:session-message-info-cancel secondary
-#. mail:session-message-warning secondary
-#. mail:session-message-warning-cancel secondary
-#. mail:session-message-error secondary
-#. mail:session-message-error-cancel secondary
-#. mail:ask-session-password secondary
-#. mail:filter-load-error secondary
-#: ../addressbook/addressbook-errors.xml.h:28
-#: ../addressbook/addressbook-errors.xml.h:36
-#: ../addressbook/addressbook-errors.xml.h:40 ../mail/mail-errors.xml.h:75
-#: ../mail/mail-errors.xml.h:77 ../mail/mail-errors.xml.h:79
-#: ../mail/mail-errors.xml.h:81 ../mail/mail-errors.xml.h:83
-#: ../mail/mail-errors.xml.h:85 ../mail/mail-errors.xml.h:89
-#: ../mail/mail-errors.xml.h:93
-msgid "{0}"
-msgstr "{0}"
+#: ../addressbook/addressbook.error.xml.h:19
+msgid "This addressbook server does not have any suggested search bases."
+msgstr "Denne adresseboktjeneren har ingen foreslått søkebase."
 
-#. addressbook:generic-error secondary
-#. mail-composer:no-attach secondary
-#. mail:no-save-path secondary
-#: ../addressbook/addressbook-errors.xml.h:30
-#: ../composer/mail-composer-errors.xml.h:4 ../mail/mail-errors.xml.h:97
-msgid "{1}"
-msgstr "{1}"
+#: ../addressbook/addressbook.error.xml.h:20
+msgid ""
+"This addressbook server might be unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
 
-#. addressbook:load-error title
-#: ../addressbook/addressbook-errors.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:21
+msgid "This server does not support LDAPv3 schema information."
+msgstr "Denne tjeneren støtter ikke LDAPv3 schema-informasjon."
+
+#: ../addressbook/addressbook.error.xml.h:22
 msgid "Unable to open addressbook"
 msgstr "Kan ikke åpne adressebok"
 
-#. addressbook:load-error primary
-#: ../addressbook/addressbook-errors.xml.h:34
-msgid "Error loading addressbook."
-msgstr "Feil under lasting av adressebok."
-
-#. addressbook:search-error primary
-#: ../addressbook/addressbook-errors.xml.h:38
+#: ../addressbook/addressbook.error.xml.h:23
 msgid "Unable to perform search."
 msgstr "Kan ikke utføre søk."
 
-#. addressbook:prompt-save primary
-#: ../addressbook/addressbook-errors.xml.h:42
+#: ../addressbook/addressbook.error.xml.h:24
+msgid "Unable to save {0}."
+msgstr "Kan ikke lagre {0}."
+
+#: ../addressbook/addressbook.error.xml.h:25
 msgid "Would you like to save your changes?"
 msgstr "Vil du lagre dine endringer?"
 
-#. addressbook:prompt-save secondary
-#: ../addressbook/addressbook-errors.xml.h:44
-msgid ""
-"You have made modifications to this contact. Do you want to save these "
-"changes?"
-msgstr ""
-"Du har gjort endringer for denne kontakten. Vil du lagre disse endringene?"
-
-#: ../addressbook/addressbook-errors.xml.h:45
-msgid "_Discard"
-msgstr "_Forkast"
-
-#. addressbook:prompt-move primary
-#: ../addressbook/addressbook-errors.xml.h:47
-msgid "Cannot move contact."
-msgstr "Kan ikke flytte kontakt."
-
-#. addressbook:prompt-move secondary
-#: ../addressbook/addressbook-errors.xml.h:49
+#: ../addressbook/addressbook.error.xml.h:26
 msgid ""
 "You are attempting to move a contact from one addressbook to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
 msgstr ""
 
-#. addressbook:save-error primary
-#: ../addressbook/addressbook-errors.xml.h:51
-msgid "Unable to save contact(s)."
-msgstr "Kan ikke lagre kontakt(er)."
-
-#. addressbook:save-error secondary
-#: ../addressbook/addressbook-errors.xml.h:53
-msgid "Error saving contacts to {0}: {1}"
-msgstr "Feil under lagring av kontakter til {0}: {1}"
+#: ../addressbook/addressbook.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:59
+msgid ""
+"You are connecting to an unsupported GroupWise server and may encounter "
+"problems using Evolution. For best results the server should be upgraded to "
+"a supported version"
+msgstr ""
 
-#. addressbook:backend-died primary
-#: ../addressbook/addressbook-errors.xml.h:55
-msgid "The Evolution addressbook has quit unexpectedly."
-msgstr "Evolution adressebok avsluttet uventet."
+#: ../addressbook/addressbook.error.xml.h:28
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr ""
+"Du har gjort endringer for denne kontakten. Vil du lagre disse endringene?"
 
-#. addressbook:backend-died secondary
-#: ../addressbook/addressbook-errors.xml.h:57
+#: ../addressbook/addressbook.error.xml.h:29
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
 "Dine kontakter for {0} vil ikke være tilgjengelige før Evolution startes på "
 "nytt."
 
-#. addressbook:ask-list-add-exists primary
-#: ../addressbook/addressbook-errors.xml.h:59
-msgid "Address '{0}' already exists."
-msgstr "Adressen «{0}» eksisterer allerede."
-
-#. addressbook:ask-list-add-exists secondary
-#: ../addressbook/addressbook-errors.xml.h:61
-msgid ""
-"A contact already exists with this address.  Would you like to add a new "
-"card with the same address anyway?"
-msgstr ""
-"En kontakt med denne adressen eksisterer allerede. Vil du legge til en ny "
-"kontakt med samme adresse likevel?"
-
-#: ../addressbook/addressbook-errors.xml.h:62 ../mail/em-vfolder-rule.c:494
-#: ../plugins/shared-folder/properties.glade.h:10
+#: ../addressbook/addressbook.error.xml.h:30 ../mail/em-vfolder-rule.c:494
+#: ../plugins/groupwise-features/properties.glade.h:10
 msgid "_Add"
 msgstr "_Legg til"
 
-#. addressbook:server-version title
-#. calendar:server-version title
-#: ../addressbook/addressbook-errors.xml.h:64
-#: ../calendar/calendar-errors.xml.h:142
-msgid "Server Version"
-msgstr "Versjon av tjener"
+#: ../addressbook/addressbook.error.xml.h:31
+msgid "_Discard"
+msgstr "_Forkast"
 
-#. addressbook:server-version primary
-#. calendar:server-version primary
-#: ../addressbook/addressbook-errors.xml.h:66
-#: ../calendar/calendar-errors.xml.h:144
-msgid "Your server needs to be updated"
-msgstr "Tjeneren din må oppdateres"
+#: ../addressbook/addressbook.error.xml.h:32
+msgid "{0}"
+msgstr "{0}"
 
-#. addressbook:server-version secondary
-#: ../addressbook/addressbook-errors.xml.h:68
-msgid "Some features may not work correctly with your current server version"
-msgstr ""
+#: ../addressbook/addressbook.error.xml.h:33
+msgid "{1}"
+msgstr "{1}"
 
 #: ../addressbook/conduit/address-conduit.c:298
 msgid "Default Sync Address:"
@@ -495,7 +446,7 @@ msgstr "Konfigurer automatisk fullføring her"
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
 #: ../addressbook/gui/component/addressbook-view.c:1119
-#: ../calendar/gui/calendar-component.c:235 ../calendar/gui/migration.c:385
+#: ../calendar/gui/calendar-component.c:246 ../calendar/gui/migration.c:388
 msgid "Contacts"
 msgstr "Kontakter"
 
@@ -535,10 +486,10 @@ msgstr "Håndter dine S/MIME-sertifikater her"
 #. On This Computer is always first and vFolders is always last
 #: ../addressbook/gui/component/addressbook-component.c:133
 #: ../addressbook/gui/component/addressbook-migrate.c:493
-#: ../calendar/gui/calendar-component.c:208 ../calendar/gui/migration.c:459
-#: ../calendar/gui/migration.c:552 ../calendar/gui/tasks-component.c:188
+#: ../calendar/gui/calendar-component.c:208 ../calendar/gui/migration.c:462
+#: ../calendar/gui/migration.c:555 ../calendar/gui/tasks-component.c:188
 #: ../mail/em-folder-tree-model.c:197 ../mail/em-folder-tree-model.c:199
-#: ../mail/mail-component.c:290 ../mail/mail-vfolder.c:222
+#: ../mail/mail-component.c:291 ../mail/mail-vfolder.c:223
 msgid "On This Computer"
 msgstr "På denne datamaskinen"
 
@@ -550,10 +501,10 @@ msgstr "På denne datamaskinen"
 #: ../addressbook/gui/component/addressbook-component.c:141
 #: ../addressbook/gui/component/addressbook-migrate.c:501
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: ../calendar/gui/calendar-component.c:216 ../calendar/gui/migration.c:467
-#: ../calendar/gui/migration.c:560 ../calendar/gui/tasks-component.c:196
-#: ../filter/filter-label.c:123 ../mail/em-migrate.c:1013
-#: ../mail/mail-config.c:77 ../mail/mail-config.glade.h:101
+#: ../calendar/gui/calendar-component.c:216 ../calendar/gui/migration.c:470
+#: ../calendar/gui/migration.c:563 ../calendar/gui/tasks-component.c:196
+#: ../filter/filter-label.c:123 ../mail/em-migrate.c:1043
+#: ../mail/mail-config.c:78 ../mail/mail-config.glade.h:104
 msgid "Personal"
 msgstr "Personlig"
 
@@ -580,7 +531,7 @@ msgid "Create a new contact list"
 msgstr "Opprett en ny kontaktliste"
 
 #: ../addressbook/gui/component/addressbook-component.c:212
-#: ../addressbook/gui/component/addressbook-config.c:1121
+#: ../addressbook/gui/component/addressbook-config.c:1120
 #: ../addressbook/gui/component/addressbook-view.c:757
 msgid "New Address Book"
 msgstr "Ny adressebok"
@@ -602,7 +553,7 @@ msgid "Base"
 msgstr "Basis"
 
 #: ../addressbook/gui/component/addressbook-config.c:510
-#: ../calendar/gui/dialogs/calendar-setup.c:191
+#: ../calendar/gui/dialogs/calendar-setup.c:192
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "_Type:"
 msgstr "_Type:"
@@ -614,10 +565,10 @@ msgstr "Kopier innholdet i adresseboken lokalt for frakoblet operasjon"
 #: ../addressbook/gui/component/addressbook-config.c:904
 #: ../addressbook/gui/component/ldap-config.glade.h:23
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: ../calendar/gui/dialogs/calendar-setup.c:361
-#: ../calendar/gui/dialogs/calendar-setup.c:372
-#: ../mail/em-folder-properties.c:215 ../mail/mail-config.glade.h:84
-#: ../smime/gui/smime-ui.glade.h:27
+#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/dialogs/calendar-setup.c:379
+#: ../mail/em-folder-properties.c:215 ../mail/mail-config.glade.h:85
+#: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Generelt"
 
@@ -636,7 +587,7 @@ msgstr "Autentisering"
 
 #: ../addressbook/gui/component/addressbook-config.c:914
 #: ../addressbook/gui/component/ldap-config.glade.h:18
-#: ../mail/mail-dialogs.glade.h:12 ../smime/gui/smime-ui.glade.h:19
+#: ../mail/mail-dialogs.glade.h:8 ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Detaljer"
 
@@ -648,18 +599,18 @@ msgstr "Søker"
 msgid "Downloading"
 msgstr "Laster ned"
 
-#: ../addressbook/gui/component/addressbook-config.c:1119
+#: ../addressbook/gui/component/addressbook-config.c:1118
 #: ../addressbook/gui/component/ldap-config.glade.h:14
 msgid "Address Book Properties"
 msgstr "Egenskaper for adressebok"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:72
-#: ../calendar/gui/migration.c:142 ../mail/em-migrate.c:1160
+#: ../calendar/gui/migration.c:142 ../mail/em-migrate.c:1190
 msgid "Migrating..."
 msgstr "Migrerer..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:124
-#: ../calendar/gui/migration.c:189 ../mail/em-migrate.c:1201
+#: ../calendar/gui/migration.c:189 ../mail/em-migrate.c:1231
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Migrerer «%s»:"
@@ -715,17 +666,17 @@ msgstr ""
 "Vennligst vent mens Evolution migrerer dine mapper..."
 
 #: ../addressbook/gui/component/addressbook-view.c:758
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
-#: ../calendar/gui/calendar-component.c:526
-#: ../calendar/gui/tasks-component.c:430 ../mail/em-filter-i18n.h:11
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../calendar/gui/calendar-component.c:537
+#: ../calendar/gui/tasks-component.c:441 ../mail/em-filter-i18n.h:11
 #: ../ui/evolution-addressbook.xml.h:8 ../ui/evolution-calendar.xml.h:5
-#: ../ui/evolution-mail-message.xml.h:24 ../ui/evolution-tasks.xml.h:6
+#: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Slett"
 
 #: ../addressbook/gui/component/addressbook-view.c:760
-#: ../calendar/gui/calendar-component.c:527
-#: ../calendar/gui/tasks-component.c:431
+#: ../calendar/gui/calendar-component.c:538
+#: ../calendar/gui/tasks-component.c:442
 msgid "Properties..."
 msgstr "Egenskaper ..."
 
@@ -733,17 +684,17 @@ msgstr "Egenskaper ..."
 msgid "Contact Source Selector"
 msgstr "Valg av kontaktkilde"
 
-#: ../addressbook/gui/component/addressbook.c:98
+#: ../addressbook/gui/component/addressbook.c:99
 msgid "Accessing LDAP Server anonymously"
 msgstr "Aksesserer LDAP-tjener anonymt"
 
 #: ../addressbook/gui/component/addressbook.c:193
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:478
+#: ../plugins/groupwise-features/camel-gw-listener.c:478
 msgid "Failed to authenticate.\n"
 msgstr "Kunne ikke autentisere.\n"
 
 #: ../addressbook/gui/component/addressbook.c:200
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:461
+#: ../plugins/groupwise-features/camel-gw-listener.c:461
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Oppgi passord for %s (bruker %s)"
@@ -786,7 +737,7 @@ msgid "URI for the folder last used in the select names dialog."
 msgstr "URI for sist brukt mappe i dialogen for å velge navn."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
 msgid "Vertical pane position"
 msgstr ""
 
@@ -809,8 +760,8 @@ msgstr "Om forhåndsvisningsområdet skal vises."
 #: ../calendar/gui/dialogs/new-task-list.glade.h:1
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: ../composer/e-msg-composer-attachment.glade.h:1
-#: ../mail/mail-dialogs.glade.h:6 ../mail/message-tags.glade.h:1
-#: ../plugins/shared-folder/properties.glade.h:1
+#: ../mail/mail-dialogs.glade.h:2 ../mail/message-tags.glade.h:1
+#: ../plugins/groupwise-features/properties.glade.h:1
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
@@ -865,7 +816,7 @@ msgid "Add Address Book"
 msgstr "Legg til adressebok"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:15
-#: ../mail/em-account-editor.c:301
+#: ../mail/em-account-editor.c:302 ../mail/em-account-editor.c:757
 msgid "Always"
 msgstr "Alltid"
 
@@ -900,7 +851,7 @@ msgid "Lo_gin:"
 msgstr "Lo_gin"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:299
+#: ../mail/em-account-editor.c:300 ../mail/em-account-editor.c:756
 msgid "Never"
 msgstr "Aldri"
 
@@ -1022,7 +973,7 @@ msgid "Using email address"
 msgstr "Bruker e-post adresse"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:42
-#: ../mail/em-account-editor.c:300
+#: ../mail/em-account-editor.c:301
 msgid "Whenever Possible"
 msgstr "Når mulig"
 
@@ -1039,13 +990,13 @@ msgid "_Find Possible Search Bases"
 msgstr "_Finn mulige søkebaser"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:46
-msgid "_Log in method:"
+msgid "_Login method:"
 msgstr "Metode for på_logging:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:47
-#: ../calendar/gui/dialogs/calendar-setup.c:243
+#: ../calendar/gui/dialogs/calendar-setup.c:244
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:8
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:165
 msgid "_Name:"
 msgstr "_Navn:"
 
@@ -1074,10 +1025,10 @@ msgid "cards"
 msgstr "kort"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:54
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:12
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:14
-#: ../filter/filter.glade.h:16 ../mail/em-account-editor.c:1884
+#: ../filter/filter.glade.h:16 ../mail/em-account-editor.c:1940
 #: ../plugins/calendar-http/calendar-http.c:263
 #: ../plugins/calendar-weather/calendar-weather.c:564
 msgid "minutes"
@@ -1121,7 +1072,7 @@ msgstr "<b>Arbeid</b> "
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:182
-#: ../addressbook/gui/widgets/eab-contact-display.c:346
+#: ../addressbook/gui/widgets/eab-contact-display.c:348
 msgid "AIM"
 msgstr "AIM"
 
@@ -1176,8 +1127,8 @@ msgstr "Telefon"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:235
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:199
-#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1012
-#: ../mail/mail-config.c:76 ../mail/mail-config.glade.h:148
+#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1042
+#: ../mail/mail-config.c:77 ../mail/mail-config.glade.h:153
 msgid "Work"
 msgstr "Arbeid"
 
@@ -1292,8 +1243,8 @@ msgid "_Zip/Postal Code:"
 msgstr "_Zip/postnummer:"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: ../addressbook/gui/widgets/eab-contact-display.c:365
-#: ../addressbook/gui/widgets/eab-contact-display.c:380
+#: ../addressbook/gui/widgets/eab-contact-display.c:367
+#: ../addressbook/gui/widgets/eab-contact-display.c:382
 msgid "Address"
 msgstr "Adresse"
 
@@ -1305,7 +1256,7 @@ msgstr "Adresse"
 #: ../addressbook/gui/widgets/e-addressbook-model.c:310
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
 #: ../addressbook/gui/widgets/e-minicard-view.c:519
 #: ../addressbook/gui/widgets/e-minicard.c:174
 msgid "Editable"
@@ -2291,7 +2242,7 @@ msgstr "AOL øyeblikksmeldinger"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:183
-#: ../addressbook/gui/widgets/eab-contact-display.c:349
+#: ../addressbook/gui/widgets/eab-contact-display.c:351
 msgid "Jabber"
 msgstr "Jabber"
 
@@ -2301,7 +2252,7 @@ msgstr "Yahoo Messenger"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:348
+#: ../addressbook/gui/widgets/eab-contact-display.c:350
 msgid "ICQ"
 msgstr "ICQ"
 
@@ -2312,6 +2263,7 @@ msgstr "Tjeneste"
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:127
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:587
 #: ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../plugins/save-calendar/csv-format.c:400
 msgid "Location"
 msgstr "Lokasjon"
 
@@ -2330,17 +2282,17 @@ msgid "Other"
 msgstr "Andre"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:184
-#: ../addressbook/gui/widgets/eab-contact-display.c:351
+#: ../addressbook/gui/widgets/eab-contact-display.c:353
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:185
-#: ../addressbook/gui/widgets/eab-contact-display.c:350
+#: ../addressbook/gui/widgets/eab-contact-display.c:352
 msgid "MSN"
 msgstr "MSN"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:187
-#: ../addressbook/gui/widgets/eab-contact-display.c:347
+#: ../addressbook/gui/widgets/eab-contact-display.c:349
 msgid "GroupWise"
 msgstr "GroupWise"
 
@@ -2404,21 +2356,39 @@ msgstr "_Fullt navn:"
 msgid "E-_mail:"
 msgstr "E-_post:"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:324
+#: ../addressbook/gui/contact-editor/eab-editor.c:323
+#, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete these contacts?"
+"to delete contact list (%s) ?"
 msgstr ""
 "Er du sikker på at du vil\n"
-"slette disse kontaktene?"
+"slette kontaktliste (%s)?"
+
+#: ../addressbook/gui/contact-editor/eab-editor.c:326
+msgid ""
+"Are you sure you want\n"
+"to delete these contact lists?"
+msgstr ""
+"Er du sikker på at du vil\n"
+"slette disse kontaktlistene?"
+
+#: ../addressbook/gui/contact-editor/eab-editor.c:331
+#, c-format
+msgid ""
+"Are you sure you want\n"
+"to delete contact (%s) ?"
+msgstr ""
+"Er du sikker på at du vil\n"
+"slette kontakt (%s)?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:327
+#: ../addressbook/gui/contact-editor/eab-editor.c:334
 msgid ""
 "Are you sure you want\n"
-"to delete this contact?"
+"to delete these contacts?"
 msgstr ""
 "Er du sikker på at du vil\n"
-"slette denne kontakten?"
+"slette disse kontaktene?"
 
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
@@ -2536,7 +2506,7 @@ msgid "Contact List Editor"
 msgstr "Kontaktlisteredigering"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-msgid "Insert email adresses from Adress Book"
+msgid "Insert email addresses from Address Book"
 msgstr "Sett inn e-postadresser fra adresseboken"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
@@ -2567,7 +2537,7 @@ msgstr "_Skriv en e-post adresse eller dra en kontakt inn i feltet under:"
 #: ../addressbook/gui/widgets/e-addressbook-model.c:296
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
 #: ../addressbook/gui/widgets/e-addressbook-view.c:223
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
 #: ../addressbook/gui/widgets/e-minicard-view.c:505
 msgid "Book"
 msgstr "Bok"
@@ -2641,7 +2611,7 @@ msgstr[1] "%d kontakter"
 #: ../addressbook/gui/widgets/e-addressbook-model.c:303
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
 #: ../addressbook/gui/widgets/e-addressbook-view.c:237
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
 #: ../addressbook/gui/widgets/e-minicard-view.c:512
 msgid "Query"
 msgstr "Spør"
@@ -2689,78 +2659,78 @@ msgstr "Kilde"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:244
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-meeting-list-view.c:319
+#: ../calendar/gui/e-meeting-list-view.c:320
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Type"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:541
+#: ../addressbook/gui/widgets/e-addressbook-view.c:551
 msgid "Address Book"
 msgstr "Adressebok"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:804
-#: ../addressbook/gui/widgets/e-addressbook-view.c:922
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1982
+#: ../addressbook/gui/widgets/e-addressbook-view.c:814
+#: ../addressbook/gui/widgets/e-addressbook-view.c:932
+#: ../addressbook/gui/widgets/e-addressbook-view.c:2008
 #: ../ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard..."
 msgstr "Lagre som VCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:918
+#: ../addressbook/gui/widgets/e-addressbook-view.c:928
 msgid "New Contact..."
 msgstr "Ny kontakt..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:919
+#: ../addressbook/gui/widgets/e-addressbook-view.c:929
 msgid "New Contact List..."
 msgstr "Ny kontaktliste..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:923
+#: ../addressbook/gui/widgets/e-addressbook-view.c:933
 #: ../ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Videresend kontakt"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:924
+#: ../addressbook/gui/widgets/e-addressbook-view.c:934
 msgid "Send Message to Contact"
 msgstr "Send melding til kontakt"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:925
-#: ../calendar/gui/calendar-commands.c:120 ../calendar/gui/print.c:2489
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
+#: ../calendar/gui/calendar-commands.c:120 ../calendar/gui/print.c:2501
 #: ../ui/evolution-addressbook.xml.h:16 ../ui/evolution-calendar.xml.h:19
-#: ../ui/evolution-mail-message.xml.h:80 ../ui/evolution-tasks.xml.h:14
+#: ../ui/evolution-mail-message.xml.h:74 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Skriv ut"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:928
+#: ../addressbook/gui/widgets/e-addressbook-view.c:938
 msgid "Copy to Address Book..."
 msgstr "Kopier til adressebok..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:929
+#: ../addressbook/gui/widgets/e-addressbook-view.c:939
 msgid "Move to Address Book..."
 msgstr "Flytt til adressebok..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:932
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 #: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Klipp ut"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:933
-#: ../calendar/gui/calendar-component.c:525
-#: ../calendar/gui/tasks-component.c:429 ../ui/evolution-addressbook.xml.h:2
-#: ../ui/evolution-mail-message.xml.h:9 ../ui/evolution-tasks.xml.h:2
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../calendar/gui/calendar-component.c:536
+#: ../calendar/gui/tasks-component.c:440 ../ui/evolution-addressbook.xml.h:2
+#: ../ui/evolution-mail-message.xml.h:11 ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopier"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:934
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 #: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Lim inn"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1537
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1547
 #: ../calendar/gui/cal-search-bar.c:346
 msgid "Any Category"
 msgstr "Enhver kategori"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1750
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1760
 msgid "Print cards"
 msgstr "Skriv ut kontakter"
 
@@ -2804,7 +2774,7 @@ msgid "Company Phone"
 msgstr "Firmatelefon"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: ../addressbook/gui/widgets/eab-contact-display.c:560
+#: ../addressbook/gui/widgets/eab-contact-display.c:562
 #: ../smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "E-post"
@@ -2856,7 +2826,7 @@ msgid "Manager"
 msgstr "Leder"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:379
+#: ../addressbook/gui/widgets/eab-contact-display.c:381
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
@@ -2865,7 +2835,7 @@ msgid "Nickname"
 msgstr "Kallenavn"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:390
+#: ../addressbook/gui/widgets/eab-contact-display.c:392
 msgid "Note"
 msgstr "Kommentar"
 
@@ -2874,7 +2844,7 @@ msgid "Office"
 msgstr "Kontor"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: ../addressbook/gui/widgets/eab-contact-display.c:360
+#: ../addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Organization"
 msgstr "Organisasjon"
 
@@ -2900,7 +2870,7 @@ msgstr "Radio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:9
-#: ../calendar/gui/e-meeting-list-view.c:326
+#: ../calendar/gui/e-meeting-list-view.c:327
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Rolle"
@@ -2966,7 +2936,7 @@ msgstr "Tekstmodell"
 msgid "Max field name length"
 msgstr "Maksimal lengde på feltnavn"
 
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:126
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:128
 msgid "Column Width"
 msgstr "Kolonnebredde"
 
@@ -3030,65 +3000,65 @@ msgstr "Valgt"
 msgid "Has Cursor"
 msgstr "Har markør"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:133
-#: ../addressbook/gui/widgets/eab-contact-display.c:196
+#: ../addressbook/gui/widgets/eab-contact-display.c:135
+#: ../addressbook/gui/widgets/eab-contact-display.c:198
 msgid "(map)"
 msgstr "(kart)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:143
-#: ../addressbook/gui/widgets/eab-contact-display.c:209
+#: ../addressbook/gui/widgets/eab-contact-display.c:145
+#: ../addressbook/gui/widgets/eab-contact-display.c:211
 msgid "map"
 msgstr "kart"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:274
-#: ../addressbook/gui/widgets/eab-contact-display.c:541
+#: ../addressbook/gui/widgets/eab-contact-display.c:276
+#: ../addressbook/gui/widgets/eab-contact-display.c:543
 msgid "List Members"
 msgstr "Listemedlemmer"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:337
 #: ../addressbook/gui/widgets/eab-contact-display.c:339
+#: ../addressbook/gui/widgets/eab-contact-display.c:341
 msgid "E-mail"
 msgstr "E-post"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:361
+#: ../addressbook/gui/widgets/eab-contact-display.c:363
 msgid "Position"
 msgstr "Stilling"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:362
+#: ../addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Video Conferencing"
 msgstr "Videokonferanse"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:363
-#: ../addressbook/gui/widgets/eab-contact-display.c:378
+#: ../addressbook/gui/widgets/eab-contact-display.c:365
+#: ../addressbook/gui/widgets/eab-contact-display.c:380
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:364
+#: ../addressbook/gui/widgets/eab-contact-display.c:366
 msgid "Fax"
 msgstr "Faks"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:368
+#: ../addressbook/gui/widgets/eab-contact-display.c:370
 msgid "work"
 msgstr "arbeid"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:375
+#: ../addressbook/gui/widgets/eab-contact-display.c:377
 msgid "WWW"
 msgstr "WWW"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:376
-#: ../addressbook/gui/widgets/eab-contact-display.c:595
+#: ../addressbook/gui/widgets/eab-contact-display.c:378
+#: ../addressbook/gui/widgets/eab-contact-display.c:597
 msgid "Blog"
 msgstr "Weblogg"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:383
+#: ../addressbook/gui/widgets/eab-contact-display.c:385
 msgid "personal"
 msgstr "personlig"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:556
+#: ../addressbook/gui/widgets/eab-contact-display.c:558
 msgid "Job Title"
 msgstr "Jobbtittel"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:587
+#: ../addressbook/gui/widgets/eab-contact-display.c:589
 msgid "Home page"
 msgstr "Hjemmeside"
 
@@ -3146,7 +3116,7 @@ msgstr "Protokollen er ikke støttet"
 #: ../calendar/gui/e-cal-component-preview.c:232
 #: ../calendar/gui/e-cal-model-tasks.c:347
 #: ../calendar/gui/e-cal-model-tasks.c:660
-#: ../calendar/gui/e-calendar-table.c:458 ../calendar/gui/print.c:2352
+#: ../calendar/gui/e-calendar-table.c:458 ../calendar/gui/print.c:2364
 msgid "Cancelled"
 msgstr "Avbrutt"
 
@@ -3256,7 +3226,7 @@ msgid "Error adding list"
 msgstr "Feil under innlegging av liste"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:177
-#: ../addressbook/gui/widgets/eab-gui-util.c:650
+#: ../addressbook/gui/widgets/eab-gui-util.c:675
 msgid "Error adding contact"
 msgstr "Feil under innlegging av kontakt"
 
@@ -3273,7 +3243,7 @@ msgid "Error removing list"
 msgstr "Feil under fjerning av liste"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:200
-#: ../addressbook/gui/widgets/eab-gui-util.c:608
+#: ../addressbook/gui/widgets/eab-gui-util.c:633
 msgid "Error removing contact"
 msgstr "Feil under fjerning av kontakt"
 
@@ -3305,40 +3275,50 @@ msgstr ""
 msgid "Overwrite"
 msgstr "Overskriv"
 
+#. more than one, finding the total number of contacts might
+#. * hit performance while saving large number of contacts
+#.
+#: ../addressbook/gui/widgets/eab-gui-util.c:360
+#: ../addressbook/gui/widgets/eab-gui-util.c:363
+msgid "contact"
+msgid_plural "contacts"
+msgstr[0] "kontakt"
+msgstr[1] "kontakter"
+
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:393
+#: ../addressbook/gui/widgets/eab-gui-util.c:410
 msgid "card.vcf"
 msgstr "kort.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:555
+#: ../addressbook/gui/widgets/eab-gui-util.c:580
 msgid "list"
 msgstr "liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:704
+#: ../addressbook/gui/widgets/eab-gui-util.c:729
 msgid "Move contact to"
 msgstr "Flytt kontakt til"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:706
+#: ../addressbook/gui/widgets/eab-gui-util.c:731
 msgid "Copy contact to"
 msgstr "Kopier kontakt til"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:709
+#: ../addressbook/gui/widgets/eab-gui-util.c:734
 msgid "Move contacts to"
 msgstr "Flytt kontakter til"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:711
+#: ../addressbook/gui/widgets/eab-gui-util.c:736
 msgid "Copy contacts to"
 msgstr "Kopier kontakter til"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:714
+#: ../addressbook/gui/widgets/eab-gui-util.c:739
 msgid "Select target addressbook."
 msgstr "Velg mål-adressebok"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:937
+#: ../addressbook/gui/widgets/eab-gui-util.c:962
 msgid "Multiple VCards"
 msgstr "Flere VCard"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:940
+#: ../addressbook/gui/widgets/eab-gui-util.c:965
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard for %s"
@@ -3594,7 +3574,7 @@ msgid "Top:"
 msgstr "Topp:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:40
-#: ../calendar/gui/dialogs/calendar-setup.c:175
+#: ../calendar/gui/dialogs/calendar-setup.c:176
 msgid "Type:"
 msgstr "Type:"
 
@@ -3709,90 +3689,67 @@ msgstr "Innfil"
 msgid "No filename provided."
 msgstr "Ingen filnavn spesifisert."
 
-#. calendar:prompt-cancel-meeting primary
-#. calendar:prompt-cancel-task primary
-#: ../calendar/calendar-errors.xml.h:2 ../calendar/calendar-errors.xml.h:12
-msgid "Would you like to send all the participants a cancellation notice?"
-msgstr "Vil du sende en avlysningsmelding til alle deltakere?"
-
-#. calendar:prompt-cancel-meeting secondary
-#: ../calendar/calendar-errors.xml.h:4
+#: ../calendar/calendar.error.xml.h:1
 msgid ""
-"If you don't send a cancellation notice, the other participants may not know "
-"the meeting is canceled."
+" There are few attachments getting downloaded. Saving the appointment will "
+"cause the appointment to be saved without those pending attachments "
 msgstr ""
-"Hvis du ikke sender en avlysningsmelding vil ikke deltakerene vite at møtet "
-"er avlyst."
 
-#: ../calendar/calendar-errors.xml.h:5 ../calendar/calendar-errors.xml.h:15
-#: ../calendar/calendar-errors.xml.h:25 ../calendar/calendar-errors.xml.h:87
-#: ../calendar/calendar-errors.xml.h:93 ../calendar/calendar-errors.xml.h:99
-#: ../calendar/calendar-errors.xml.h:105
-msgid "Don't Send"
-msgstr "Ikke send"
-
-#: ../calendar/calendar-errors.xml.h:6 ../calendar/calendar-errors.xml.h:16
-#: ../calendar/calendar-errors.xml.h:26
-msgid "Send Notice"
-msgstr "Send melding"
+#: ../calendar/calendar.error.xml.h:2
+msgid ""
+" There are few attachments getting downloaded. Saving the task will cause "
+"the task to be saved without those pending attachments "
+msgstr ""
 
-#. calendar:prompt-delete-meeting primary
-#: ../calendar/calendar-errors.xml.h:8
-msgid "Are you sure you want to delete this meeting?"
-msgstr "Er du sikker på at du vil slette dette møtet?"
+#: ../calendar/calendar.error.xml.h:3
+msgid ""
+"Adding a meaningful Summary to your appointment will give your recipients an "
+"idea of what your appointment is about."
+msgstr ""
+"Hvis du gir dine avtaler en meningsfylt emnelinje vil mottakerene lettere "
+"forstå hva avtalen gjelder."
 
-#. calendar:prompt-delete-meeting secondary
-#: ../calendar/calendar-errors.xml.h:10
+#: ../calendar/calendar.error.xml.h:4
 msgid ""
-"All information on this meeting will be deleted and can not be restored."
+"Adding a meaningful Summary to your task will give your recipients an idea "
+"of what your task is about."
 msgstr ""
-"All informasjon om dette møtet vil bli slettet og kan ikke gjenopprettes."
+"Hvis du gir dine oppgaver et meningsfylt sammendrag vil mottakerene lettere "
+"forstå hva oppgaven dreier seg om."
 
-#. calendar:prompt-cancel-task secondary
-#: ../calendar/calendar-errors.xml.h:14
+#: ../calendar/calendar.error.xml.h:5
 msgid ""
-"If you don't send a cancellation notice, the other participants may not know "
-"the task has been deleted."
+"All information in these journal entries will be deleted and can not be "
+"restored."
 msgstr ""
-"Hvis du ikke sender en avlysningsmelding vil ikke de andre deltakerene vite "
-"at oppgaven er slettet."
+"All informasjon i disse journaloppføringene vil slettes og kan ikke "
+"gjenopprettes."
 
-#. calendar:prompt-delete-task primary
-#: ../calendar/calendar-errors.xml.h:18 ../calendar/calendar-errors.xml.h:44
-msgid "Are you sure you want to delete this task?"
-msgstr "Er du sikker på at du vil slette denne oppgaven?"
+#: ../calendar/calendar.error.xml.h:6
+msgid ""
+"All information in this journal will be deleted and can not be restored."
+msgstr ""
+"All informasjon i denne journalen vil bli slettet og kan ikke gjenopprettes."
 
-#. calendar:prompt-delete-task secondary
-#. calendar:prompt-delete-named-task secondary
-#. calendar:prompt-delete-task secondary
-#: ../calendar/calendar-errors.xml.h:20 ../calendar/calendar-errors.xml.h:42
-#: ../calendar/calendar-errors.xml.h:46
-msgid "All information on this task will be deleted and can not be restored."
+#: ../calendar/calendar.error.xml.h:7
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
 msgstr ""
-"All informasjon om denne oppgaven vil bli slettet og kan ikke gjenopprettes."
+"All informasjon i disse avtalene vil bli slettet og kan ikke gjenopprettes."
 
-#. calendar:prompt-cancel-journal primary
-#: ../calendar/calendar-errors.xml.h:22
-msgid "Would you like to send a cancellation notice for this journal entry?"
+#: ../calendar/calendar.error.xml.h:8
+msgid "All information on these tasks will be deleted and can not be restored."
 msgstr ""
-"Er du sikker på at du vil sende en avlysing for denne journaloppføringen?"
+"All informasjon om disse oppgavene vil bli slettet og kan ikke gjenopprettes."
 
-#. calendar:prompt-cancel-journal secondary
-#: ../calendar/calendar-errors.xml.h:24
+#: ../calendar/calendar.error.xml.h:9
 msgid ""
-"If you don't send a cancellation notice, the other participants may not know "
-"the journal has been deleted."
+"All information on this appointment will be deleted and can not be restored."
 msgstr ""
-"Hvis du ikke sender en avlysningsmelding vil ikke de andre deltakerene vite "
-"at journalen er slettet."
-
-#. calendar:prompt-delete-journal primary
-#: ../calendar/calendar-errors.xml.h:28 ../calendar/calendar-errors.xml.h:52
-msgid "Are you sure you want to delete this journal entry?"
-msgstr "Er du sikker på at du vil slette denne journaloppføringen?"
+"All informasjon i denne avtalen vil bli slettet og kan ikke gjenopprettes."
 
-#. calendar:prompt-delete-journal secondary
-#: ../calendar/calendar-errors.xml.h:30
+#: ../calendar/calendar.error.xml.h:10
 msgid ""
 "All information on this journal entry will be deleted and can not be "
 "restored."
@@ -3800,143 +3757,153 @@ msgstr ""
 "All informasjon i denne journaloppføringen vil bli slettet og kan ikke "
 "gjenopprettes."
 
-#. calendar:prompt-delete-titled-appointment primary
-#: ../calendar/calendar-errors.xml.h:32
-msgid "Are you sure you want to delete the appointment titled '{0}'?"
-msgstr "Er du sikker på at du vil slette avtalen med navn «{0}»?"
-
-#. calendar:prompt-delete-titled-appointment secondary
-#. calendar:prompt-delete-appointment secondary
-#: ../calendar/calendar-errors.xml.h:34 ../calendar/calendar-errors.xml.h:38
+#: ../calendar/calendar.error.xml.h:11
 msgid ""
-"All information on this appointment will be deleted and can not be restored."
+"All information on this meeting will be deleted and can not be restored."
 msgstr ""
-"All informasjon i denne avtalen vil bli slettet og kan ikke gjenopprettes."
+"All informasjon om dette møtet vil bli slettet og kan ikke gjenopprettes."
 
-#. calendar:prompt-delete-appointment primary
-#: ../calendar/calendar-errors.xml.h:36
-msgid "Are you sure you want to delete this appointment?"
-msgstr "Er du sikker på at du vil slette denne avtalen?"
+#: ../calendar/calendar.error.xml.h:12
+msgid "All information on this task will be deleted and can not be restored."
+msgstr ""
+"All informasjon om denne oppgaven vil bli slettet og kan ikke gjenopprettes."
 
-#. calendar:prompt-delete-named-task primary
-#: ../calendar/calendar-errors.xml.h:40
+#: ../calendar/calendar.error.xml.h:13
 msgid "Are you sure you want to delete the '{0}' task?"
 msgstr "Er du sikker på at du vil slette oppgaven «{0}»?"
 
-#. calendar:prompt-delete-named-journal primary
-#: ../calendar/calendar-errors.xml.h:48
+#: ../calendar/calendar.error.xml.h:14
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr "Er du sikker på at du vil slette avtalen med navn «{0}»?"
+
+#: ../calendar/calendar.error.xml.h:15
 msgid "Are you sure you want to delete the journal entry '{0}'?"
 msgstr "Er du sikker på at du vil slette journaloppføringen «{0}»?"
 
-#. calendar:prompt-delete-named-journal secondary
-#. calendar:prompt-delete-journal secondary
-#: ../calendar/calendar-errors.xml.h:50 ../calendar/calendar-errors.xml.h:54
-msgid ""
-"All information in this journal will be deleted and can not be restored."
-msgstr ""
-"All informasjon i denne journalen vil bli slettet og kan ikke gjenopprettes."
-
-#. calendar:prompt-delete-appointments primary
-#: ../calendar/calendar-errors.xml.h:56
+#: ../calendar/calendar.error.xml.h:16
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "Er du sikker på at du vil slette disse {0} avtalene?"
 
-#. calendar:prompt-delete-appointments secondary
-#: ../calendar/calendar-errors.xml.h:58
-msgid ""
-"All information on these appointments will be deleted and can not be "
-"restored."
-msgstr ""
-"All informasjon i disse avtalene vil bli slettet og kan ikke gjenopprettes."
+#: ../calendar/calendar.error.xml.h:17
+msgid "Are you sure you want to delete these {0} journal entries?"
+msgstr "Er du sikker på at du vil slette disse {0} journaloppføringene?"
 
-#. calendar:prompt-delete-tasks primary
-#: ../calendar/calendar-errors.xml.h:60
+#: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "Er du sikker på at du vil slette disse {0} oppgavene?"
 
-#. calendar:prompt-delete-tasks secondary
-#: ../calendar/calendar-errors.xml.h:62
-msgid "All information on these tasks will be deleted and can not be restored."
-msgstr ""
-"All informasjon om disse oppgavene vil bli slettet og kan ikke gjenopprettes."
+#: ../calendar/calendar.error.xml.h:19
+msgid "Are you sure you want to delete this appointment?"
+msgstr "Er du sikker på at du vil slette denne avtalen?"
 
-#. calendar:prompt-delete-journals primary
-#: ../calendar/calendar-errors.xml.h:64
-msgid "Are you sure you want to delete these {0} journal entries?"
-msgstr "Er du sikker på at du vil slette disse {0} journaloppføringene?"
+#: ../calendar/calendar.error.xml.h:20
+msgid "Are you sure you want to delete this journal entry?"
+msgstr "Er du sikker på at du vil slette denne journaloppføringen?"
 
-#. calendar:prompt-delete-journals secondary
-#: ../calendar/calendar-errors.xml.h:66
-msgid ""
-"All information in these journal entries will be deleted and can not be "
-"restored."
-msgstr ""
-"All informasjon i disse journaloppføringene vil slettes og kan ikke "
-"gjenopprettes."
+#: ../calendar/calendar.error.xml.h:21
+msgid "Are you sure you want to delete this meeting?"
+msgstr "Er du sikker på at du vil slette dette møtet?"
 
-#. calendar:prompt-save-appointment title
-#: ../calendar/calendar-errors.xml.h:68
-msgid "Save Appointment"
-msgstr "Lagre avtale"
+#: ../calendar/calendar.error.xml.h:22
+msgid "Are you sure you want to delete this task?"
+msgstr "Er du sikker på at du vil slette denne oppgaven?"
 
-#. calendar:prompt-save-appointment primary
-#: ../calendar/calendar-errors.xml.h:70
-msgid "Would you like to save your changes to this appointment?"
-msgstr "Vil du lagre dine endringer i denne avtalen?"
+#: ../calendar/calendar.error.xml.h:23
+msgid "Are you sure you want to send the appointment without a summary?"
+msgstr "Er du sikker på at du vil sende en avtelen uten emne?"
 
-#. calendar:prompt-save-appointment secondary
-#: ../calendar/calendar-errors.xml.h:72
-msgid "You have made changes to this appointment, but not yet saved them."
-msgstr "Du har gjort endringer i denne avtalen, men har ikke lagret dem."
+#: ../calendar/calendar.error.xml.h:24
+msgid "Are you sure you want to send the task without a summary?"
+msgstr "Er du sikker på at du vil sende oppgaven uten sammendrag?"
+
+#: ../calendar/calendar.error.xml.h:25
+msgid "Delete calendar '{0}'?"
+msgstr "Slett kalender «{0}»?"
 
-#: ../calendar/calendar-errors.xml.h:73 ../calendar/calendar-errors.xml.h:81
+#: ../calendar/calendar.error.xml.h:26
+msgid "Delete task list '{0}'?"
+msgstr "Slett oppgaveliste «{0}»?"
+
+#: ../calendar/calendar.error.xml.h:27
 msgid "Discard Changes"
 msgstr "Forkast endringer"
 
-#: ../calendar/calendar-errors.xml.h:74 ../calendar/calendar-errors.xml.h:82
-msgid "Save Changes"
-msgstr "Lagre endringer"
-
-#. calendar:prompt-save-task title
-#: ../calendar/calendar-errors.xml.h:76
-msgid "Save Task"
-msgstr "Lagre oppgave"
+#: ../calendar/calendar.error.xml.h:28
+msgid "Don't Send"
+msgstr "Ikke send"
 
-#. calendar:prompt-save-task primary
-#: ../calendar/calendar-errors.xml.h:78
-msgid "Would you like to save your changes to this task?"
-msgstr "Vil du lagre dine endringer i denne oppgaven?"
+#: ../calendar/calendar.error.xml.h:29
+msgid "Download in progress. Do you want to save the appointment?"
+msgstr "Nedlasting pågår. Vil du lagre avtalen?"
 
-#. calendar:prompt-save-task secondary
-#: ../calendar/calendar-errors.xml.h:80
-msgid "You have made changes to this task, but not yet saved them."
-msgstr "Du har gjort endringer i denne oppgaven, men har ikke lagret dem."
+#: ../calendar/calendar.error.xml.h:30
+msgid "Download in progress. Do you want to save the task?"
+msgstr "Nedlasting pågår. Vil du lagre oppgaven?"
 
-#. calendar:prompt-meeting-invite primary
-#: ../calendar/calendar-errors.xml.h:84
-msgid "Would you like to send meeting invitations to participants?"
-msgstr "Vil du sende møteinvitasjoner til deltakerene?"
+#: ../calendar/calendar.error.xml.h:31
+msgid "Editor could not be loaded."
+msgstr "Redigeringskomponenten kunne ikke lastes."
 
-#. calendar:prompt-meeting-invite secondary
-#: ../calendar/calendar-errors.xml.h:86
+#: ../calendar/calendar.error.xml.h:32
 msgid ""
 "Email invitations will be sent to all participants and allow them to RSVP."
 msgstr ""
 "Invitasjoner vil sendes til alle deltakere via e-post slik at de kan gi svar."
 
-#: ../calendar/calendar-errors.xml.h:88 ../calendar/calendar-errors.xml.h:94
-#: ../calendar/calendar-errors.xml.h:100 ../calendar/calendar-errors.xml.h:106
-#: ../ui/evolution-message-composer.xml.h:24
+#: ../calendar/calendar.error.xml.h:33
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+"Invitasjoner vil sendes til alle deltakere via e-post slik at de kan godta "
+"denne oppgaven."
+
+#: ../calendar/calendar.error.xml.h:34
+msgid "Error loading calendar"
+msgstr "Feil under lasting av kalender"
+
+#: ../calendar/calendar.error.xml.h:35
+msgid "Error loading task list"
+msgstr "Feil under lasting av oppgaveliste"
+
+#: ../calendar/calendar.error.xml.h:36
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the journal has been deleted."
+msgstr ""
+"Hvis du ikke sender en avlysningsmelding vil ikke de andre deltakerene vite "
+"at journalen er slettet."
+
+#: ../calendar/calendar.error.xml.h:37
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+"Hvis du ikke sender en avlysningsmelding vil ikke deltakerene vite at møtet "
+"er avlyst."
+
+#: ../calendar/calendar.error.xml.h:38
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+"Hvis du ikke sender en avlysningsmelding vil ikke de andre deltakerene vite "
+"at oppgaven er slettet."
+
+#: ../calendar/calendar.error.xml.h:39
+msgid "Save Changes"
+msgstr "Lagre endringer"
+
+#: ../calendar/calendar.error.xml.h:40
+#: ../ui/evolution-message-composer.xml.h:26
 msgid "Send"
 msgstr "Send"
 
-#. calendar:prompt-send-updated-meeting-info primary
-#: ../calendar/calendar-errors.xml.h:90
-msgid "Would you like to send updated meeting information to participants?"
-msgstr "Vil du sende oppdatert møteinformasjon til alle deltakere?"
+#: ../calendar/calendar.error.xml.h:41
+msgid "Send Notice"
+msgstr "Send melding"
 
-#. calendar:prompt-send-updated-meeting-info secondary
-#: ../calendar/calendar-errors.xml.h:92
+#: ../calendar/calendar.error.xml.h:42
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -3944,27 +3911,7 @@ msgstr ""
 "Sending av oppdatert informasjon lar andre deltakere holde sine kalendere "
 "oppdatert."
 
-#. calendar:prompt-send-task primary
-#: ../calendar/calendar-errors.xml.h:96
-msgid "Would you like to send this task to participants?"
-msgstr "Vil du sende denne oppgaven til deltakere?"
-
-#. calendar:prompt-send-task secondary
-#: ../calendar/calendar-errors.xml.h:98
-msgid ""
-"Email invitations will be sent to all participants and allow them to accept "
-"this task."
-msgstr ""
-"Invitasjoner vil sendes til alle deltakere via e-post slik at de kan godta "
-"denne oppgaven."
-
-#. calendar:prompt-send-updated-task-info primary
-#: ../calendar/calendar-errors.xml.h:102
-msgid "Would you like to send updated task information to participants?"
-msgstr "Vil du sende oppdatert oppgaveinformasjon til deltakere?"
-
-#. calendar:prompt-send-updated-task-info secondary
-#: ../calendar/calendar-errors.xml.h:104
+#: ../calendar/calendar.error.xml.h:43
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -3972,107 +3919,95 @@ msgstr ""
 "Sending av oppdatert informasjon lar andre deltakere holde sine "
 "oppgavelister oppdatert."
 
-#. calendar:tasks-crashed primary
-#: ../calendar/calendar-errors.xml.h:108
-msgid "The Evolution tasks have quit unexpectedly."
-msgstr "Evolution-oppgaver har avsluttet uventet."
-
-#. calendar:tasks-crashed secondary
-#: ../calendar/calendar-errors.xml.h:110
-msgid "Your tasks will not be available until Evolution is restarted."
-msgstr ""
-"Dine oppgaver vil ikke være tilgjengelige før Evolution startes på nytt."
-
-#. calendar:calendar-crashed primary
-#: ../calendar/calendar-errors.xml.h:112
+#: ../calendar/calendar.error.xml.h:45
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Evolution-kalender har avsluttet uventet."
 
-#. calendar:calendar-crashed secondary
-#: ../calendar/calendar-errors.xml.h:114
-msgid "Your calendars will not be available until Evolution is restarted."
-msgstr ""
-"Dine kalendere vil ikke være tilgjengelige før Evolution startes på nytt."
+#: ../calendar/calendar.error.xml.h:46
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr "Evolution-oppgaver har avsluttet uventet."
 
-#. calendar:prompt-delete-calendar primary
-#: ../calendar/calendar-errors.xml.h:116
-msgid "Delete calendar '{0}'?"
-msgstr "Slett kalender «{0}»?"
+#: ../calendar/calendar.error.xml.h:47
+msgid "The calendar is not marked for offline usage"
+msgstr "Kalenderen er ikke merket for frakoblet bruk"
 
-#. calendar:prompt-delete-calendar secondary
-#: ../calendar/calendar-errors.xml.h:118
+#: ../calendar/calendar.error.xml.h:48
+msgid "The task list is not marked for offline usage"
+msgstr "Oppgavelisten er ikke merket for frakoblet bruk"
+
+#: ../calendar/calendar.error.xml.h:49
 msgid "This calendar will be removed permanently."
 msgstr "Denne kalenderen vil bli fjernet for godt."
 
-#. calendar:prompt-delete-task-list primary
-#: ../calendar/calendar-errors.xml.h:120
-msgid "Delete task list '{0}'?"
-msgstr "Slett oppgaveliste «{0}»?"
-
-#. calendar:prompt-delete-task-list secondary
-#: ../calendar/calendar-errors.xml.h:122
+#: ../calendar/calendar.error.xml.h:50
 msgid "This task list will be removed permanently."
 msgstr "Denne oppgavelisten vil bli fjernet for godt."
 
-#. calendar:prompt-send-no-subject-calendar primary
-#: ../calendar/calendar-errors.xml.h:124
-msgid "Are you sure you want to send the appointment without a summary?"
-msgstr "Er du sikker på at du vil sende en avtelen uten emne?"
+#: ../calendar/calendar.error.xml.h:51
+msgid "Would you like to save your changes to this appointment?"
+msgstr "Vil du lagre dine endringer i denne avtalen?"
 
-#. calendar:prompt-send-no-subject-calendar secondary
-#: ../calendar/calendar-errors.xml.h:126
-msgid ""
-"Adding a meaningful Summary to your appointment will give your recipients an "
-"idea of what your appointment is about."
+#: ../calendar/calendar.error.xml.h:52
+msgid "Would you like to save your changes to this task?"
+msgstr "Vil du lagre dine endringer i denne oppgaven?"
+
+#: ../calendar/calendar.error.xml.h:53
+msgid "Would you like to send a cancellation notice for this journal entry?"
 msgstr ""
-"Hvis du gir dine avtaler en meningsfylt emnelinje vil mottakerene lettere "
-"forstå hva avtalen gjelder."
+"Er du sikker på at du vil sende en avlysing for denne journaloppføringen?"
 
-#: ../calendar/calendar-errors.xml.h:127 ../calendar/calendar-errors.xml.h:132
-#: ../mail/mail-errors.xml.h:15 ../mail/mail-errors.xml.h:20
-#: ../mail/mail-errors.xml.h:27 ../mail/mail-errors.xml.h:32
-msgid "_Send"
-msgstr "_Send"
+#: ../calendar/calendar.error.xml.h:54
+msgid "Would you like to send all the participants a cancellation notice?"
+msgstr "Vil du sende en avlysningsmelding til alle deltakere?"
 
-#. calendar:prompt-send-no-subject-task primary
-#: ../calendar/calendar-errors.xml.h:129
-msgid "Are you sure you want to send the task without a summary?"
-msgstr "Er du sikker på at du vil sende oppgaven uten sammendrag?"
+#: ../calendar/calendar.error.xml.h:55
+msgid "Would you like to send meeting invitations to participants?"
+msgstr "Vil du sende møteinvitasjoner til deltakerene?"
 
-#. calendar:prompt-send-no-subject-task secondary
-#: ../calendar/calendar-errors.xml.h:131
-msgid ""
-"Adding a meaningful Summary to your task will give your recipients an idea "
-"of what your task is about."
-msgstr ""
-"Hvis du gir dine oppgaver et meningsfylt sammendrag vil mottakerene lettere "
-"forstå hva oppgaven dreier seg om."
+#: ../calendar/calendar.error.xml.h:56
+msgid "Would you like to send this task to participants?"
+msgstr "Vil du sende denne oppgaven til deltakere?"
 
-#. calendar:prompt-no-contents-offline-calendar primary
-#: ../calendar/calendar-errors.xml.h:134
-msgid "Error loading calendar"
-msgstr "Feil under lasting av kalender"
+#: ../calendar/calendar.error.xml.h:57
+msgid "Would you like to send updated meeting information to participants?"
+msgstr "Vil du sende oppdatert møteinformasjon til alle deltakere?"
 
-#. calendar:prompt-no-contents-offline-calendar secondary
-#: ../calendar/calendar-errors.xml.h:136
-msgid "The calendar is not marked for offline usage"
-msgstr "Kalenderen er ikke merket for frakoblet bruk"
+#: ../calendar/calendar.error.xml.h:58
+msgid "Would you like to send updated task information to participants?"
+msgstr "Vil du sende oppdatert oppgaveinformasjon til deltakere?"
 
-#. calendar:prompt-no-contents-offline-tasks primary
-#: ../calendar/calendar-errors.xml.h:138
-msgid "Error loading task list"
-msgstr "Feil under lasting av oppgaveliste"
+#: ../calendar/calendar.error.xml.h:60
+msgid "You have made changes to this appointment, but not yet saved them."
+msgstr "Du har gjort endringer i denne avtalen, men har ikke lagret dem."
 
-#. calendar:prompt-no-contents-offline-tasks secondary
-#: ../calendar/calendar-errors.xml.h:140
-msgid "The task list is not marked for offline usage"
-msgstr "Oppgavelisten er ikke merket for frakoblet bruk"
+#: ../calendar/calendar.error.xml.h:61
+msgid "You have made changes to this task, but not yet saved them."
+msgstr "Du har gjort endringer i denne oppgaven, men har ikke lagret dem."
+
+#: ../calendar/calendar.error.xml.h:62
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr ""
+"Dine kalendere vil ikke være tilgjengelige før Evolution startes på nytt."
 
-#. calendar:server-version secondary
-#: ../calendar/calendar-errors.xml.h:146
-msgid " Some features may not work correctly with your current server version "
+#: ../calendar/calendar.error.xml.h:63
+msgid "Your tasks will not be available until Evolution is restarted."
 msgstr ""
-" Noen funksjoner vil kanskje ikke fungere med denne versjonen av tjeneren "
+"Dine oppgaver vil ikke være tilgjengelige før Evolution startes på nytt."
+
+#: ../calendar/calendar.error.xml.h:64
+#: ../ui/evolution-message-composer.xml.h:49
+#: ../ui/evolution-signature-editor.xml.h:15
+msgid "_Save"
+msgstr "_Lagre"
+
+#: ../calendar/calendar.error.xml.h:65
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:118
+msgid "_Send"
+msgstr "_Send"
+
+#: ../calendar/calendar.error.xml.h:66
+msgid "{0}."
+msgstr "{0}."
 
 #: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:301
 #: ../smime/gui/component.c:48
@@ -4142,12 +4077,12 @@ msgid "Evolution's Tasks component"
 msgstr "Oppgavekomponent for Evolution"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#: ../calendar/gui/e-tasks.c:1219 ../calendar/gui/print.c:1822
-#: ../calendar/gui/tasks-component.c:508 ../calendar/gui/tasks-component.c:981
+#: ../calendar/gui/e-tasks.c:1222 ../calendar/gui/print.c:1822
+#: ../calendar/gui/tasks-component.c:519 ../calendar/gui/tasks-component.c:994
 #: ../calendar/gui/tasks-control.c:408
 #: ../calendar/importers/icalendar-importer.c:83
 #: ../calendar/importers/icalendar-importer.c:701
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:383
+#: ../plugins/groupwise-features/camel-gw-listener.c:383
 msgid "Tasks"
 msgstr "Oppgaver"
 
@@ -4164,100 +4099,88 @@ msgstr "_Oppgaver"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Tjeneste for alarm-meldinger i Evolution kalender"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:79
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minutt"
 msgstr[1] "minutter"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: ../calendar/gui/dialogs/event-editor.c:140 ../calendar/gui/print.c:2298
-msgid "Appointment"
-msgstr "Avtale"
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+msgid "Start time"
+msgstr "Starttid:"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Appointment Title"
-msgstr "Tittel på avtale"
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:312
+#, c-format
+msgid ""
+"<big><b>%s</b></big>\n"
+"%s until %s"
+msgstr ""
+"<big><b>%s</b></big>\n"
+"%s til %s"
 
-#. End time
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
-#: ../plugins/itip-formatter/itip-view.c:876
-msgid "End time:"
-msgstr "Slutt-tid:"
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:1
+msgid "Appointments"
+msgstr "Avtaler"
 
 #. Location
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
 #: ../calendar/gui/e-itip-control.c:1118
 #: ../plugins/itip-formatter/itip-view.c:859
 msgid "Location:"
 msgstr "Plassering:"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
 msgid "Snooze _time:"
 msgstr "Utsett-_tid:"
 
-#. Start time
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
-#: ../plugins/itip-formatter/itip-view.c:867
-msgid "Start time:"
-msgstr "Start-tid:"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:6
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:153
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:158
 #: ../ui/evolution-addressbook.xml.h:34 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-composer-entries.xml.h:8 ../ui/evolution-mail-list.xml.h:24
-#: ../ui/evolution-mail-messagedisplay.xml.h:6
-#: ../ui/evolution-message-composer.xml.h:43
+#: ../ui/evolution-composer-entries.xml.h:8
+#: ../ui/evolution-mail-messagedisplay.xml.h:5
+#: ../ui/evolution-message-composer.xml.h:42
 #: ../ui/evolution-signature-editor.xml.h:12
 #: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:22
-#: ../ui/evolution.xml.h:38
+#: ../ui/evolution.xml.h:32
 msgid "_Edit"
 msgstr "R_ediger"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
 msgid "_Snooze"
 msgstr "Ut_sett"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:9
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
 msgid "description of appointment"
 msgstr "beskrivelse av avtale"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:10
-msgid "end-time"
-msgstr "slutt-tid"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:11
-msgid "location"
-msgstr "lokasjon"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:13
-msgid "start-time"
-msgstr "start-tid"
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
+msgid "location of appointment"
+msgstr "lokasjon for avtalen"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:864
+#: ../calendar/gui/alarm-notify/alarm-queue.c:954
 msgid "Dismiss"
 msgstr "Se bort fra"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:865
+#: ../calendar/gui/alarm-notify/alarm-queue.c:955
 msgid "Dismiss All"
 msgstr "Se bort fra alle"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:947
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1037
 msgid "No summary available."
 msgstr "Sammendrag er ikke tilgjengelig."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:956
-#: ../calendar/gui/alarm-notify/alarm-queue.c:958
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1046
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1048
 msgid "No description available."
 msgstr "Ingen beskrivelse tilgjengelig."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:966
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1056
 msgid "No location information available."
 msgstr "Beskrivelse av lokasjon er ikke tilgjengelig."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:982
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1072
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -4270,12 +4193,12 @@ msgstr ""
 "Starter %s\n"
 "Slutter %s"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1084
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1108
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1175
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1199
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1088
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1179
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4287,7 +4210,7 @@ msgstr ""
 "å sende e-post. Evolution vil vise en vanlig dialog\n"
 "for påminnelse i stedet."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1114
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1205
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4304,7 +4227,7 @@ msgstr ""
 "\n"
 "Er du sikker på at du ønsker å kjøre dette programmet?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1128
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1219
 msgid "Do not ask me about this program again."
 msgstr "Ikke spør meg om dette programmet igjen."
 
@@ -4341,273 +4264,295 @@ msgid "Calendars to run alarms for"
 msgstr "Kalendere det skal kjøres alarmer for"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+msgid ""
+"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+msgid "Color to draw the Marcus Bains line in the Day View."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
 msgid "Compress weekends in month view"
 msgstr "Komprimer helger i månedsvisning"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
 msgid "Confirm expunge"
 msgstr "Bekreft tømming av mappe"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
 msgid "Default appointment reminder"
 msgstr "Forvalgt påminnelse for avtale"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
 msgid "Default reminder units"
 msgstr "Forvalgt enhet for påminnelser"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
 msgid "Default reminder value"
 msgstr "Forvalgt verdi for påminnelse"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
 msgid "Free/busy server urls"
 msgstr "Tjener-URLer for ledig/opptatt-informasjon"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
 msgid "Free/busy template url"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Hide completed tasks"
 msgstr "Skjul fullførte oppgaver"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
 msgid "Hide task units"
 msgstr "Skjul enheter for oppgaver"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
 msgid "Hide task value"
 msgstr "Skjul oppgaveverdi"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
 msgid "Horizontal pane position"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+msgid "Intervals shown in Day and Work Week views, in minutes."
+msgstr "Intervaller i minutter som vises i dag- og arbeidsukevisningene."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
 msgid "Last alarm time"
 msgstr "Siste varslingstid"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
 msgid "List of server urls for free/busy publishing."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
-msgid "Minute the workday ends on, 0 to 59"
-msgstr "Minutt arbeidsdagen slutter på fra 0 til 59"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+msgid "Marcus Bains Line"
+msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+msgid "Marcus Bains Line Color - Day View"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+msgid "Marcus Bains Line Color - Time bar"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+msgid "Minute the workday ends on, 0 to 59."
+msgstr "Minutt arbeidsdagen slutter på fra 0 til 59."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Minutt arbeidsdagen starter på fra 0 til 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Month view horizontal pane position"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Month view vertical pane position"
-msgstr "Plassering av vertikalt felt i hovedvisningen"
+msgstr "Plassering av vertikalt felt for månedsvisning"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Number of units for determining for a default reminder."
-msgstr "Antall enheter for forvalgt påminnelse"
+msgstr "Antall enheter for forvalgt påminnelse."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
 msgid "Number of units for determining when to hide tasks."
-msgstr "Enheter for å bestemme når oppgaver skal skjules"
+msgstr "Antall enheter for å bestemme når oppgaver skal skjules"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
 msgid "Overdue tasks color"
 msgstr "Farge for utgåtte oppgaver"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
 #, fuzzy
 msgid ""
-"Position of the vertical pane, between task list and the task preview pane, "
-"in pixels."
+"Position of the vertical pane, between the task list and the task preview "
+"pane, in pixels."
 msgstr "Plassering av vertikalt felt i hovedvisningen."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
 msgid "Programs that are allowed to be run by alarms."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
 msgid "Show appointment end times in week and month views"
 msgstr "Vis tid for avtalers slutt i ukes- og månedsvisning"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
 msgid "Show display alarms in notification tray"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
 msgid "Show week numbers in date navigator"
 msgstr "Vis ukenummer i datovelger"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
 msgid "Tasks due today color"
 msgstr "Farge for oppgaver som går ut i dag"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
 msgid "Tasks vertical pane position"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
 #, no-c-format
 msgid ""
 "The url template to use as a free/busy data fallback, %u is replaced by the "
 "user part of the mail address and %d is replaced by the domain."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
-#, fuzzy
-msgid ""
-"Time divisions</short> <short>Intervals shown in Day and Work Week views, in "
-"minutes."
-msgstr "Intervaller vises i dag- og arbeidsukevisningene"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+msgid "Time divisions"
+msgstr "Oppdeling av tid"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
 #, fuzzy
 msgid "Time the last alarm ran, in time_t."
 msgstr "Tid for kjøring av forrige alarm"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
 msgid "Timezone"
 msgstr "Tidssone"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
 msgid "Twenty four hour time format"
 msgstr "24-timers tidsformat"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
-msgstr ""
+msgstr "Enhet for forvalgt påminnelse. «minutes», «hours», eller «days»."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
-msgstr "Enheter for å bestemme når oppgaver skal skjules"
+msgstr "Enheter for å bestemme når oppgaver skal skjules. «minutes», «hours» eller «days»."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
 msgid "Week start"
 msgstr "Ukestart"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
-#, fuzzy
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
-msgstr "Dag uken starter på"
+msgstr "Dag uken starter på. Fra søndag (0) til lørdag (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
 #, fuzzy
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Om det skal spørres etter bekreftelse ved sletting av avtaler"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
 #, fuzzy
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Om det skal spørres etter bekreftelse ved sletting av avtaler"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
 #, fuzzy
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "Vi_s tid for avtalers slutt i ukes- og månedsvisning"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
+msgid ""
+"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
 #, fuzzy
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Om fullførte oppgaver skal skjules"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
 #, fuzzy
 msgid "Whether to set a default reminder for appointments."
 msgstr "Im en forvalgt påminnelse skal settes for hendelser"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
 #, fuzzy
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "Om tider skal vises i 24-timers format i stedet for å bruke AM/PM"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
 #, fuzzy
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Om ukenummer skal vises i minikalenderen"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
 msgid "Work days"
 msgstr "Arbeidsdager"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
 #, fuzzy
 msgid "Workday end hour"
 msgstr "Time for arbeidsdagens slutt"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
 #, fuzzy
 msgid "Workday end minute"
 msgstr "Ar_beid tilkoblet"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
 #, fuzzy
 msgid "Workday start hour"
 msgstr "Time for arbeidsdagens start"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
 #, fuzzy
 msgid "Workday start minute"
 msgstr "Time for arbeidsdagens start"
@@ -4634,10 +4579,10 @@ msgstr "Ingen treff"
 
 #: ../calendar/gui/calendar-commands.c:120
 #: ../calendar/gui/calendar-component.c:708
-#: ../calendar/gui/dialogs/calendar-setup.c:362
-#: ../calendar/gui/gnome-cal.c:1942
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:382
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:412
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/gnome-cal.c:1974
+#: ../plugins/groupwise-features/camel-gw-listener.c:382
+#: ../plugins/groupwise-features/camel-gw-listener.c:412
 msgid "Calendar"
 msgstr "Kalender"
 
@@ -4659,30 +4604,30 @@ msgstr "Slett hendelser eldre enn"
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:12
 #: ../filter/filter.glade.h:14 ../plugins/calendar-http/calendar-http.c:265
 #: ../plugins/calendar-weather/calendar-weather.c:566
-#: ../widgets/misc/e-send-options.glade.h:39
+#: ../widgets/misc/e-send-options.glade.h:36
 msgid "days"
 msgstr "dager"
 
 #. Create the On the web source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:223 ../calendar/gui/migration.c:486
-#: ../calendar/gui/migration.c:579 ../calendar/gui/tasks-component.c:204
+#: ../calendar/gui/calendar-component.c:234 ../calendar/gui/migration.c:489
+#: ../calendar/gui/migration.c:582 ../calendar/gui/tasks-component.c:215
 msgid "On The Web"
 msgstr "På nettet"
 
-#: ../calendar/gui/calendar-component.c:241 ../calendar/gui/migration.c:388
+#: ../calendar/gui/calendar-component.c:252 ../calendar/gui/migration.c:391
 msgid "Birthdays & Anniversaries"
 msgstr "Fødselsdager og jubileum"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:247
+#: ../calendar/gui/calendar-component.c:258
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "Vær"
 
-#: ../calendar/gui/calendar-component.c:524
-#: ../calendar/gui/dialogs/calendar-setup.c:442
+#: ../calendar/gui/calendar-component.c:535
+#: ../calendar/gui/dialogs/calendar-setup.c:450
 msgid "New Calendar"
 msgstr "Ny kalender"
 
@@ -4779,7 +4724,7 @@ msgstr "Metoden er ikke støttet under åpning av kalender"
 msgid "Permission denied to open the calendar"
 msgstr "Tilgang nektet ved åpning av kalender"
 
-#: ../calendar/gui/comp-editor-factory.c:437 ../shell/e-shell.c:1259
+#: ../calendar/gui/comp-editor-factory.c:437 ../shell/e-shell.c:1263
 msgid "Unknown error"
 msgstr "Ukjent feil"
 
@@ -4903,50 +4848,50 @@ msgstr "Le_gg til"
 msgid "Alarms"
 msgstr "Varsel"
 
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:108
-#: ../composer/e-msg-composer-attachment-bar.c:103
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:110
+#: ../composer/e-msg-composer-attachment-bar.c:105
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:111
-#: ../composer/e-msg-composer-attachment-bar.c:106
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:113
+#: ../composer/e-msg-composer-attachment-bar.c:108
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:114
-#: ../composer/e-msg-composer-attachment-bar.c:109
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:116
+#: ../composer/e-msg-composer-attachment-bar.c:111
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:298
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:913
-#: ../composer/e-msg-composer-attachment-bar.c:295 ../mail/em-utils.c:436
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:311
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:1106
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:438
 msgid "attachment"
 msgstr "vedlegg"
 
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:439
-#: ../calendar/gui/dialogs/meeting-page.c:781
-#: ../composer/e-msg-composer-attachment-bar.c:437
-#: ../plugins/shared-folder/properties.glade.h:14
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:473
+#: ../calendar/gui/dialogs/meeting-page.c:784
+#: ../composer/e-msg-composer-attachment-bar.c:470
+#: ../plugins/groupwise-features/properties.glade.h:14
 msgid "_Remove"
 msgstr "Fje_rn"
 
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:440
-#: ../composer/e-msg-composer-attachment-bar.c:438
-#: ../mail/em-folder-tree.c:2818 ../ui/evolution-mail-list.xml.h:27
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:474
+#: ../composer/e-msg-composer-attachment-bar.c:471
+#: ../mail/em-folder-tree.c:2123 ../ui/evolution-mail-list.xml.h:28
 msgid "_Properties"
 msgstr "Egenska_per..."
 
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:442
-#: ../composer/e-msg-composer-attachment-bar.c:440
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:476
+#: ../composer/e-msg-composer-attachment-bar.c:473
 msgid "_Add attachment..."
 msgstr "_Legg til vedlegg..."
 
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:699
-#: ../composer/e-msg-composer-attachment-bar.c:703
+#: ../calendar/gui/dialogs/cal-attachment-bar.c:736
+#: ../composer/e-msg-composer-attachment-bar.c:740
 msgid "Attachment Bar"
 msgstr "Vedleggsfelt"
 
@@ -4964,16 +4909,22 @@ msgstr "Foreslå automatisk visning av vedlegg"
 msgid "Attach file(s)"
 msgstr "Legg ved fil(er)"
 
-#: ../calendar/gui/dialogs/cal-attachment.c:197
-#: ../calendar/gui/dialogs/cal-attachment.c:213
-#: ../composer/e-msg-composer-attachment.c:174
-#: ../composer/e-msg-composer-attachment.c:190
+#: ../calendar/gui/dialogs/cal-attachment.c:210
+#: ../calendar/gui/dialogs/cal-attachment.c:226
+#: ../calendar/gui/dialogs/cal-attachment.c:319
+#: ../calendar/gui/dialogs/cal-attachment.c:335
+#: ../composer/e-msg-composer-attachment.c:187
+#: ../composer/e-msg-composer-attachment.c:203
+#: ../composer/e-msg-composer-attachment.c:297
+#: ../composer/e-msg-composer-attachment.c:313
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Kan ikke legge ved fil: %s: %s"
 
-#: ../calendar/gui/dialogs/cal-attachment.c:205
-#: ../composer/e-msg-composer-attachment.c:182
+#: ../calendar/gui/dialogs/cal-attachment.c:218
+#: ../calendar/gui/dialogs/cal-attachment.c:327
+#: ../composer/e-msg-composer-attachment.c:195
+#: ../composer/e-msg-composer-attachment.c:305
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Kan ikke legge ved fil %s: ikke en vanlig fil"
@@ -4988,7 +4939,7 @@ msgstr "Egenskaper for vedlegg"
 #: ../calendar/gui/e-itip-control.c:1164
 #: ../calendar/gui/e-itip-control.glade.h:6
 #: ../composer/e-msg-composer-attachment.glade.h:3
-#: ../mail/mail-config.glade.h:68
+#: ../mail/mail-config.glade.h:69
 msgid "Description:"
 msgstr "Beskrivelse:"
 
@@ -5004,7 +4955,7 @@ msgstr "MIME-type:"
 
 #. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:576
-#: ../mail/em-account-prefs.c:460 ../mail/em-composer-prefs.c:888
+#: ../mail/em-account-prefs.c:476 ../mail/em-composer-prefs.c:888
 #: ../plugins/plugin-manager/plugin-manager.c:213
 msgid "Enabled"
 msgstr "Aktivert"
@@ -5024,16 +4975,16 @@ msgstr "Ikke fjern"
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:787
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:820
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:853
-#: ../mail/em-account-prefs.c:307 ../mail/em-account-prefs.c:335
-#: ../mail/em-account-prefs.c:366
+#: ../mail/em-account-prefs.c:323 ../mail/em-account-prefs.c:351
+#: ../mail/em-account-prefs.c:382
 msgid "Disable"
 msgstr "Deaktiver"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:787
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:820
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:855
-#: ../mail/em-account-prefs.c:307 ../mail/em-account-prefs.c:335
-#: ../mail/em-account-prefs.c:368
+#: ../mail/em-account-prefs.c:323 ../mail/em-account-prefs.c:351
+#: ../mail/em-account-prefs.c:384
 msgid "Enable"
 msgstr "Aktiver"
 
@@ -5117,7 +5068,7 @@ msgid "Display"
 msgstr "Vis"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: ../mail/mail-config.glade.h:73
+#: ../mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr "A_ktiver"
 
@@ -5126,7 +5077,7 @@ msgid "Free/Busy"
 msgstr "Ledig/opptatt"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1044
+#: ../calendar/gui/dialogs/recurrence-page.c:1043
 #: ../calendar/gui/e-itip-control.c:732
 msgid "Friday"
 msgstr "Fredag"
@@ -5140,171 +5091,179 @@ msgid "Minutes"
 msgstr "Minutter"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: ../calendar/gui/dialogs/recurrence-page.c:1040
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 #: ../calendar/gui/e-itip-control.c:728
 msgid "Monday"
 msgstr "Mandag"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+msgid "Publishing Table"
+msgstr "Tabell for publisering"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "S_un"
 msgstr "S_ø."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: ../calendar/gui/dialogs/recurrence-page.c:1045
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
 #: ../calendar/gui/e-itip-control.c:733
 msgid "Saturday"
 msgstr "Lørdag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Sh_ow a reminder"
 msgstr "_Vis en påminnelse"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Show week _numbers in date navigator"
 msgstr "Vis uke_nummer i datonavigasjon"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ../calendar/gui/dialogs/recurrence-page.c:1046
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/recurrence-page.c:1045
 #: ../calendar/gui/e-itip-control.c:727
 msgid "Sunday"
 msgstr "Søndag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "T_asks due today:"
 msgstr "Oppg_aver som går ut i dag:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "T_hu"
 msgstr "T_o."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Template:"
 msgstr "Mal:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-#: ../calendar/gui/dialogs/recurrence-page.c:1043
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/recurrence-page.c:1042
 #: ../calendar/gui/e-itip-control.c:731
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "Time _zone:"
 msgstr "Tids_sone:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Time format:"
 msgstr "Tidformat:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: ../calendar/gui/dialogs/recurrence-page.c:1041
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: ../calendar/gui/dialogs/recurrence-page.c:1040
 #: ../calendar/gui/e-itip-control.c:729
 msgid "Tuesday"
 msgstr "Tirsdag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "W_eek starts:"
 msgstr "Uk_en starter:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#: ../calendar/gui/dialogs/recurrence-page.c:1042
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/recurrence-page.c:1041
 #: ../calendar/gui/e-itip-control.c:730
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Work days:"
 msgstr "Arbeidsdager:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_12 hour (AM/PM)"
 msgstr "_12 timer (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_24 hour"
 msgstr "_24 timer"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Add URL"
 msgstr "_Legg til URL"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Ask for confirmation when deleting items"
 msgstr "Spør etter bekreftelse ved sletting _av oppføringer"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_Compress weekends in month view"
 msgstr "_Komprimer helger i månedsvisning"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_Day begins:"
 msgstr "_Dagen begynner:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Fri"
 msgstr "_Fr."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Hide completed tasks after"
 msgstr "Sk_jul utførte oppgaver etter"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "_Mon"
 msgstr "_Ma."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_Overdue tasks:"
 msgstr "Utgåtte _oppgaver:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "_Sat"
 msgstr "L_ø."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_Show appointment end times in week and month views"
 msgstr "Vi_s tid for avtalers slutt i ukes- og månedsvisning"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_Time divisions:"
 msgstr "Oppdeling av _tid:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Tue"
 msgstr "_Ti."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "_Wed"
 msgstr "_On."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "before every appointment"
 msgstr "før hver avtale"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "option menu to choose reminder units"
 msgstr "meny for valg av enheter for påminnelser"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "option menu to choose time units"
 msgstr "meny for å velge tidsenheter"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:284
+#: ../calendar/gui/dialogs/calendar-setup.c:287
 msgid "Copy calendar contents locally for offline operation"
 msgstr "Kopier kalenderinnhold lokalt for frakoblet operasjon"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:336
+#: ../calendar/gui/dialogs/calendar-setup.c:290
+msgid "Copy task list contents locally for offline operation"
+msgstr "Kopier innholdet i oppgavelisten lokalt for frakoblet operasjon"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:343
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:4
 msgid "C_olor:"
 msgstr "F_arge:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:373
+#: ../calendar/gui/dialogs/calendar-setup.c:380
 msgid "Tasks List"
 msgstr "Oppgaveliste"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:440
+#: ../calendar/gui/dialogs/calendar-setup.c:448
 msgid "Calendar Properties"
 msgstr "Kalenderegenskaper"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:506
+#: ../calendar/gui/dialogs/calendar-setup.c:515
 msgid "Task List Properties"
 msgstr "Egenskaper for oppgaveliste"
 
@@ -5317,7 +5276,7 @@ msgid "Add Task List"
 msgstr "Legg til oppgaveliste"
 
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:5
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:105
 msgid "Pick a color"
 msgstr "Velg en farge"
 
@@ -5417,116 +5376,106 @@ msgstr " (Ferdig "
 msgid "Due "
 msgstr "Ferdig "
 
-#: ../calendar/gui/dialogs/comp-editor.c:181 ../composer/e-msg-composer.c:2676
+#: ../calendar/gui/dialogs/comp-editor.c:181 ../composer/e-msg-composer.c:2653
 #, c-format
 msgid "Attached message - %s"
 msgstr "Vedlagt melding - %s"
 
 #. translators, this count will always be >1
 #: ../calendar/gui/dialogs/comp-editor.c:186
-#: ../calendar/gui/dialogs/comp-editor.c:349 ../composer/e-msg-composer.c:2681
-#: ../composer/e-msg-composer.c:2844
+#: ../calendar/gui/dialogs/comp-editor.c:355 ../composer/e-msg-composer.c:2658
+#: ../composer/e-msg-composer.c:2834
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Vedlagt melding"
 msgstr[1] "%d vedlagte meldinger"
 
-#: ../calendar/gui/dialogs/comp-editor.c:412
+#: ../calendar/gui/dialogs/comp-editor.c:418
 #: ../calendar/gui/e-calendar-table.c:1164
-#: ../calendar/gui/e-calendar-view.c:1402 ../composer/e-msg-composer.c:2906
-#: ../mail/em-folder-tree.c:1046 ../mail/em-folder-view.c:966
-#: ../mail/message-list.c:1707 ../ui/evolution-addressbook.xml.h:31
+#: ../calendar/gui/e-calendar-view.c:1426 ../composer/e-msg-composer.c:2896
+#: ../mail/em-folder-tree.c:1047 ../mail/em-folder-view.c:1033
+#: ../mail/message-list.c:1708 ../ui/evolution-addressbook.xml.h:31
 #: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:7
-#: ../ui/evolution-mail-message.xml.h:105 ../ui/evolution-tasks.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:100 ../ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Kopier"
 
-#: ../calendar/gui/dialogs/comp-editor.c:413 ../composer/e-msg-composer.c:2907
-#: ../mail/em-folder-tree.c:1047 ../mail/em-folder-tree.c:2311
-#: ../mail/em-folder-view.c:862 ../mail/message-list.c:1708
+#: ../calendar/gui/dialogs/comp-editor.c:419 ../composer/e-msg-composer.c:2897
+#: ../mail/em-folder-tree.c:1048 ../mail/em-folder-view.c:929
+#: ../mail/message-list.c:1709
 msgid "_Move"
 msgstr "_Flytt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:415 ../composer/e-msg-composer.c:2909
-#: ../mail/em-folder-tree.c:1049 ../mail/message-list.c:1710
+#: ../calendar/gui/dialogs/comp-editor.c:421 ../composer/e-msg-composer.c:2899
+#: ../mail/em-folder-tree.c:1050 ../mail/message-list.c:1711
 msgid "Cancel _Drag"
 msgstr "Avbryt _draoperasjon"
 
-#: ../calendar/gui/dialogs/comp-editor.c:659
+#: ../calendar/gui/dialogs/comp-editor.c:694
 msgid "Could not update object"
 msgstr "Kunne ikke oppdatere objekt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:820 ../composer/e-msg-composer.c:2310
+#: ../calendar/gui/dialogs/comp-editor.c:873 ../composer/e-msg-composer.c:2308
 #, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../calendar/gui/dialogs/comp-editor.c:873 ../composer/e-msg-composer.c:2339
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr "Skjul _vedleggsfeltet (slipp vedlegg her)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:876
-#: ../calendar/gui/dialogs/comp-editor.c:928 ../composer/e-msg-composer.c:2342
-#: ../composer/e-msg-composer.c:3471
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr "Vis _vedleggsfeltet (slipp vedlegg her)"
+msgid "<b>%d</b> Attachment"
+msgid_plural "<b>%d</b> Attachments"
+msgstr[0] "<b>%d</b> vedlegg"
+msgstr[1] "<b>%d</b> vedlegg"
 
-#: ../calendar/gui/dialogs/comp-editor.c:952 ../composer/e-msg-composer.c:3493
-msgid "Attachment Button: Press space key to toggle attachment bar"
-msgstr "Vedleggsknapp: Trykk mellomrom for å slå av/på vedleggsfeletet"
+#: ../calendar/gui/dialogs/comp-editor.c:968 ../composer/e-msg-composer.c:3477
+msgid "_Attachment Bar (drop attachments here)"
+msgstr "_Vedleggsfelt (slipp vedlegg her)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1499
-#: ../calendar/gui/dialogs/comp-editor.c:1542
+#: ../calendar/gui/dialogs/comp-editor.c:1546
+#: ../calendar/gui/dialogs/comp-editor.c:1589
 msgid "Edit Appointment"
 msgstr "Rediger avtale"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1505
-#: ../calendar/gui/dialogs/comp-editor.c:1548
+#: ../calendar/gui/dialogs/comp-editor.c:1552
+#: ../calendar/gui/dialogs/comp-editor.c:1595
 #, c-format
 msgid "Meeting - %s"
 msgstr "Møte- %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1507
-#: ../calendar/gui/dialogs/comp-editor.c:1550
+#: ../calendar/gui/dialogs/comp-editor.c:1554
+#: ../calendar/gui/dialogs/comp-editor.c:1597
 #, c-format
 msgid "Appointment - %s"
 msgstr "Avtale - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1511
-#: ../calendar/gui/dialogs/comp-editor.c:1554
+#: ../calendar/gui/dialogs/comp-editor.c:1558
+#: ../calendar/gui/dialogs/comp-editor.c:1601
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tildelt oppgave - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1513
-#: ../calendar/gui/dialogs/comp-editor.c:1556
+#: ../calendar/gui/dialogs/comp-editor.c:1560
+#: ../calendar/gui/dialogs/comp-editor.c:1603
 #, c-format
 msgid "Task - %s"
 msgstr "Oppgave - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1516
-#: ../calendar/gui/dialogs/comp-editor.c:1559
+#: ../calendar/gui/dialogs/comp-editor.c:1563
+#: ../calendar/gui/dialogs/comp-editor.c:1606
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journaloppføring - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1527
-#: ../calendar/gui/dialogs/comp-editor.c:1569
+#: ../calendar/gui/dialogs/comp-editor.c:1574
+#: ../calendar/gui/dialogs/comp-editor.c:1616
 msgid "No summary"
 msgstr "Ingen sammendrag"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2003
-#: ../calendar/gui/dialogs/comp-editor.c:2036
-#: ../calendar/gui/dialogs/comp-editor.c:2060
+#: ../calendar/gui/dialogs/comp-editor.c:2054
+#: ../calendar/gui/dialogs/comp-editor.c:2087
+#: ../calendar/gui/dialogs/comp-editor.c:2111
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Endringer som gjøres i denne oppføringen kan bli forkastet hvis det kommer "
 "enoppdatering"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2084
+#: ../calendar/gui/dialogs/comp-editor.c:2135
 msgid "Unable to use current version!"
 msgstr "Kan ikke bruke denne versjonen!"
 
@@ -5602,44 +5551,48 @@ msgstr "Deleger til:"
 msgid "Enter Delegate"
 msgstr "Skriv inn delegat"
 
-#: ../calendar/gui/dialogs/event-editor.c:149
+#: ../calendar/gui/dialogs/event-editor.c:141 ../calendar/gui/print.c:2298
+msgid "Appointment"
+msgstr "Avtale"
+
+#: ../calendar/gui/dialogs/event-editor.c:150
 msgid "Recurrence"
 msgstr "Gjeninntreffelse"
 
-#: ../calendar/gui/dialogs/event-editor.c:161
-#: ../calendar/gui/dialogs/event-editor.c:233
-#: ../calendar/gui/dialogs/event-editor.c:379
+#: ../calendar/gui/dialogs/event-editor.c:166
+#: ../calendar/gui/dialogs/event-editor.c:238
+#: ../calendar/gui/dialogs/event-editor.c:402
 msgid "Scheduling"
 msgstr "Møteplanlegging"
 
-#: ../calendar/gui/dialogs/event-editor.c:168
-#: ../calendar/gui/dialogs/event-editor.c:236
-#: ../calendar/gui/dialogs/event-editor.c:382
+#: ../calendar/gui/dialogs/event-editor.c:173
+#: ../calendar/gui/dialogs/event-editor.c:241
+#: ../calendar/gui/dialogs/event-editor.c:405
 msgid "Invitations"
 msgstr "Invitasjoner"
 
-#: ../calendar/gui/dialogs/event-page.c:725
+#: ../calendar/gui/dialogs/event-page.c:720
 msgid "Event with no start date"
 msgstr "Hendelse uten startdato"
 
-#: ../calendar/gui/dialogs/event-page.c:728
+#: ../calendar/gui/dialogs/event-page.c:723
 msgid "Event with no end date"
 msgstr "Hendelse uten sluttdato"
 
-#: ../calendar/gui/dialogs/event-page.c:894
-#: ../calendar/gui/dialogs/task-page.c:561
+#: ../calendar/gui/dialogs/event-page.c:889
+#: ../calendar/gui/dialogs/task-page.c:556
 msgid "Start date is wrong"
 msgstr "Startdato er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:904
+#: ../calendar/gui/dialogs/event-page.c:899
 msgid "End date is wrong"
 msgstr "Sluttdato er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:927
+#: ../calendar/gui/dialogs/event-page.c:922
 msgid "Start time is wrong"
 msgstr "Tid for start er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:934
+#: ../calendar/gui/dialogs/event-page.c:929
 msgid "End time is wrong"
 msgstr "Tid for slutt er feil"
 
@@ -5701,7 +5654,8 @@ msgid "A_ll day event"
 msgstr "Varer hele _dagen"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:9
-msgid "Ad_vanced  send options"
+#: ../calendar/gui/dialogs/task-page.glade.h:4
+msgid "Ad_vanced send options"
 msgstr "A_vanserte alternativer for sending"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:10
@@ -5790,37 +5744,37 @@ msgstr "_Start-tid:"
 #: ../calendar/gui/dialogs/meeting-page.c:296
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/e-cal-model-tasks.c:652
-#: ../calendar/gui/e-itip-control.c:1104 ../composer/e-msg-composer.c:2117
-#: ../filter/filter-rule.c:878 ../mail/em-account-editor.c:684
-#: ../mail/em-account-editor.c:1290 ../mail/em-account-prefs.c:421
-#: ../mail/em-folder-view.c:993
+#: ../calendar/gui/e-itip-control.c:1104 ../composer/e-msg-composer.c:2112
+#: ../filter/filter-rule.c:881 ../mail/em-account-editor.c:683
+#: ../mail/em-account-editor.c:1346 ../mail/em-account-prefs.c:437
+#: ../mail/em-folder-view.c:1062
 #: ../plugins/calendar-weather/calendar-weather.c:371
 #: ../plugins/calendar-weather/calendar-weather.c:425
-#: ../plugins/itip-formatter/itip-formatter.c:1376
+#: ../plugins/itip-formatter/itip-formatter.c:1390
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:190
-#: ../widgets/misc/e-cell-date-edit.c:248 ../widgets/misc/e-dateedit.c:458
-#: ../widgets/misc/e-dateedit.c:1497 ../widgets/misc/e-dateedit.c:1651
+#: ../widgets/misc/e-cell-date-edit.c:248 ../widgets/misc/e-dateedit.c:465
+#: ../widgets/misc/e-dateedit.c:1504 ../widgets/misc/e-dateedit.c:1673
 msgid "None"
 msgstr "Ingen"
 
-#: ../calendar/gui/dialogs/meeting-page.c:432
+#: ../calendar/gui/dialogs/meeting-page.c:435
 msgid "The organizer selected no longer has an account."
 msgstr "Valgt organisator har ingen konto lenger."
 
-#: ../calendar/gui/dialogs/meeting-page.c:438
+#: ../calendar/gui/dialogs/meeting-page.c:441
 msgid "An organizer is required."
 msgstr "En organisator kreves."
 
-#: ../calendar/gui/dialogs/meeting-page.c:453
+#: ../calendar/gui/dialogs/meeting-page.c:456
 msgid "At least one attendee is required."
 msgstr "Minst en deltaker kreves."
 
-#: ../calendar/gui/dialogs/meeting-page.c:778
+#: ../calendar/gui/dialogs/meeting-page.c:781
 msgid "_Delegate To..."
 msgstr "_Deleger til..."
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:1
-#: ../calendar/gui/e-meeting-list-view.c:308
+#: ../calendar/gui/e-meeting-list-view.c:309
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Deltaker"
@@ -5856,15 +5810,15 @@ msgid "Member"
 msgstr "Medlem"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:8
-#: ../calendar/gui/e-meeting-list-view.c:333
+#: ../calendar/gui/e-meeting-list-view.c:334
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:10
-#: ../calendar/gui/dialogs/task-editor.c:146
+#: ../calendar/gui/dialogs/task-editor.c:147
 #: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:340
+#: ../calendar/gui/e-meeting-list-view.c:341
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
 #: ../mail/message-list.etspec.h:12
 msgid "Status"
@@ -5974,43 +5928,43 @@ msgstr "Gjenintreffingsdato er ugyldig"
 msgid "on"
 msgstr "på"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:984
+#: ../calendar/gui/dialogs/recurrence-page.c:983
 msgid "first"
 msgstr "første"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:985
+#: ../calendar/gui/dialogs/recurrence-page.c:984
 msgid "second"
 msgstr "sekund"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:986
+#: ../calendar/gui/dialogs/recurrence-page.c:985
 msgid "third"
 msgstr "tredje"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:987
+#: ../calendar/gui/dialogs/recurrence-page.c:986
 msgid "fourth"
 msgstr "fjerde"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:988
+#: ../calendar/gui/dialogs/recurrence-page.c:987
 msgid "last"
 msgstr "siste"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1011
+#: ../calendar/gui/dialogs/recurrence-page.c:1010
 msgid "Other Date"
 msgstr "Annen dato"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1039
+#: ../calendar/gui/dialogs/recurrence-page.c:1038
 msgid "day"
 msgstr "dag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1176
+#: ../calendar/gui/dialogs/recurrence-page.c:1175
 msgid "on the"
 msgstr "den"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1362
+#: ../calendar/gui/dialogs/recurrence-page.c:1364
 msgid "occurrences"
 msgstr "gjentakelser"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2315
+#: ../calendar/gui/dialogs/recurrence-page.c:2317
 msgid "Date/Time"
 msgstr "Dato/klokkeslett"
 
@@ -6084,13 +6038,13 @@ msgstr "<span weight=\"bold\">Status</span>"
 #: ../calendar/gui/e-cal-model-tasks.c:658
 #: ../calendar/gui/e-calendar-table.c:457 ../calendar/gui/e-itip-control.c:896
 #: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
-#: ../calendar/gui/print.c:2349
+#: ../calendar/gui/print.c:2361 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "Fullført"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
 #: ../calendar/gui/e-cal-component-preview.c:248
-#: ../calendar/gui/e-calendar-table.c:382 ../mail/message-list.c:1006
+#: ../calendar/gui/e-calendar-table.c:382 ../mail/message-list.c:1008
 msgid "High"
 msgstr "Høy"
 
@@ -6099,20 +6053,20 @@ msgstr "Høy"
 #: ../calendar/gui/e-cal-model-tasks.c:343
 #: ../calendar/gui/e-cal-model-tasks.c:656
 #: ../calendar/gui/e-cal-model-tasks.c:731
-#: ../calendar/gui/e-calendar-table.c:456 ../calendar/gui/print.c:2346
+#: ../calendar/gui/e-calendar-table.c:456 ../calendar/gui/print.c:2358
 msgid "In Progress"
 msgstr "Under arbeid"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-calendar-table.c:384 ../mail/message-list.c:1004
+#: ../calendar/gui/e-calendar-table.c:384 ../mail/message-list.c:1006
 msgid "Low"
 msgstr "Lav"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:250
 #: ../calendar/gui/e-cal-model.c:899 ../calendar/gui/e-calendar-table.c:383
-#: ../mail/message-list.c:1005
+#: ../mail/message-list.c:1007
 msgid "Normal"
 msgstr "Normal"
 
@@ -6120,7 +6074,7 @@ msgstr "Normal"
 #: ../calendar/gui/e-cal-component-preview.c:236
 #: ../calendar/gui/e-cal-model-tasks.c:341
 #: ../calendar/gui/e-cal-model-tasks.c:654
-#: ../calendar/gui/e-calendar-table.c:455 ../calendar/gui/print.c:2343
+#: ../calendar/gui/e-calendar-table.c:455 ../calendar/gui/print.c:2355
 msgid "Not Started"
 msgstr "Ikke startet"
 
@@ -6138,7 +6092,7 @@ msgid "_Date completed:"
 msgstr "Fullført _dato:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:13
-#: ../widgets/misc/e-send-options.glade.h:34
+#: ../widgets/misc/e-send-options.glade.h:31
 msgid "_Priority:"
 msgstr "_Prioritet:"
 
@@ -6150,29 +6104,25 @@ msgstr "_Status:"
 msgid "_Web Page:"
 msgstr "_Nettside:"
 
-#: ../calendar/gui/dialogs/task-editor.c:137 ../calendar/gui/print.c:2300
+#: ../calendar/gui/dialogs/task-editor.c:138 ../calendar/gui/print.c:2300
 msgid "Task"
 msgstr "Oppgave"
 
-#: ../calendar/gui/dialogs/task-editor.c:157
-#: ../calendar/gui/dialogs/task-editor.c:219
-#: ../calendar/gui/dialogs/task-editor.c:359
+#: ../calendar/gui/dialogs/task-editor.c:163
+#: ../calendar/gui/dialogs/task-editor.c:225
+#: ../calendar/gui/dialogs/task-editor.c:379
 msgid "Assignment"
 msgstr "Tildeling"
 
-#: ../calendar/gui/dialogs/task-page.c:534
+#: ../calendar/gui/dialogs/task-page.c:529
 msgid "Due date is wrong"
 msgstr "Ferdigdato er feil"
 
-#: ../calendar/gui/dialogs/task-page.c:878
+#: ../calendar/gui/dialogs/task-page.c:873
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Kan ikke åpne oppgaver i «%s»."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:4
-msgid "Ad_vanced send options"
-msgstr "A_vanserte alternativer for sending"
-
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "D_escription:"
 msgstr "B_eskrivelse:"
@@ -6272,52 +6222,58 @@ msgstr[1] "%d sekunder"
 msgid "Unknown action to be performed"
 msgstr "Ukjent handling som skal utføres"
 
-#: ../calendar/gui/e-alarm-list.c:474
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
+#: ../calendar/gui/e-alarm-list.c:476
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s før avtalen starter"
 
-#: ../calendar/gui/e-alarm-list.c:477
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
+#: ../calendar/gui/e-alarm-list.c:481
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s etter avtalen har startet"
 
-#: ../calendar/gui/e-alarm-list.c:482
+#. Translator: The %s refers to the base, which would be actions like
+#. * "Play a sound"
+#: ../calendar/gui/e-alarm-list.c:488
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s ved avtalens start"
 
-#: ../calendar/gui/e-alarm-list.c:491
+#: ../calendar/gui/e-alarm-list.c:497
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s før avtalen slutter"
 
-#: ../calendar/gui/e-alarm-list.c:494
+#: ../calendar/gui/e-alarm-list.c:500
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s etter avtalens slutt"
 
-#: ../calendar/gui/e-alarm-list.c:499
+#: ../calendar/gui/e-alarm-list.c:505
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s ved avtalens slutt"
 
-#: ../calendar/gui/e-alarm-list.c:521
+#: ../calendar/gui/e-alarm-list.c:527
 #, c-format
 msgid "%s at %s"
 msgstr "%s ved %s"
 
-#: ../calendar/gui/e-alarm-list.c:527
+#: ../calendar/gui/e-alarm-list.c:533
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s for en ukjent utløsertype"
 
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2573
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2693
 #, c-format
 msgid "Click to open %s"
 msgstr "Klikk for å åpne %s"
 
-#: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:795
+#: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:796
 msgid "Untitled"
 msgstr "Uten navn"
 
@@ -6341,7 +6297,7 @@ msgstr "Ferdig-dato:"
 #. Status
 #: ../calendar/gui/e-cal-component-preview.c:222
 #: ../calendar/gui/e-itip-control.c:1132
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:129
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:209
 #: ../plugins/itip-formatter/itip-view.c:884
 msgid "Status:"
 msgstr "Status:"
@@ -6364,7 +6320,7 @@ msgstr "Startdato"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:5
 #: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../mail/mail-dialogs.glade.h:21
+#: ../mail/mail-dialogs.glade.h:17 ../plugins/save-calendar/csv-format.c:386
 msgid "Summary"
 msgstr "Sammendrag"
 
@@ -6379,22 +6335,6 @@ msgstr "Ledig"
 msgid "Busy"
 msgstr "Opptatt"
 
-#: ../calendar/gui/e-cal-model-tasks.c:297
-msgid "N"
-msgstr "N"
-
-#: ../calendar/gui/e-cal-model-tasks.c:297
-msgid "S"
-msgstr "S"
-
-#: ../calendar/gui/e-cal-model-tasks.c:299 ../smime/lib/e-cert.c:681
-msgid "E"
-msgstr "Ø"
-
-#: ../calendar/gui/e-cal-model-tasks.c:299
-msgid "W"
-msgstr "V"
-
 #: ../calendar/gui/e-cal-model-tasks.c:606
 msgid ""
 "The geographical position must be entered in the format: \n"
@@ -6424,11 +6364,11 @@ msgstr "Nei"
 #: ../calendar/gui/e-meeting-list-view.c:139
 #: ../calendar/gui/e-meeting-list-view.c:153
 #: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:224 ../mail/em-utils.c:1173
+#: ../calendar/gui/e-meeting-store.c:224 ../mail/em-utils.c:1175
 #: ../plugins/itip-formatter/itip-formatter.c:251
-#: ../plugins/itip-formatter/itip-formatter.c:1398
+#: ../plugins/itip-formatter/itip-formatter.c:1412
 #: ../plugins/plugin-manager/plugin-manager.c:72
-#: ../shell/e-component-registry.c:201 ../shell/e-component-registry.c:205
+#: ../shell/e-component-registry.c:205 ../shell/e-component-registry.c:211
 #: ../widgets/misc/e-charset-picker.c:62
 msgid "Unknown"
 msgstr "Ukjent"
@@ -6495,17 +6435,17 @@ msgid "Deleting selected objects"
 msgstr "Sletter valgte objekter"
 
 #: ../calendar/gui/e-calendar-table.c:873
-#: ../calendar/gui/e-calendar-view.c:756
+#: ../calendar/gui/e-calendar-view.c:779
 msgid "Updating objects"
 msgstr "Oppdaterer objekter"
 
 #: ../calendar/gui/e-calendar-table.c:1014
-#: ../calendar/gui/e-calendar-view.c:1064 ../composer/e-msg-composer.c:1241
+#: ../calendar/gui/e-calendar-view.c:1082 ../composer/e-msg-composer.c:1241
 msgid "Save as..."
 msgstr "Lagre som..."
 
 #: ../calendar/gui/e-calendar-table.c:1156
-#: ../calendar/gui/e-calendar-view.c:1395 ../ui/evolution-addressbook.xml.h:37
+#: ../calendar/gui/e-calendar-view.c:1419 ../ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Åpne"
 
@@ -6514,30 +6454,30 @@ msgid "Open _Web Page"
 msgstr "_Åpne nettside"
 
 #: ../calendar/gui/e-calendar-table.c:1158
-#: ../calendar/gui/e-calendar-view.c:1396 ../mail/em-folder-view.c:976
-#: ../mail/em-popup.c:494 ../ui/evolution-mail-message.xml.h:124
+#: ../calendar/gui/e-calendar-view.c:1420 ../mail/em-folder-view.c:1043
+#: ../mail/em-popup.c:494
 msgid "_Save As..."
 msgstr "Lagre _som..."
 
 #: ../calendar/gui/e-calendar-table.c:1159
-#: ../calendar/gui/e-calendar-view.c:1376
-#: ../calendar/gui/e-calendar-view.c:1397 ../ui/evolution-addressbook.xml.h:40
-#: ../ui/evolution-calendar.xml.h:44 ../ui/evolution-mail-message.xml.h:121
-#: ../ui/evolution-tasks.xml.h:25
+#: ../calendar/gui/e-calendar-view.c:1400
+#: ../calendar/gui/e-calendar-view.c:1421 ../mail/em-folder-view.c:1044
+#: ../ui/evolution-addressbook.xml.h:40 ../ui/evolution-calendar.xml.h:44
+#: ../ui/evolution-mail-message.xml.h:117 ../ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "S_kriv ut..."
 
 #: ../calendar/gui/e-calendar-table.c:1163
-#: ../calendar/gui/e-calendar-view.c:1401 ../ui/evolution-addressbook.xml.h:1
+#: ../calendar/gui/e-calendar-view.c:1425 ../ui/evolution-addressbook.xml.h:1
 #: ../ui/evolution-calendar.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Kli_pp ut"
 
 #: ../calendar/gui/e-calendar-table.c:1165
-#: ../calendar/gui/e-calendar-view.c:1379
-#: ../calendar/gui/e-calendar-view.c:1403 ../ui/evolution-addressbook.xml.h:38
+#: ../calendar/gui/e-calendar-view.c:1403
+#: ../calendar/gui/e-calendar-view.c:1427 ../ui/evolution-addressbook.xml.h:38
 #: ../ui/evolution-calendar.xml.h:43 ../ui/evolution-composer-entries.xml.h:9
-#: ../ui/evolution-mail-message.xml.h:119 ../ui/evolution-tasks.xml.h:24
+#: ../ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Lim inn"
 
@@ -6559,9 +6499,9 @@ msgstr "_Merk valgte oppgaver som fullført"
 
 #. FIXME: need to disable for undeletable folders
 #: ../calendar/gui/e-calendar-table.c:1176
-#: ../calendar/gui/e-calendar-view.c:1414 ../mail/em-folder-tree.c:2814
-#: ../mail/em-folder-view.c:980 ../ui/evolution-addressbook.xml.h:33
-#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-message.xml.h:108
+#: ../calendar/gui/e-calendar-view.c:1438 ../mail/em-folder-tree.c:2119
+#: ../mail/em-folder-view.c:1047 ../ui/evolution-addressbook.xml.h:33
+#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:26
 #: ../ui/evolution-tasks.xml.h:21
 msgid "_Delete"
 msgstr "_Slett"
@@ -6593,6 +6533,7 @@ msgid "Due date"
 msgstr "Ferdigdato"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:8
+#: ../plugins/save-calendar/csv-format.c:397
 msgid "Priority"
 msgstr "Prioritet"
 
@@ -6604,69 +6545,69 @@ msgstr "Startdato"
 msgid "Task sort"
 msgstr "Oppgavesortering"
 
-#: ../calendar/gui/e-calendar-view.c:1185
+#: ../calendar/gui/e-calendar-view.c:1203
 msgid "Moving items"
 msgstr "Flytter oppføringer"
 
-#: ../calendar/gui/e-calendar-view.c:1187
+#: ../calendar/gui/e-calendar-view.c:1205
 msgid "Copying items"
 msgstr "Kopierer oppføringer"
 
-#: ../calendar/gui/e-calendar-view.c:1370
+#: ../calendar/gui/e-calendar-view.c:1394
 msgid "New _Appointment..."
 msgstr "Ny _avtale..."
 
-#: ../calendar/gui/e-calendar-view.c:1371
+#: ../calendar/gui/e-calendar-view.c:1395
 msgid "New All Day _Event"
 msgstr "Ny avtale som varer h_ele dagen"
 
-#: ../calendar/gui/e-calendar-view.c:1373
+#: ../calendar/gui/e-calendar-view.c:1397
 msgid "New Task"
 msgstr "Ny oppgave"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1383
+#: ../calendar/gui/e-calendar-view.c:1407
 msgid "Current View"
 msgstr "Aktiv visning"
 
-#: ../calendar/gui/e-calendar-view.c:1385 ../ui/evolution-calendar.xml.h:26
+#: ../calendar/gui/e-calendar-view.c:1409 ../ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "Velg i _dag"
 
-#: ../calendar/gui/e-calendar-view.c:1386
+#: ../calendar/gui/e-calendar-view.c:1410
 msgid "_Select Date..."
 msgstr "_Velg dato..."
 
 #. TODO: Why is this in a context menu when it applies globally?
-#: ../calendar/gui/e-calendar-view.c:1391 ../ui/evolution-calendar.xml.h:45
+#: ../calendar/gui/e-calendar-view.c:1415 ../ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publiser ledig/opptatt-informasjon"
 
-#: ../calendar/gui/e-calendar-view.c:1407
+#: ../calendar/gui/e-calendar-view.c:1431
 msgid "Cop_y to Calendar..."
 msgstr "Kop_ier til kalender..."
 
-#: ../calendar/gui/e-calendar-view.c:1408
+#: ../calendar/gui/e-calendar-view.c:1432
 msgid "Mo_ve to Calendar..."
 msgstr "Fl_ytt til kalender..."
 
-#: ../calendar/gui/e-calendar-view.c:1409
+#: ../calendar/gui/e-calendar-view.c:1433
 msgid "_Schedule Meeting..."
 msgstr "_Sett opp møte..."
 
-#: ../calendar/gui/e-calendar-view.c:1410
+#: ../calendar/gui/e-calendar-view.c:1434
 msgid "_Forward as iCalendar..."
 msgstr "_Videresend som iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1415
+#: ../calendar/gui/e-calendar-view.c:1439
 msgid "Make this Occurrence _Movable"
 msgstr "Gjør denne hendelsen _flyttbar"
 
-#: ../calendar/gui/e-calendar-view.c:1416
+#: ../calendar/gui/e-calendar-view.c:1440
 msgid "Delete this _Occurrence"
 msgstr "Slett denne _hendelsen"
 
-#: ../calendar/gui/e-calendar-view.c:1417
+#: ../calendar/gui/e-calendar-view.c:1441
 msgid "Delete _All Occurrences"
 msgstr "Slett _alle hendelser"
 
@@ -6701,7 +6642,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../calendar/gui/e-day-view-time-item.c:527
+#: ../calendar/gui/e-day-view-time-item.c:553
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minutters oppdeling"
@@ -6712,19 +6653,19 @@ msgstr "%02i minutters oppdeling"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1494
+#: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1499
 #: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1517
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:748 ../calendar/gui/e-week-view.c:512
+#: ../calendar/gui/e-day-view.c:752 ../calendar/gui/e-week-view.c:512
 #: ../calendar/gui/print.c:841
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:751 ../calendar/gui/e-week-view.c:515
+#: ../calendar/gui/e-day-view.c:755 ../calendar/gui/e-week-view.c:515
 #: ../calendar/gui/print.c:843
 msgid "pm"
 msgstr "pm"
@@ -6802,6 +6743,7 @@ msgid "Ends"
 msgstr "Slutter"
 
 #: ../calendar/gui/e-itip-control.c:909
+#: ../plugins/save-calendar/csv-format.c:395
 msgid "Due"
 msgstr "Ferdig"
 
@@ -6835,21 +6777,21 @@ msgstr ""
 #: ../calendar/gui/e-itip-control.c:1137
 #: ../calendar/gui/e-meeting-list-view.c:175
 #: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
-#: ../calendar/gui/itip-utils.c:422
-#: ../plugins/itip-formatter/itip-formatter.c:1389
+#: ../calendar/gui/itip-utils.c:421
+#: ../plugins/itip-formatter/itip-formatter.c:1403
 msgid "Accepted"
 msgstr "Godtatt"
 
-#: ../calendar/gui/e-itip-control.c:1141 ../calendar/gui/itip-utils.c:425
-#: ../plugins/itip-formatter/itip-formatter.c:1392
+#: ../calendar/gui/e-itip-control.c:1141 ../calendar/gui/itip-utils.c:424
+#: ../plugins/itip-formatter/itip-formatter.c:1406
 msgid "Tentatively Accepted"
 msgstr "Akseptert tentativt"
 
 #: ../calendar/gui/e-itip-control.c:1145
 #: ../calendar/gui/e-meeting-list-view.c:176
 #: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
-#: ../calendar/gui/itip-utils.c:428 ../calendar/gui/itip-utils.c:454
-#: ../plugins/itip-formatter/itip-formatter.c:1395
+#: ../calendar/gui/itip-utils.c:427 ../calendar/gui/itip-utils.c:453
+#: ../plugins/itip-formatter/itip-formatter.c:1409
 msgid "Declined"
 msgstr "Avslått"
 
@@ -7115,7 +7057,7 @@ msgstr "Oppdater status for respondent"
 msgid "Send Latest Information"
 msgstr "Send siste informasjon"
 
-#: ../calendar/gui/e-itip-control.c:2375 ../calendar/gui/itip-utils.c:442
+#: ../calendar/gui/e-itip-control.c:2375 ../calendar/gui/itip-utils.c:441
 #: ../mail/mail-send-recv.c:414 ../mail/mail-send-recv.c:466
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
@@ -7264,7 +7206,7 @@ msgstr "%a %d.%m.%Y"
 #. This is a strftime() format for a short date. %m = month,
 #. %d = day of month, %Y = year (all digits).
 #: ../calendar/gui/e-meeting-time-sel-item.c:452 ../e-util/e-time-utils.c:238
-#: ../e-util/e-time-utils.c:299 ../widgets/misc/e-dateedit.c:1660
+#: ../e-util/e-time-utils.c:299 ../widgets/misc/e-dateedit.c:1682
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
@@ -7325,7 +7267,7 @@ msgstr "Obligatoriske personer _og en ressurs"
 msgid "Enter the password for %s"
 msgstr "Oppgi passord for %s"
 
-#: ../calendar/gui/e-tasks.c:763 ../calendar/gui/gnome-cal.c:2372
+#: ../calendar/gui/e-tasks.c:763 ../calendar/gui/gnome-cal.c:2412
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7366,39 +7308,39 @@ msgstr "Tidssone-knapp"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:718
+#: ../calendar/gui/gnome-cal.c:723
 msgid "Updating query"
 msgstr "Oppdaterer spørring"
 
 #. bonobo displays this string so it must be in locale
-#: ../calendar/gui/gnome-cal.c:2057 ../widgets/menus/gal-view-menus.c:351
+#: ../calendar/gui/gnome-cal.c:2089 ../widgets/menus/gal-view-menus.c:350
 msgid "Custom View"
 msgstr "Egendefinert visning"
 
-#: ../calendar/gui/gnome-cal.c:2058
+#: ../calendar/gui/gnome-cal.c:2090
 msgid "Save Custom View"
 msgstr "Lagre egendefinert visning"
 
-#: ../calendar/gui/gnome-cal.c:2063 ../widgets/menus/gal-view-menus.c:373
+#: ../calendar/gui/gnome-cal.c:2095 ../widgets/menus/gal-view-menus.c:372
 msgid "Define Views..."
 msgstr "Definer visninger..."
 
-#: ../calendar/gui/gnome-cal.c:2222
+#: ../calendar/gui/gnome-cal.c:2258
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Laster avtaler på %s"
 
-#: ../calendar/gui/gnome-cal.c:2241
+#: ../calendar/gui/gnome-cal.c:2277
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Laster oppgaver på %s"
 
-#: ../calendar/gui/gnome-cal.c:2338
+#: ../calendar/gui/gnome-cal.c:2378
 #, c-format
 msgid "Opening %s"
 msgstr "Åpner %s"
 
-#: ../calendar/gui/gnome-cal.c:3228
+#: ../calendar/gui/gnome-cal.c:3268
 msgid "Purging"
 msgstr "Sletter"
 
@@ -7458,57 +7400,57 @@ msgstr "September"
 msgid "_Select Today"
 msgstr "_Velg i dag"
 
-#: ../calendar/gui/itip-utils.c:271 ../calendar/gui/itip-utils.c:319
-#: ../calendar/gui/itip-utils.c:351
+#: ../calendar/gui/itip-utils.c:270 ../calendar/gui/itip-utils.c:318
+#: ../calendar/gui/itip-utils.c:350
 msgid "An organizer must be set."
 msgstr "En organisator må oppgis."
 
-#: ../calendar/gui/itip-utils.c:306
+#: ../calendar/gui/itip-utils.c:305
 msgid "At least one attendee is necessary"
 msgstr "Minst en deltaker kreves"
 
-#: ../calendar/gui/itip-utils.c:394 ../calendar/gui/itip-utils.c:503
+#: ../calendar/gui/itip-utils.c:393 ../calendar/gui/itip-utils.c:502
 msgid "Event information"
 msgstr "Hendelsesinformasjon"
 
-#: ../calendar/gui/itip-utils.c:396 ../calendar/gui/itip-utils.c:505
+#: ../calendar/gui/itip-utils.c:395 ../calendar/gui/itip-utils.c:504
 msgid "Task information"
 msgstr "Oppgaveinformasjon"
 
-#: ../calendar/gui/itip-utils.c:398 ../calendar/gui/itip-utils.c:507
+#: ../calendar/gui/itip-utils.c:397 ../calendar/gui/itip-utils.c:506
 msgid "Journal information"
 msgstr "Journalinformasjon"
 
-#: ../calendar/gui/itip-utils.c:400 ../calendar/gui/itip-utils.c:525
+#: ../calendar/gui/itip-utils.c:399 ../calendar/gui/itip-utils.c:524
 msgid "Free/Busy information"
 msgstr "Ledig/opptatt-informasjon"
 
-#: ../calendar/gui/itip-utils.c:402
+#: ../calendar/gui/itip-utils.c:401
 msgid "Calendar information"
 msgstr "Kalenderinformasjon"
 
-#: ../calendar/gui/itip-utils.c:438
+#: ../calendar/gui/itip-utils.c:437
 msgid "Updated"
 msgstr "Oppdatert"
 
-#: ../calendar/gui/itip-utils.c:446
+#: ../calendar/gui/itip-utils.c:445
 msgid "Refresh"
 msgstr "Oppdater"
 
-#: ../calendar/gui/itip-utils.c:450
+#: ../calendar/gui/itip-utils.c:449
 msgid "Counter-proposal"
 msgstr "Motforslag"
 
-#: ../calendar/gui/itip-utils.c:521
+#: ../calendar/gui/itip-utils.c:520
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Ledig/opptatt-informasjon (%s til %s)"
 
-#: ../calendar/gui/itip-utils.c:531
+#: ../calendar/gui/itip-utils.c:530
 msgid "iCalendar information"
 msgstr "iCalendar-informasjon"
 
-#: ../calendar/gui/itip-utils.c:673
+#: ../calendar/gui/itip-utils.c:672
 msgid "You must be an attendee of the event."
 msgstr "Du må være en deltager i hendelsen."
 
@@ -7537,18 +7479,18 @@ msgstr ""
 "Vennligst vent mens Evolution migrere dine mapper..."
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:745 ../calendar/gui/migration.c:912
+#: ../calendar/gui/migration.c:748 ../calendar/gui/migration.c:915
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "Kan ikke migrere gamle innstillinger fra evolution/config.xmldb"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:774
+#: ../calendar/gui/migration.c:777
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "Kan ikke migrere kalender «%s»"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:941
+#: ../calendar/gui/migration.c:944
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Kan ikke migrere oppgaver «%s»"
@@ -7738,112 +7680,122 @@ msgstr "Valgt måned (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Valgt år (%Y)"
 
-#: ../calendar/gui/print.c:2359
+#: ../calendar/gui/print.c:2320
+#, c-format
+msgid "Summary: %s"
+msgstr "Sammendrag: %s"
+
+#: ../calendar/gui/print.c:2328
+#, c-format
+msgid "Location: %s"
+msgstr "Plassering: %s"
+
+#: ../calendar/gui/print.c:2371
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: ../calendar/gui/print.c:2376
+#: ../calendar/gui/print.c:2388
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioritet: %s"
 
-#: ../calendar/gui/print.c:2388
+#: ../calendar/gui/print.c:2400
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Prosent fullført: %i"
 
-#: ../calendar/gui/print.c:2400
+#: ../calendar/gui/print.c:2412
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2414
+#: ../calendar/gui/print.c:2426
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorier: %s"
 
-#: ../calendar/gui/print.c:2425
+#: ../calendar/gui/print.c:2437
 msgid "Contacts: "
 msgstr "Kontakter: "
 
-#: ../calendar/gui/print.c:2565 ../calendar/gui/print.c:2653
-#: ../calendar/gui/print.c:2779 ../mail/em-format-html-print.c:178
+#: ../calendar/gui/print.c:2577 ../calendar/gui/print.c:2665
+#: ../calendar/gui/print.c:2791 ../mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Forhåndsvisning av utskrift"
 
-#: ../calendar/gui/print.c:2600
+#: ../calendar/gui/print.c:2612
 msgid "Print Item"
 msgstr "Skriv ut oppføring"
 
-#: ../calendar/gui/tasks-component.c:428
+#: ../calendar/gui/tasks-component.c:439
 msgid "New Task List"
 msgstr "Ny oppgaveliste"
 
-#: ../calendar/gui/tasks-component.c:504
+#: ../calendar/gui/tasks-component.c:515
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d oppgave"
 msgstr[1] "%d oppgaver"
 
-#: ../calendar/gui/tasks-component.c:506 ../mail/mail-component.c:544
+#: ../calendar/gui/tasks-component.c:517 ../mail/mail-component.c:545
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", %d valgt"
 msgstr[1] ", %d valgt"
 
-#: ../calendar/gui/tasks-component.c:553
+#: ../calendar/gui/tasks-component.c:564
 msgid "Failed upgrading tasks."
 msgstr "Feil under oppgradering av oppgaver."
 
-#: ../calendar/gui/tasks-component.c:847
+#: ../calendar/gui/tasks-component.c:860
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "Kan ikke åpne oppgaveliste «%s» for oppretting av hendelser og møter"
 
-#: ../calendar/gui/tasks-component.c:862
+#: ../calendar/gui/tasks-component.c:875
 msgid "There is no calendar available for creating tasks"
 msgstr "Ingen kalender tilgjengelig for opppretting av oppgaver"
 
-#: ../calendar/gui/tasks-component.c:956
+#: ../calendar/gui/tasks-component.c:969
 msgid "Task Source Selector"
 msgstr "Valgt av oppgavekilde"
 
-#: ../calendar/gui/tasks-component.c:1139
+#: ../calendar/gui/tasks-component.c:1152
 msgid "New task"
 msgstr "Ny oppgave"
 
-#: ../calendar/gui/tasks-component.c:1140
+#: ../calendar/gui/tasks-component.c:1153
 msgid "_Task"
 msgstr "_Oppgave"
 
-#: ../calendar/gui/tasks-component.c:1141
+#: ../calendar/gui/tasks-component.c:1154
 msgid "Create a new task"
 msgstr "Opprett en ny oppgave"
 
-#: ../calendar/gui/tasks-component.c:1147
+#: ../calendar/gui/tasks-component.c:1160
 msgid "New assigned task"
 msgstr "Ny tildelt oppgave"
 
-#: ../calendar/gui/tasks-component.c:1148
+#: ../calendar/gui/tasks-component.c:1161
 msgid "Assigne_d Task"
 msgstr "Til_delt oppgave"
 
-#: ../calendar/gui/tasks-component.c:1149
+#: ../calendar/gui/tasks-component.c:1162
 msgid "Create a new assigned task"
 msgstr "Opprett en ny tildelt oppgave"
 
-#: ../calendar/gui/tasks-component.c:1155
+#: ../calendar/gui/tasks-component.c:1168
 msgid "New task list"
 msgstr "Ny oppgaveliste"
 
-#: ../calendar/gui/tasks-component.c:1156
+#: ../calendar/gui/tasks-component.c:1169
 msgid "Task l_ist"
 msgstr "Oppgave_liste"
 
-#: ../calendar/gui/tasks-component.c:1157
+#: ../calendar/gui/tasks-component.c:1170
 msgid "Create a new task list"
 msgstr "Opprett en ny oppgaveliste"
 
@@ -9442,15 +9394,15 @@ msgstr "Stillehavet/Wallis"
 msgid "Pacific/Yap"
 msgstr "Stillahavet/Yap"
 
-#: ../composer/e-msg-composer-hdrs.c:519
+#: ../composer/e-msg-composer-hdrs.c:520
 msgid "Posting destination"
 msgstr "Destinasjon for post"
 
-#: ../composer/e-msg-composer-hdrs.c:520
+#: ../composer/e-msg-composer-hdrs.c:521
 msgid "Choose folders to post the message to."
 msgstr "Velg mapper meldingen skal postes til."
 
-#: ../composer/e-msg-composer-hdrs.c:554
+#: ../composer/e-msg-composer-hdrs.c:555
 msgid "Click here for the address book"
 msgstr "Klikk her for å få opp adresseboken"
 
@@ -9461,45 +9413,45 @@ msgstr "Klikk her for å få opp adresseboken"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: ../composer/e-msg-composer-hdrs.c:584
+#: ../composer/e-msg-composer-hdrs.c:585
 msgid "_Reply-To:"
 msgstr "Sva_r-til:"
 
 #.
 #. * From
 #.
-#: ../composer/e-msg-composer-hdrs.c:591
+#: ../composer/e-msg-composer-hdrs.c:592
 msgid "Fr_om:"
 msgstr "Fr_a:"
 
 #.
 #. * Subject
 #.
-#: ../composer/e-msg-composer-hdrs.c:598
+#: ../composer/e-msg-composer-hdrs.c:599
 msgid "S_ubject:"
 msgstr "Em_ne:"
 
-#: ../composer/e-msg-composer-hdrs.c:608
+#: ../composer/e-msg-composer-hdrs.c:609
 msgid "_To:"
 msgstr "_Til:"
 
-#: ../composer/e-msg-composer-hdrs.c:609
+#: ../composer/e-msg-composer-hdrs.c:610
 msgid "Enter the recipients of the message"
 msgstr "Skriv inn mottakerene for meldingen"
 
-#: ../composer/e-msg-composer-hdrs.c:612
+#: ../composer/e-msg-composer-hdrs.c:613
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-msg-composer-hdrs.c:613
+#: ../composer/e-msg-composer-hdrs.c:614
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Skriv inn adressene som skal motta en kopi av meldingen"
 
-#: ../composer/e-msg-composer-hdrs.c:616
+#: ../composer/e-msg-composer-hdrs.c:617
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-msg-composer-hdrs.c:617
+#: ../composer/e-msg-composer-hdrs.c:618
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9510,26 +9462,30 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: ../composer/e-msg-composer-hdrs.c:624
+#: ../composer/e-msg-composer-hdrs.c:625
 msgid "_Post To:"
 msgstr "_Post til:"
 
-#: ../composer/e-msg-composer-hdrs.c:629
+#: ../composer/e-msg-composer-hdrs.c:630
 msgid "Click here to select folders to post to"
 msgstr "Klikk her for å velge mapper å poste til"
 
-#: ../composer/e-msg-composer-hdrs.c:635
+#: ../composer/e-msg-composer-hdrs.c:636
 msgid "Post To:"
 msgstr "Post til:"
 
-#: ../composer/e-msg-composer.c:730
+#: ../composer/e-msg-composer-select-file.c:80
+msgid "A_ttach"
+msgstr "Le_gg ved"
+
+#: ../composer/e-msg-composer.c:737
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Kan ikke signere utgående melding: Ingen sertifikat for signering satt for "
 "denne kontoen"
 
-#: ../composer/e-msg-composer.c:737
+#: ../composer/e-msg-composer.c:744
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -9558,21 +9514,21 @@ msgstr "Melding uten navn"
 msgid "Open File"
 msgstr "Åpne fil"
 
-#: ../composer/e-msg-composer.c:2001 ../mail/em-account-editor.c:587
-#: ../mail/em-account-editor.c:632 ../mail/em-account-editor.c:699
+#: ../composer/e-msg-composer.c:1996 ../mail/em-account-editor.c:588
+#: ../mail/em-account-editor.c:633 ../mail/em-account-editor.c:698
 msgid "Autogenerated"
 msgstr "Generert automatisk"
 
-#: ../composer/e-msg-composer.c:2100
+#: ../composer/e-msg-composer.c:2095
 msgid "Si_gnature:"
 msgstr "Si_gnatur:"
 
-#: ../composer/e-msg-composer.c:2359 ../composer/e-msg-composer.c:3360
-#: ../composer/e-msg-composer.c:3361
+#: ../composer/e-msg-composer.c:2336 ../composer/e-msg-composer.c:3366
+#: ../composer/e-msg-composer.c:3367
 msgid "Compose a message"
 msgstr "Skriv en melding"
 
-#: ../composer/e-msg-composer.c:4542
+#: ../composer/e-msg-composer.c:4537
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -9580,100 +9536,33 @@ msgstr ""
 "<b>(Redigering inneholder en meldingskropp som ikke er tekst, og derfor ikke "
 "kan redigeres.)<b>"
 
-#. mail-composer:no-attach primary
-#: ../composer/mail-composer-errors.xml.h:2
-msgid "You cannot attach the file `{0}' to this message."
-msgstr "Du kan ikke legge ved filen «{0}» i denne meldingen."
-
-#. mail-composer:attach-notfile primary
-#: ../composer/mail-composer-errors.xml.h:6
-msgid "The file `{0}' is not a regular file and cannot be sent in a message."
-msgstr "Filen «{0}» er ikke en vanlig fil og kan ikke sendes i en melding."
-
-#. mail-composer:attach-directory primary
-#: ../composer/mail-composer-errors.xml.h:8
-msgid "Directories can not be attached to Messages."
-msgstr "Kataloger kan ikke legges ved meldinger."
-
-#. mail-composer:attach-directory secondary
-#: ../composer/mail-composer-errors.xml.h:10
-msgid ""
-"To attach the contents of this directory, either attach the files in this "
-"directory individually, or create an archive of the directory and attach it."
-msgstr ""
-"For å legge til innholdet i denne katalogen må du enten legge ved filene "
-"hver for seg eller opprette et arkiv av katalogen og legge ved dette."
-
-#. mail-composer:attach-nomessages primary
-#: ../composer/mail-composer-errors.xml.h:12
-msgid "Could not retrieve messages to attach from {0}."
-msgstr "Kunne ikke hente meldinger som skal legges ved fra {0}."
-
-#. mail-composer:attach-nomessages secondary
-#. mail-composer:no-sig-file secondary
-#. mail:no-create-tmp-path secondary
-#. mail:no-delete-folder secondary
-#. system:no-save-file secondary
-#. system:no-load-file secondary
-#: ../composer/mail-composer-errors.xml.h:14
-#: ../composer/mail-composer-errors.xml.h:42 ../mail/mail-errors.xml.h:105
-#: ../mail/mail-errors.xml.h:117 ../widgets/misc/e-system-errors.xml.h:11
-#: ../widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr "pga «{1}»."
-
-#. mail-composer:recover-autosave title
-#: ../composer/mail-composer-errors.xml.h:16
-msgid "Unfinished messages found"
-msgstr "Uferdige meldinger funnet"
-
-#. mail-composer:recover-autosave primary
-#: ../composer/mail-composer-errors.xml.h:18
-msgid "Do you want to recover unfinished messages?"
-msgstr "Vil du gjenopprette uferdige meldinger?"
-
-#. mail-composer:recover-autosave secondary
-#: ../composer/mail-composer-errors.xml.h:20
+#: ../composer/mail-composer.error.xml.h:1
 msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
+" There are few attachments getting downloaded. Sending the mail will cause "
+"the mail to be sent without those pending attachments "
 msgstr ""
-"Evolution avsluttet uventet mens du skrev en ny melding. Gjenoppretting av "
-"meldingen vil la deg fortsette der du slapp."
 
-#: ../composer/mail-composer-errors.xml.h:21
-msgid "Don't Recover"
-msgstr "Ikke gjenopprett"
-
-#: ../composer/mail-composer-errors.xml.h:22
-msgid "Recover"
-msgstr "Gjenopprett"
-
-#. mail-composer:no-autosave primary
-#: ../composer/mail-composer-errors.xml.h:24
-msgid "Could not save to autosave file \"{0}\"."
-msgstr "Kunne ikke lagre til fil for autolagring: «{0}»."
-
-#. mail-composer:no-autosave secondary
-#: ../composer/mail-composer-errors.xml.h:26
-msgid "Error saving to autosave because \"{1}\"."
-msgstr "Feil under automatisk lagring pga «{1}»."
-
-#. mail-composer:exit-unsaved title
-#: ../composer/mail-composer-errors.xml.h:28
-msgid "Warning: Modified Message"
-msgstr "Advarsel: Endret melding"
+#: ../composer/mail-composer.error.xml.h:2
+msgid "All accounts have been removed."
+msgstr "Alle kontoer er fjernet."
 
-#. mail-composer:exit-unsaved primary
-#: ../composer/mail-composer-errors.xml.h:30
+#: ../composer/mail-composer.error.xml.h:3
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
 msgstr ""
 "Er du sikker på at du vil forkaste meldingen du skriver med tittel «{0}?"
 
-#. mail-composer:exit-unsaved secondary
-#: ../composer/mail-composer-errors.xml.h:32
+#: ../composer/mail-composer.error.xml.h:4
+msgid "Because &quot;{0}&quot;, you may need to select different mail options."
+msgstr "Du vil kanskje måtte velge andre alternativer for e-post pga &quot;{0}&quot;."
+
+#: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
+#: ../mail/mail.error.xml.h:16
+msgid "Because &quot;{1}&quot;."
+msgstr "Pga &quot;{1}&quot;."
+
+#: ../composer/mail-composer.error.xml.h:6
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
@@ -9683,53 +9572,71 @@ msgstr ""
 "velger å lagre meldingen i mappen Skisser. Dette vil la deg fortsette å "
 "skrive på meldingen på et senere tidspunkt."
 
-#: ../composer/mail-composer-errors.xml.h:33
-msgid "_Discard Changes"
-msgstr "_Forkast endringer"
-
-#: ../composer/mail-composer-errors.xml.h:34
-msgid "_Save Message"
-msgstr "_Lagre melding"
+#: ../composer/mail-composer.error.xml.h:7
+msgid "Could not create composer window."
+msgstr "Kunne ikke opprette vindu for å skrive melding."
 
-#. mail-composer:no-build-message primary
-#: ../composer/mail-composer-errors.xml.h:36
+#: ../composer/mail-composer.error.xml.h:8
 msgid "Could not create message."
 msgstr "Kunne ikke opprette melding."
 
-#. mail-composer:no-build-message secondary
-#: ../composer/mail-composer-errors.xml.h:38
-msgid "Because \"{0}\", you may need to select different mail options."
-msgstr "Pga «{0}» vil du kanskje måtte velge andre alternativer for e-post."
+#: ../composer/mail-composer.error.xml.h:9
+msgid "Could not read signature file &quot;{0}&quot;."
+msgstr "Kunne ikke lese signaturfil &quot;{0}&quot;."
 
-#. mail-composer:no-sig-file primary
-#: ../composer/mail-composer-errors.xml.h:40
-msgid "Could not read signature file \"{0}\"."
-msgstr "Kunne ikke lagre signaturfil «{0}»."
+#: ../composer/mail-composer.error.xml.h:10
+msgid "Could not retrieve messages to attach from {0}."
+msgstr "Kunne ikke hente meldinger som skal legges ved fra {0}."
 
-#. mail-composer:all-accounts-deleted primary
-#: ../composer/mail-composer-errors.xml.h:44
-msgid "All accounts have been removed."
-msgstr "Alle kontoer er fjernet."
+#: ../composer/mail-composer.error.xml.h:11
+msgid "Could not save to autosave file &quot;{0}&quot;."
+msgstr "Kunne ikke lagre til fil for automatisk lagring: &quot;{0}&quot;."
 
-#. mail-composer:all-accounts-deleted secondary
-#: ../composer/mail-composer-errors.xml.h:46
-msgid "You need to configure an account before you can compose mail."
-msgstr "Du må konfigurere en konto før du kan skrive meldinger."
+#: ../composer/mail-composer.error.xml.h:12
+msgid "Directories can not be attached to Messages."
+msgstr "Kataloger kan ikke legges ved meldinger."
 
-#. mail-composer:no-address-control primary
-#. mail-composer:no-editor-control primary
-#: ../composer/mail-composer-errors.xml.h:48
-#: ../composer/mail-composer-errors.xml.h:52
-msgid "Could not create composer window."
-msgstr "Kunne ikke opprette vindu for å skrive melding."
+#: ../composer/mail-composer.error.xml.h:13
+msgid "Do you want to recover unfinished messages?"
+msgstr "Vil du gjenopprette uferdige meldinger?"
 
-#. mail-composer:no-address-control secondary
-#: ../composer/mail-composer-errors.xml.h:50
-msgid "Unable to activate the address selector control."
-msgstr "Klarte ikke å aktivere kontroll for adressevelger."
+#: ../composer/mail-composer.error.xml.h:14
+msgid "Don't Recover"
+msgstr "Ikke gjenopprett"
+
+#: ../composer/mail-composer.error.xml.h:15
+msgid "Download in progress. Do you want to send the mail?"
+msgstr "Nedlasting pågår. Vil du sende meldingen?"
+
+#: ../composer/mail-composer.error.xml.h:16
+msgid "Error saving to autosave because &quot;{1}&quot;."
+msgstr "Feil under automatisk lagring pga &quot;{1}&quot;."
 
-#. mail-composer:no-editor-control secondary
-#: ../composer/mail-composer-errors.xml.h:54
+#: ../composer/mail-composer.error.xml.h:17
+msgid ""
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
+msgstr ""
+"Evolution avsluttet uventet mens du skrev en ny melding. Gjenoppretting av "
+"meldingen vil la deg fortsette der du slapp."
+
+#: ../composer/mail-composer.error.xml.h:18
+msgid "Recover"
+msgstr "Gjenopprett"
+
+#: ../composer/mail-composer.error.xml.h:19
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
+msgstr "Filen «{0}» er ikke en vanlig fil og kan ikke sendes i en melding."
+
+#: ../composer/mail-composer.error.xml.h:20
+msgid ""
+"To attach the contents of this directory, either attach the files in this "
+"directory individually, or create an archive of the directory and attach it."
+msgstr ""
+"For å legge til innholdet i denne katalogen må du enten legge ved filene "
+"hver for seg eller opprette et arkiv av katalogen og legge ved dette."
+
+#: ../composer/mail-composer.error.xml.h:21
 msgid ""
 "Unable to activate the HTML editor control.\n"
 "\n"
@@ -9740,7 +9647,35 @@ msgstr ""
 "Vennligst sjekk at du har installert korrekt versjon av gtkhtml og "
 "libgtkhtml."
 
-#: ../data/evolution.desktop.in.in.h:1 ../shell/main.c:520
+#: ../composer/mail-composer.error.xml.h:24
+msgid "Unable to activate the address selector control."
+msgstr "Klarte ikke å aktivere kontroll for adressevelger."
+
+#: ../composer/mail-composer.error.xml.h:25
+msgid "Unfinished messages found"
+msgstr "Uferdige meldinger funnet"
+
+#: ../composer/mail-composer.error.xml.h:26
+msgid "Warning: Modified Message"
+msgstr "Advarsel: Endret melding"
+
+#: ../composer/mail-composer.error.xml.h:27
+msgid "You cannot attach the file `{0}' to this message."
+msgstr "Du kan ikke legge ved filen «{0}» i denne meldingen."
+
+#: ../composer/mail-composer.error.xml.h:28
+msgid "You need to configure an account before you can compose mail."
+msgstr "Du må konfigurere en konto før du kan skrive meldinger."
+
+#: ../composer/mail-composer.error.xml.h:29
+msgid "_Discard Changes"
+msgstr "_Forkast endringer"
+
+#: ../composer/mail-composer.error.xml.h:30
+msgid "_Save Message"
+msgstr "_Lagre melding"
+
+#: ../data/evolution.desktop.in.in.h:1 ../shell/main.c:509
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -9829,8 +9764,8 @@ msgstr ""
 "kvittering ra deg.</small>"
 
 #: ../designs/read_receipts/read.glade.h:6
-msgid "Always send back a read reciept"
-msgstr "Alltid send en kvittering tilbake"
+msgid "Always send back a read receipt"
+msgstr "Alltid send en lesekvittering tilbake"
 
 #: ../designs/read_receipts/read.glade.h:7
 msgid "Ask me if I want to send back a read receipt"
@@ -9869,18 +9804,52 @@ msgstr ""
 "En fil med samme navn eksisterer allerede.\n"
 "Overskriv den?"
 
-#. system:ask-save-file-exists-overwrite title
-#: ../e-util/e-dialog-utils.c:269 ../widgets/misc/e-system-errors.xml.h:2
+#: ../e-util/e-dialog-utils.c:269 ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
 msgstr "Overskriv fil?"
 
-#: ../e-util/e-passwords.c:472
-msgid "_Remember this password"
-msgstr "Husk dette passo_rdet"
+#: ../e-util/e-error.c:84 ../e-util/e-error.c:85 ../e-util/e-error.c:127
+msgid "Evolution Error"
+msgstr "Evolution feil"
+
+#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:125
+msgid "Evolution Warning"
+msgstr "Evolution advarsel"
+
+#: ../e-util/e-error.c:124
+msgid "Evolution Information"
+msgstr "Evolution informasjon"
 
-#: ../e-util/e-passwords.c:473
-msgid "_Remember this password for the remainder of this session"
-msgstr "Husk dette passo_rdet for resten av denne sesjonen"
+#: ../e-util/e-error.c:126
+msgid "Evolution Query"
+msgstr "Evolution spørring"
+
+#. setup a dummy error
+#: ../e-util/e-error.c:438
+#, c-format
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr "<span weight=\"bold\">Intern feil, ukjent feil «%s» etterspurt</span>"
+
+#: ../e-util/e-system.error.xml.h:2
+msgid "Cannot open file &quot;{0}&quot;."
+msgstr "Kan ikke åpne fil &quot;{0}&quot;."
+
+#: ../e-util/e-system.error.xml.h:3
+msgid "Cannot save file &quot;{0}&quot;."
+msgstr "Kan ikke lagre fil &quot;{0}&quot;."
+
+#: ../e-util/e-system.error.xml.h:4
+msgid "Do you wish to overwrite it?"
+msgstr "Vil du overskrive den?"
+
+#: ../e-util/e-system.error.xml.h:5
+msgid "File exists &quot;{0}&quot;."
+msgstr "Filen &quot;{0}&quot; eksisterer."
+
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:117
+msgid "_Overwrite"
+msgstr "_Overskriv"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
@@ -9962,7 +9931,7 @@ msgstr "%H.%M.%S"
 #. without seconds.
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
 #: ../e-util/e-time-utils.c:348 ../e-util/e-time-utils.c:435
-#: ../widgets/misc/e-dateedit.c:1431 ../widgets/misc/e-dateedit.c:1697
+#: ../widgets/misc/e-dateedit.c:1438 ../widgets/misc/e-dateedit.c:1720
 msgid "%I:%M %p"
 msgstr "%H.%M"
 
@@ -9971,7 +9940,7 @@ msgstr "%H.%M"
 #. without seconds.
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
 #: ../e-util/e-time-utils.c:352 ../e-util/e-time-utils.c:427
-#: ../widgets/misc/e-dateedit.c:1428 ../widgets/misc/e-dateedit.c:1694
+#: ../widgets/misc/e-dateedit.c:1435 ../widgets/misc/e-dateedit.c:1717
 msgid "%H:%M"
 msgstr "%H.%M"
 
@@ -9984,6 +9953,50 @@ msgstr "%H"
 msgid "The orientation of the tray."
 msgstr "Orientering for trauet."
 
+#: ../filter/filter.error.xml.h:1
+msgid "Bad regular expression &quot;{0}&quot;."
+msgstr "Ugyldig regulært uttrykk &quot;{0}&quot;."
+
+#: ../filter/filter.error.xml.h:2
+msgid "Could not compile regular expression &quot;{1}&quot;."
+msgstr "Kunne ikke sette sammen regulært uttrykk &quot;{1}&quot;."
+
+#: ../filter/filter.error.xml.h:3
+msgid "File &quot;{0}&quot; does not exist or is not a regular file."
+msgstr "Filen &quot;{0}&quot; eksisterer ikke eller er ikke en vanlig fil."
+
+#: ../filter/filter.error.xml.h:4
+msgid "Missing date."
+msgstr "Mangler dato."
+
+#: ../filter/filter.error.xml.h:5
+msgid "Missing file name."
+msgstr "Mangler filnavn."
+
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:62
+msgid "Missing name."
+msgstr "Mangler navn."
+
+#: ../filter/filter.error.xml.h:7
+msgid "Name &quot;{0}&quot; already used."
+msgstr "Navnet &quot;{0}&quot; er allerede i bruk."
+
+#: ../filter/filter.error.xml.h:8
+msgid "Please choose another name."
+msgstr "Vennligst velg et annet navn."
+
+#: ../filter/filter.error.xml.h:9
+msgid "You must choose a date."
+msgstr "Du må velge en dato."
+
+#: ../filter/filter.error.xml.h:10
+msgid "You must name this filter."
+msgstr "Du må gi navn til dette filteret."
+
+#: ../filter/filter.error.xml.h:11
+msgid "You must specify a file name."
+msgstr "Du må oppgi et filnavn."
+
 #: ../filter/filter-datespec.c:73
 #, c-format
 msgid "1 second ago"
@@ -10050,82 +10063,25 @@ msgstr "%d.%b.%Y"
 msgid "Select a time to compare against"
 msgstr "Velg en tid å sammenligne mot"
 
-#. filter:no-date primary
-#: ../filter/filter-errors.xml.h:2
-msgid "Missing date."
-msgstr "Mangler dato."
-
-#. filter:no-date secondary
-#: ../filter/filter-errors.xml.h:4
-msgid "You must choose a date."
-msgstr "Du må velge en dato."
-
-#. filter:no-file primary
-#: ../filter/filter-errors.xml.h:6
-msgid "Missing file name."
-msgstr "Mangler filnavn."
-
-#. filter:no-file secondary
-#. filter:bad-file secondary
-#: ../filter/filter-errors.xml.h:8 ../filter/filter-errors.xml.h:12
-msgid "You must specify a file name."
-msgstr "Du må oppgi et filnavn."
-
-#. filter:bad-file primary
-#: ../filter/filter-errors.xml.h:10
-msgid "File \"{0}\" does not exist or is not a regular file."
-msgstr "Filen «{0}» eksisterer ikke eller er ikke en vanlig fil."
-
-#. filter:bad-regexp primary
-#: ../filter/filter-errors.xml.h:14
-msgid "Bad regular expression \"{0}\"."
-msgstr "Ugyldig regulært uttrykk «{0}»."
-
-#. filter:bad-regexp secondary
-#: ../filter/filter-errors.xml.h:16
-msgid "Could not compile regular expression \"{1}\"."
-msgstr "Kunne ikke sette sammen regulært uttrykk «{1}»."
-
-#. filter:no-name primary
-#. mail:no-name-vfolder primary
-#: ../filter/filter-errors.xml.h:18 ../mail/mail-errors.xml.h:219
-msgid "Missing name."
-msgstr "Mangler navn."
-
-#. filter:no-name secondary
-#: ../filter/filter-errors.xml.h:20
-msgid "You must name this filter."
-msgstr "Du må gi navn til dette filteret."
-
-#. filter:bad-name-notunique primary
-#: ../filter/filter-errors.xml.h:22
-msgid "Name \"{0}\" already used."
-msgstr "Navn «{0}» er allerede brukt."
-
-#. filter:bad-name-notunique secondary
-#: ../filter/filter-errors.xml.h:24
-msgid "Please choose another name."
-msgstr "Vennligst velg et annet navn."
-
 #: ../filter/filter-file.c:288
 msgid "Choose a file"
 msgstr "Velg en fil"
 
 #: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1011 ../mail/mail-config.c:75
-#: ../mail/mail-config.glade.h:90
+#: ../mail/em-migrate.c:1041 ../mail/mail-config.c:76
+#: ../mail/mail-config.glade.h:91
 msgid "Important"
 msgstr "Viktig"
 
 #. forest green
-#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1014
-#: ../mail/mail-config.c:78 ../mail/mail-config.glade.h:140
+#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1044
+#: ../mail/mail-config.c:79 ../mail/mail-config.glade.h:145
 msgid "To Do"
 msgstr "Oppgaver"
 
 #. blue
-#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1015
-#: ../mail/mail-config.c:79 ../mail/mail-config.glade.h:93
+#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1045
+#: ../mail/mail-config.c:80 ../mail/mail-config.glade.h:95
 msgid "Later"
 msgstr "Senere"
 
@@ -10133,47 +10089,47 @@ msgstr "Senere"
 msgid "Test"
 msgstr "Test"
 
-#: ../filter/filter-rule.c:790
+#: ../filter/filter-rule.c:791
 msgid "_Rule name:"
 msgstr "_Regelnavn:"
 
-#: ../filter/filter-rule.c:818
-msgid "<b>If</b>"
-msgstr "<b>Hvis</b> "
+#: ../filter/filter-rule.c:819
+msgid "If"
+msgstr "Hvis"
 
-#: ../filter/filter-rule.c:855
+#: ../filter/filter-rule.c:858
 msgid "if all criteria are met"
 msgstr "hvis alle kriterier er møtt"
 
-#: ../filter/filter-rule.c:855
+#: ../filter/filter-rule.c:858
 msgid "if any criteria are met"
 msgstr "hvis ethvert kriterie er møtt"
 
-#: ../filter/filter-rule.c:857
+#: ../filter/filter-rule.c:860
 msgid "Execute actions"
 msgstr "Utfør handlinger"
 
-#: ../filter/filter-rule.c:878
+#: ../filter/filter-rule.c:881
 msgid "All related"
 msgstr "Alle relaterte"
 
-#: ../filter/filter-rule.c:878
+#: ../filter/filter-rule.c:881
 msgid "Replies"
 msgstr "Svar"
 
-#: ../filter/filter-rule.c:878
+#: ../filter/filter-rule.c:881
 msgid "Replies and parents"
 msgstr "Svar med opphav"
 
-#: ../filter/filter-rule.c:880
+#: ../filter/filter-rule.c:883
 msgid "Include threads"
 msgstr "Ta med tråder"
 
-#: ../filter/filter-rule.c:975 ../filter/filter.glade.h:3
+#: ../filter/filter-rule.c:978 ../filter/filter.glade.h:3
 msgid "Incoming"
 msgstr "Innkommende"
 
-#: ../filter/filter-rule.c:975
+#: ../filter/filter-rule.c:978
 msgid "Outgoing"
 msgstr "Utgående"
 
@@ -10225,7 +10181,7 @@ msgstr "siden"
 msgid "months"
 msgstr "måneder"
 
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:172
+#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:177
 msgid "seconds"
 msgstr " sekunder"
 
@@ -10295,11 +10251,11 @@ msgstr "Konfigurasjonskontroll for Evolution e-postredigering"
 msgid "Evolution Mail preferences control"
 msgstr "Brukervalg-kontroll for Evolution e-post"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:469
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:493
 #: ../mail/importers/elm-importer.c:418
 #: ../mail/importers/netscape-importer.c:1902
-#: ../mail/importers/pine-importer.c:474 ../mail/mail-component.c:557
-#: ../mail/mail-component.c:608
+#: ../mail/importers/pine-importer.c:474 ../mail/mail-component.c:558
+#: ../mail/mail-component.c:609
 msgid "Mail"
 msgstr "E-post"
 
@@ -10308,7 +10264,7 @@ msgid "Mail Accounts"
 msgstr "E-post-konti"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:95
+#: ../mail/mail-config.glade.h:98
 msgid "Mail Preferences"
 msgstr "Brukervalg for e-post"
 
@@ -10316,12 +10272,12 @@ msgstr "Brukervalg for e-post"
 msgid "_Mail"
 msgstr "_E-post"
 
-#: ../mail/em-account-editor.c:386
+#: ../mail/em-account-editor.c:387
 #, c-format
 msgid "%s License Agreement"
 msgstr "Lisensavtale for %s"
 
-#: ../mail/em-account-editor.c:393
+#: ../mail/em-account-editor.c:394
 #, c-format
 msgid ""
 "\n"
@@ -10334,67 +10290,75 @@ msgstr ""
 "under nøye\n"
 "og kryss av i ruten for å akseptere den\n"
 
-#: ../mail/em-account-editor.c:463 ../mail/em-filter-folder-element.c:237
+#: ../mail/em-account-editor.c:464 ../mail/em-filter-folder-element.c:237
 #: ../mail/em-vfolder-rule.c:494
 msgid "Select Folder"
 msgstr "Velg mappe"
 
-#: ../mail/em-account-editor.c:1663 ../mail/mail-config.glade.h:89
+#: ../mail/em-account-editor.c:758
+msgid "Ask for each message"
+msgstr "Spør for hver melding"
+
+#: ../mail/em-account-editor.c:1719 ../mail/mail-config.glade.h:90
 msgid "Identity"
 msgstr "Identitet"
 
-#: ../mail/em-account-editor.c:1699 ../mail/mail-config.glade.h:114
+#: ../mail/em-account-editor.c:1755 ../mail/mail-config.glade.h:117
 msgid "Receiving Email"
 msgstr "Innkommende e-post"
 
-#: ../mail/em-account-editor.c:1876
+#: ../mail/em-account-editor.c:1932
 msgid "Automatically check for _new mail every"
 msgstr "Se etter _nye meldinger automatisk"
 
-#: ../mail/em-account-editor.c:2040 ../mail/mail-config.glade.h:124
+#: ../mail/em-account-editor.c:2100 ../mail/mail-config.glade.h:128
 msgid "Sending Email"
 msgstr "Utgående e-post"
 
-#: ../mail/em-account-editor.c:2084 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2148 ../mail/mail-config.glade.h:68
 msgid "Defaults"
 msgstr "Forvalg"
 
-#: ../mail/em-account-editor.c:2143 ../mail/mail-config.glade.h:119
+#: ../mail/em-account-editor.c:2207 ../mail/mail-config.glade.h:122
 msgid "Security"
 msgstr "Sikkerhet"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2180 ../mail/em-account-editor.c:2255
+#: ../mail/em-account-editor.c:2244 ../mail/em-account-editor.c:2318
 msgid "Receiving Options"
 msgstr "Alternativer for mottak"
 
-#: ../mail/em-account-editor.c:2181 ../mail/em-account-editor.c:2256
+#: ../mail/em-account-editor.c:2245 ../mail/em-account-editor.c:2319
 msgid "Checking for New Mail"
 msgstr "Ser etter nye meldinger"
 
-#: ../mail/em-account-editor.c:2596 ../mail/mail-config.glade.h:33
+#: ../mail/em-account-editor.c:2643 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Kontoredigering"
 
-#: ../mail/em-account-editor.c:2596 ../mail/mail-config.glade.h:79
+#: ../mail/em-account-editor.c:2643 ../mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr "Evolution kontoassistent"
 
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:412
+#: ../mail/em-account-prefs.c:428
 msgid "[Default]"
 msgstr "[Forvalg]"
 
-#: ../mail/em-account-prefs.c:466
+#: ../mail/em-account-prefs.c:482
 msgid "Account name"
 msgstr "Kontonavn"
 
-#: ../mail/em-account-prefs.c:468
+#: ../mail/em-account-prefs.c:484
 msgid "Protocol"
 msgstr "Protokoll"
 
+#: ../mail/em-account-prefs.c:489
+msgid "Mail Accounts Table"
+msgstr "Tabell med e-post-konti"
+
 #: ../mail/em-composer-prefs.c:306 ../mail/em-composer-prefs.c:429
-#: ../mail/mail-config.c:934
+#: ../mail/mail-config.c:935
 msgid "Unnamed"
 msgstr "Uten navn"
 
@@ -10410,18 +10374,18 @@ msgstr "Legg til signaturskript"
 msgid "Signature(s)"
 msgstr "Signatur(er)"
 
-#: ../mail/em-composer-utils.c:910
+#: ../mail/em-composer-utils.c:852
 msgid "-------- Forwarded Message --------"
 msgstr "---------Videresendt melding-------"
 
-#: ../mail/em-composer-utils.c:1526
+#: ../mail/em-composer-utils.c:1644
 msgid "an unknown sender"
 msgstr "en ukjent avsender"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1573
+#: ../mail/em-composer-utils.c:1691
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10558,8 +10522,8 @@ msgstr "er ikke"
 msgid "is not Flagged"
 msgstr "er ikke merket"
 
-#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:92
-#: ../ui/evolution-mail-message.xml.h:48
+#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:93
+#: ../ui/evolution-mail-message.xml.h:47
 msgid "Junk"
 msgstr "Søppel"
 
@@ -10567,7 +10531,7 @@ msgstr "Søppel"
 msgid "Junk Test"
 msgstr "Søppeltest"
 
-#: ../mail/em-filter-i18n.h:37 ../mail/em-folder-view.c:992
+#: ../mail/em-filter-i18n.h:37 ../mail/em-folder-view.c:1061
 #: ../widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Etikett"
@@ -10676,11 +10640,12 @@ msgstr "starter med"
 msgid "Stop Processing"
 msgstr "Stopp behandling"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1533
-#: ../mail/em-format-quote.c:306 ../mail/em-format.c:853
+#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1541
+#: ../mail/em-format-quote.c:310 ../mail/em-format.c:848
 #: ../mail/em-mailer-prefs.c:88 ../mail/message-list.etspec.h:13
 #: ../mail/message-tag-followup.c:330
-#: ../plugins/shared-folder/properties.glade.h:7 ../smime/lib/e-cert.c:1131
+#: ../plugins/groupwise-features/properties.glade.h:7
+#: ../smime/lib/e-cert.c:1131
 msgid "Subject"
 msgstr "Emne"
 
@@ -10693,7 +10658,7 @@ msgstr "Nullstill status"
 msgid "<b>Then</b>"
 msgstr "<b>Så</b> "
 
-#: ../mail/em-folder-browser.c:133
+#: ../mail/em-folder-browser.c:134
 msgid "Create _vFolder From Search..."
 msgstr "Lag _virtuell mappe fra søk..."
 
@@ -10711,7 +10676,7 @@ msgstr[0] "Ulest melding:"
 msgstr[1] "Uleste meldinger:"
 
 #: ../mail/em-folder-properties.c:278
-#: ../plugins/shared-folder/properties.glade.h:3
+#: ../plugins/groupwise-features/properties.glade.h:3
 msgid "Folder Properties"
 msgstr "Egenskaper for mappe"
 
@@ -10719,26 +10684,16 @@ msgstr "Egenskaper for mappe"
 msgid "<click here to select a folder>"
 msgstr "<klikk her for å velge en mappe>"
 
-#: ../mail/em-folder-selector.c:166
-msgid "Create New Folder"
-msgstr "Opprett ny mappe"
-
-#: ../mail/em-folder-selector.c:166 ../mail/em-folder-tree.c:2527
-#: ../mail/mail-component.c:760 ../plugins/shared-folder/install-shared.c:144
-#: ../plugins/shared-folder/share-folder-common.c:345
-msgid "Specify where to create the folder:"
-msgstr "Spesifiser hvor mappen skal opprettes:"
-
-#: ../mail/em-folder-selector.c:304
+#: ../mail/em-folder-selector.c:261
 msgid "Create"
 msgstr "Opprett"
 
-#: ../mail/em-folder-selector.c:308
+#: ../mail/em-folder-selector.c:265
 msgid "Folder _name:"
 msgstr "Mappe_navn:"
 
 #: ../mail/em-folder-tree-model.c:201 ../mail/em-folder-tree-model.c:203
-#: ../mail/mail-vfolder.c:899 ../mail/mail-vfolder.c:969
+#: ../mail/mail-vfolder.c:900 ../mail/mail-vfolder.c:970
 msgid "vFolders"
 msgstr "Virtuelle mapper"
 
@@ -10747,20 +10702,20 @@ msgstr "Virtuelle mapper"
 msgid "UNMATCHED"
 msgstr "UTEN TREFF"
 
-#: ../mail/em-folder-tree-model.c:468 ../mail/mail-component.c:142
+#: ../mail/em-folder-tree-model.c:468 ../mail/mail-component.c:143
 msgid "Drafts"
 msgstr "Skisser"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:471 ../mail/mail-component.c:141
+#: ../mail/em-folder-tree-model.c:471 ../mail/mail-component.c:142
 msgid "Inbox"
 msgstr "Innboks"
 
-#: ../mail/em-folder-tree-model.c:474 ../mail/mail-component.c:143
+#: ../mail/em-folder-tree-model.c:474 ../mail/mail-component.c:144
 msgid "Outbox"
 msgstr "Utboks"
 
-#: ../mail/em-folder-tree-model.c:476 ../mail/mail-component.c:144
+#: ../mail/em-folder-tree-model.c:476 ../mail/mail-component.c:145
 msgid "Sent"
 msgstr "Sendt"
 
@@ -10768,255 +10723,228 @@ msgstr "Sendt"
 msgid "Loading..."
 msgstr "Laster..."
 
-#: ../mail/em-folder-tree.c:688
+#: ../mail/em-folder-tree.c:689
 msgid "Mail Folder Tree"
 msgstr "Tre for e-postmapper"
 
-#: ../mail/em-folder-tree.c:921
+#: ../mail/em-folder-tree.c:922
 #, c-format
 msgid "Moving folder %s"
 msgstr "Flytter mappe %s"
 
-#: ../mail/em-folder-tree.c:923
+#: ../mail/em-folder-tree.c:924
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopierer mappe %s"
 
-#: ../mail/em-folder-tree.c:930 ../mail/message-list.c:1612
+#: ../mail/em-folder-tree.c:931 ../mail/message-list.c:1613
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Flytter meldinger til mappe %s"
 
-#: ../mail/em-folder-tree.c:932 ../mail/message-list.c:1614
+#: ../mail/em-folder-tree.c:933 ../mail/message-list.c:1615
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopierer meldinger til mappe %s"
 
-#: ../mail/em-folder-tree.c:948
+#: ../mail/em-folder-tree.c:949
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Kan ikke slippe melding(er) toppnivå for lageret"
 
-#: ../mail/em-folder-tree.c:1044 ../ui/evolution-mail-message.xml.h:106
+#: ../mail/em-folder-tree.c:1045 ../ui/evolution-mail-message.xml.h:101
 msgid "_Copy to Folder"
 msgstr "_Kopier til mappe"
 
-#: ../mail/em-folder-tree.c:1045 ../ui/evolution-mail-message.xml.h:115
+#: ../mail/em-folder-tree.c:1046 ../ui/evolution-mail-message.xml.h:111
 msgid "_Move to Folder"
 msgstr "_Flytt til mappe"
 
-#: ../mail/em-folder-tree.c:1750 ../mail/mail-ops.c:1026
+#: ../mail/em-folder-tree.c:1751 ../mail/mail-ops.c:1055
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanner mapper i «%s»"
 
-#: ../mail/em-folder-tree.c:2023
-#, c-format
-msgid "Copying `%s' to `%s'"
-msgstr "Kopierer «%s» til «%s»"
-
-#: ../mail/em-folder-tree.c:2297 ../mail/em-folder-tree.c:2311
-#: ../mail/em-folder-view.c:862 ../mail/em-folder-view.c:877
-#: ../mail/importers/evolution-mbox-importer.c:120
-#: ../mail/importers/evolution-outlook-importer.c:134
-msgid "Select folder"
-msgstr "Velg mappe"
-
-#: ../mail/em-folder-tree.c:2297 ../mail/em-folder-view.c:877
-msgid "C_opy"
-msgstr "K_opier"
-
-#: ../mail/em-folder-tree.c:2338
-#: ../plugins/shared-folder/share-folder-common.c:138
-#, c-format
-msgid "Creating folder `%s'"
-msgstr "Oppretter mappe «%s»"
-
-#: ../mail/em-folder-tree.c:2527 ../mail/mail-component.c:760
-#: ../plugins/shared-folder/install-shared.c:144
-#: ../plugins/shared-folder/share-folder-common.c:345
-msgid "Create folder"
-msgstr "Opprett mappe"
-
-#: ../mail/em-folder-tree.c:2720
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "Endre navn på mappe «%s» til:"
-
-#: ../mail/em-folder-tree.c:2722
-msgid "Rename Folder"
-msgstr "Endre navn på mappe"
-
-#: ../mail/em-folder-tree.c:2728
-msgid "Folder names cannot contain '/'"
-msgstr "Mappenavn kan ikke inneholde tegnet «/»"
-
-#: ../mail/em-folder-tree.c:2802 ../ui/evolution-addressbook.xml.h:44
-#: ../ui/evolution-mail-global.xml.h:17
+#: ../mail/em-folder-tree.c:2107 ../ui/evolution-addressbook.xml.h:44
+#: ../ui/evolution-mail-global.xml.h:23
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:53 ../ui/evolution.xml.h:49
+#: ../ui/evolution-message-composer.xml.h:52 ../ui/evolution.xml.h:46
 msgid "_View"
 msgstr "_Vis"
 
-#: ../mail/em-folder-tree.c:2803
+#: ../mail/em-folder-tree.c:2108
 msgid "Open in _New Window"
 msgstr "Åpne i _nytt vindu"
 
-#: ../mail/em-folder-tree.c:2807
+#: ../mail/em-folder-tree.c:2112
 msgid "_Copy..."
 msgstr "_Kopier..."
 
-#: ../mail/em-folder-tree.c:2808
+#: ../mail/em-folder-tree.c:2113
 msgid "_Move..."
 msgstr "_Flytt..."
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2812
+#: ../mail/em-folder-tree.c:2117
 msgid "_New Folder..."
 msgstr "_Ny mappe..."
 
-#: ../mail/em-folder-tree.c:2815
+#: ../mail/em-folder-tree.c:2120 ../ui/evolution-mail-list.xml.h:29
 msgid "_Rename..."
 msgstr "End_re navn..."
 
-#: ../mail/em-folder-view.c:970 ../mail/em-popup.c:499
-#: ../ui/evolution-mail-message.xml.h:87
+#: ../mail/em-folder-view.c:929 ../mail/em-folder-view.c:944
+#: ../mail/importers/evolution-mbox-importer.c:120
+#: ../mail/importers/evolution-outlook-importer.c:134
+msgid "Select folder"
+msgstr "Velg mappe"
+
+#: ../mail/em-folder-view.c:944
+msgid "C_opy"
+msgstr "K_opier"
+
+#: ../mail/em-folder-view.c:1037 ../mail/em-popup.c:499
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: ../mail/em-folder-view.c:971 ../ui/evolution-mail-message.xml.h:123
+#: ../mail/em-folder-view.c:1038 ../ui/evolution-mail-message.xml.h:119
 msgid "_Reply to Sender"
 msgstr "Sva_r til avsender"
 
-#: ../mail/em-folder-view.c:972 ../mail/em-popup.c:501
-#: ../ui/evolution-mail-message.xml.h:110
+#: ../mail/em-folder-view.c:1039 ../mail/em-popup.c:501
+#: ../ui/evolution-mail-message.xml.h:105
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: ../mail/em-folder-view.c:975 ../ui/evolution-mail-message.xml.h:109
+#: ../mail/em-folder-view.c:1042 ../ui/evolution-mail-message.xml.h:103
 msgid "_Edit as New Message..."
 msgstr "R_ediger som ny melding..."
 
-#: ../mail/em-folder-view.c:977
-msgid "_Print"
-msgstr "S_kriv ut"
-
-#: ../mail/em-folder-view.c:981
+#: ../mail/em-folder-view.c:1048
 msgid "U_ndelete"
 msgstr "A_ngre slett"
 
-#: ../mail/em-folder-view.c:982
+#: ../mail/em-folder-view.c:1049
 msgid "Mo_ve to Folder..."
 msgstr "Fl_ytt til mappe..."
 
-#: ../mail/em-folder-view.c:983 ../ui/evolution-addressbook.xml.h:32
+#: ../mail/em-folder-view.c:1050 ../ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "K_opier til mappe..."
 
-#: ../mail/em-folder-view.c:986
+#: ../mail/em-folder-view.c:1053
+msgid "Mar_k as Read"
+msgstr "Mer_k som lest"
+
+#: ../mail/em-folder-view.c:1054
+msgid "Mark as U_nread"
+msgstr "Merk som _ulest"
+
+#: ../mail/em-folder-view.c:1055
 msgid "Mark as _Important"
 msgstr "Merk som v_iktig"
 
-#: ../mail/em-folder-view.c:987
+#: ../mail/em-folder-view.c:1056
 msgid "_Mark as Unimportant"
 msgstr "_Merk som uviktig"
 
-#: ../mail/em-folder-view.c:988 ../ui/evolution-mail-message.xml.h:54
+#: ../mail/em-folder-view.c:1057
 msgid "Mark as _Junk"
 msgstr "Merk som _søppel"
 
-#: ../mail/em-folder-view.c:989 ../ui/evolution-mail-message.xml.h:55
+#: ../mail/em-folder-view.c:1058
 msgid "Mark as _Not Junk"
 msgstr "Merk som _gyldig melding"
 
-#: ../mail/em-folder-view.c:990
+#: ../mail/em-folder-view.c:1059
 msgid "Mark for Follo_w Up..."
 msgstr "Merk for oppføl_ging..."
 
-#: ../mail/em-folder-view.c:998
+#: ../mail/em-folder-view.c:1067
 msgid "Fla_g Completed"
 msgstr "Mer_k som fullført"
 
-#: ../mail/em-folder-view.c:999
+#: ../mail/em-folder-view.c:1068
 msgid "Cl_ear Flag"
 msgstr "Fj_ern flagg"
 
-#: ../mail/em-folder-view.c:1002
+#: ../mail/em-folder-view.c:1071
 msgid "Crea_te Rule From Message"
 msgstr "Oppre_tt regel fra melding"
 
-#: ../mail/em-folder-view.c:1003
+#: ../mail/em-folder-view.c:1072
 msgid "vFolder on _Subject"
 msgstr "Virtuell mappe på e_mne"
 
-#: ../mail/em-folder-view.c:1004
+#: ../mail/em-folder-view.c:1073
 msgid "vFolder on Se_nder"
 msgstr "Virtuell mappe på se_nder"
 
-#: ../mail/em-folder-view.c:1005
+#: ../mail/em-folder-view.c:1074
 msgid "vFolder on _Recipients"
 msgstr "Virtuell mappe på mottake_re"
 
-#: ../mail/em-folder-view.c:1006
+#: ../mail/em-folder-view.c:1075
 msgid "vFolder on Mailing _List"
 msgstr "Virtuell mappe på e-post_liste"
 
-#: ../mail/em-folder-view.c:1010
+#: ../mail/em-folder-view.c:1079
 msgid "Filter on Sub_ject"
 msgstr "Filtrer på em_ne"
 
-#: ../mail/em-folder-view.c:1011
+#: ../mail/em-folder-view.c:1080
 msgid "Filter on Sen_der"
 msgstr "Filtrer på sen_der"
 
-#: ../mail/em-folder-view.c:1012
+#: ../mail/em-folder-view.c:1081
 msgid "Filter on Re_cipients"
 msgstr "Filtrer på motta_ker"
 
-#: ../mail/em-folder-view.c:1013
+#: ../mail/em-folder-view.c:1082
 msgid "Filter on _Mailing List"
 msgstr "Filtrer på e-_postliste"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:1844 ../mail/em-folder-view.c:1888
+#: ../mail/em-folder-view.c:1922 ../mail/em-folder-view.c:1966
 msgid "Default"
 msgstr "Forvalgt"
 
-#: ../mail/em-folder-view.c:1987
+#: ../mail/em-folder-view.c:2065
+#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 msgid "Print Message"
 msgstr "Skriv ut melding"
 
-#: ../mail/em-folder-view.c:2295
+#: ../mail/em-folder-view.c:2403
 msgid "_Copy Link Location"
 msgstr "_Kopier lokasjon for lenke"
 
-#: ../mail/em-folder-view.c:2297
+#: ../mail/em-folder-view.c:2405
 msgid "Create _vFolder"
 msgstr "Opprett _virtuell mappe"
 
-#: ../mail/em-folder-view.c:2298
+#: ../mail/em-folder-view.c:2406
 msgid "_From this Address"
 msgstr "_Fra denne adressen"
 
-#: ../mail/em-folder-view.c:2299
+#: ../mail/em-folder-view.c:2407
 msgid "_To this Address"
 msgstr "_Til denne adressen"
 
-#: ../mail/em-folder-view.c:2568
+#: ../mail/em-folder-view.c:2688
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klikk for å sende melding til %s"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:412
+#: ../mail/em-format-html-display.c:406
 #, c-format
 msgid "Matches: %d"
 msgstr "Treff: %d"
 
-#: ../mail/em-format-html-display.c:680 ../mail/em-format-html.c:579
+#: ../mail/em-format-html-display.c:653 ../mail/em-format-html.c:578
 msgid "Unsigned"
 msgstr "Usignert"
 
-#: ../mail/em-format-html-display.c:680
+#: ../mail/em-format-html-display.c:653
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -11024,11 +10952,11 @@ msgstr ""
 "Denne meldingen er ikke signert. Du har ingen garanti for at meldingen er "
 "autentisk."
 
-#: ../mail/em-format-html-display.c:681 ../mail/em-format-html.c:580
+#: ../mail/em-format-html-display.c:654 ../mail/em-format-html.c:579
 msgid "Valid signature"
 msgstr "Gyldig signatur"
 
-#: ../mail/em-format-html-display.c:681
+#: ../mail/em-format-html-display.c:654
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11036,11 +10964,11 @@ msgstr ""
 "Denne meldingen er signert og gyldig hvilket betyr denne meldingen høyst "
 "sannsynlig er autentisk."
 
-#: ../mail/em-format-html-display.c:682 ../mail/em-format-html.c:581
+#: ../mail/em-format-html-display.c:655 ../mail/em-format-html.c:580
 msgid "Invalid signature"
 msgstr "Ugyldig signatur"
 
-#: ../mail/em-format-html-display.c:682
+#: ../mail/em-format-html-display.c:655
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11048,11 +10976,11 @@ msgstr ""
 "Signaturen for denne meldingen kan ikke verifiseres. Den kan være endret "
 "under overføring."
 
-#: ../mail/em-format-html-display.c:683
+#: ../mail/em-format-html-display.c:656
 msgid "Valid signature, cannot verify sender"
 msgstr "Gyldig signatur. Kan ikke verifisere avsender"
 
-#: ../mail/em-format-html-display.c:683
+#: ../mail/em-format-html-display.c:656
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11060,11 +10988,11 @@ msgstr ""
 "Denne meldingen er signert med en gyldig signatur, men avsender av meldingen "
 "kan ikke verifiseres."
 
-#: ../mail/em-format-html-display.c:689 ../mail/em-format-html.c:588
+#: ../mail/em-format-html-display.c:662 ../mail/em-format-html.c:587
 msgid "Unencrypted"
 msgstr "Ukryptert"
 
-#: ../mail/em-format-html-display.c:689
+#: ../mail/em-format-html-display.c:662
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
@@ -11072,11 +11000,11 @@ msgstr ""
 "Denne meldingen er ikke kryptert. Innholdet kan vises under overføring over "
 "Internett."
 
-#: ../mail/em-format-html-display.c:690 ../mail/em-format-html.c:589
+#: ../mail/em-format-html-display.c:663 ../mail/em-format-html.c:588
 msgid "Encrypted, weak"
 msgstr "Kryptert, svak"
 
-#: ../mail/em-format-html-display.c:690
+#: ../mail/em-format-html-display.c:663
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm.  It would "
 "be difficult, but not impossible for an outsider to view the content of this "
@@ -11086,11 +11014,11 @@ msgstr ""
 "vanskelig, men ikke umulig for en utenforstående å se innholdet i denne "
 "meldingen på noenlunde kort tid."
 
-#: ../mail/em-format-html-display.c:691 ../mail/em-format-html.c:590
+#: ../mail/em-format-html-display.c:664 ../mail/em-format-html.c:589
 msgid "Encrypted"
 msgstr "Kryptert"
 
-#: ../mail/em-format-html-display.c:691
+#: ../mail/em-format-html-display.c:664
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -11098,11 +11026,11 @@ msgstr ""
 "Denne meldingen er kryptert. Det vil være vanskelig for en utenforstående å "
 "se innholdet i denne meldingen."
 
-#: ../mail/em-format-html-display.c:692 ../mail/em-format-html.c:591
+#: ../mail/em-format-html-display.c:665 ../mail/em-format-html.c:590
 msgid "Encrypted, strong"
 msgstr "Kryptert, sterk"
 
-#: ../mail/em-format-html-display.c:692
+#: ../mail/em-format-html-display.c:665
 msgid ""
 "This message is encrypted, with a strong encryption algorithm.  It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -11111,35 +11039,35 @@ msgstr ""
 "Denne meldingen er kryptert med en sterk algoritme. Det vil være meget "
 "vanskelig for en utenforstående å se innholdet i denne meldingen på kort tid."
 
-#: ../mail/em-format-html-display.c:793 ../smime/gui/smime-ui.glade.h:47
+#: ../mail/em-format-html-display.c:766 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Vis sertifikat"
 
-#: ../mail/em-format-html-display.c:808
+#: ../mail/em-format-html-display.c:781
 msgid "This certificate is not viewable"
 msgstr "Dette sertifikatet kan ikke vises"
 
-#: ../mail/em-format-html-display.c:1037
+#: ../mail/em-format-html-display.c:1011
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Ferdigstilt på %d %B, %Y, %H.%M"
 
-#: ../mail/em-format-html-display.c:1045
+#: ../mail/em-format-html-display.c:1019
 msgid "Overdue:"
 msgstr "Utgått:"
 
-#: ../mail/em-format-html-display.c:1048
+#: ../mail/em-format-html-display.c:1022
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "til %d %B %Y %H.%M"
 
-#: ../mail/em-format-html-display.c:1095
+#: ../mail/em-format-html-display.c:1064
 msgid "_View Inline"
 msgstr "_Vis i meldingsteksten"
 
-#: ../mail/em-format-html-display.c:1096
+#: ../mail/em-format-html-display.c:1065
 msgid "_Hide"
 msgstr "_Skjul"
 
-#: ../mail/em-format-html-display.c:1340
+#: ../mail/em-format-html-display.c:1309
 msgid "Attachment Button"
 msgstr "Vedleggsknapp"
 
@@ -11148,128 +11076,128 @@ msgstr "Vedleggsknapp"
 msgid "Page %d of %d"
 msgstr "Side %d av %d"
 
-#: ../mail/em-format-html.c:472 ../mail/em-format-html.c:474
+#: ../mail/em-format-html.c:471 ../mail/em-format-html.c:473
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Henter «%s»"
 
-#: ../mail/em-format-html.c:582
+#: ../mail/em-format-html.c:581
 msgid "Valid signature but cannot verify sender"
 msgstr "Gyldig signatur, men ikke verifisere avsender"
 
-#: ../mail/em-format-html.c:840
+#: ../mail/em-format-html.c:839
 msgid "Malformed external-body part."
 msgstr "Feilutformet del for ekstern kropp."
 
-#: ../mail/em-format-html.c:870
+#: ../mail/em-format-html.c:869
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Peker til FTP-tjener (%s)"
 
-#: ../mail/em-format-html.c:881
+#: ../mail/em-format-html.c:880
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Peker til lokal fil (%s) gyldig på nettsted «%s»"
 
-#: ../mail/em-format-html.c:883
+#: ../mail/em-format-html.c:882
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Peker til lokal fil (%s)"
 
-#: ../mail/em-format-html.c:904
+#: ../mail/em-format-html.c:903
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Peker til eksterne data (%s)"
 
-#: ../mail/em-format-html.c:915
+#: ../mail/em-format-html.c:914
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Peker til ukjente eksterne data («%s»-type)"
 
-#: ../mail/em-format-html.c:1137
+#: ../mail/em-format-html.c:1140
 msgid "Formatting message"
 msgstr "Formatterer melding"
 
-#: ../mail/em-format-html.c:1424 ../mail/em-format-quote.c:193
-#: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:83
+#: ../mail/em-format-html.c:1433 ../mail/em-format-quote.c:197
+#: ../mail/em-format.c:843 ../mail/em-mailer-prefs.c:83
 #: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:326
 msgid "From"
 msgstr "Fra"
 
-#: ../mail/em-format-html.c:1424 ../mail/em-format-quote.c:193
-#: ../mail/em-format.c:849 ../mail/em-mailer-prefs.c:84
+#: ../mail/em-format-html.c:1433 ../mail/em-format-quote.c:197
+#: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:84
 msgid "Reply-To"
 msgstr "Svar-til"
 
-#: ../mail/em-format-html.c:1424 ../mail/em-format-quote.c:193
-#: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:85
+#: ../mail/em-format-html.c:1433 ../mail/em-format-quote.c:197
+#: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:85
 #: ../mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Til"
 
-#: ../mail/em-format-html.c:1424 ../mail/em-format-quote.c:193
-#: ../mail/em-format.c:851 ../mail/em-mailer-prefs.c:86
+#: ../mail/em-format-html.c:1433 ../mail/em-format-quote.c:197
+#: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:86
 msgid "Cc"
 msgstr "Cc"
 
-#: ../mail/em-format-html.c:1424 ../mail/em-format-quote.c:193
-#: ../mail/em-format.c:852 ../mail/em-mailer-prefs.c:87
+#: ../mail/em-format-html.c:1433 ../mail/em-format-quote.c:197
+#: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:87
 msgid "Bcc"
 msgstr "Bcc"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1537 ../mail/em-format-quote.c:315
+#: ../mail/em-format-html.c:1545 ../mail/em-format-quote.c:319
 #: ../mail/em-mailer-prefs.c:986
 msgid "Mailer"
 msgstr "E-postprogram"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1564
+#: ../mail/em-format-html.c:1572
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1567
+#: ../mail/em-format-html.c:1575
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: ../mail/em-format-html.c:1577 ../mail/em-format-quote.c:322
-#: ../mail/em-format.c:854 ../mail/em-mailer-prefs.c:89
+#: ../mail/em-format-html.c:1585 ../mail/em-format-quote.c:326
+#: ../mail/em-format.c:849 ../mail/em-mailer-prefs.c:89
 #: ../mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Dato"
 
-#: ../mail/em-format-html.c:1600 ../mail/em-format.c:855
+#: ../mail/em-format-html.c:1608 ../mail/em-format.c:850
 #: ../mail/em-mailer-prefs.c:90
 msgid "Newsgroups"
 msgstr "Nyhetsgrupper"
 
-#: ../mail/em-format.c:1104
+#: ../mail/em-format.c:1099
 #, c-format
 msgid "%s attachment"
 msgstr "%s-vedlegg"
 
-#: ../mail/em-format.c:1143 ../mail/em-format.c:1276
+#: ../mail/em-format.c:1138 ../mail/em-format.c:1271
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Kunne ikke lese S/MIME-melding: Ukjent feil"
 
-#: ../mail/em-format.c:1266
+#: ../mail/em-format.c:1261
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Krypteringstype for multipart/encrypted som ikke er støttet"
 
-#: ../mail/em-format.c:1414
+#: ../mail/em-format.c:1409
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Kunne ikke lese MIME-melding. Viser ren meldingstekst."
 
-#: ../mail/em-format.c:1433
+#: ../mail/em-format.c:1428
 msgid "Unsupported signature format"
 msgstr "Ustøttet signaturformat"
 
-#: ../mail/em-format.c:1441
+#: ../mail/em-format.c:1436
 msgid "Error verifying signature"
 msgstr "Feil under verifisering av signatur"
 
-#: ../mail/em-format.c:1441
+#: ../mail/em-format.c:1436
 msgid "Unknown error verifying signature"
 msgstr "Ukjent feil under verifisering av signatur"
 
@@ -11293,7 +11221,7 @@ msgstr "En gang i uken"
 msgid "Once per month"
 msgstr "En gang i måneden"
 
-#: ../mail/em-migrate.c:1168
+#: ../mail/em-migrate.c:1198
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -11305,50 +11233,50 @@ msgstr ""
 "\n"
 "Vennligst vent mens Evolution migrere dine mapper..."
 
-#: ../mail/em-migrate.c:1602
+#: ../mail/em-migrate.c:1632
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Kan ikke opprette ny mappe «%s»: %s"
 
-#: ../mail/em-migrate.c:1628
+#: ../mail/em-migrate.c:1658
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Kan ikke kopiere mappe «%s» til «%s»: %s"
 
-#: ../mail/em-migrate.c:1813
+#: ../mail/em-migrate.c:1843
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Kan ikke søke etter eksisterende postbokser på «%s»: %s"
 
-#: ../mail/em-migrate.c:2017
+#: ../mail/em-migrate.c:2047
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr ""
 "Kunne ikke åpne gamle data om meldinger som er beholdt på tjeneren for POP-"
 "tjener «%s»: %s"
 
-#: ../mail/em-migrate.c:2031
+#: ../mail/em-migrate.c:2061
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr ""
 "Klarte ikke å opprette katalog for bevaring av data på POP3-tjener «%s»: %s"
 
-#: ../mail/em-migrate.c:2060
+#: ../mail/em-migrate.c:2090
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "Kan ikke kopiere data for bevaring på POP3-tjener: «%s»: %s"
 
-#: ../mail/em-migrate.c:2494 ../mail/em-migrate.c:2506
+#: ../mail/em-migrate.c:2561 ../mail/em-migrate.c:2573
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Klarte ikke å opprette lokalt e-postlager «%s»: %s"
 
-#: ../mail/em-migrate.c:2657
+#: ../mail/em-migrate.c:2693
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Kunne ikke opprette lokale e-postmapper i «%s»: %s"
 
-#: ../mail/em-migrate.c:2675
+#: ../mail/em-migrate.c:2711
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -11373,7 +11301,7 @@ msgstr "Sett som _bakgrunn"
 msgid "_Reply to sender"
 msgstr "Sva_r til avsender"
 
-#: ../mail/em-popup.c:498 ../ui/evolution-mail-message.xml.h:88
+#: ../mail/em-popup.c:498 ../ui/evolution-mail-message.xml.h:81
 msgid "Reply to _List"
 msgstr "Svar til _listen"
 
@@ -11424,20 +11352,20 @@ msgstr "Ikke vis denne meldingen igjen."
 msgid "Filters"
 msgstr "Filtre"
 
-#: ../mail/em-utils.c:434
+#: ../mail/em-utils.c:436
 msgid "message"
 msgstr "melding"
 
-#: ../mail/em-utils.c:543
+#: ../mail/em-utils.c:545
 msgid "Save Message..."
 msgstr "Lagre melding..."
 
-#: ../mail/em-utils.c:592
+#: ../mail/em-utils.c:594
 msgid "Add address"
 msgstr "Legg til adresse"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1071
+#: ../mail/em-utils.c:1073
 #, c-format
 msgid "Messages from %s"
 msgstr "Meldinger fra %s"
@@ -11614,8 +11542,8 @@ msgstr "Last bilder for HTML-meldinger og http"
 #: ../mail/evolution-mail.schemas.in.in.h:39
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
-"load images off the net 1 - Load images if sender is in the addressbook 2 - "
-"Always load images off the net"
+"load images off the net 1 - Load images in mail from contacts 2 - Always "
+"load images off the net"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.in.h:40
@@ -11906,14 +11834,6 @@ msgid ""
 "not contain In-Reply-To or References headers."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:109
-msgid "port for starting user runned spamd"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.in.h:110
-msgid "spamd port"
-msgstr "port for spamd"
-
 #: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
 msgid "Evolution Elm importer"
 msgstr "Import fra Elm for Evolution"
@@ -12102,108 +12022,108 @@ msgstr ""
 msgid "Pine"
 msgstr "Pine"
 
-#: ../mail/mail-autofilter.c:74
+#: ../mail/mail-autofilter.c:78
 #, c-format
 msgid "Mail to %s"
 msgstr "Send til %s"
 
-#: ../mail/mail-autofilter.c:238 ../mail/mail-autofilter.c:277
+#: ../mail/mail-autofilter.c:242 ../mail/mail-autofilter.c:281
 #, c-format
 msgid "Mail from %s"
 msgstr "E-post fra %s"
 
-#: ../mail/mail-autofilter.c:261
+#: ../mail/mail-autofilter.c:265
 #, c-format
 msgid "Subject is %s"
 msgstr "Emne er %s"
 
-#: ../mail/mail-autofilter.c:296
+#: ../mail/mail-autofilter.c:300
 #, c-format
 msgid "%s mailing list"
 msgstr "%s e-postliste"
 
-#: ../mail/mail-autofilter.c:365
+#: ../mail/mail-autofilter.c:369
 msgid "Add Filter Rule"
 msgstr "Legg til filterregel"
 
-#: ../mail/mail-component.c:505
+#: ../mail/mail-component.c:506
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d slettet"
 msgstr[1] "%d slettet"
 
-#: ../mail/mail-component.c:507
+#: ../mail/mail-component.c:508
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d søppel"
 msgstr[1] "%d søppel"
 
-#: ../mail/mail-component.c:530
+#: ../mail/mail-component.c:531
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d skisse"
 msgstr[1] "%d skisser"
 
-#: ../mail/mail-component.c:532
+#: ../mail/mail-component.c:533
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d sendt"
 msgstr[1] "%d sendt"
 
-#: ../mail/mail-component.c:534
+#: ../mail/mail-component.c:535
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d usendt"
 msgstr[1] "%d usendte"
 
-#: ../mail/mail-component.c:538
+#: ../mail/mail-component.c:539
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d totalt"
 msgstr[1] "%d totalt"
 
-#: ../mail/mail-component.c:540
+#: ../mail/mail-component.c:541
 #, c-format
 msgid ", %d unread"
 msgid_plural ", %d unread"
 msgstr[0] ", %d ulest"
 msgstr[1] ", %d uleste"
 
-#: ../mail/mail-component.c:712
+#: ../mail/mail-component.c:723
 msgid "New Mail Message"
 msgstr "Ny e-post melding"
 
-#: ../mail/mail-component.c:713
+#: ../mail/mail-component.c:724
 msgid "_Mail Message"
 msgstr "Send _melding"
 
-#: ../mail/mail-component.c:714
+#: ../mail/mail-component.c:725
 msgid "Compose a new mail message"
 msgstr "Skriv en ny e-postmelding"
 
-#: ../mail/mail-component.c:720
+#: ../mail/mail-component.c:731
 msgid "New Mail Folder"
 msgstr "Ny e-postmappe"
 
-#: ../mail/mail-component.c:721
+#: ../mail/mail-component.c:732
 msgid "Mail _Folder"
 msgstr "_E-postmappe"
 
-#: ../mail/mail-component.c:722
+#: ../mail/mail-component.c:733
 msgid "Create a new mail folder"
 msgstr "Opprett en ny e-postmappe"
 
-#: ../mail/mail-component.c:869
+#: ../mail/mail-component.c:855
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Feil under oppgradering av innstillinger eller mapper for e-post."
 
-#: ../mail/mail-config.glade.h:1 ../mail/mail-dialogs.glade.h:5
+#: ../mail/mail-config.glade.h:1 ../mail/mail-dialogs.glade.h:1
 msgid "    "
 msgstr "    "
 
@@ -12268,7 +12188,7 @@ msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr "<span weight=\"bold\">Alternativer for filtre</span>"
 
 #: ../mail/mail-config.glade.h:18
-#: ../plugins/itip-formatter/itip-formatter.c:1667
+#: ../plugins/itip-formatter/itip-formatter.c:1681
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">Generelt</span>"
 
@@ -12289,147 +12209,151 @@ msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr "<span weight=\"bold\">Skrifter for meldinger</span>"
 
 #: ../mail/mail-config.glade.h:23
+msgid "<span weight=\"bold\">Message Receipts</span>"
+msgstr "<span weight=\"bold\">Kvitteringer for meldinger</span>"
+
+#: ../mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "<span weight=\"bold\">Melding om ny e-post</span>"
 
-#: ../mail/mail-config.glade.h:24
+#: ../mail/mail-config.glade.h:25
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr "<span weight=\"bold\">Tilleggsinformasjon</span>"
 
-#: ../mail/mail-config.glade.h:25
+#: ../mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<span weight=\"bold\">Alternativer</span>"
 
-#: ../mail/mail-config.glade.h:26
+#: ../mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 
-#: ../mail/mail-config.glade.h:27
+#: ../mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">Skrifter for utskrift</span>"
 
-#: ../mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">Nødvendig informasjon</span>"
 
-#: ../mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 
-#: ../mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">Sikkerhet</span>"
 
-#: ../mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">Sendte meldinger og skisser</span>"
 
-#: ../mail/mail-config.glade.h:32
+#: ../mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">Tjenerkonfigurasjon</span>"
 
-#: ../mail/mail-config.glade.h:34
+#: ../mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Håndtering av konti"
 
-#: ../mail/mail-config.glade.h:35
+#: ../mail/mail-config.glade.h:36
 msgid "Add Ne_w Signature..."
 msgstr "Legg til n_y signatur..."
 
-#: ../mail/mail-config.glade.h:36
+#: ../mail/mail-config.glade.h:37
 msgid "Add _Script"
 msgstr "Legg til _skript"
 
-#: ../mail/mail-config.glade.h:37
+#: ../mail/mail-config.glade.h:38
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "All_tid signer utgående meldinger når denne kontoen brukes"
 
-#: ../mail/mail-config.glade.h:38
+#: ../mail/mail-config.glade.h:39
 msgid "Also encrypt to sel_f when sending encrypted mail"
 msgstr ""
 "Send krypterte me_ldinger til meg selv også ved sending av kryptert e-post"
 
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.glade.h:40
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "All_tid _kopi (cc) til:"
 
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.glade.h:41
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Alltid _blindkopi (bcc) til:"
 
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.glade.h:42
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Alltid s_tol på nøkler i min nøkkelring ved kryptering"
 
-#: ../mail/mail-config.glade.h:42
+#: ../mail/mail-config.glade.h:43
 msgid "Always encrypt to _myself when sending encrypted mail"
 msgstr "Alltid krypter til _meg selv ved sending av kryptert e-post"
 
-#: ../mail/mail-config.glade.h:43
+#: ../mail/mail-config.glade.h:44
 msgid "Attach original message"
 msgstr "Legg ved opprinnelig melding"
 
-#: ../mail/mail-config.glade.h:44 ../mail/message-list.etspec.h:1
+#: ../mail/mail-config.glade.h:45 ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Vedlegg"
 
-#: ../mail/mail-config.glade.h:45
+#: ../mail/mail-config.glade.h:46
 msgid "Automatically _insert smiley images"
 msgstr "Sett _inn smilefjes automatisk"
 
-#: ../mail/mail-config.glade.h:46
+#: ../mail/mail-config.glade.h:47
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltisk (ISO-8859-13)"
 
-#: ../mail/mail-config.glade.h:47
+#: ../mail/mail-config.glade.h:48
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltisk (ISO-8859-4)"
 
-#: ../mail/mail-config.glade.h:48
+#: ../mail/mail-config.glade.h:49
 msgid "Beep w_hen new mail arrives"
 msgstr "_Pip når nye meldinger ankommer"
 
-#: ../mail/mail-config.glade.h:49
+#: ../mail/mail-config.glade.h:50
 msgid "C_haracter set:"
 msgstr "Te_gnsett:"
 
-#: ../mail/mail-config.glade.h:50
+#: ../mail/mail-config.glade.h:51
 msgid "Ch_eck for Supported Types "
 msgstr "Sj_ekk støttede typer "
 
-#: ../mail/mail-config.glade.h:51
+#: ../mail/mail-config.glade.h:52
 msgid "Check _incoming mail for junk"
 msgstr "Sjekk om innkommende meldinger er søppel"
 
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.glade.h:53
 msgid "Check spelling while I _type"
 msgstr "Sjekk s_taving mens jeg skriver"
 
-#: ../mail/mail-config.glade.h:53
+#: ../mail/mail-config.glade.h:54
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Sjekker om innkommende meldinger er søppel"
 
-#: ../mail/mail-config.glade.h:54
+#: ../mail/mail-config.glade.h:55
 msgid "Cle_ar"
 msgstr "_Tøm"
 
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.glade.h:56
 msgid "Clea_r"
 msgstr "Tø_m"
 
-#: ../mail/mail-config.glade.h:56
+#: ../mail/mail-config.glade.h:57
 msgid "Color for _misspelled words:"
 msgstr "_Farge for feilstavede ord:"
 
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:58
 msgid "Colors"
 msgstr "Farger"
 
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.glade.h:59
 msgid "Confirm _when expunging a folder"
 msgstr "_Bekreft ved tømming av en mappe"
 
-#: ../mail/mail-config.glade.h:59
+#: ../mail/mail-config.glade.h:60
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12445,118 +12369,126 @@ msgstr ""
 "\n"
 "Klikk «Fullfør» for å lagre dine innstillinger."
 
-#: ../mail/mail-config.glade.h:65
+#: ../mail/mail-config.glade.h:66
 msgid "De_fault"
 msgstr "_Forvalgt"
 
-#: ../mail/mail-config.glade.h:66
+#: ../mail/mail-config.glade.h:67
 msgid "Default character e_ncoding:"
 msgstr "Forvalgt teg_nkoding:"
 
-#: ../mail/mail-config.glade.h:69
+#: ../mail/mail-config.glade.h:70
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "_Signer utgående meldinger digitalt (som forvalg)"
 
-#: ../mail/mail-config.glade.h:70
+#: ../mail/mail-config.glade.h:71
 msgid "Do not quote original message"
 msgstr "Ikke siter opprinnelig melding"
 
-#: ../mail/mail-config.glade.h:71 ../shell/evolution-startup-wizard.glade.h:1
+#: ../mail/mail-config.glade.h:72
 msgid "Done"
 msgstr "Ferdig"
 
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.glade.h:73
 msgid "Drafts _Folder:"
 msgstr "Mappe _for skisser:"
 
-#: ../mail/mail-config.glade.h:74
+#: ../mail/mail-config.glade.h:75
 msgid "Email Accounts"
 msgstr "E-post kontoer"
 
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:76
 msgid "Email _Address:"
 msgstr "E-post_adresse:"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:77
 msgid "Empty trash folders on e_xit"
 msgstr "_Tøm søppelkurven når programmet avsluttes"
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:78
 msgid "Encry_ption certificate:"
 msgstr "Sertifikat for kry_ptering:"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:79
 msgid "Encrypt out_going messages (by default)"
 msgstr "Krypter ut_gående meldinger (som forvalg)"
 
-#: ../mail/mail-config.glade.h:80
+#: ../mail/mail-config.glade.h:81
 msgid "Execute Command..."
 msgstr "Kjør kommando..."
 
-#: ../mail/mail-config.glade.h:81
+#: ../mail/mail-config.glade.h:82
 msgid "Fi_xed-width:"
 msgstr "Fast _bredde:"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:83
 msgid "Font Properties"
 msgstr "Egenskaper for skrift"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:84
 msgid "Format messages in _HTML"
 msgstr "Formater meldinger med _HTML"
 
-#: ../mail/mail-config.glade.h:85
+#: ../mail/mail-config.glade.h:86
 msgid "HTML Mail"
 msgstr "HTML-e-post"
 
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:87
 msgid "Headers"
 msgstr "Meldingshoder"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:88
 msgid "Highlight _quotations with"
 msgstr "_Merk sitering med"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:89
 msgid "I_nclude remote tests"
 msgstr "Inkluder eksterne tester"
 
-#: ../mail/mail-config.glade.h:91
+#: ../mail/mail-config.glade.h:92
 msgid "Inline"
 msgstr "Inline"
 
 #: ../mail/mail-config.glade.h:94
+msgid "Languages Table"
+msgstr "Språktabell"
+
+#: ../mail/mail-config.glade.h:96
 msgid "Mail Configuration"
 msgstr "E-post-konfigurasjon"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:97
+msgid "Mail Headers Table"
+msgstr "Tabell med meldingshoder"
+
+#: ../mail/mail-config.glade.h:99
 msgid "Mailbox location"
 msgstr "Plassering av postboks"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:100
 msgid "Message Composer"
 msgstr "Meldingsredigering"
 
-#: ../mail/mail-config.glade.h:98
+#: ../mail/mail-config.glade.h:101
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 "Merk: du vil ikke bli spurt etter et passord før du kobler til første gang"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:102
 msgid "Or_ganization:"
 msgstr "Or_ganisasjon:"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:103
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG-nø_kkel ID:"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:106
 msgid "Play sound file when new mail arri_ves"
 msgstr "Spill en l_ydfil når nye meldinger ankommer"
 
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:107
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -12564,7 +12496,7 @@ msgstr ""
 "Vennligst oppgi et beskrivende navn for denne kontoen i feltet under.\n"
 "Dette navnet vil kun bli brukt som et visningsnavn."
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:109
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -12572,7 +12504,7 @@ msgstr ""
 "Vennligst skriv inn informasjon om måten du sender e-post. Hvis du ikke er "
 "sikker, kontakt din systemadministrator eller din Internett tjenestetilbyder."
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:110
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -12582,107 +12514,115 @@ msgstr ""
 "under må ikke nødvendigvis fylles ut, hvis du ikke ønsker å inkludere denne "
 "informasjonen i meldingene du sender."
 
-#: ../mail/mail-config.glade.h:108
+#: ../mail/mail-config.glade.h:111
 msgid "Please select among the following options"
 msgstr "Vennligst velg mellom følgende alternativer"
 
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:112
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Spø_r ved sending av meldinger med kun Bcc-mottakere definert"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:113
 msgid "Quote original message"
 msgstr "Siter opprinnelig melding"
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:114
 msgid "Quoted"
 msgstr "Sitert"
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:115
 msgid "Re_member password"
 msgstr "_Husk passord"
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:116
 msgid "Re_ply-To:"
 msgstr "S_var-til:"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:118
 msgid "Remember _password"
 msgstr "Husk _passord"
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:119
 msgid "S_elect..."
 msgstr "V_elg..."
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:120
 msgid "S_tandard Font:"
 msgstr "Forvalg_t skrift:"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:121
 msgid "Se_lect..."
 msgstr "Ve_lg..."
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:123
 msgid "Select HTML fixed width font"
 msgstr "Velg skrift med fast bredde for HTML"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:124
 msgid "Select HTML fixed width font for printing"
 msgstr "Velg skrift med fast bredde for bruk ved utskrift av HTML"
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:125
 msgid "Select HTML variable width font"
 msgstr "Velg skrift med variabel bredde for HTML"
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:126
 msgid "Select HTML variable width font for printing"
 msgstr "Velg skrift med variabel bredde for bruk ved utskrift av HTML"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:127
+msgid "Send message receipts:"
+msgstr "Send kvittering for meldinger:"
+
+#: ../mail/mail-config.glade.h:129
 msgid "Sending Mail"
 msgstr "Utgående e-post"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:130
 msgid "Sent _Messages Folder:"
 msgstr "Mappe for sendte _meldinger:"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:131
 msgid "Ser_ver requires authentication"
 msgstr "Tjener kre_ver autentisering"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:132
 msgid "Server _Type: "
 msgstr "Tjener_type: "
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:133
 msgid "Sig_ning certificate:"
 msgstr "Sertifikat for sig_nering:"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:134
 msgid "Signat_ure:"
 msgstr "Signat_ur:"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:135
 msgid "Signatures"
 msgstr "Signaturer"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:136
+msgid "Signatures Table"
+msgstr "Tabell med signaturer"
+
+#: ../mail/mail-config.glade.h:137
 msgid "Specify _filename:"
 msgstr "Spesifiser _filnavn:"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:138
 msgid "Spell Checking"
 msgstr "Stavekontroll"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:139
 msgid "T_erminal Font:"
 msgstr "T_erminalskrift:"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:140
 msgid "T_ype: "
 msgstr "T_ype:"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:141
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -12690,7 +12630,7 @@ msgstr ""
 "Språklisten som vises her reflekterer kun de språkene du har installert en "
 "ordbok for."
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:142
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12700,7 +12640,7 @@ msgstr ""
 "signatur. Navnet du oppgir vil kun brukes for\n"
 "visning på skjermen."
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:146
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12708,15 +12648,15 @@ msgstr ""
 "Skriv navnet du vil referere til denne kontoen.\n"
 "For eksempel «Arbeid» eller «Personlig»"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:148
 msgid "User_name:"
 msgstr "Bruker_navn:"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:149
 msgid "V_ariable-width:"
 msgstr "V_ariabel bredde:"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:150
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12726,154 +12666,144 @@ msgstr ""
 "\n"
 "Klikk «Neste» for å begynne. "
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:154
 msgid "_Add Signature"
 msgstr "_Legg til signatur"
 
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:155
 msgid "_Always load images from the Internet"
 msgstr "_Alltid last bilder fra Internett"
 
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:156
 msgid "_Do not notify me when new mail arrives"
 msgstr "Ikke gi beskjed når nye meldinger ankommer"
 
-#: ../mail/mail-config.glade.h:152
+#: ../mail/mail-config.glade.h:157
 msgid "_Don't sign meeting requests (for Outlook compatibility)"
 msgstr "Ikke signer _møteforespørsler (for kompatibilitet med Outlook)"
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:159
 msgid "_Forward style:"
 msgstr "_Videresendingsstil:"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:160
 msgid "_Full Name:"
 msgstr "_Fullt navn:"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:161
 msgid "_Host:"
 msgstr "_Vert:"
 
-#: ../mail/mail-config.glade.h:157
-msgid "_Load images if sender is in address book"
-msgstr "_Last bilder hvis avsender er i adresseboken"
+#: ../mail/mail-config.glade.h:162
+msgid "_Load images in mail from contacts"
+msgstr "_Last bilder i meldinger fra kontakter"
 
-#: ../mail/mail-config.glade.h:158
+#: ../mail/mail-config.glade.h:163
 msgid "_Make this my default account"
 msgstr "_Bruk denne som forvalgt konto"
 
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:164
 msgid "_Mark messages as read after"
 msgstr "_Merk meldinger som lest etter"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:166
 msgid "_Never load images from the Internet"
 msgstr "Aldri last bilder fra Internett"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:167
 msgid "_Path:"
 msgstr "S_ti:"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:168
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "S_pør ved sending av HTML-meldinger til kontakter som ikke ønsker dem"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:169
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "S_pør ved sending av meldinger med tomt emnefelt"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:170
 msgid "_Reply style:"
 msgstr "Sva_rstil:"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:171
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:172
 msgid "_Show animated images"
 msgstr "Vi_s animerte bilder"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:173
 msgid "_Use Secure Connection:"
 msgstr "Br_uk sikker forbindelse:"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:174
 msgid "_Use the same fonts as other applications"
 msgstr "Br_uk samme skrifter som andre applikasjoner"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:175
 msgid "color"
 msgstr "farge"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:176
 msgid "description"
 msgstr "beskrivelse"
 
-#: ../mail/mail-dialogs.glade.h:1
-msgid ""
-"\n"
-" Please read carefully the license agreement displayed\n"
-" below and tick the check box for accepting it\n"
-msgstr ""
-"\n"
-"Vennligst les lisensavtalen som vises under nøye\n"
-"og kryss av i ruten for å akseptere den\n"
-
-#: ../mail/mail-dialogs.glade.h:7
+#: ../mail/mail-dialogs.glade.h:3
 msgid "<b>vFolder Sources</b>"
 msgstr "<b>Kilder for virtuelle mapper</b>"
 
-#: ../mail/mail-dialogs.glade.h:8
+#: ../mail/mail-dialogs.glade.h:4
 msgid "<span weight=\"bold\">Digital Signature</span>"
 msgstr "<span weight=\"bold\">Digital signatur</span>"
 
-#: ../mail/mail-dialogs.glade.h:9
+#: ../mail/mail-dialogs.glade.h:5
 msgid "<span weight=\"bold\">Encryption</span>"
 msgstr "<span weight=\"bold\">Kryptering</span>"
 
-#: ../mail/mail-dialogs.glade.h:10
+#: ../mail/mail-dialogs.glade.h:6
 msgid "Case _Sensitive"
 msgstr "_Skill mellom store/små bokstaver"
 
-#: ../mail/mail-dialogs.glade.h:11 ../mail/message-tags.glade.h:2
+#: ../mail/mail-dialogs.glade.h:7 ../mail/message-tags.glade.h:2
 msgid "Co_mpleted"
 msgstr "Fu_llført"
 
-#: ../mail/mail-dialogs.glade.h:13
+#: ../mail/mail-dialogs.glade.h:9
 msgid "F_ind:"
 msgstr "F_inn:"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:10
 msgid "Find in Message"
 msgstr "Finn i melding"
 
-#: ../mail/mail-dialogs.glade.h:15 ../mail/message-tag-followup.c:295
+#: ../mail/mail-dialogs.glade.h:11 ../mail/message-tag-followup.c:295
 #: ../mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "Merk for oppfølging"
 
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:12
 msgid "Folder Subscriptions"
 msgstr "Abonnement på mapper"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:13
 msgid "License Agreement"
 msgstr "Lisensavtale"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:14
 msgid "None Selected"
 msgstr "Ingen valgt"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:15
 msgid "S_erver:"
 msgstr "Tj_ener:"
 
-#: ../mail/mail-dialogs.glade.h:20
+#: ../mail/mail-dialogs.glade.h:16
 msgid "Security Information"
 msgstr "Sikkerhetsinformasjon"
 
-#: ../mail/mail-dialogs.glade.h:22 ../mail/message-tags.glade.h:4
+#: ../mail/mail-dialogs.glade.h:18 ../mail/message-tags.glade.h:4
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -12881,99 +12811,67 @@ msgstr ""
 "Meldingene du har valgt for oppfølging er listet under.\n"
 "Vennligst velg en handling for oppfølging fra menyen «Flagg»."
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:20
 msgid "_Accept License"
 msgstr "Godt_a lisensen"
 
-#: ../mail/mail-dialogs.glade.h:25 ../mail/message-tags.glade.h:6
+#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:6
 msgid "_Due By:"
 msgstr "_Ferdig til:"
 
-#: ../mail/mail-dialogs.glade.h:26 ../mail/message-tags.glade.h:7
+#: ../mail/mail-dialogs.glade.h:22 ../mail/message-tags.glade.h:7
 msgid "_Flag:"
 msgstr "_Flagg:"
 
-#: ../mail/mail-dialogs.glade.h:27
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Subscribe"
 msgstr "_Abonner"
 
-#: ../mail/mail-dialogs.glade.h:28
+#: ../mail/mail-dialogs.glade.h:24
 msgid "_Tick this to accept the license agreement"
 msgstr "_Kryss av her for å godta lisensen"
 
-#: ../mail/mail-dialogs.glade.h:29
+#: ../mail/mail-dialogs.glade.h:25
+#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
 msgid "_Unsubscribe"
 msgstr "_Fjern abonnement"
 
-#: ../mail/mail-dialogs.glade.h:30
+#: ../mail/mail-dialogs.glade.h:26
 msgid "specific folders only"
 msgstr "kun spesifikke mapper"
 
-#: ../mail/mail-dialogs.glade.h:31
+#: ../mail/mail-dialogs.glade.h:27
 msgid "with all active remote folders"
 msgstr "med alle aktive eksterne mapper"
 
-#: ../mail/mail-dialogs.glade.h:32
+#: ../mail/mail-dialogs.glade.h:28
 msgid "with all local and active remote folders"
 msgstr "med alle lokale og aktive eksterne mapper"
 
-#: ../mail/mail-dialogs.glade.h:33
+#: ../mail/mail-dialogs.glade.h:29
 msgid "with all local folders"
 msgstr "med alle lokale mapper"
 
-#. mail:camel-service-auth-invalid primary
-#: ../mail/mail-errors.xml.h:2
-msgid "Invalid authentication"
-msgstr "Ugyldig autentisering"
-
-#. mail:camel-service-auth-invalid secondary
-#: ../mail/mail-errors.xml.h:4
+#: ../mail/mail.error.xml.h:1
 msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
-msgstr ""
-"Tjener støtter ikke denne typen autentisering. Det kan hende den ikke "
-"støtter autentisering i det hele tatt."
-
-#. mail:camel-service-auth-failed primary
-#: ../mail/mail-errors.xml.h:6
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
-msgstr "Din pålogging på tjener «{0}» som «{0}» feilet."
+"A folder named &quot;{1}&quot; already exists. Please use a different name."
+msgstr "En mappe med navn &quot;{1}&quot; eksisterer allerede. Vennligst bruk et annet navn."
 
-#. mail:camel-service-auth-failed secondary
-#: ../mail/mail-errors.xml.h:8
+#: ../mail/mail.error.xml.h:2
 msgid ""
-"Check to make sure your password is spelled correctly.  Remember that many "
-"passwords are case sensitive; your caps lock might be on."
+"A non-empty folder at &quot;{1}&quot; already exists.\n"
+"\n"
+"You can choose to ignore this folder, overwrite or append its contents, or "
+"quit.\n"
 msgstr ""
-"Sjekk at passordet ditt er skrevet korrekt. Husk at mange passord skiller "
-"mellom store og små bokstaver. Caps lock kan være på."
 
-#. mail:ask-send-html primary
-#: ../mail/mail-errors.xml.h:10
-msgid "Are you sure you want to send a message in HTML format?"
-msgstr "Er du sikker på at du vil sende en melding i HTML-format?"
-
-#. mail:ask-send-html secondary
-#: ../mail/mail-errors.xml.h:12
+#: ../mail/mail.error.xml.h:6
 msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email:\n"
-"{0}\n"
-"Send anyway?"
+"A read receipt notification has been requested for &quot;{1}&quot;.  Send "
+"the reciept notification to {0}?"
 msgstr ""
-"Vennligst sjekk at følgende mottakere kan og ønsker å motta e-post som "
-"HTML:\n"
-"{0}\n"
-"Send likevel?"
 
-#. mail:ask-send-no-subject primary
-#: ../mail/mail-errors.xml.h:17
-msgid "Are you sure you want to send a message without a subject?"
-msgstr "Er du sikker på at du vil sende en melding uten emne?"
-
-#. mail:ask-send-no-subject secondary
-#: ../mail/mail-errors.xml.h:19
+#: ../mail/mail.error.xml.h:7
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
@@ -12981,529 +12879,466 @@ msgstr ""
 "Hvis du gir dine meldinger en meningsfylt emnelinje vil mottakerene lettere "
 "forstå hva meldingen din handler om."
 
-#. mail:ask-send-only-bcc-contact primary
-#. mail:ask-send-only-bcc primary
-#: ../mail/mail-errors.xml.h:22 ../mail/mail-errors.xml.h:29
-msgid "Are you sure you want to send a message with only BCC recipients?"
-msgstr "Er du sikker på at du ønsker å sende en melding med kun BCB-mottakere?"
+#: ../mail/mail.error.xml.h:8
+msgid "Are you sure you want to delete this account?"
+msgstr "Er du sikker på at du vil slette denne kontoen?"
 
-#. mail:ask-send-only-bcc-contact secondary
-#: ../mail/mail-errors.xml.h:24
-msgid ""
-"The contact list you are sending to is configured to hide list recipients.\n"
-"\n"
-"Many email systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients in "
-"your message. To avoid this, you should add at least one To: or CC: "
-"recipient. "
-msgstr ""
+#: ../mail/mail.error.xml.h:9
+msgid "Are you sure you want to open {0} messages at once?"
+msgstr "Er du sikker på at du vil åpne {0} meldinger samtidig?"
 
-#. mail:ask-send-only-bcc secondary
-#: ../mail/mail-errors.xml.h:31
+#: ../mail/mail.error.xml.h:10
 msgid ""
-"Many email systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients to "
-"your message anyway. To avoid this, you should add at least one To: or CC: "
-"recipient."
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
 msgstr ""
+"Er du sikker på at du vil fjerne alle slettede meldinger fra alle mapper "
+"permanent?"
 
-#. mail:send-no-recipients primary
-#: ../mail/mail-errors.xml.h:34
+#: ../mail/mail.error.xml.h:11
 msgid ""
-"This message cannot be sent because you have not specified any Recipients"
-msgstr "Denne meldingen kan ikke sendes da du ikke har oppgitt noen mottakere"
+"Are you sure you want to permanently remove all the deleted messages in "
+"folder &quot;{0}&quot;?"
+msgstr "Er du sikker på at du vil fjerne alle slettede meldinger fra mappe &quot;{0}&quot; permanent?"
 
-#. mail:send-no-recipients secondary
-#: ../mail/mail-errors.xml.h:36
-msgid ""
-"Please enter a valid email address in the To: field. You can search for "
-"email addresses by clicking on the To: button next to the entry box."
-msgstr ""
-"Vennligst oppgi en gyldig e-postadresse i Til:-feltet. Du kan søke etter e-"
-"postadresser ved å klikke på Til:-knappen ved siden av inntastingsfeltet."
+#: ../mail/mail.error.xml.h:12
+msgid "Are you sure you want to send a message in HTML format?"
+msgstr "Er du sikker på at du vil sende en melding i HTML-format?"
 
-#. mail:ask-default-drafts primary
-#: ../mail/mail-errors.xml.h:38
-msgid "Use default drafts folder?"
-msgstr "Bruk forvalgt mappe for skisser?"
+#: ../mail/mail.error.xml.h:13
+msgid "Are you sure you want to send a message with only BCC recipients?"
+msgstr "Er du sikker på at du ønsker å sende en melding med kun BCB-mottakere?"
 
-#. mail:ask-default-drafts secondary
-#: ../mail/mail-errors.xml.h:40
-msgid ""
-"Unable to open the drafts folder for this account.  Use the system drafts "
-"folder instead?"
-msgstr ""
-"Kunne ikke åpne skisse-mappen for denne kontoen. Vil du bruke standard "
-"skisse-mappe?"
+#: ../mail/mail.error.xml.h:14
+msgid "Are you sure you want to send a message without a subject?"
+msgstr "Er du sikker på at du vil sende en melding uten emne?"
 
-#: ../mail/mail-errors.xml.h:41
-msgid "Use _Default"
-msgstr "Bruk _forvalg"
+#: ../mail/mail.error.xml.h:15
+msgid "Because &quot;{0}&quot;."
+msgstr "Fordi &quot;{0}&quot;."
 
-#. mail:ask-expunge primary
-#: ../mail/mail-errors.xml.h:43
-msgid ""
-"Are you sure you want to permanently remove all the deleted message in "
-"folder \"{0}\"?"
-msgstr ""
-"Er du sikker på at du vil fjerne alle slettede meldinger fra mappe «{0}» "
-"permanent?"
+#: ../mail/mail.error.xml.h:17
+msgid "Because &quot;{2}&quot;."
+msgstr "Fordi &quot;{2}&quot;."
 
-#. mail:ask-expunge secondary
-#. mail:ask-empty-trash secondary
-#: ../mail/mail-errors.xml.h:45 ../mail/mail-errors.xml.h:50
-msgid "If you continue, you will not be able to recover these messages."
-msgstr "Hvis du fortsetter vil du ikke kunne gjenopprette disse meldingene."
+#: ../mail/mail.error.xml.h:18
+msgid "Cannot add vFolder &quot;{0}&quot;."
+msgstr "Kan ikke legge til virtuell mappe &quot;{0}&quot;."
 
-#: ../mail/mail-errors.xml.h:46
-msgid "_Expunge"
-msgstr "T_øm"
+#: ../mail/mail.error.xml.h:19
+msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
+msgstr "Kan ikke kopiere mappe &quot;{0}&quot; til &quot;{1}&quot;."
 
-#. mail:ask-empty-trash primary
-#: ../mail/mail-errors.xml.h:48
-msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
-msgstr ""
-"Er du sikker på at du vil fjerne alle slettede meldinger fra alle mapper "
-"permanent?"
+#: ../mail/mail.error.xml.h:20
+msgid "Cannot create folder &quot;{0}&quot;."
+msgstr "Kan ikke opprette mappe &quot;{0}&quot;."
 
-#: ../mail/mail-errors.xml.h:51
-msgid "_Empty Trash"
-msgstr "Tøm søpp_elkurven"
+#: ../mail/mail.error.xml.h:21
+msgid "Cannot create temporary save directory."
+msgstr "Kan ikke opprette midlertidig katalog."
 
-#. mail:ask-open-many primary
-#: ../mail/mail-errors.xml.h:53
-msgid "Are you sure you want to open {0} messages at once?"
-msgstr "Er du sikker på at du vil åpne {0} meldinger samtidig?"
+#: ../mail/mail.error.xml.h:22
+msgid "Cannot create the save directory, because &quot;{1}&quot;"
+msgstr "Kan ikke opprette katalog for lagring fordi &quot{1}&quot;"
 
-#. mail:ask-open-many secondary
-#: ../mail/mail-errors.xml.h:55
-msgid "Opening too many messages at once may take a long time."
-msgstr "Hvis du åpner for mange meldinger på en gang kan dette ta lang tid."
+#: ../mail/mail.error.xml.h:23
+msgid "Cannot delete folder &quot;{0}&quot;."
+msgstr "Kunne ikke slette mappe &quot;{0}&quot;."
 
-#: ../mail/mail-errors.xml.h:56
-msgid "_Open Messages"
-msgstr "_Åpne meldinger"
+#: ../mail/mail.error.xml.h:24
+msgid "Cannot delete system folder &quot;{0}&quot;."
+msgstr "Kan ikke slette systemmappe &quot;{0}&quot;."
 
-#. mail:exit-unsaved primary
-#: ../mail/mail-errors.xml.h:58
-msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr "Du har usendte meldinger. Vil du avslutte likevel?"
+#: ../mail/mail.error.xml.h:25
+msgid "Cannot edit vFolder &quot;{0}&quot; as it does not exist."
+msgstr "Kan ikke redigere virtuell mappe &quot;{0}&quot; da den ikke eksisterer."
+
+#: ../mail/mail.error.xml.h:26
+msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
+msgstr "Kunne ikke flytte mappe &quot;{0}&quot; til &quot;{1}&quot;."
 
-#. mail:exit-unsaved secondary
-#: ../mail/mail-errors.xml.h:60
+#: ../mail/mail.error.xml.h:27
+msgid "Cannot open source &quot;{1}&quot;"
+msgstr "Kan ikke åpne kilde &quot;{1}&quot;"
+
+#: ../mail/mail.error.xml.h:28
+msgid "Cannot open source &quot;{2}&quot;."
+msgstr "Kan ikke åpne kilde &quot;{2}&quot;."
+
+#: ../mail/mail.error.xml.h:29
+msgid "Cannot open target &quot;{2}&quot;."
+msgstr "Kan ikke åpne mål &quot;{2}&quot;."
+
+#: ../mail/mail.error.xml.h:30
 msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+"Cannot read the license file &quot;{0}&quot;, due to an installation "
+"problem.  You will not be able to use this provider until you can accept its "
+"license."
 msgstr ""
-"Hvis du avslutter vil ikke disse meldingene sendes før Evolution startes "
-"igjen."
 
-#. mail:camel-exception primary
-#: ../mail/mail-errors.xml.h:62
-msgid "Your message with the subject \"{0}\" was not delivered."
-msgstr "Din melding med emne «{0}» ble ikke levert."
+#: ../mail/mail.error.xml.h:31
+msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
+msgstr "Kan ikke endre navn på &quot;{0}&quot; til &quot;{1}&quot;."
+
+#: ../mail/mail.error.xml.h:32
+msgid "Cannot rename or move system folder &quot;{0}&quot;."
+msgstr "Kan ikke endre navn på eller flytte systemmappe &quot;{0}&quot;."
+
+#: ../mail/mail.error.xml.h:33
+msgid "Cannot save changes to account."
+msgstr "Kan ikke lagre endringer for kontoen."
+
+#: ../mail/mail.error.xml.h:34
+msgid "Cannot save to directory &quot;{0}&quot;."
+msgstr "Kan ikke lagre til katalog &quot;{0}&quot;."
+
+#: ../mail/mail.error.xml.h:35
+msgid "Cannot save to file &quot;{0}&quot;."
+msgstr "Kan ikke lagre til fil &quot;{0}&quot;."
 
-#. mail:camel-exception secondary
-#: ../mail/mail-errors.xml.h:64
+#: ../mail/mail.error.xml.h:36
+msgid "Cannot set signature script &quot;{0}&quot;."
+msgstr "Kan ikke sette signaturskript &quot;{0}&quot;."
+
+#: ../mail/mail.error.xml.h:37
 msgid ""
-"The message was sent via the \"sendmail\" external application.  Sendmail "
-"reports the following error: status 67: mail not sent.\n"
-"The message is stored in the Outbox folder.  Check the message for errors "
-"and resend."
+"Check to make sure your password is spelled correctly.  Remember that many "
+"passwords are case sensitive; your caps lock might be on."
 msgstr ""
+"Sjekk at passordet ditt er skrevet korrekt. Husk at mange passord skiller "
+"mellom store og små bokstaver. Caps lock kan være på."
 
-#. mail:async-error primary
-#: ../mail/mail-errors.xml.h:67
-msgid "Error while {0}."
-msgstr "Feil under {0}."
+#: ../mail/mail.error.xml.h:38
+msgid "Could not save signature file."
+msgstr "Kunne ikke lagre signaturfil."
 
-#. mail:async-error secondary
-#: ../mail/mail-errors.xml.h:69
-msgid "{1}."
-msgstr "{1}."
+#: ../mail/mail.error.xml.h:39
+msgid "Delete &quot;{0}&quot;?"
+msgstr "Slett &quot;{0}&quot;?"
 
-#. mail:async-error-nodescribe primary
-#: ../mail/mail-errors.xml.h:71
-msgid "Error while performing operation."
-msgstr "Feil under utføring av operasjon."
+#: ../mail/mail.error.xml.h:40
+msgid "Delete account?"
+msgstr "Slett konto?"
 
-#. mail:async-error-nodescribe secondary
-#: ../mail/mail-errors.xml.h:73
-msgid "{0}."
-msgstr "{0}."
+#: ../mail/mail.error.xml.h:41
+msgid "Discard changed?"
+msgstr "Forkast endringer?"
+
+#: ../mail/mail.error.xml.h:42
+msgid "Do you want the operation to be performed in the sub folders ?"
+msgstr "Vil du at operasjonen skal utføres i undermapper?"
+
+#: ../mail/mail.error.xml.h:43
+msgid "Do you wish to save your changes?"
+msgstr "Vil du lagre dine endringer?"
 
-#. mail:ask-session-password primary
-#: ../mail/mail-errors.xml.h:87
+#: ../mail/mail.error.xml.h:44
+msgid "Don't delete"
+msgstr "Ikke slett"
+
+#: ../mail/mail.error.xml.h:45
 msgid "Enter password."
 msgstr "Oppgi passord."
 
-#. mail:filter-load-error primary
-#: ../mail/mail-errors.xml.h:91
+#: ../mail/mail.error.xml.h:46
 msgid "Error loading filter definitions."
 msgstr "Feil under lasting av filterdefinisjoner."
 
-#. mail:no-save-path primary
-#: ../mail/mail-errors.xml.h:95
-msgid "Cannot save to directory \"{0}\"."
-msgstr "Kan ikke lagre til katalog «{0}»."
-
-#. mail:no-create-path primary
-#. mail:no-write-path-exists primary
-#. mail:no-write-path-notfile primary
-#: ../mail/mail-errors.xml.h:99 ../mail/mail-errors.xml.h:107
-#: ../mail/mail-errors.xml.h:111
-msgid "Cannot save to file \"{0}\"."
-msgstr "Kan ikke lagre til fil «{0}»."
-
-#. mail:no-create-path secondary
-#: ../mail/mail-errors.xml.h:101
-msgid "Cannot create the save directory, because \"{1}\""
-msgstr "Kan ikke opprette katalog for lagring pga «{1}»"
-
-#. mail:no-create-tmp-path primary
-#: ../mail/mail-errors.xml.h:103
-msgid "Cannot create temporary save directory."
-msgstr "Kan ikke opprette midlertidig katalog."
+#: ../mail/mail.error.xml.h:47
+msgid "Error while performing operation."
+msgstr "Feil under utføring av operasjon."
+
+#: ../mail/mail.error.xml.h:48
+msgid "Error while {0}."
+msgstr "Feil under {0}."
 
-#. mail:no-write-path-exists secondary
-#: ../mail/mail-errors.xml.h:109
+#: ../mail/mail.error.xml.h:49
 msgid "File exists but cannot overwrite it."
 msgstr "Filen eksisterer men kan ikke overskrives."
 
-#. mail:no-write-path-notfile secondary
-#: ../mail/mail-errors.xml.h:113
+#: ../mail/mail.error.xml.h:50
 msgid "File exists but is not a regular file."
 msgstr "Filen eksisterer, men den er ikke en vanlig fil."
 
-#. mail:no-delete-folder primary
-#: ../mail/mail-errors.xml.h:115
-msgid "Cannot delete folder \"{0}\"."
-msgstr "Kunne ikke slette mappe «{0}»."
+#: ../mail/mail.error.xml.h:51
+msgid "If you continue, you will not be able to recover these messages."
+msgstr "Hvis du fortsetter vil du ikke kunne gjenopprette disse meldingene."
 
-#. mail:no-delete-special-folder primary
-#: ../mail/mail-errors.xml.h:119
-msgid "Cannot delete system folder \"{0}\"."
-msgstr "Kan ikke slette systemmappe «{0}»."
+#: ../mail/mail.error.xml.h:52
+msgid ""
+"If you delete the folder, all of its contents and its subfolders contents "
+"will be deleted permanently."
+msgstr ""
+"Hvis du sletter mappen vil alt innhold i denne og undermapper slettes "
+"permanent."
+
+#: ../mail/mail.error.xml.h:53
+msgid "If you proceed, the account information will be deleted permanently."
+msgstr "Hvis du fortsetter vil kontoinformasjonen bli slettet permanent."
 
-#. mail:no-delete-special-folder secondary
-#. mail:no-rename-special-folder secondary
-#: ../mail/mail-errors.xml.h:121 ../mail/mail-errors.xml.h:125
+#: ../mail/mail.error.xml.h:54
 msgid ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
 msgstr ""
-"Systemmapper kreves for at Evolution skal fungere korrekt og du kan ikke "
-"endre navn på, flytte eller slette disse."
+"Hvis du avslutter vil ikke disse meldingene sendes før Evolution startes "
+"igjen."
 
-#. mail:no-rename-special-folder primary
-#: ../mail/mail-errors.xml.h:123
-msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "Kan ikke endre navn på eller flytte systemmappe «{0}»."
+#: ../mail/mail.error.xml.h:55
+msgid "Ignore"
+msgstr "Ignorer"
 
-#. mail:ask-delete-folder title
-#: ../mail/mail-errors.xml.h:127
-msgid "Delete \"{0}\"?"
-msgstr "Slett «{0}»?"
+#: ../mail/mail.error.xml.h:56
+msgid "Invalid authentication"
+msgstr "Ugyldig autentisering"
 
-#. mail:ask-delete-folder primary
-#: ../mail/mail-errors.xml.h:129
-msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr "Vil du virkelig slette mappen «{0}» og alle dens undermapper?"
+#: ../mail/mail.error.xml.h:57
+msgid "Mail filters automatically updated."
+msgstr "E-postfiltre oppdatert automatisk."
 
-#. mail:ask-delete-folder secondary
-#: ../mail/mail-errors.xml.h:131
+#: ../mail/mail.error.xml.h:58
 msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
-"will be deleted permanently."
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients to "
+"your message anyway. To avoid this, you should add at least one To: or CC: "
+"recipient."
 msgstr ""
-"Hvis du sletter mappen vil alt innhold i denne og undermapper slettes "
-"permanent."
 
-#. mail:no-rename-folder-exists primary
-#. mail:no-rename-folder primary
-#: ../mail/mail-errors.xml.h:133 ../mail/mail-errors.xml.h:137
-msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr "Kan ikke endre navn på «{0}» til {1}."
-
-#. mail:no-rename-folder-exists secondary
-#. mail:vfolder-notunique secondary
-#: ../mail/mail-errors.xml.h:135 ../mail/mail-errors.xml.h:197
-msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr ""
-"En mappe med navn «{1}» eksisterer allerede. Vennligst bruk et annet navn."
-
-#. mail:no-rename-folder secondary
-#: ../mail/mail-errors.xml.h:139
-msgid "Because \"{2}\"."
-msgstr "fordi «{2}»."
-
-#. mail:no-move-folder-nostore primary
-#. mail:no-move-folder-to-nostore primary
-#: ../mail/mail-errors.xml.h:141 ../mail/mail-errors.xml.h:145
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
-msgstr "Kunne ikke flytte mappe «{0}» til «{1}»."
-
-#. mail:no-move-folder-nostore secondary
-#. mail:no-copy-folder-nostore secondary
-#: ../mail/mail-errors.xml.h:143 ../mail/mail-errors.xml.h:151
-msgid "Cannot open source \"{2}\"."
-msgstr "Kan ikke åpne kilde «{2}»."
-
-#. mail:no-move-folder-to-nostore secondary
-#. mail:no-copy-folder-to-nostore secondary
-#: ../mail/mail-errors.xml.h:147 ../mail/mail-errors.xml.h:155
-msgid "Cannot open target \"{2}\"."
-msgstr "Kan ikke åpne mål «{2}»."
-
-#. mail:no-copy-folder-nostore primary
-#. mail:no-copy-folder-to-nostore primary
-#: ../mail/mail-errors.xml.h:149 ../mail/mail-errors.xml.h:153
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "Kan ikke kopiere mappe «{0}» til «{1}»."
-
-#. mail:no-create-folder-nostore primary
-#: ../mail/mail-errors.xml.h:157
-msgid "Cannot create folder \"{0}\"."
-msgstr "Kan ikke opprette mappe «{0}»."
-
-#. mail:no-create-folder-nostore secondary
-#: ../mail/mail-errors.xml.h:159
-msgid "Cannot open source \"{1}\""
-msgstr "Kan ikke åpne kilde «{1}»"
-
-#. mail:account-incomplete primary
-#. mail:account-notunique primary
-#: ../mail/mail-errors.xml.h:161 ../mail/mail-errors.xml.h:165
-msgid "Cannot save changes to account."
-msgstr "Kan ikke lagre endringer for kontoen."
+#: ../mail/mail.error.xml.h:59
+msgid "Mark all messages as read"
+msgstr "Merk alle meldinger som lest"
 
-#. mail:account-incomplete secondary
-#: ../mail/mail-errors.xml.h:163
-msgid "You have not filled in all of the required information."
-msgstr "Du har ikke fylt ut all nødvendig informasjon."
+#: ../mail/mail.error.xml.h:60
+msgid "Mark all messages as read in the selected folder"
+msgstr "Merk alle meldinger i valgt mappe som lest"
 
-#. mail:account-notunique secondary
-#: ../mail/mail-errors.xml.h:167
-msgid "You may not create two accounts with the same name."
-msgstr "Du kan ikke opprette to kontoer med samme navn."
+#: ../mail/mail.error.xml.h:61
+msgid "Missing folder."
+msgstr "Mangler mappe."
 
-#. mail:ask-delete-account title
-#: ../mail/mail-errors.xml.h:169
-msgid "Delete account?"
-msgstr "Slett konto?"
+#: ../mail/mail.error.xml.h:63
+msgid "No sources selected."
+msgstr "Ingen kilder valgt."
 
-#. mail:ask-delete-account primary
-#: ../mail/mail-errors.xml.h:171
-msgid "Are you sure you want to delete this account?"
-msgstr "Er du sikker på at du vil slette denne kontoen?"
+#: ../mail/mail.error.xml.h:64
+msgid "Opening too many messages at once may take a long time."
+msgstr "Hvis du åpner for mange meldinger på en gang kan dette ta lang tid."
 
-#. mail:ask-delete-account secondary
-#: ../mail/mail-errors.xml.h:173
-msgid "If you proceed, the account information will be deleted permanently."
-msgstr "Hvis du fortsetter vil kontoinformasjonen bli slettet permanent."
+#: ../mail/mail.error.xml.h:65
+msgid "Please check your account settings and try again."
+msgstr "Vennligst sjekk innstillingene for kontoen og prøv igjen."
 
-#: ../mail/mail-errors.xml.h:174
-msgid "Don't delete"
-msgstr "Ikke slett"
+#: ../mail/mail.error.xml.h:66
+msgid ""
+"Please enter a valid email address in the To: field. You can search for "
+"email addresses by clicking on the To: button next to the entry box."
+msgstr ""
+"Vennligst oppgi en gyldig e-postadresse i Til:-feltet. Du kan søke etter e-"
+"postadresser ved å klikke på Til:-knappen ved siden av inntastingsfeltet."
 
-#. mail:no-save-signature primary
-#: ../mail/mail-errors.xml.h:176
-msgid "Could not save signature file."
-msgstr "Kunne ikke lagre signaturfil."
+#: ../mail/mail.error.xml.h:67
+msgid ""
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}\n"
+"Send anyway?"
+msgstr ""
+"Vennligst sjekk at følgende mottakere kan og ønsker å motta e-post som "
+"HTML:\n"
+"{0}\n"
+"Send likevel?"
 
-#. mail:no-save-signature secondary
-#: ../mail/mail-errors.xml.h:178
-msgid "Because \"{0}\"."
-msgstr "Fordi «{0}»."
+#: ../mail/mail.error.xml.h:70
+msgid "Please wait."
+msgstr "Vennligst vent."
 
-#. mail:signature-notscript primary
-#: ../mail/mail-errors.xml.h:180
-msgid "Cannot set signature script \"{0}\"."
-msgstr "Kan ikke sette signaturskript «{0}»."
+#: ../mail/mail.error.xml.h:71
+msgid "Problem migrating old mail folder &quot;{0}&quot;."
+msgstr "Det oppsto et problem under migrering av gammel meldingsmappe &quot;{0}&quot;."
 
-#. mail:signature-notscript secondary
-#: ../mail/mail-errors.xml.h:182
-msgid "The script file must exist and be executable."
-msgstr "Skriptfilen må eksistere og være kjørbar."
+#: ../mail/mail.error.xml.h:72
+msgid "Querying server"
+msgstr "Spør tjener"
 
-#. mail:ask-signature-changed title
-#: ../mail/mail-errors.xml.h:184
-msgid "Discard changed?"
-msgstr "Forkast endringer?"
+#: ../mail/mail.error.xml.h:73
+msgid "Querying server for a list of supported authentication mechanisms."
+msgstr "Spør tjener etter en liste med støttede autentiseringsmekanismer."
 
-#. mail:ask-signature-changed primary
-#: ../mail/mail-errors.xml.h:186
-msgid "Do you wish to save your changes?"
-msgstr "Vil du lagre dine endringer?"
+#: ../mail/mail.error.xml.h:74
+msgid "Read receipt requested."
+msgstr "Lesekvittering etterspurt."
 
-#. mail:ask-signature-changed secondary
-#: ../mail/mail-errors.xml.h:188
-msgid "This signature has been changed, but has not been saved."
-msgstr "Denne signaturen er endret, men er ikke lagret."
+#: ../mail/mail.error.xml.h:75
+msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
+msgstr "Vil du virkelig slette mappen &quot;{0}&quot; og alle dens undermapper?"
 
-#: ../mail/mail-errors.xml.h:189
-msgid "_Discard changes"
-msgstr "_Forkast endringene"
-
-#. mail:vfolder-notexist primary
-#: ../mail/mail-errors.xml.h:191
-msgid "Cannot edit vFolder \"{0}\" as it does not exist."
-msgstr "Kan ikke redigere virtuell mappe «{0}» da den ikke eksisterer."
+#: ../mail/mail.error.xml.h:76
+msgid "Send Receipt"
+msgstr "Send kvittering"
 
-#. mail:vfolder-notexist secondary
-#: ../mail/mail-errors.xml.h:193
+#: ../mail/mail.error.xml.h:77
 msgid ""
-"This folder may have been added implicitly, go to the vFolder editor to add "
-"it explicitly, if required."
+"System folders are required for Ximian Evolution to function correctly and "
+"cannot be renamed, moved, or deleted."
 msgstr ""
+"Systemmapper kreves for at Evolution skal fungere korrekt og du kan ikke "
+"endre navn på, flytte eller slette disse."
 
-#. mail:vfolder-notunique primary
-#: ../mail/mail-errors.xml.h:195
-msgid "Cannot add vFolder \"{0}\"."
-msgstr "Kan ikke legge til virtuell mappe «{0}»."
-
-#. mail:vfolder-updated primary
-#: ../mail/mail-errors.xml.h:199
-msgid "vFolders automatically updated."
-msgstr "Virtuelle mapper oppdatert automatisk."
+#: ../mail/mail.error.xml.h:78
+msgid ""
+"The contact list you are sending to is configured to hide list recipients.\n"
+"\n"
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients in "
+"your message. To avoid this, you should add at least one To: or CC: "
+"recipient. "
+msgstr ""
 
-#. mail:vfolder-updated secondary
-#: ../mail/mail-errors.xml.h:201
+#: ../mail/mail.error.xml.h:81
 msgid ""
-"The following vFolder(s):\n"
+"The following filter rule(s):\n"
 "{0}\n"
 "Used the now removed folder:\n"
-"    \"{1}\"\n"
+"    &quot;{1}&quot;\n"
 "And have been updated."
 msgstr ""
-"Følgende virtuelle mapper:\n"
+"Følgende filterregler:\n"
 "{0}\n"
-"brukte nå fjernet mappe:\n"
-"    «{1}»\n"
-"og ble oppdatert."
-
-#. mail:filter-updated primary
-#: ../mail/mail-errors.xml.h:207
-msgid "Mail filters automatically updated."
-msgstr "E-postfiltre oppdatert automatisk."
+"brukte fjernet mappe:\n"
+"    &quot;{1}&quot;\n"
+"og er nå oppdatert."
 
-#. mail:filter-updated secondary
-#: ../mail/mail-errors.xml.h:209
+#: ../mail/mail.error.xml.h:86
 msgid ""
-"The following filter rule(s):\n"
+"The following vFolder(s):\n"
 "{0}\n"
 "Used the now removed folder:\n"
-"    \"{1}\"\n"
+"    &quot;{1}&quot;\n"
 "And have been updated."
 msgstr ""
-"Følgende filterregler:\n"
+"Følgende virtuelle mapper:\n"
 "{0}\n"
-"brukte nå fjernet mappe:\n"
-"    «{1}»\n"
-"og ble oppdatert."
+"brukte fjernet mappe:\n"
+"    &quot;{1}&quot;\n"
+"og er nå oppdatert."
 
-#. mail:no-folder primary
-#: ../mail/mail-errors.xml.h:215
-msgid "Missing folder."
-msgstr "Mangler mappe."
-
-#. mail:no-folder secondary
-#: ../mail/mail-errors.xml.h:217
-msgid "You must specify a folder."
-msgstr "Du må oppgi en mappe."
-
-#. mail:no-name-vfolder secondary
-#: ../mail/mail-errors.xml.h:221
-msgid "You must name this vFolder."
-msgstr "Du må gi navn til denne virtuelle mappen."
+#: ../mail/mail.error.xml.h:91
+msgid ""
+"The message was sent via the &quot;sendmail&quot; external application.  "
+"Sendmail reports the following error: status 67: mail not sent.\n"
+"The message is stored in the Outbox folder.  Check the message for errors "
+"and resend."
+msgstr ""
 
-#. mail:vfolder-no-source primary
-#: ../mail/mail-errors.xml.h:223
-msgid "No sources selected."
-msgstr "Ingen kilder valgt."
+#: ../mail/mail.error.xml.h:93
+msgid "The script file must exist and be executable."
+msgstr "Skriptfilen må eksistere og være kjørbar."
 
-#. mail:vfolder-no-source secondary
-#: ../mail/mail-errors.xml.h:225
+#: ../mail/mail.error.xml.h:94
 msgid ""
-"You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting\n"
-"all local folders, all remote folders, or both."
+"This folder may have been added implicitly, go to the vFolder editor to add "
+"it explicitly, if required."
 msgstr ""
 
-#. mail:ask-migrate-existing primary
-#: ../mail/mail-errors.xml.h:229
-msgid "Problem migrating old mail folder \"{0}\"."
-msgstr "Det oppsto et problem under migrering av gammel meldingsmappe «{0}»."
+#: ../mail/mail.error.xml.h:95
+msgid ""
+"This message cannot be sent because you have not specified any Recipients"
+msgstr "Denne meldingen kan ikke sendes da du ikke har oppgitt noen mottakere"
 
-#. mail:ask-migrate-existing secondary
-#: ../mail/mail-errors.xml.h:231
+#: ../mail/mail.error.xml.h:96
 msgid ""
-"A non-empty folder at \"{1}\" already exists.\n"
-"\n"
-"You can choose to ignore this folder, overwrite or append its contents, or "
-"quit.\n"
+"This server does not support this type of authentication and may not support "
+"authentication at all."
 msgstr ""
+"Tjener støtter ikke denne typen autentisering. Det kan hende den ikke "
+"støtter autentisering i det hele tatt."
 
-#: ../mail/mail-errors.xml.h:235
-msgid "Ignore"
-msgstr "Ignorer"
+#: ../mail/mail.error.xml.h:97
+msgid "This signature has been changed, but has not been saved."
+msgstr "Denne signaturen er endret, men er ikke lagret."
 
-#: ../mail/mail-errors.xml.h:236 ../widgets/misc/e-system-errors.xml.h:7
-msgid "_Overwrite"
-msgstr "_Overskriv"
+#: ../mail/mail.error.xml.h:98
+msgid "Unable to connect to the GroupWise server."
+msgstr "Kunne ikke koble til GroupWise-tjener."
 
-#: ../mail/mail-errors.xml.h:237
-msgid "_Append"
-msgstr "_Legg til"
+#: ../mail/mail.error.xml.h:99
+msgid ""
+"Unable to open the drafts folder for this account.  Use the system drafts "
+"folder instead?"
+msgstr ""
+"Kunne ikke åpne skisse-mappen for denne kontoen. Vil du bruke standard "
+"skisse-mappe?"
 
-#. mail:no-load-license primary
-#: ../mail/mail-errors.xml.h:239
+#: ../mail/mail.error.xml.h:100
 msgid "Unable to read license file."
 msgstr "Kan ikke lese lisensfilen."
 
-#. mail:no-load-license secondary
-#: ../mail/mail-errors.xml.h:241
-msgid ""
-"Cannot read the license file \"{0}\", due to an\n"
-"      installation problem.  You will not be able to use this provider "
-"until\n"
-"      you can accept its license."
-msgstr ""
+#: ../mail/mail.error.xml.h:101
+msgid "Use _Default"
+msgstr "Bruk _forvalg"
 
-#. mail:checking-service title
-#: ../mail/mail-errors.xml.h:245
-msgid "Querying server"
-msgstr "Spør tjener"
+#: ../mail/mail.error.xml.h:102
+msgid "Use default drafts folder?"
+msgstr "Bruk forvalgt mappe for skisser?"
 
-#. mail:checking-service primary
-#: ../mail/mail-errors.xml.h:247
-msgid "Please wait."
-msgstr "Vennligst vent."
+#: ../mail/mail.error.xml.h:103
+msgid "You have not filled in all of the required information."
+msgstr "Du har ikke fylt ut all nødvendig informasjon."
 
-#. mail:checking-service secondary
-#: ../mail/mail-errors.xml.h:249
-msgid "Querying server for a list of supported authentication mechanisms."
-msgstr "Spør tjener etter en liste med støttede autentiseringsmekanismer."
+#: ../mail/mail.error.xml.h:104
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr "Du har usendte meldinger. Vil du avslutte likevel?"
 
-#. mail:gw-accountsetup-error primary
-#: ../mail/mail-errors.xml.h:251
-msgid ""
-"Unable to connect to the GroupWise\n"
-"server."
-msgstr ""
-"Kunne ikke koble til GroupWise-\n"
-"tjener."
+#: ../mail/mail.error.xml.h:105
+msgid "You may not create two accounts with the same name."
+msgstr "Du kan ikke opprette to kontoer med samme navn."
+
+#: ../mail/mail.error.xml.h:106
+msgid "You must name this vFolder."
+msgstr "Du må gi navn til denne virtuelle mappen."
+
+#: ../mail/mail.error.xml.h:107
+msgid "You must specify a folder."
+msgstr "Du må oppgi en mappe."
 
-#. mail:gw-accountsetup-error secondary
-#: ../mail/mail-errors.xml.h:254
+#: ../mail/mail.error.xml.h:108
 msgid ""
-"\n"
-"Please check your account settings and try again.\n"
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting all local "
+"folders, all remote folders, or both."
 msgstr ""
-"\n"
-"Vennligst sjekk dine kontoinnstillinger og prøv igjen.\n"
+
+#: ../mail/mail.error.xml.h:110
+msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
+msgstr "Din pålogging på tjener &quot;{0}&quot; som &quot;{0}&quot; feilet."
+
+#: ../mail/mail.error.xml.h:111
+msgid "Your message with the subject &quot;{0}&quot; was not delivered."
+msgstr "Din melding med emne &quot;{0}&quot; ble ikke levert."
+
+#: ../mail/mail.error.xml.h:112
+msgid "_Append"
+msgstr "_Legg til"
+
+#: ../mail/mail.error.xml.h:113
+msgid "_Discard changes"
+msgstr "_Forkast endringene"
+
+#: ../mail/mail.error.xml.h:114
+msgid "_Empty Trash"
+msgstr "Tøm søpp_elkurven"
+
+#: ../mail/mail.error.xml.h:115
+msgid "_Expunge"
+msgstr "T_øm"
+
+#: ../mail/mail.error.xml.h:116
+msgid "_Open Messages"
+msgstr "_Åpne meldinger"
+
+#: ../mail/mail.error.xml.h:119
+msgid "vFolders automatically updated."
+msgstr "Virtuelle mapper oppdatert automatisk."
 
 #: ../mail/mail-folder-cache.c:813
 #, c-format
@@ -13518,7 +13353,13 @@ msgstr "Filtrerer mappe"
 msgid "Fetching Mail"
 msgstr "Henter e-post"
 
-#: ../mail/mail-ops.c:542 ../mail/mail-ops.c:585
+#. sending mail, filtering failed
+#: ../mail/mail-ops.c:562
+#, c-format
+msgid "Failed to apply outgoing filters: %s"
+msgstr "Feil under påføring av utgående filtre: %s"
+
+#: ../mail/mail-ops.c:573 ../mail/mail-ops.c:602
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13527,120 +13368,114 @@ msgstr ""
 "Kunne ikke legge til i %s: %s\n"
 "Legger til i lokal «Sendt»-mappe i stedet."
 
-#. sending mail, filtering failed
-#: ../mail/mail-ops.c:564
-#, c-format
-msgid "Failed to apply outgoing filters: %s"
-msgstr "Feil under påføring av utgående filtre: %s"
-
-#: ../mail/mail-ops.c:602
+#: ../mail/mail-ops.c:619
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Kunne ikke legge til i lokal Sendt-mappe: %s"
 
-#: ../mail/mail-ops.c:702
+#: ../mail/mail-ops.c:731
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sender melding %d av %d"
 
-#: ../mail/mail-ops.c:727
+#: ../mail/mail-ops.c:756
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Feil under sending av %d av %d meldinger"
 
-#: ../mail/mail-ops.c:729 ../mail/mail-send-recv.c:613
+#: ../mail/mail-ops.c:758 ../mail/mail-send-recv.c:613
 msgid "Cancelled."
 msgstr "Avbrutt."
 
-#: ../mail/mail-ops.c:731
+#: ../mail/mail-ops.c:760
 msgid "Complete."
 msgstr "Fullført."
 
-#: ../mail/mail-ops.c:828
+#: ../mail/mail-ops.c:857
 msgid "Saving message to folder"
 msgstr "Lagrer melding til mappe"
 
-#: ../mail/mail-ops.c:913
+#: ../mail/mail-ops.c:942
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flytter melding(er) til %s"
 
-#: ../mail/mail-ops.c:913
+#: ../mail/mail-ops.c:942
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopierer meldinger til %s"
 
-#: ../mail/mail-ops.c:1139
+#: ../mail/mail-ops.c:1168
 msgid "Forwarded messages"
 msgstr "Videresendte meldinger"
 
-#: ../mail/mail-ops.c:1182
+#: ../mail/mail-ops.c:1211
 #, c-format
 msgid "Opening folder %s"
 msgstr "Åpner mappe %s"
 
-#: ../mail/mail-ops.c:1254
+#: ../mail/mail-ops.c:1283
 #, c-format
 msgid "Opening store %s"
 msgstr "Åpner lager %s"
 
-#: ../mail/mail-ops.c:1332
+#: ../mail/mail-ops.c:1361
 #, c-format
 msgid "Removing folder %s"
 msgstr "Fjerner mappe %s"
 
-#: ../mail/mail-ops.c:1426
+#: ../mail/mail-ops.c:1455
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Lagrer mappe «%s»"
 
-#: ../mail/mail-ops.c:1491
+#: ../mail/mail-ops.c:1520
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Tømmer og lagrer konto «%s»"
 
-#: ../mail/mail-ops.c:1492
+#: ../mail/mail-ops.c:1521
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Lagrer konto «%s»"
 
-#: ../mail/mail-ops.c:1547
+#: ../mail/mail-ops.c:1576
 msgid "Refreshing folder"
 msgstr "Oppdaterer mappe"
 
-#: ../mail/mail-ops.c:1583 ../mail/mail-ops.c:1634
+#: ../mail/mail-ops.c:1612 ../mail/mail-ops.c:1663
 msgid "Expunging folder"
 msgstr "Tømmer mappe"
 
-#: ../mail/mail-ops.c:1631
+#: ../mail/mail-ops.c:1660
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Tømmer søppel i «%s»"
 
-#: ../mail/mail-ops.c:1632
+#: ../mail/mail-ops.c:1661
 msgid "Local Folders"
 msgstr "Lokale mapper"
 
-#: ../mail/mail-ops.c:1715
+#: ../mail/mail-ops.c:1744
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Henter melding %s"
 
-#: ../mail/mail-ops.c:1787
+#: ../mail/mail-ops.c:1816
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Henter %d melding"
 msgstr[1] "Henter %d melding(er)"
 
-#: ../mail/mail-ops.c:1873
+#: ../mail/mail-ops.c:1902
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Lagrer %d melding"
 msgstr[1] "Lagrer %d melding(er)"
 
-#: ../mail/mail-ops.c:1923
+#: ../mail/mail-ops.c:1952
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13649,7 +13484,7 @@ msgstr ""
 "Kunne ikke opprette utdatafil: %s\n"
 " %s"
 
-#: ../mail/mail-ops.c:1951
+#: ../mail/mail-ops.c:1980
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13658,11 +13493,11 @@ msgstr ""
 "Feil under lagring av av meldinger til: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2022
+#: ../mail/mail-ops.c:2051
 msgid "Saving attachment"
 msgstr "Lagrer vedlegg"
 
-#: ../mail/mail-ops.c:2034
+#: ../mail/mail-ops.c:2063
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13671,22 +13506,22 @@ msgstr ""
 "Kunne ikke opprette utdatafil: %s\n"
 " %s"
 
-#: ../mail/mail-ops.c:2044
+#: ../mail/mail-ops.c:2073
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kan ikke skrive data: %s"
 
-#: ../mail/mail-ops.c:2194
+#: ../mail/mail-ops.c:2223
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Kobler fra %s"
 
-#: ../mail/mail-ops.c:2194
+#: ../mail/mail-ops.c:2223
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Kobler til %s på nytt"
 
-#: ../mail/mail-ops.c:2310
+#: ../mail/mail-ops.c:2339
 msgid "Checking Service"
 msgstr "Sjekker tjeneste"
 
@@ -13747,124 +13582,124 @@ msgid "Enter a name for this signature."
 msgstr "Oppgi et navn for denne signaturen."
 
 #: ../mail/mail-signature-editor.c:415
-#: ../plugins/shared-folder/properties.glade.h:5
+#: ../plugins/groupwise-features/properties.glade.h:5
 msgid "Name:"
 msgstr "Navn:"
 
-#: ../mail/mail-tools.c:115
+#: ../mail/mail-tools.c:116
 #, c-format
 msgid "Could not create spool directory `%s': %s"
 msgstr "Kan ikke opprette spool-katalog «%s»: %s"
 
-#: ../mail/mail-tools.c:142
+#: ../mail/mail-tools.c:143
 #, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
 msgstr "Prøver å bruke movemail på en kilde som ikke er i mbox-format «%s»"
 
-#: ../mail/mail-tools.c:277
+#: ../mail/mail-tools.c:242
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Videresendt melding - %s"
 
-#: ../mail/mail-tools.c:279
+#: ../mail/mail-tools.c:244
 msgid "Forwarded message"
 msgstr "Videresendt melding"
 
-#: ../mail/mail-tools.c:320
+#: ../mail/mail-tools.c:284
 #, c-format
 msgid "Invalid folder: `%s'"
 msgstr "Ugyldig mappe: «%s»"
 
-#: ../mail/mail-vfolder.c:90
+#: ../mail/mail-vfolder.c:91
 #, c-format
 msgid "Setting up vFolder: %s"
 msgstr "Setter opp virtuell mappe: %s"
 
-#: ../mail/mail-vfolder.c:239
+#: ../mail/mail-vfolder.c:240
 #, c-format
 msgid "Updating vFolders for '%s:%s'"
 msgstr "Oppdaterer virtuelle mapper for «%s:%s»"
 
-#: ../mail/mail-vfolder.c:246
+#: ../mail/mail-vfolder.c:247
 #, c-format
 msgid "Updating vFolders for '%s'"
 msgstr "Oppdaterer virtuelle mapper for «%s»"
 
-#: ../mail/mail-vfolder.c:1008
+#: ../mail/mail-vfolder.c:1009
 msgid "Edit vFolder"
 msgstr "Rediger virtuell mappe"
 
-#: ../mail/mail-vfolder.c:1092
+#: ../mail/mail-vfolder.c:1093
 msgid "New vFolder"
 msgstr "Ny virtuell mappe"
 
-#: ../mail/message-list.c:994
+#: ../mail/message-list.c:996
 msgid "Unseen"
 msgstr "Ulest"
 
-#: ../mail/message-list.c:995
+#: ../mail/message-list.c:997
 msgid "Seen"
 msgstr "Lest"
 
-#: ../mail/message-list.c:996
+#: ../mail/message-list.c:998
 msgid "Answered"
 msgstr "Besvart"
 
-#: ../mail/message-list.c:997
+#: ../mail/message-list.c:999
 msgid "Multiple Unseen Messages"
 msgstr "Flere uleste meldinger"
 
-#: ../mail/message-list.c:998
+#: ../mail/message-list.c:1000
 msgid "Multiple Messages"
 msgstr "Flere meldinger"
 
-#: ../mail/message-list.c:1002
+#: ../mail/message-list.c:1004
 msgid "Lowest"
 msgstr "Lavest"
 
-#: ../mail/message-list.c:1003
+#: ../mail/message-list.c:1005
 msgid "Lower"
 msgstr "Lavere"
 
-#: ../mail/message-list.c:1007
+#: ../mail/message-list.c:1009
 msgid "Higher"
 msgstr "Høyere"
 
-#: ../mail/message-list.c:1008
+#: ../mail/message-list.c:1010
 msgid "Highest"
 msgstr "Høyest"
 
-#: ../mail/message-list.c:1336
+#: ../mail/message-list.c:1338
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1343 ../plugins/itip-formatter/itip-view.c:189
+#: ../mail/message-list.c:1345 ../plugins/itip-formatter/itip-view.c:189
 msgid "Today %l:%M %p"
 msgstr "I dag %l:%M %p"
 
-#: ../mail/message-list.c:1352
+#: ../mail/message-list.c:1354
 msgid "Yesterday %l:%M %p"
 msgstr "I går %l:%M %p"
 
-#: ../mail/message-list.c:1364
+#: ../mail/message-list.c:1366
 msgid "%a %l:%M %p"
 msgstr "%a %H.%M"
 
-#: ../mail/message-list.c:1372
+#: ../mail/message-list.c:1374
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H.%M"
 
-#: ../mail/message-list.c:1374
+#: ../mail/message-list.c:1376
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../mail/message-list.c:2041
+#: ../mail/message-list.c:2042
 msgid "Message List"
 msgstr "Meldingsliste"
 
-#: ../mail/message-list.c:3384
+#: ../mail/message-list.c:3387
 msgid "Generating message list"
 msgstr "Genererer meldingsliste"
 
@@ -13912,7 +13747,7 @@ msgstr "Følg opp"
 msgid "For Your Information"
 msgstr "Til din informasjon"
 
-#: ../mail/message-tag-followup.c:78 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:78 ../ui/evolution-mail-message.xml.h:41
 msgid "Forward"
 msgstr "Videresend"
 
@@ -13920,11 +13755,11 @@ msgstr "Videresend"
 msgid "No Response Necessary"
 msgstr "Ingen respons nødvendig"
 
-#: ../mail/message-tag-followup.c:81 ../ui/evolution-mail-message.xml.h:85
+#: ../mail/message-tag-followup.c:81 ../ui/evolution-mail-message.xml.h:79
 msgid "Reply"
 msgstr "Svar"
 
-#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:86
+#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply to All"
 msgstr "Svar til alle"
 
@@ -13956,6 +13791,16 @@ msgstr "Emne inneholder"
 msgid "Subject or Sender contains"
 msgstr "Emne eller avsender inneholder"
 
+#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
+msgid ""
+"A formatter plugin which displays audio attachments inline and allows you to "
+"play them directly from evolution."
+msgstr ""
+
+#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
+msgid "Audio inline plugin"
+msgstr ""
+
 #: ../plugins/backup-restore/backup-restore.c:51
 msgid "Select name of Evolution archive"
 msgstr "Velg navn på Evolution-arkiv"
@@ -13988,6 +13833,14 @@ msgstr "Sjekk arkiv for Evolution"
 msgid "Restart Evolution"
 msgstr "Start Evolution på nytt"
 
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
+msgid "A plugin for backing up and restore Evolution data and settings."
+msgstr "Et tillegg for sikkerhetskopiering og gjenoppretting av data og innstillinger for Evolution."
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
+msgid "Backup and restore plugin"
+msgstr "Tillegg for sikkerhetskopiering og gjenoppretting"
+
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
 msgid "Backup Settings..."
 msgstr "Innstillinger for sikkerhetskopiering..."
@@ -14001,36 +13854,66 @@ msgstr ""
 msgid "Restore Settings..."
 msgstr "Gjenopprett innstillinger..."
 
-#: ../plugins/bbdb/bbdb.c:388
+#: ../plugins/bbdb/bbdb.c:398
 msgid "Automatic Contacts"
 msgstr "Automatiske kontakter"
 
-#: ../plugins/bbdb/bbdb.c:397
+#: ../plugins/bbdb/bbdb.c:407
 msgid "<span weight=\"bold\">Automatic Contacts</span>"
 msgstr "<span weight=\"bold\">Automatiske kontakter</span>"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:410
+#: ../plugins/bbdb/bbdb.c:420
 msgid ""
 "_Automatically create entries in the addressbook when responding to mail"
 msgstr "Opprett oppføringer i adresseboken _automatisk når du svarer på e-post"
 
-#: ../plugins/bbdb/bbdb.c:428
+#: ../plugins/bbdb/bbdb.c:438
 msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
 msgstr "<span weight=\"bold\">Kontakter for lynmeldinger</span>"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:441
+#: ../plugins/bbdb/bbdb.c:451
 msgid ""
 "Periodically synchronize contact information and images from my _instant "
 "messenger"
 msgstr "Synkroniser kontaktinformasjon og bilder fra Ga_im periodisk"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:448
+#: ../plugins/bbdb/bbdb.c:458
 msgid "Synchronize with _buddy list now"
 msgstr "Synkroniser med _vennelisten nå"
 
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
+msgid "Automatic contacts"
+msgstr "Automatiske kontakter"
+
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
+msgid ""
+"Automatically fills your addressbook with names and email addresses as you "
+"reply to mails. Also fills in IM contact information from your buddy lists."
+msgstr ""
+
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
+msgid "BBDB"
+msgstr "BBDB"
+
+#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
+msgid "Local Calendars"
+msgstr "Lokale kalender"
+
+#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
+msgid "Provides core functionality for local calendars."
+msgstr "Gir kjernefunksjoner for lokale kalendere."
+
+#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
+msgid "HTTP Calendars"
+msgstr "HTTP-kalendere"
+
+#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
+msgid "Provides core functionality for webcal and http calendars."
+msgstr "Gir kjernefunksjoner for webcal- og HTTP-kalendere."
+
 #: ../plugins/calendar-weather/calendar-weather.c:54
 #: ../plugins/calendar-weather/calendar-weather.c:60
 msgid "Weather: Cloudy"
@@ -14076,21 +13959,40 @@ msgstr "Metrisk (celcius, cm, osv)"
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "Imerisk (Fahrenheit, tommer, osv)"
 
-#: ../plugins/default-source/default-source.c:82
-msgid "Mark  as default folder"
-msgstr "Sett som forvalgt mappe"
+#: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1
+msgid "Provides core functionality for weather calendars."
+msgstr ""
+
+#: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
+msgid "Weather Calendars"
+msgstr "Værkalendere"
+
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:1
+msgid ""
+"A test plugin which demonstrates a popup menu plugin which lets you copy "
+"things to the clipboard."
+msgstr ""
+
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
+msgid "Copy _Email Address"
+msgstr "Kopier _e-postadresse"
+
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
+msgid "Copy tool"
+msgstr "Kopieringsverktøy"
 
+#: ../plugins/default-source/default-source.c:82
 #: ../plugins/default-source/default-source.c:108
 msgid "Mark as default folder"
 msgstr "Sett som forvalgt mappe"
 
 #. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:53
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:59
 msgid "Secure Password"
 msgstr "Sikkert passord"
 
 #. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:56
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:62
 msgid ""
 "This option will connect to the Exchange server using secure password (NTLM) "
 "authentication."
@@ -14098,11 +14000,11 @@ msgstr ""
 "Dette alternativet kobler til Exchange-tjeneren ved bruk av autentisering "
 "med sikkert passord (NTLM)."
 
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:64
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:70
 msgid "Plaintext Password"
 msgstr "Klartekst-passord"
 
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:66
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:72
 msgid ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
@@ -14111,7 +14013,7 @@ msgstr ""
 "passord."
 
 #. Description section
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:113
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:193
 msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
@@ -14119,37 +14021,39 @@ msgstr ""
 "Meldingen spesifisert under vil sendes automatisk til alle \n"
 "som sender deg e-post mens du er borte fra kontoret."
 
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:140
-msgid "I am in the office"
-msgstr "Jeg er på kontoret"
-
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:154
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:221
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:231
 msgid "I am out of the office"
 msgstr "Jeg er ute av kontoret"
 
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:168
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:224
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:228
+msgid "I am in the office"
+msgstr "Jeg er på kontoret"
+
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:257
 msgid "Out of office Message:"
 msgstr "Melding ved fravær fra kontoret"
 
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:194
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:302
 msgid "Exchange Settings"
 msgstr "Innstillinger for Exchange"
 
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:342
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:475
 #: ../plugins/exchange-account-setup/exchange-ask-password.c:200
 msgid "_OWA Url:"
 msgstr "_OWA-URL:"
 
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:350
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:500
 #: ../plugins/exchange-account-setup/exchange-ask-password.c:193
 msgid "A_uthenticate"
 msgstr "A_utentiser"
 
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:467
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:722
 msgid "Authentication Type"
 msgstr "Autentiseringstype"
 
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:481
+#: ../plugins/exchange-account-setup/exchange-account-setup.c:736
 msgid "Ch_eck for Supported Types"
 msgstr "Sj_ekk støttede typer"
 
@@ -14158,16 +14062,24 @@ msgstr "Sj_ekk støttede typer"
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Fjerner abonnement på mappe «%s»"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:413
+#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1
+msgid "Allows unsubscribing of mail folders in the folder tree context menu."
+msgstr ""
+
+#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
+msgid "Unsubscribe Folders"
+msgstr "Fjern abonnement på mapper"
+
+#: ../plugins/groupwise-features/camel-gw-listener.c:413
 msgid "Checklist"
 msgstr "Sjekkliste"
 
-#: ../plugins/groupwise-send-options/org-gnome-compose-send-options.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
 msgid "Add Send Options to groupwise messages"
 msgstr "Legg til sendingsalternativer for GroupWise-meldinger"
 
-#: ../plugins/groupwise-send-options/org-gnome-compose-send-options.xml.h:2
-#: ../widgets/misc/e-send-options.glade.h:20
+#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../widgets/misc/e-send-options.glade.h:17
 msgid "Send Options"
 msgstr "Alternativer for sending"
 
@@ -14226,12 +14138,14 @@ msgstr ""
 "gyldig iCalendar."
 
 #: ../plugins/itip-formatter/itip-formatter.c:1008
-#: ../plugins/itip-formatter/itip-formatter.c:1064
+#: ../plugins/itip-formatter/itip-formatter.c:1023
+#: ../plugins/itip-formatter/itip-formatter.c:1078
 msgid "The item in the calendar is not valid"
 msgstr "Oppføringen i kalenderen er ikke gyldig"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1009
-#: ../plugins/itip-formatter/itip-formatter.c:1065
+#: ../plugins/itip-formatter/itip-formatter.c:1024
+#: ../plugins/itip-formatter/itip-formatter.c:1079
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -14239,38 +14153,42 @@ msgstr ""
 "Meldingen inneholder en kalender, men kalenderen inneholder ingen hendelser, "
 "oppgaver eller ledig/opptatt-informasjon"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1020
+#: ../plugins/itip-formatter/itip-formatter.c:1034
 msgid "The calendar attached contains multiple items"
 msgstr "Vedlagt kalender inneholder flere oppføringer"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1021
+#: ../plugins/itip-formatter/itip-formatter.c:1035
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1658
+#: ../plugins/itip-formatter/itip-formatter.c:1672
 msgid "Meetings and Tasks"
 msgstr "Møter og oppgaver"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:1681
+#: ../plugins/itip-formatter/itip-formatter.c:1695
 msgid "_Delete message after acting"
 msgstr "_Slett melding etter utført handling"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1691
+#: ../plugins/itip-formatter/itip-formatter.c:1705
 msgid "<span weight=\"bold\">Conflict Search</span>"
 msgstr "<span weight=\"bold\">Søk etter konflikter</span>"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:1704
+#: ../plugins/itip-formatter/itip-formatter.c:1718
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Velg kalendere som skal gjennomsøkes for å finne møtekonflikter"
 
+#: ../plugins/itip-formatter/itip-formatter.c:1735
+msgid "Conflict Search Table"
+msgstr ""
+
 #. strftime format of a weekday and a date.
 #: ../plugins/itip-formatter/itip-view.c:175 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:240 ../widgets/misc/e-dateedit.c:450
+#: ../widgets/misc/e-cell-date-edit.c:240 ../widgets/misc/e-dateedit.c:457
 msgid "Today"
 msgstr "I dag"
 
@@ -14558,98 +14476,247 @@ msgstr "<b>%s</b> har via %s avslått følgende tildelt oppgave:"
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> har avslått følgende tildelt oppgave:"
 
+#. Start time
+#: ../plugins/itip-formatter/itip-view.c:867
+msgid "Start time:"
+msgstr "Start-tid:"
+
+#. End time
+#: ../plugins/itip-formatter/itip-view.c:876
+msgid "End time:"
+msgstr "Slutt-tid:"
+
 #. Comment
 #: ../plugins/itip-formatter/itip-view.c:892
 #: ../plugins/itip-formatter/itip-view.c:942
 msgid "Comment:"
 msgstr "Kommentar:"
 
-#. org.gnome.mailing-list-actions:no-header primary
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:2
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
+#, fuzzy
+msgid "Displays text/calendar parts in messages."
+msgstr "Vis neste viktige melding"
+
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
+msgid "Itip Formatter"
+msgstr "Formattering av iTip"
+
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
+#, fuzzy
+msgid ""
+"This response is not from a current attendee. Add the sender as an attendee?"
+msgstr "Dette svaret er ikke fra en aktiv deltaker. Legg til som deltaker?"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
+msgid "Contact list _owner"
+msgstr "Eier av k_ontaktliste"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:2
+#, fuzzy
+msgid "Contact the owner of the mailing list this message belongs to"
+msgstr "Skriv et svar til e-postlisten for den valgte meldingen"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
+msgid "Get an archive of the list this message belongs to"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
+msgid "Get information about the usage of the list this message belongs to"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
+msgid "Get list _archive"
+msgstr "Hent liste_arkiv"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:3
+msgid "Get list _usage information"
+msgstr "Hent informasjon om br_uk av liste"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:7
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:5
+msgid "Mailing _List"
+msgstr "E-post_liste"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:8
+#, fuzzy
+msgid "Post a message to the mailing list this message belongs to"
+msgstr "Skriv et svar til e-postlisten for den valgte meldingen"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:9
+#, fuzzy
+msgid "Subscribe to the mailing list this message belongs to"
+msgstr "Skriv et svar til e-postlisten for den valgte meldingen"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:10
+#, fuzzy
+msgid "Unsubscribe to the mailing list this message belongs to"
+msgstr "Skriv et svar til e-postlisten for den valgte meldingen"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
+#, fuzzy
+msgid "_Post message to list"
+msgstr "Legg ut en melding til en ny offentlig mappe"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8
+msgid "_Subscribe to list"
+msgstr "_Abonner på listen"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:9
+msgid "_Un-subscribe to list"
+msgstr "_Fjern abonnement på listen"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:4
+msgid "Mailing List Actions"
+msgstr "Handlinger for e-postliste"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
+msgid ""
+"Provide actions for common mailing list commands (subscribe, "
+"unsubscribe, ...)."
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
 msgid "Action not available"
 msgstr "Handlingen er ikke tilgjengelig"
 
-#. org.gnome.mailing-list-actions:no-header secondary
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:4
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
 msgid ""
-"This message does not contain the header information required for this "
-"action."
+"An e-mail message will be sent to the URL \"{0}\". You can either send the "
+"message automatically, or see and change it first.\n"
+"\n"
+"You should receive an answer from the mailing list shortly after the message "
+"has been sent."
 msgstr ""
 
-#. org.gnome.mailing-list-actions:posting-not-allowed primary
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:6
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:5
+msgid "Malformed header"
+msgstr "Feilutformet hode"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:6
+msgid "No e-mail action"
+msgstr "Ingen handling for e-post"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:7
 msgid "Posting not allowed"
 msgstr "Posting er ikke tillatt"
 
-#. org.gnome.mailing-list-actions:posting-not-allowed secondary
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:8
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:8
 msgid ""
 "Posting to this mailing list is not allowed. Possibly, this is a read-only "
 "mailing list. Contact the list owner for details."
 msgstr ""
 
-#. org.gnome.mailing-list-actions:ask-send-message primary
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:10
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
 msgid "Send e-mail message to mailing list?"
 msgstr "Send melding til e-postliste?"
 
-#. org.gnome.mailing-list-actions:ask-send-message secondary
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:12
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 msgid ""
-"An e-mail message will be sent to the URL \"{0}\". You can either send the "
-"message automatically, or see and change it first.\n"
+"The action could not be performed. This means the header for this action did "
+"not contain any action we could handle.\n"
 "\n"
-"You should receive an answer from the mailing list shortly after the message "
-"has been sent."
+"Header: {0}"
 msgstr ""
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:15
-msgid "_Send message"
-msgstr "_Send melding"
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:13
+msgid ""
+"The {0} header of this message is malformed and could not be processed.\n"
+"\n"
+"Header: {1}"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
+msgid ""
+"This message does not contain the header information required for this "
+"action."
+msgstr ""
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:16
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
 msgid "_Edit message"
 msgstr "R_ediger melding"
 
-#. org.gnome.mailing-list-actions:malformed-header primary
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:18
-msgid "Malformed header"
-msgstr "Feilutformet hode"
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:18
+msgid "_Send message"
+msgstr "_Send melding"
 
-#. org.gnome.mailing-list-actions:malformed-header secondary
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:20
+#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:1
 msgid ""
-"The {0} header of this message is malformed and could not be processed.\n"
-"\n"
-"Header: {1}"
+"A plugin which allows the creation of meetings from the contents of a mail "
+"message."
 msgstr ""
 
-#. org.gnome.mailing-list-actions:no-action primary
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:24
-msgid "No e-mail action"
-msgstr "Ingen handling for e-post"
+#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:2
+msgid "Con_vert to Meeting"
+msgstr "Kon_verter til møte"
+
+#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:3
+msgid "Mail to meeting"
+msgstr "E-post til møte"
 
-#. org.gnome.mailing-list-actions:no-action secondary
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:26
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
 msgid ""
-"The action could not be performed. This means the header for this action did "
-"not contain any action we could handle.\n"
-"\n"
-"Header: {0}"
+"A plugin which allows the creation of tasks from the contents of a mail "
+"message."
 msgstr ""
 
-#. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
-#: ../plugins/new-mail-notify/new-mail-notify.c:66
-msgid "_Generates a D-BUS message when new mail arrives"
-msgstr "_Genererer en D-BUS-melding når nye meldinger ankommer"
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
+msgid "Con_vert to Task"
+msgstr "Kon_verter til oppgave"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3
+msgid "Mail to task"
+msgstr "E-post til oppgave"
+
+#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:1
+msgid "Mark calendar offline"
+msgstr "Marker kalender som frakoblet"
+
+#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:2
+#, fuzzy
+msgid "Marks the selected calendar for offline viewing."
+msgstr "Merk valgte meldinger for sletting"
+
+#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:3
+msgid "_Do not make this available offline"
+msgstr "_Ikke gjør denne tilgjengelig i frakoblet modus"
+
+#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:4
+msgid "_Mark Calendar for offline use"
+msgstr "_Merk kalender for bruk i frakoblet modus"
+
+#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:1
+msgid "Generates a D-BUS message when new mail arrives."
+msgstr "Genererer en D-BUS-melding når nye meldinger ankommer."
+
+#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:2
+msgid "New Mail Notification"
+msgstr "Varsling for ny e-post"
+
+#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:3
+msgid "New mail notify"
+msgstr "Varsle ny e-post"
+
+#: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
+msgid "A plugin for managing which plugins are enabled or disabled."
+msgstr ""
+
+#: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
+msgid "Plugin manager"
+msgstr "Tilleggshåndterer"
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:1
 msgid "Enable and disable plugins"
 msgstr "Aktiver og deaktiver tillegg"
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
-msgid "Manage Plugins..."
-msgstr "Håndter tillegg..."
+msgid "Plugins"
+msgstr "Tillegg"
 
 #: ../plugins/plugin-manager/plugin-manager.c:45
 msgid "Author(s)"
@@ -14681,6 +14748,23 @@ msgstr ""
 msgid "Plugin"
 msgstr "Tillegg"
 
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:1
+msgid ""
+"A test plugin which demonstrates a formatter plugin which lets you choose to "
+"disable HTML mails.\n"
+"\n"
+"This plugin is unsupported demonstration code only.\n"
+msgstr ""
+
+#. but then we also need to create our own section frame
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:6
+msgid "Plain Text Mode"
+msgstr "Tekstmodus"
+
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:7
+msgid "Prefer plain-text"
+msgstr "Foretrekk vanlig tekst"
+
 #: ../plugins/prefer-plain/prefer-plain.c:105
 msgid "Show HTML if present"
 msgstr "Vis HTML hvis det finnes"
@@ -14705,6 +14789,14 @@ msgstr "Lagre vedlegg..."
 msgid "Save all attachments"
 msgstr "Lagre alle vedlegg"
 
+#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
+msgid "A plugin for saving all attachments or parts of a message at once."
+msgstr ""
+
+#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:2
+msgid "Save attachments"
+msgstr "Lagre vedlegg"
+
 #: ../plugins/save-attachments/save-attachments.c:331
 msgid "Select save base name"
 msgstr "Velg basisnavn for lagring"
@@ -14714,158 +14806,294 @@ msgid "MIME Type"
 msgstr "MIME-type"
 
 #: ../plugins/save-attachments/save-attachments.c:359
-#: ../ui/evolution-message-composer.xml.h:16
+#: ../ui/evolution-message-composer.xml.h:18
 #: ../ui/evolution-signature-editor.xml.h:6
 msgid "Save"
 msgstr "Lagre"
 
-#: ../plugins/save-calendar/csv-format.c:167
-#, c-format
-msgid "%s%d/%s%d/%s%d %s%d:%s%d:%s%d"
-msgstr "%s%d/%s%d/%s%d %s%d:%s%d:%s%d"
+#.
+#. * Translator: the %F %T is the thirth argument for a strftime function.
+#. * It lets you define the formatting of the date in the csv-file.
+#. *
+#: ../plugins/save-calendar/csv-format.c:171
+msgid "%F %T"
+msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:370
-#, c-format
-msgid ""
-"Uid%sSummary%sDescription List%sCategories List%sComment List%sCompleted%"
-"sCreated%sContact List%sStart%sEnd%sDue%sPercent Done%sPriority%sUrl%"
-"sAttendees List%sLocation%sModified%s"
-msgstr ""
+#: ../plugins/save-calendar/csv-format.c:385
+msgid "Uid"
+msgstr "Uid"
 
-#: ../plugins/save-calendar/csv-format.c:519
+#: ../plugins/save-calendar/csv-format.c:387
+msgid "Description List"
+msgstr "Beskrivelsesliste"
+
+#: ../plugins/save-calendar/csv-format.c:388
+msgid "Categories List"
+msgstr "Liste med kategorier"
+
+#: ../plugins/save-calendar/csv-format.c:389
+msgid "Comment List"
+msgstr "Liste med kommentarer"
+
+#: ../plugins/save-calendar/csv-format.c:391
+msgid "Created"
+msgstr "Opprettet"
+
+#: ../plugins/save-calendar/csv-format.c:392
+msgid "Contact List"
+msgstr "Kontaktliste"
+
+#: ../plugins/save-calendar/csv-format.c:393
+msgid "Start"
+msgstr "Start"
+
+#: ../plugins/save-calendar/csv-format.c:394
+msgid "End"
+msgstr "Slutt"
+
+#: ../plugins/save-calendar/csv-format.c:396
+msgid "percent Done"
+msgstr "Prosent fullført"
+
+#: ../plugins/save-calendar/csv-format.c:398
+msgid "Url"
+msgstr "URL"
+
+#: ../plugins/save-calendar/csv-format.c:399
+msgid "Attendees List"
+msgstr "Deltakerliste"
+
+#: ../plugins/save-calendar/csv-format.c:401
+msgid "Modified"
+msgstr "Endret"
+
+#: ../plugins/save-calendar/csv-format.c:552
 msgid "Advanced options for the CSV format"
 msgstr "Avanserte alternativer for CVS-format"
 
-#: ../plugins/save-calendar/csv-format.c:526
+#: ../plugins/save-calendar/csv-format.c:559
 msgid "Prepend a header"
 msgstr "Legg til et hode"
 
-#: ../plugins/save-calendar/csv-format.c:535
+#: ../plugins/save-calendar/csv-format.c:568
 msgid "Value delimiter:"
 msgstr "Skilletegn for verdier:"
 
-#: ../plugins/save-calendar/csv-format.c:541
+#: ../plugins/save-calendar/csv-format.c:574
 msgid "Record delimiter:"
 msgstr "Skilletegn for poster:"
 
-#: ../plugins/save-calendar/csv-format.c:547
+#: ../plugins/save-calendar/csv-format.c:580
 msgid "Encapsulate values with:"
 msgstr "Pakk inn verdier med:"
 
-#: ../plugins/save-calendar/csv-format.c:569
+#: ../plugins/save-calendar/csv-format.c:602
 msgid "Comma separated value format (.csv)"
 msgstr "Kommaseparert verdiformat (.csv)"
 
-#: ../plugins/save-calendar/ical-format.c:120
+#: ../plugins/save-calendar/ical-format.c:136
 msgid "iCalendar format (.ics)"
 msgstr "iCalendar-format (.ics)"
 
-#: ../plugins/save-calendar/rdf-format.c:390
+#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
+msgid "Save Selected"
+msgstr "Lagre valgte"
+
+#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
+msgid "Save to _Disk"
+msgstr "Lagre til _disk"
+
+#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
+msgid "Saves selected calendar or tasks list to disk."
+msgstr "Lagrer valgt kalender eller oppgaveliste til disk."
+
+#.
+#. * Translator: the %FT%T is the thirth argument for a strftime function.
+#. * It lets you define the formatting of the date in the rdf-file.
+#. * Also check out http://www.w3.org/2002/12/cal/tzd
+#. *
+#: ../plugins/save-calendar/rdf-format.c:158
+msgid "%FT%T"
+msgstr "%FT%T"
+
+#: ../plugins/save-calendar/rdf-format.c:396
 msgid "RDF format (.rdf)"
 msgstr "RDF-format (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:172
-#: ../plugins/save-calendar/save-calendar.c:182
+#: ../plugins/save-calendar/save-calendar.c:171
+#: ../plugins/save-calendar/save-calendar.c:181
 msgid "Select destination file"
 msgstr "Velg målfil"
 
-#: ../plugins/save-calendar/save-calendar.c:217
+#: ../plugins/save-calendar/save-calendar.c:216
 #, c-format
 msgid ""
 "The suggested filename extension of this filetype (%s) is unused in the "
 "chosen filename. Do you want to continue?"
 msgstr ""
 
-#: ../plugins/send-options/send-options.c:82
+#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
+msgid "Select one source"
+msgstr "Velg en kilde"
+
+#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:2
+#, fuzzy
+msgid "Selects a single calendar or task source for viewing."
+msgstr "Velg kalendere som skal gjennomsøkes for å finne møtekonflikter"
+
+#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
+msgid "_Show only this Calendar"
+msgstr "Vi_s kun denne kalenderen"
+
+#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:4
+msgid "_Show only this Task List"
+msgstr "Vi_s kun denne oppgavelisten"
+
+#: ../plugins/groupwise-features/send-options.c:82
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sSkriv inn passord for %s (bruker %s)"
 
-#. org.gnome.evolution.mail_shared_folder:invalid-user primary
-#: ../plugins/shared-folder/org-gnome-shared-folder-errors.xml.h:2
-msgid "Invalid user"
-msgstr "Ugyldig bruker"
+#: ../plugins/groupwise-features/install-shared.c:156
+#: ../plugins/groupwise-features/share-folder-common.c:382
+msgid "Create folder"
+msgstr "Opprett mappe"
 
-#. org.gnome.evolution.mail_shared_folder:invalid-user secondary
-#: ../plugins/shared-folder/org-gnome-shared-folder-errors.xml.h:4
-msgid ""
-"\n"
-"You cannot share folder with specified user \"{0}\" \n"
-msgstr ""
-"\n"
-"Du kan ikke dele en mappe med oppgitt bruker «{0}» \n"
+#: ../plugins/groupwise-features/install-shared.c:156
+#: ../plugins/groupwise-features/share-folder-common.c:382
+msgid "Specify where to create the folder:"
+msgstr "Spesifiser hvor mappen skal opprettes:"
 
-#. org.gnome.evolution.mail_shared_folder:no-user primary
-#: ../plugins/shared-folder/org-gnome-shared-folder-errors.xml.h:8
-msgid "Specify User"
-msgstr "Oppgi bruker"
+#: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
+msgid "A plugin for the features in Groupwise accounts."
+msgstr "Tillegg for funksjoner vedrørende GroupWise-kontoer."
 
-#. org.gnome.evolution.mail_shared_folder:no-user secondary
-#: ../plugins/shared-folder/org-gnome-shared-folder-errors.xml.h:10
-msgid ""
-"\n"
-"\tYou have to specify a user name whom you want to add to the list \n"
-msgstr ""
-"\n"
-"\tDu må oppgi et brukernavn for brukeren du ønsker å legge til på listen \n"
+#: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
+msgid "Groupwise Features"
+msgstr "Funksjoner for GroupWise"
 
-#: ../plugins/shared-folder/properties.glade.h:2
+#: ../plugins/groupwise-features/properties.glade.h:2
 msgid "<b>Users :</b>"
 msgstr "<b>Brukere:</b> "
 
-#: ../plugins/shared-folder/properties.glade.h:4
+#: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Message"
 msgstr "Melding"
 
-#: ../plugins/shared-folder/properties.glade.h:6
+#: ../plugins/groupwise-features/properties.glade.h:6
 msgid "Shared Folder Notification"
 msgstr "Melding om delte mapper"
 
-#: ../plugins/shared-folder/properties.glade.h:8
+#: ../plugins/groupwise-features/properties.glade.h:8
 msgid "The participants will receive the following notification.\n"
 msgstr "Deltakerene  vil motta følgende varsel.\n"
 
-#: ../plugins/shared-folder/properties.glade.h:11
+#: ../plugins/groupwise-features/properties.glade.h:11
 msgid "_Contacts..."
 msgstr "_Kontakter..."
 
-#: ../plugins/shared-folder/properties.glade.h:12
+#: ../plugins/groupwise-features/properties.glade.h:12
 msgid "_Cutomize notification message"
 msgstr "_Tilpass varslingsmelding"
 
-#: ../plugins/shared-folder/properties.glade.h:13
+#: ../plugins/groupwise-features/properties.glade.h:13
 msgid "_Not Shared"
 msgstr "_Ikke delt"
 
-#: ../plugins/shared-folder/properties.glade.h:15
+#: ../plugins/groupwise-features/properties.glade.h:15
 msgid "_Shared With ..."
 msgstr "_Delt med..."
 
-#: ../plugins/shared-folder/properties.glade.h:16
+#: ../plugins/groupwise-features/properties.glade.h:16
 msgid "_Sharing"
 msgstr "_Deling"
 
-#: ../plugins/shared-folder/share-folder-common.c:315
+#: ../plugins/groupwise-features/share-folder-common.c:140
+#, c-format
+msgid "Creating folder `%s'"
+msgstr "Oppretter mappe «%s»"
+
+#: ../plugins/groupwise-features/share-folder-common.c:317
 msgid "Users"
 msgstr "Brukere"
 
-#: ../plugins/shared-folder/share-folder-common.c:316
+#: ../plugins/groupwise-features/share-folder-common.c:318
 msgid "Enter the users and set permissions"
 msgstr "Oppgi brukere og sett rettigheter"
 
-#: ../plugins/shared-folder/share-folder-common.c:401
+#: ../plugins/groupwise-features/share-folder-common.c:337
+msgid "New _Shared Folder..."
+msgstr "Ny _delt mappe..."
+
+#: ../plugins/groupwise-features/share-folder-common.c:440
 msgid "Sharing"
 msgstr "Deling"
 
+#: ../plugins/startup-wizard/startup-wizard.c:255
+msgid "Evolution Setup Assistant"
+msgstr "Konfigurasjonsassistent for Evolution"
+
+#: ../plugins/startup-wizard/startup-wizard.c:260
+msgid "Welcome"
+msgstr "Velkommen"
+
+#: ../plugins/startup-wizard/startup-wizard.c:261
+msgid ""
+"Welcome to Evolution. The next few screens will allow Evolution to connect "
+"to your email accounts, and to import files from other applications. \n"
+"\n"
+"Please click the \"Forward\" button to continue. "
+msgstr ""
+"Velkommen til Evolution. De neste skjermene lar deg konfigurere Evolution "
+"til å koble til dine e-post kontoer, og importere filer fra andre "
+"applikasjoner. \n"
+"\n"
+"Vennligst klikk «Fremover» for å fortsette. "
+
+#: ../plugins/startup-wizard/startup-wizard.c:306
+#: ../shell/e-shell-importer.c:159
+msgid "Please select the information that you would like to import:"
+msgstr "Vennligst velg informasjon du ønsker å importere:"
+
+#: ../plugins/startup-wizard/startup-wizard.c:321
+#: ../shell/e-shell-importer.c:905
+#, c-format
+msgid "From %s:"
+msgstr "Fra %s:"
+
+#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
+msgid "Startup wizard"
+msgstr "Oppstartsveiviser"
+
+#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
+msgid "Indicates if threading of messages should fall back to subject."
+msgstr ""
+
+#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
+msgid "Subject Threading"
+msgstr "Meldingstråder på emne"
+
+#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:3
+msgid "Thread messages by subject"
+msgstr "Vis meldingstråder etter emne"
+
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
 #: ../plugins/subject-thread/subject-thread.c:54
 msgid "Fall back to threading messages by sub_ject"
 msgstr ""
 
+#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:1
+msgid "Gives an option to print mail from composer"
+msgstr ""
+
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Evolution Shell"
 msgstr "Evolution skall"
 
+#: ../shell/GNOME_Evolution_Shell.server.in.in.h:2
+msgid "Evolution Shell Config factory"
+msgstr "Konfigurasjonsfabrikk for Evolution skall"
+
 #: ../shell/GNOME_Evolution_Test.server.in.in.h:1
 msgid "Evolution Test"
 msgstr "Evolution test"
@@ -14915,7 +15143,7 @@ msgstr "Innstillinger for skriver"
 msgid "Skip development warning dialog"
 msgstr "Hopp over varseldialogen om utviklingsversjonen"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:11 ../shell/main.c:475
+#: ../shell/apps_evolution_shell.schemas.in.in.h:11 ../shell/main.c:468
 msgid "Start in offline mode"
 msgstr "Start i frakoblet modus"
 
@@ -14945,7 +15173,7 @@ msgstr ""
 #: ../shell/apps_evolution_shell.schemas.in.in.h:17
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
-"\"toolbar\". If \"toolbar\" is set, the style of the buutons is determined "
+"\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
 "by the GNOME toolbar setting."
 msgstr ""
 
@@ -15019,15 +15247,11 @@ msgstr ""
 msgid "Choose the destination for this import"
 msgstr "Velg mål det skal importeres til"
 
-#: ../shell/e-shell-importer.c:159 ../shell/e-shell-startup-wizard.c:750
-msgid "Please select the information that you would like to import:"
-msgstr "Vennligst velg informasjon du ønsker å importere:"
-
 #: ../shell/e-shell-importer.c:162
 msgid ""
 "Evolution checked for settings to import from the following\n"
-"applications: Pine, Netscape, Elm, iCalendar. No settings\n"
-"that could be imported where found. If you would like to\n"
+"applications: Pine, Netscape, Elm, iCalendar. No importable\n"
+"settings found. If you would like to\n"
 "try again, please click the \"Back\" button.\n"
 msgstr ""
 "Evolution så etter innstillinger å importere for følgende\n"
@@ -15044,30 +15268,30 @@ msgstr ""
 "Importerer %s\n"
 "Importerer oppføring %d."
 
-#: ../shell/e-shell-importer.c:341
+#: ../shell/e-shell-importer.c:347
 msgid "Select importer"
 msgstr "Velg importerer"
 
-#: ../shell/e-shell-importer.c:462 ../shell/e-shell-importer.c:1086
+#: ../shell/e-shell-importer.c:468 ../shell/e-shell-importer.c:1092
 #, c-format
 msgid "File %s does not exist"
 msgstr "Filen %s eksisterer ikke"
 
-#: ../shell/e-shell-importer.c:470
+#: ../shell/e-shell-importer.c:476
 msgid "Importing"
 msgstr "Importerer"
 
-#: ../shell/e-shell-importer.c:478
+#: ../shell/e-shell-importer.c:484
 #, c-format
 msgid "Importing %s.\n"
 msgstr "Importerer %s.\n"
 
-#: ../shell/e-shell-importer.c:488 ../shell/e-shell-importer.c:489
+#: ../shell/e-shell-importer.c:494 ../shell/e-shell-importer.c:495
 #, c-format
 msgid "Error loading %s"
 msgstr "Feil under lasting av %s"
 
-#: ../shell/e-shell-importer.c:507
+#: ../shell/e-shell-importer.c:513
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -15076,31 +15300,31 @@ msgstr ""
 "Importerer %s\n"
 "Importerer oppføring 1."
 
-#: ../shell/e-shell-importer.c:583
+#: ../shell/e-shell-importer.c:589
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: ../shell/e-shell-importer.c:639
+#: ../shell/e-shell-importer.c:645
 msgid "F_ilename:"
 msgstr "F_ilnavn:"
 
-#: ../shell/e-shell-importer.c:644
+#: ../shell/e-shell-importer.c:650
 msgid "Select a file"
 msgstr "Velg en fil"
 
-#: ../shell/e-shell-importer.c:656
+#: ../shell/e-shell-importer.c:662
 msgid "File _type:"
 msgstr "Fil_type:"
 
-#: ../shell/e-shell-importer.c:695
+#: ../shell/e-shell-importer.c:701
 msgid "Import data and settings from _older programs"
 msgstr "Importer data og innstillinger fra _eldre programmer"
 
-#: ../shell/e-shell-importer.c:698
+#: ../shell/e-shell-importer.c:704
 msgid "Import a _single file"
 msgstr "Importer en en_kelt fil"
 
-#: ../shell/e-shell-importer.c:766 ../shell/e-shell-startup-wizard.c:571
+#: ../shell/e-shell-importer.c:772
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -15108,54 +15332,27 @@ msgstr ""
 "Vennligst vent...\n"
 "Søker etter eksisterende oppsett"
 
-#: ../shell/e-shell-importer.c:773
+#: ../shell/e-shell-importer.c:779
 msgid "Starting Intelligent Importers"
 msgstr "Starter intelligent import"
 
-#: ../shell/e-shell-importer.c:899 ../shell/e-shell-startup-wizard.c:700
-#, c-format
-msgid "From %s:"
-msgstr "Fra %s:"
-
-#: ../shell/e-shell-importer.c:1105
+#: ../shell/e-shell-importer.c:1111
 #, c-format
 msgid "No importer available for file %s"
 msgstr "Ingen importfunksjon tilgjengelig for fil %s"
 
-#: ../shell/e-shell-importer.c:1119
+#: ../shell/e-shell-importer.c:1125
 msgid "Unable to execute importer"
 msgstr "Kan ikke kjøre importprogram"
 
-#: ../shell/e-shell-importer.c:1235
+#: ../shell/e-shell-importer.c:1241
 msgid "_Import"
 msgstr "_Importer"
 
-#: ../shell/e-shell-offline-handler.c:589
-msgid "Closing connections..."
-msgstr "Lukker forbindelser..."
-
 #: ../shell/e-shell-settings-dialog.c:318
 msgid "Evolution Settings"
 msgstr "Innstillinger for Evolution"
 
-#: ../shell/e-shell-startup-wizard.c:577
-msgid "Starting import"
-msgstr "Starter import"
-
-#: ../shell/e-shell-startup-wizard.c:797
-msgid ""
-"If you quit the Evolution Setup Assistant now, all of the information that "
-"you have entered will be forgotten. You will need to run this assistant "
-"again before using Evolution.\n"
-"\n"
-"Do you want to quit using the Assistant now?"
-msgstr ""
-"Hvis du avslutter veiviser for oppsett av Evolution nå vil all informasjon "
-"du har oppgitt hittil bli glemt. Du vil måtte kjøre denne veiviseren igjen "
-"før du kan bruke Evolution.\n"
-"\n"
-"Vil du avslutte veiviseren nå?"
-
 #: ../shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "Ingen mappenavn spesifisert."
@@ -15176,44 +15373,44 @@ msgstr "Mappenavn kan ikke inneholde tegnet «#»."
 msgid "'.' and '..' are reserved folder names."
 msgstr "«.» og «..» er reserverte mappenavn."
 
-#: ../shell/e-shell-window-commands.c:68
+#: ../shell/e-shell-window-commands.c:69
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 "GNOME pilot verktøyene ser ikke ut til å være installert på dette systemet."
 
-#: ../shell/e-shell-window-commands.c:76
+#: ../shell/e-shell-window-commands.c:77
 #, c-format
 msgid "Error executing %s."
 msgstr "Feil under kjøring av %s."
 
-#: ../shell/e-shell-window-commands.c:125
+#: ../shell/e-shell-window-commands.c:126
 msgid "Bug buddy is not installed."
 msgstr "Bug buddy er ikke installert."
 
-#: ../shell/e-shell-window-commands.c:133
+#: ../shell/e-shell-window-commands.c:134
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy kunne ikke kjøres."
 
 #. The translator-credits string is for translators to list
 #. * per language credits for translation, displayed in the
 #. * about box
-#: ../shell/e-shell-window-commands.c:427
+#: ../shell/e-shell-window-commands.c:507
 msgid "translator-credits"
 msgstr "Kjartan Maraas <kmaraas@gnome.org>"
 
-#: ../shell/e-shell-window-commands.c:441
+#: ../shell/e-shell-window-commands.c:521
 msgid "Groupware Suite"
 msgstr "Gruppevareløsning"
 
-#: ../shell/e-shell-window-commands.c:668
+#: ../shell/e-shell-window-commands.c:748
 msgid "_Work Online"
 msgstr "Ar_beid tilkoblet"
 
-#: ../shell/e-shell-window-commands.c:681 ../ui/evolution.xml.h:51
+#: ../shell/e-shell-window-commands.c:761 ../ui/evolution.xml.h:47
 msgid "_Work Offline"
 msgstr "Ar_beid frakoblet"
 
-#: ../shell/e-shell-window-commands.c:694 ../ui/evolution.xml.h:34
+#: ../shell/e-shell-window-commands.c:774
 msgid "Work Offline"
 msgstr "Arbeid frakoblet"
 
@@ -15231,7 +15428,7 @@ msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Evolution er frakoblet. Klikk på denne knappen for å arbeide tilkoblet."
 
-#: ../shell/e-shell-window.c:713
+#: ../shell/e-shell-window.c:712
 #, c-format
 msgid "Switch to %s"
 msgstr "Bytt til %s"
@@ -15240,28 +15437,28 @@ msgstr "Bytt til %s"
 msgid "Uknown system error."
 msgstr "Ukjent systemfeil."
 
-#: ../shell/e-shell.c:805 ../shell/e-shell.c:806
+#: ../shell/e-shell.c:799 ../shell/e-shell.c:800
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1249 ../widgets/misc/e-cell-date-edit.c:256
+#: ../shell/e-shell.c:1253 ../widgets/misc/e-cell-date-edit.c:256
 msgid "OK"
 msgstr "OK"
 
-#: ../shell/e-shell.c:1251
+#: ../shell/e-shell.c:1255
 msgid "Invalid arguments"
 msgstr "Ugyldige argumenter"
 
-#: ../shell/e-shell.c:1253
+#: ../shell/e-shell.c:1257
 msgid "Cannot register on OAF"
 msgstr "Kan ikke registrere i OAF"
 
-#: ../shell/e-shell.c:1255
+#: ../shell/e-shell.c:1259
 msgid "Configuration Database not found"
 msgstr "Konfigurasjonsdatabase ikke funnet"
 
-#: ../shell/e-shell.c:1257
+#: ../shell/e-shell.c:1261
 msgid "Generic error"
 msgstr "Vanlig feil"
 
@@ -15269,47 +15466,6 @@ msgstr "Vanlig feil"
 msgid "New"
 msgstr "Ny"
 
-#: ../shell/evolution-startup-wizard.glade.h:2
-msgid "Evolution Setup Assistant"
-msgstr "Konfigurasjonsassistent for Evolution"
-
-#: ../shell/evolution-startup-wizard.glade.h:3
-msgid "Importing Files"
-msgstr "Importerer filer"
-
-#: ../shell/evolution-startup-wizard.glade.h:4
-msgid "Timezone "
-msgstr "Tidssone "
-
-#: ../shell/evolution-startup-wizard.glade.h:5
-msgid "Welcome"
-msgstr "Velkommen"
-
-#: ../shell/evolution-startup-wizard.glade.h:6
-msgid ""
-"Welcome to Evolution. The next few screens will allow Evolution to connect "
-"to your email accounts, and to import files from other applications. \n"
-"\n"
-"Please click the \"Forward\" button to continue. "
-msgstr ""
-"Velkommen til Evolution. De neste skjermene lar deg konfigurere Evolution "
-"til å koble til dine e-post kontoer, og importere filer fra andre "
-"applikasjoner. \n"
-"\n"
-"Vennligst klikk «Fremover» for å fortsette. "
-
-#: ../shell/evolution-startup-wizard.glade.h:9
-msgid ""
-"You have successfully entered all of the information needed to set up "
-"Evolution. \n"
-"\n"
-"Click the \"Apply\" button to save your settings. "
-msgstr ""
-"Du har fullført inntasting av all informasjon som trengs for å konfigurere "
-"Evolution.\n"
-"\n"
-"Klikk på «Bruk» for å lagre dine innstillinger. "
-
 #: ../shell/evolution-test-component.c:140
 msgid "New Test"
 msgstr "Ny test"
@@ -15364,7 +15520,7 @@ msgstr ""
 msgid "Importers"
 msgstr "Importerere"
 
-#: ../shell/importer/intelligent.c:195 ../smime/gui/smime-ui.glade.h:28
+#: ../shell/importer/intelligent.c:195 ../smime/gui/smime-ui.glade.h:29
 msgid "Import"
 msgstr "Importer"
 
@@ -15381,7 +15537,7 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution kan importere data fra følgende filer:"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:237
+#: ../shell/main.c:230
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -15416,7 +15572,7 @@ msgstr ""
 "Vi håper at du nyter resultatene av vårt harde arbeid, og vi venter i\n"
 "spenning på at du tilbyr din hjelp!\n"
 
-#: ../shell/main.c:261
+#: ../shell/main.c:254
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -15424,39 +15580,35 @@ msgstr ""
 "Takk\n"
 "Evolution utviklerene\n"
 
-#: ../shell/main.c:268
+#: ../shell/main.c:261
 msgid "Don't tell me again"
 msgstr "Ikke gi beskjed igjen"
 
-#: ../shell/main.c:473
+#: ../shell/main.c:466
 msgid "Start Evolution activating the specified component"
 msgstr "Aktiver oppgitt komponent ved oppstart av Evolution"
 
-#: ../shell/main.c:477
+#: ../shell/main.c:470
 msgid "Start in online mode"
 msgstr "Start i tilkoblet modus"
 
-#: ../shell/main.c:480
+#: ../shell/main.c:473
 msgid "Forcibly shut down all Evolution components"
 msgstr "Steng ned alle komponenter i Evolution"
 
-#: ../shell/main.c:484
+#: ../shell/main.c:477
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Tvungen ommigrering fra Evolution 1.4"
 
-#: ../shell/main.c:487
+#: ../shell/main.c:480
 msgid "Send the debugging output of all components to a file."
 msgstr "Send feilsøkingsutskrift for alle komponentene til en fil."
 
-#: ../shell/main.c:490
-msgid "Disable the mono plugin environment."
-msgstr "Deaktiver mono-tilleggsmiljø."
-
-#: ../shell/main.c:493
+#: ../shell/main.c:482
 msgid "Disable loading of any plugins."
 msgstr "Slå av lasting av tillegg."
 
-#: ../shell/main.c:524
+#: ../shell/main.c:513
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -15465,86 +15617,29 @@ msgstr ""
 "%s: --online og --offline kan ikke brukes samtidig.\n"
 "  Bruk %s --help for mer informasjon.\n"
 
-#. shell:upgrade-nospace primary
-#: ../shell/shell-errors.xml.h:2
-msgid "Insufficient disk space for upgrade."
-msgstr "Ikke nok diskplass for oppgraderingen."
-
-#. shell:upgrade-nospace secondary
-#: ../shell/shell-errors.xml.h:4
-msgid ""
-"Upgrading your data and settings will require upto {0} of disk space, but "
-"you only have {1} available.\n"
-"\n"
-"You will need to make more space available in your home directory before you "
-"can continue."
-msgstr ""
-"Oppgradering av dine data og innstillinger vil kreve opptil {0} diskplass, "
-"men du har kun {1} tilgjengelig.\n"
-"\n"
-"Du må gjøre mer plass tilgjengelig i din hjemmekatalog før du kan fortsette."
-
-#. shell:upgrade-failed primary
-#: ../shell/shell-errors.xml.h:8
-msgid ""
-"Upgrade from previous version failed:\n"
-"{0}"
-msgstr ""
-"Oppgradering fra forrige versjon feilet:\n"
-"{0}"
-
-#. shell:upgrade-failed secondary
-#: ../shell/shell-errors.xml.h:11
-msgid ""
-"{1}\n"
-"\n"
-"If you choose to continue, you may not have access to some of your old "
-"data.\n"
-msgstr ""
-"{1}\n"
-"\n"
-"Hvis du velger å fortsette vil du kanskje ikke få tilgang til alle dine "
-"gamle data.\n"
-
-#: ../shell/shell-errors.xml.h:15
+#: ../shell/shell.error.xml.h:1
 msgid "Continue"
 msgstr "Fortsett"
 
-#. shell:upgrade-remove-1-4 title
-#. shell:upgrade-remove-1-4 primary
-#: ../shell/shell-errors.xml.h:17 ../shell/shell-errors.xml.h:19
+#: ../shell/shell.error.xml.h:2
 msgid "Delete old data from version {0}?"
 msgstr "Slett gamle data fra versjon {0}?"
 
-#. shell:upgrade-remove-1-4 secondary
-#: ../shell/shell-errors.xml.h:21
-msgid ""
-"The previous version of evolution stored its data in a different location.\n"
-"\n"
-"If you choose to remove this data, the entire contents of the \"evolution\" "
-"directory will be removed permanently.  If you choose to keep this data, "
-"then you may manually remove the contents of \"evolution\" at your "
-"convenience.\n"
-msgstr ""
-
-#: ../shell/shell-errors.xml.h:25
-msgid "_Remind Me Later"
-msgstr "_Vis påminnelse senere"
+#: ../shell/shell.error.xml.h:3
+msgid "Evolution can not start."
+msgstr "Evolution kan ikke starte."
 
-#: ../shell/shell-errors.xml.h:26
-msgid "_Keep Data"
-msgstr "_Behold data"
+#: ../shell/shell.error.xml.h:4
+msgid "Insufficient disk space for upgrade."
+msgstr "Ikke nok diskplass for oppgraderingen."
 
-#. shell:upgrade-remove-1-4-confirm title
-#. shell:upgrade-remove-1-4-confirm primary
-#: ../shell/shell-errors.xml.h:28 ../shell/shell-errors.xml.h:30
+#: ../shell/shell.error.xml.h:5
 msgid "Really delete old data?"
 msgstr "Vil du virkelig slette gamle data?"
 
-#. shell:upgrade-remove-1-4-confirm secondary
-#: ../shell/shell-errors.xml.h:32
+#: ../shell/shell.error.xml.h:6
 msgid ""
-"The entire contents of the \"evolution\" directory is about to be be "
+"The entire contents of the &quot;evolution&quot; directory is about to be be "
 "permanently removed.\n"
 "\n"
 "It is suggested you manually verify that all of your mail, contact, and "
@@ -15555,28 +15650,44 @@ msgid ""
 "without manual intervention.\n"
 msgstr ""
 
-#. shell:noshell title
-#. shell:noshell-reason title
-#: ../shell/shell-errors.xml.h:39 ../shell/shell-errors.xml.h:47
-msgid "Cannot start Evolution"
-msgstr "Kan ikke starte Evolution."
+#: ../shell/shell.error.xml.h:12
+msgid ""
+"The previous version of evolution stored its data in a different location.\n"
+"\n"
+"If you choose to remove this data, the entire contents of the &quot;"
+"evolution&quot; directory will be removed permanently.  If you choose to "
+"keep this data, then you may manually remove the contents of &quot;"
+"evolution&quot; at your convenience.\n"
+msgstr ""
 
-#. shell:noshell primary
-#. shell:noshell-reason primary
-#: ../shell/shell-errors.xml.h:41 ../shell/shell-errors.xml.h:49
-msgid "Evolution can not start."
-msgstr "Evolution kan ikke starte."
+#: ../shell/shell.error.xml.h:16
+msgid "Upgrade from previous version failed: {0}"
+msgstr "Oppgradering fra forrige versjon feilet: {0}"
 
-#. shell:noshell secondary
-#: ../shell/shell-errors.xml.h:43
+#: ../shell/shell.error.xml.h:17
+msgid ""
+"Upgrading your data and settings will require upto {0} of disk space, but "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"can continue."
+msgstr ""
+"Oppgradering av dine data og innstillinger vil kreve opptil {0} diskplass, "
+"men du har kun {1} tilgjengelig.\n"
+"\n"
+"Du må gjøre mer plass tilgjengelig i din hjemmekatalog før du kan fortsette."
+
+#: ../shell/shell.error.xml.h:20
 msgid ""
 "Your system configuration does not match your Evolution configuration.\n"
 "\n"
 "Click help for details"
 msgstr ""
+"Systemkonfigurasjonen stemmer ikke overens med konfigurasjonen i Evolution.\n"
+"\n"
+"Klikk på hjelp for detaljer"
 
-#. shell:noshell-reason secondary
-#: ../shell/shell-errors.xml.h:51
+#: ../shell/shell.error.xml.h:23
 msgid ""
 "Your system configuration does not match your Evolution configuration:\n"
 "\n"
@@ -15585,6 +15696,26 @@ msgid ""
 "Click help for details."
 msgstr ""
 
+#: ../shell/shell.error.xml.h:28
+msgid "_Keep Data"
+msgstr "_Behold data"
+
+#: ../shell/shell.error.xml.h:29
+msgid "_Remind Me Later"
+msgstr "_Vis påminnelse senere"
+
+#: ../shell/shell.error.xml.h:30
+msgid ""
+"{1}\n"
+"\n"
+"If you choose to continue, you may not have access to some of your old "
+"data.\n"
+msgstr ""
+"{1}\n"
+"\n"
+"Hvis du velger å fortsette vil du kanskje ikke få tilgang til alle dine "
+"gamle data.\n"
+
 #: ../smime/gui/ca-trust-dialog.c:96
 #, c-format
 msgid ""
@@ -15612,34 +15743,34 @@ msgstr ""
 
 #: ../smime/gui/certificate-manager.c:134
 #: ../smime/gui/certificate-manager.c:142
-#: ../smime/gui/certificate-manager.c:375
-#: ../smime/gui/certificate-manager.c:383
-#: ../smime/gui/certificate-manager.c:595
-#: ../smime/gui/certificate-manager.c:603
-msgid "Select a cert to import..."
+#: ../smime/gui/certificate-manager.c:377
+#: ../smime/gui/certificate-manager.c:385
+#: ../smime/gui/certificate-manager.c:597
+#: ../smime/gui/certificate-manager.c:605
+msgid "Select a certificate to import..."
 msgstr "Velg et sertifikat som skal importeres..."
 
-#: ../smime/gui/certificate-manager.c:263
-#: ../smime/gui/certificate-manager.c:472
-#: ../smime/gui/certificate-manager.c:690
+#: ../smime/gui/certificate-manager.c:265
+#: ../smime/gui/certificate-manager.c:474
+#: ../smime/gui/certificate-manager.c:692
 msgid "Certificate Name"
 msgstr "Navn på sertifikat"
 
-#: ../smime/gui/certificate-manager.c:272
-#: ../smime/gui/certificate-manager.c:490
+#: ../smime/gui/certificate-manager.c:274
+#: ../smime/gui/certificate-manager.c:492
 msgid "Purposes"
 msgstr "Hensikter"
 
-#: ../smime/gui/certificate-manager.c:281 ../smime/gui/smime-ui.glade.h:36
+#: ../smime/gui/certificate-manager.c:283 ../smime/gui/smime-ui.glade.h:37
 #: ../smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr "Serienummer"
 
-#: ../smime/gui/certificate-manager.c:289
+#: ../smime/gui/certificate-manager.c:291
 msgid "Expires"
 msgstr "Utgår"
 
-#: ../smime/gui/certificate-manager.c:481
+#: ../smime/gui/certificate-manager.c:483
 msgid "E-Mail Address"
 msgstr "E-postadresse"
 
@@ -15754,117 +15885,121 @@ msgid "Certificate details"
 msgstr "Detaljer om sertifikat"
 
 #: ../smime/gui/smime-ui.glade.h:17
+msgid "Certificates Table"
+msgstr "Tabell med sertifikater"
+
+#: ../smime/gui/smime-ui.glade.h:18
 msgid "Common Name (CN)"
 msgstr "Vanlig navn (CN)"
 
-#: ../smime/gui/smime-ui.glade.h:18
+#: ../smime/gui/smime-ui.glade.h:19
 msgid "Contact Certificates"
 msgstr "Kontaktsertifikater"
 
-#: ../smime/gui/smime-ui.glade.h:20
+#: ../smime/gui/smime-ui.glade.h:21
 msgid "Do not trust the authenticity of this certificate"
 msgstr "Ikke stol på at dette sertifikatet er autentisk"
 
-#: ../smime/gui/smime-ui.glade.h:21
+#: ../smime/gui/smime-ui.glade.h:22
 msgid "Dummy window only"
 msgstr "Dummyvindu"
 
-#: ../smime/gui/smime-ui.glade.h:22
+#: ../smime/gui/smime-ui.glade.h:23
 msgid "Edit"
 msgstr "Rediger"
 
-#: ../smime/gui/smime-ui.glade.h:23
+#: ../smime/gui/smime-ui.glade.h:24
 msgid "Email Certificate Trust Settings"
 msgstr "Innstillinger for tillit til e-postsertifikater"
 
-#: ../smime/gui/smime-ui.glade.h:24
+#: ../smime/gui/smime-ui.glade.h:25
 msgid "Email Recipient Certificate"
 msgstr "Sertifikat for e-postmottaker"
 
-#: ../smime/gui/smime-ui.glade.h:25
+#: ../smime/gui/smime-ui.glade.h:26
 msgid "Email Signer Certificate"
 msgstr "Sertifikat for signering av e-post"
 
-#: ../smime/gui/smime-ui.glade.h:26
+#: ../smime/gui/smime-ui.glade.h:27
 msgid "Expires On"
 msgstr "Utgår"
 
-#: ../smime/gui/smime-ui.glade.h:29
+#: ../smime/gui/smime-ui.glade.h:30
 msgid "Issued On"
 msgstr "Utstedt"
 
-#: ../smime/gui/smime-ui.glade.h:30
+#: ../smime/gui/smime-ui.glade.h:31
 msgid "MD5 Fingerprint"
 msgstr "MD5-fingeravtrykk"
 
-#: ../smime/gui/smime-ui.glade.h:31
+#: ../smime/gui/smime-ui.glade.h:32
 msgid "Organization (O)"
 msgstr "Organisasjon (O)"
 
-#: ../smime/gui/smime-ui.glade.h:32
+#: ../smime/gui/smime-ui.glade.h:33
 msgid "Organizational Unit (OU)"
 msgstr "Organisasjonsenhet (OU)"
 
-#: ../smime/gui/smime-ui.glade.h:33
+#: ../smime/gui/smime-ui.glade.h:34
 msgid "SHA1 Fingerprint"
 msgstr "SHA1-fingeravtrykk"
 
-#: ../smime/gui/smime-ui.glade.h:34 ../smime/lib/e-cert.c:818
+#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr "SSL-klientsertifikat"
 
-#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:822
+#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr "SSL-tjenersertifikat"
 
-#: ../smime/gui/smime-ui.glade.h:37
+#: ../smime/gui/smime-ui.glade.h:38
 msgid "Trust the authenticity of this certificate"
 msgstr "Stol på at dette sertifikatet er autentisk"
 
-#: ../smime/gui/smime-ui.glade.h:38
+#: ../smime/gui/smime-ui.glade.h:39
 msgid "Trust this CA to identify email users."
 msgstr "Stol på denne CAen for å identifisere e-postbrukere."
 
-#: ../smime/gui/smime-ui.glade.h:39
+#: ../smime/gui/smime-ui.glade.h:40
 msgid "Trust this CA to identify software developers."
 msgstr "Stol på denne CAen for å identifisere programvareutviklere."
 
-#: ../smime/gui/smime-ui.glade.h:40
+#: ../smime/gui/smime-ui.glade.h:41
 msgid "Trust this CA to identify web sites."
 msgstr "Stol på denne CAen for identifisering av nettsteder."
 
-#: ../smime/gui/smime-ui.glade.h:41
+#: ../smime/gui/smime-ui.glade.h:42
 msgid "View"
 msgstr "Vis"
 
-#: ../smime/gui/smime-ui.glade.h:42
+#: ../smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr "Du har sertifikater som identifiserer deg fra disse organisasjonene:"
 
-#: ../smime/gui/smime-ui.glade.h:43
+#: ../smime/gui/smime-ui.glade.h:44
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 "Du har sertifikater på lager som identifiserer disse sertifikatmyndighetene:"
 
-#: ../smime/gui/smime-ui.glade.h:44
+#: ../smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
 msgstr "Du har sertifikater som identifiserer disse menneskene på lager:"
 
-#: ../smime/gui/smime-ui.glade.h:45
+#: ../smime/gui/smime-ui.glade.h:46
 msgid "Your Certificates"
 msgstr "Dine sertifikater"
 
-#: ../smime/gui/smime-ui.glade.h:46
+#: ../smime/gui/smime-ui.glade.h:47
 msgid "_Edit CA Trust"
 msgstr "R_ediger tillit til CA"
 
-#: ../smime/gui/smime-ui.glade.h:48
+#: ../smime/gui/smime-ui.glade.h:49
 msgid "dialog1"
 msgstr "dialog1"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:612
+#: ../smime/lib/e-cert-db.c:642
 msgid "Certificate already exists"
 msgstr "Sertifikatet eksisterer allerede"
 
@@ -15961,6 +16096,10 @@ msgstr "Nøkkelidentifikator for sertifikatmyndighet"
 msgid "UID"
 msgstr "UID"
 
+#: ../smime/lib/e-cert.c:681
+msgid "E"
+msgstr "Ø"
+
 #: ../smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
@@ -16153,7 +16292,7 @@ msgid "Previews the contacts to be printed"
 msgstr "Forhåndsviser kontaktene som skal skrives ut"
 
 #: ../ui/evolution-addressbook.xml.h:17 ../ui/evolution-calendar.xml.h:20
-#: ../ui/evolution-mail-message.xml.h:81 ../ui/evolution-tasks.xml.h:15
+#: ../ui/evolution-mail-message.xml.h:75 ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "Forhåndsvisning av utskrift"
 
@@ -16202,10 +16341,7 @@ msgid "View the current contact"
 msgstr "Vis aktiv kontakt"
 
 #: ../ui/evolution-addressbook.xml.h:30 ../ui/evolution-calendar.xml.h:38
-#: ../ui/evolution-mail-global.xml.h:14 ../ui/evolution-mail-list.xml.h:23
-#: ../ui/evolution-mail-message.xml.h:103
-#: ../ui/evolution-mail-messagedisplay.xml.h:4 ../ui/evolution-tasks.xml.h:19
-#: ../ui/evolution.xml.h:36
+#: ../ui/evolution-mail-list.xml.h:24 ../ui/evolution-tasks.xml.h:19
 msgid "_Actions"
 msgstr "H_andlinger"
 
@@ -16217,7 +16353,7 @@ msgstr "_Videresend kontakt..."
 msgid "_Move to Folder..."
 msgstr "Fl_ytt til mappe..."
 
-#: ../ui/evolution-addressbook.xml.h:39 ../ui/evolution-mail-global.xml.h:16
+#: ../ui/evolution-addressbook.xml.h:39
 msgid "_Preview Pane"
 msgstr "_Forhåndsvisningsvindu"
 
@@ -16273,7 +16409,7 @@ msgstr "Liste"
 msgid "Month"
 msgstr "Måned"
 
-#: ../ui/evolution-calendar.xml.h:15 ../ui/evolution-mail-message.xml.h:65
+#: ../ui/evolution-calendar.xml.h:15 ../ui/evolution-mail-message.xml.h:59
 msgid "Next"
 msgstr "Neste"
 
@@ -16281,7 +16417,7 @@ msgstr "Neste"
 msgid "Previews the calendar to be printed"
 msgstr "Forhåndsviser av kalenderen som skal skrives ut"
 
-#: ../ui/evolution-calendar.xml.h:18 ../ui/evolution-mail-message.xml.h:79
+#: ../ui/evolution-calendar.xml.h:18 ../ui/evolution-mail-message.xml.h:73
 msgid "Previous"
 msgstr "Forrige"
 
@@ -16354,7 +16490,6 @@ msgid "Copy selected text to the clipboard"
 msgstr "Kopier valgt tekst til utklippstavlen"
 
 #: ../ui/evolution-composer-entries.xml.h:2
-#: ../ui/evolution-mail-message.xml.h:21
 msgid "Cu_t"
 msgstr "Klipp u_t"
 
@@ -16366,8 +16501,7 @@ msgstr "Klipp ut valgt tekst til utklippstavlen"
 msgid "Paste text from the clipboard"
 msgstr "Lim inn tekst fra utklippstavlen"
 
-#: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-mail-list.xml.h:13
-#: ../ui/evolution-subscribe.xml.h:6
+#: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Velg _alle"
 
@@ -16384,99 +16518,125 @@ msgid "Cancel the current mail operation"
 msgstr "Avbryt aktiv e-postoperasjon"
 
 #: ../ui/evolution-mail-global.xml.h:3
-msgid "Compose _New Message"
-msgstr "Skriv _ny melding"
+msgid "Copy the selected folder into another folder"
+msgstr "Kopier valgt mappe til en annen mappe"
 
 #: ../ui/evolution-mail-global.xml.h:4
+msgid "Create a new folder for storing mail"
+msgstr "Lag en ny mappe for lagring av meldinger"
+
+#: ../ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr "Opprett eller rediger regler for filtrering av ny e-post"
 
-#: ../ui/evolution-mail-global.xml.h:5
+#: ../ui/evolution-mail-global.xml.h:6
 msgid "Create or edit vFolder definitions"
 msgstr "Opprett eller rediger definisjoner av virtuelle mapper"
 
-#: ../ui/evolution-mail-global.xml.h:6
+#: ../ui/evolution-mail-global.xml.h:7
 msgid "Empty _Trash"
 msgstr "Tø_m søppelkurven"
 
-#: ../ui/evolution-mail-global.xml.h:7
-msgid "Open a window for composing a mail message"
-msgstr "Åpne et vindu for å skrive en e-post melding"
-
-#: ../ui/evolution-mail-global.xml.h:8
-msgid "Permanently remove all deleted messages from all folders"
-msgstr "Fjern alle slettede meldinger fra alle mapper permanent"
+#: ../ui/evolution-mail-global.xml.h:8 ../ui/evolution-mail-list.xml.h:6
+#: ../ui/evolution-subscribe.xml.h:2
+msgid "F_older"
+msgstr "M_appe"
 
 #: ../ui/evolution-mail-global.xml.h:9
-msgid "Post Ne_w Message"
-msgstr "Legg ut n_y melding"
+msgid "Message F_ilters"
+msgstr "Meldingsfiltre"
 
 #: ../ui/evolution-mail-global.xml.h:10
-msgid "Post a message to a Public folder"
-msgstr "Legg ut en melding til en ny offentlig mappe"
+#, fuzzy
+msgid "Message _List As"
+msgstr "Meldingsliste"
 
 #: ../ui/evolution-mail-global.xml.h:11
-msgid "S_ubscribe to Folders..."
-msgstr "_Abonnerer på mapper..."
+msgid "Message _Preview"
+msgstr "Forhåndsvisning av _melding"
 
 #: ../ui/evolution-mail-global.xml.h:12
+msgid "Move the selected folder into another folder"
+msgstr "Flytt valgt mappe til en annen mappe"
+
+#: ../ui/evolution-mail-global.xml.h:13
+msgid "Permanently remove all deleted messages from all folders"
+msgstr "Fjern alle slettede meldinger fra alle mapper permanent"
+
+#: ../ui/evolution-mail-global.xml.h:14
+msgid "Post a message to a Public folder"
+msgstr "Legg ut en melding til en ny offentlig mappe"
+
+#: ../ui/evolution-mail-global.xml.h:15
+msgid "Search F_olders"
+msgstr "Søk i _mapper"
+
+#: ../ui/evolution-mail-global.xml.h:16
 msgid "Show message preview window"
 msgstr "Vis vindu for forhåndsvisning av melding"
 
-#: ../ui/evolution-mail-global.xml.h:13
+#: ../ui/evolution-mail-global.xml.h:17
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Abonner eller fjern abonnement på mapper på eksterne tjenere"
 
-#: ../ui/evolution-mail-global.xml.h:15
-msgid "_Filters..."
-msgstr "_Filtre..."
-
 #: ../ui/evolution-mail-global.xml.h:18
-msgid "vFolder _Editor..."
-msgstr "R_edigering av virtuelle mapper..."
+msgid "_Copy Folder To..."
+msgstr "_Kopier mappe til..."
+
+#: ../ui/evolution-mail-global.xml.h:19
+msgid "_Move Folder To..."
+msgstr "Flytt _mappe til..."
+
+#: ../ui/evolution-mail-global.xml.h:20
+msgid "_New Search _Folder (FIXME)"
+msgstr "_Ny søkemappe"
+
+#: ../ui/evolution-mail-global.xml.h:21
+msgid "_New..."
+msgstr "_Ny..."
+
+#: ../ui/evolution-mail-global.xml.h:22
+msgid "_Subscriptions"
+msgstr "_Abonnement"
 
 #: ../ui/evolution-mail-list.xml.h:1
+msgid "Change the name of this folder"
+msgstr "Endre navn på denne mappen"
+
+#: ../ui/evolution-mail-list.xml.h:2
 msgid "Change the properties of this folder"
 msgstr "Endre egenskaper for denne mappen"
 
-#: ../ui/evolution-mail-list.xml.h:2 ../ui/evolution-mail-message.xml.h:10
+#: ../ui/evolution-mail-list.xml.h:3 ../ui/evolution-mail-message.xml.h:12
 msgid "Copy selected message(s) to the clipboard"
 msgstr "Kopier valgt(e) melding(er) til utklippstavlen"
 
-#: ../ui/evolution-mail-list.xml.h:3 ../ui/evolution-mail-message.xml.h:22
+#: ../ui/evolution-mail-list.xml.h:4 ../ui/evolution-mail-message.xml.h:23
 msgid "Cut selected message(s) to the clipboard"
 msgstr "Klipp ut valgt(e) melding(er) til utklippstavlen"
 
-#: ../ui/evolution-mail-list.xml.h:4
+#: ../ui/evolution-mail-list.xml.h:5
 msgid "E_xpunge"
 msgstr "T_øm"
 
-#: ../ui/evolution-mail-list.xml.h:5
-msgid "Hide S_elected Messages"
-msgstr "Skjul valgt_e meldinger"
+#: ../ui/evolution-mail-list.xml.h:7
+msgid "Group By _Threads"
+msgstr "Grupper etter _tråder"
 
-#: ../ui/evolution-mail-list.xml.h:6
+#: ../ui/evolution-mail-list.xml.h:8
 msgid "Hide _Deleted Messages"
 msgstr "Skjul slette_de meldinger"
 
-#: ../ui/evolution-mail-list.xml.h:7
-msgid "Hide _Read Messages"
-msgstr "Skjul leste meldinge_r"
-
-#: ../ui/evolution-mail-list.xml.h:8
+#: ../ui/evolution-mail-list.xml.h:9
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr "Skjul slettede meldinger heller enn å vise dem gjennomstreket"
 
-#: ../ui/evolution-mail-list.xml.h:9
-msgid "Mark All as _Read"
-msgstr "Me_rk alle som lest"
-
 #: ../ui/evolution-mail-list.xml.h:10
-msgid "Mark all visible messages as read"
-msgstr "Merk alle synlige meldinger som lest"
+msgid "Mark Me_ssages as Read"
+msgstr "Merk meldinger som le_st"
 
-#: ../ui/evolution-mail-list.xml.h:11 ../ui/evolution-mail-message.xml.h:74
+#: ../ui/evolution-mail-list.xml.h:11 ../ui/evolution-mail-message.xml.h:68
 msgid "Paste message(s) from the clipboard"
 msgstr "Lim inn melding(er) fra utklippstavlen"
 
@@ -16484,9 +16644,13 @@ msgstr "Lim inn melding(er) fra utklippstavlen"
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Fjern alle slettede meldinger fra denne mappen permanent"
 
+#: ../ui/evolution-mail-list.xml.h:13
+msgid "Permanently remove this folder"
+msgstr "Fjern denne mappen permanent"
+
 #: ../ui/evolution-mail-list.xml.h:14
-msgid "Select _Thread"
-msgstr "Velg _tråd"
+msgid "Select _All Messages"
+msgstr "Velg _alle meldinger"
 
 #: ../ui/evolution-mail-list.xml.h:15
 msgid "Select all and only the messages that are not currently selected"
@@ -16501,8 +16665,8 @@ msgid "Select all visible messages"
 msgstr "Velg alle synlige meldinger"
 
 #: ../ui/evolution-mail-list.xml.h:18
-msgid "Sh_ow Hidden Messages"
-msgstr "_Vis skjulte meldinger"
+msgid "Show _Messages"
+msgstr "Vis _meldinger"
 
 #: ../ui/evolution-mail-list.xml.h:19
 msgid "Show messages that have been temporarily hidden"
@@ -16520,17 +16684,22 @@ msgstr "Skjul valgte meldinger midlertidig"
 msgid "Threaded Message list"
 msgstr "Meldingsliste med tråder"
 
+#: ../ui/evolution-mail-list.xml.h:23
+msgid "Un_read Messages"
+msgstr "_Uleste meldinger"
+
 #: ../ui/evolution-mail-list.xml.h:25
-msgid "_Folder"
-msgstr "M_appe"
+msgid "_All"
+msgstr "_Alle"
 
-#: ../ui/evolution-mail-list.xml.h:26 ../ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "_Reverser utvalg"
+#: ../ui/evolution-mail-list.xml.h:27 ../ui/evolution-mail-message.xml.h:110
+#: ../ui/evolution-mail-messagedisplay.xml.h:7
+msgid "_Message"
+msgstr "_Melding"
 
-#: ../ui/evolution-mail-list.xml.h:28
-msgid "_Threaded Message List"
-msgstr "Meldingsliste med _tråder"
+#: ../ui/evolution-mail-list.xml.h:30
+msgid "_Selected Messages"
+msgstr "_Valgte meldinger"
 
 #: ../ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
@@ -16545,421 +16714,420 @@ msgid "Add Sender to Address Book"
 msgstr "Legg til avsender i adressebok"
 
 #: ../ui/evolution-mail-message.xml.h:4
-msgid "Apply filter rules to the selected messages"
-msgstr "Aktiver filterregler på de valgte meldingene"
+msgid "All Message _Headers"
+msgstr "Alle meldings_hoder"
 
 #: ../ui/evolution-mail-message.xml.h:5
-msgid "Caret _Mode"
-msgstr "Markør_modus"
+msgid "Apply filter rules to the selected messages"
+msgstr "Aktiver filterregler på de valgte meldingene"
 
 #: ../ui/evolution-mail-message.xml.h:6
+msgid "Check for _Junk"
+msgstr "Sjekk _søppel"
+
+#: ../ui/evolution-mail-message.xml.h:7
+msgid "Compose _New Message"
+msgstr "Skriv _ny melding"
+
+#: ../ui/evolution-mail-message.xml.h:8
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "Skriv et svar til alle mottakere av den valgte meldingen"
 
-#: ../ui/evolution-mail-message.xml.h:7
+#: ../ui/evolution-mail-message.xml.h:9
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Skriv et svar til e-postlisten for den valgte meldingen"
 
-#: ../ui/evolution-mail-message.xml.h:8
+#: ../ui/evolution-mail-message.xml.h:10
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Skriv et svar til avsender av den valgte meldingen"
 
-#: ../ui/evolution-mail-message.xml.h:11
+#: ../ui/evolution-mail-message.xml.h:13
 msgid "Copy selected messages to another folder"
 msgstr "Kopier valgte meldinger til en annen mappe"
 
-#: ../ui/evolution-mail-message.xml.h:12
-msgid "Create _vFolder From Message"
-msgstr "Lag _virtuell mappe fra melding"
+#: ../ui/evolution-mail-message.xml.h:14
+msgid "Create R_ule"
+msgstr "Opprett _regel"
 
-#: ../ui/evolution-mail-message.xml.h:13
+#: ../ui/evolution-mail-message.xml.h:15
 msgid "Create a rule to filter messages from this sender"
 msgstr "Lag en regel for å filtrere meldinger fra denne avsenderen"
 
-#: ../ui/evolution-mail-message.xml.h:14
+#: ../ui/evolution-mail-message.xml.h:16
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Lag en regel for å filtrere meldinger til disse mottakerene"
 
-#: ../ui/evolution-mail-message.xml.h:15
+#: ../ui/evolution-mail-message.xml.h:17
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Lag en regel for å filtrere meldinger til denne meldingslisten"
 
-#: ../ui/evolution-mail-message.xml.h:16
+#: ../ui/evolution-mail-message.xml.h:18
 msgid "Create a rule to filter messages with this subject"
 msgstr "Lag en regel for filtrering av meldinger med dette emnet"
 
-#: ../ui/evolution-mail-message.xml.h:17
+#: ../ui/evolution-mail-message.xml.h:19
 msgid "Create a vFolder for these recipients"
 msgstr "Lag en virtuell mappe for disse mottakerene"
 
-#: ../ui/evolution-mail-message.xml.h:18
+#: ../ui/evolution-mail-message.xml.h:20
 msgid "Create a vFolder for this mailing list"
 msgstr "Lag en virtuell mappe for denne e-postlisten"
 
-#: ../ui/evolution-mail-message.xml.h:19
+#: ../ui/evolution-mail-message.xml.h:21
 msgid "Create a vFolder for this sender"
 msgstr "Lag en virtuell mappe for denne avsenderen"
 
-#: ../ui/evolution-mail-message.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:22
 msgid "Create a vFolder for this subject"
 msgstr "Lag en virtuell mappe for dette emnet"
 
-#: ../ui/evolution-mail-message.xml.h:23
+#: ../ui/evolution-mail-message.xml.h:24
 msgid "Decrease the text size"
 msgstr "Mindre skrift"
 
-#: ../ui/evolution-mail-message.xml.h:25
+#: ../ui/evolution-mail-message.xml.h:26
 msgid "Display the next important message"
 msgstr "Vis neste viktige melding"
 
-#: ../ui/evolution-mail-message.xml.h:26
+#: ../ui/evolution-mail-message.xml.h:27
 msgid "Display the next message"
 msgstr "Vis neste melding"
 
-#: ../ui/evolution-mail-message.xml.h:27
+#: ../ui/evolution-mail-message.xml.h:28
 msgid "Display the next unread message"
 msgstr "Vis neste uleste melding"
 
-#: ../ui/evolution-mail-message.xml.h:28
+#: ../ui/evolution-mail-message.xml.h:29
 msgid "Display the next unread thread"
 msgstr "Vis neste uleste tråd"
 
-#: ../ui/evolution-mail-message.xml.h:29
+#: ../ui/evolution-mail-message.xml.h:30
 msgid "Display the previous important message"
 msgstr "Vis forrige viktige melding"
 
-#: ../ui/evolution-mail-message.xml.h:30
+#: ../ui/evolution-mail-message.xml.h:31
 msgid "Display the previous message"
 msgstr "Vis forrige melding"
 
-#: ../ui/evolution-mail-message.xml.h:31
+#: ../ui/evolution-mail-message.xml.h:32
 msgid "Display the previous unread message"
 msgstr "Vis forrige uleste melding"
 
-#: ../ui/evolution-mail-message.xml.h:32
-msgid "F_orward As..."
-msgstr "V_ideresend som..."
-
 #: ../ui/evolution-mail-message.xml.h:33
-msgid "Filter _Junk"
-msgstr "Filtrer s_øppel"
-
-#: ../ui/evolution-mail-message.xml.h:34
 msgid "Filter on Mailing _List..."
 msgstr "Filtrer på e-post_liste..."
 
-#: ../ui/evolution-mail-message.xml.h:35
+#: ../ui/evolution-mail-message.xml.h:34
 msgid "Filter on Se_nder..."
 msgstr "Filtrer på se_nder..."
 
-#: ../ui/evolution-mail-message.xml.h:36
+#: ../ui/evolution-mail-message.xml.h:35
 msgid "Filter on _Recipients..."
 msgstr "Filtrer på mottake_re..."
 
-#: ../ui/evolution-mail-message.xml.h:37
+#: ../ui/evolution-mail-message.xml.h:36
 msgid "Filter on _Subject..."
 msgstr "Filtrer på e_mne..."
 
-#: ../ui/evolution-mail-message.xml.h:38
+#: ../ui/evolution-mail-message.xml.h:37
 msgid "Filter the selected messages for junk status"
 msgstr "Filtrer valgte meldinger etter søppelstatus"
 
-#: ../ui/evolution-mail-message.xml.h:39
+#: ../ui/evolution-mail-message.xml.h:38
 msgid "Flag selected message(s) for follow-up"
 msgstr "Merk valgt(e) melding(er) for oppfølging"
 
-#: ../ui/evolution-mail-message.xml.h:40
+#: ../ui/evolution-mail-message.xml.h:39
 msgid "Follow _Up..."
 msgstr "Følg _opp..."
 
-#: ../ui/evolution-mail-message.xml.h:41
+#: ../ui/evolution-mail-message.xml.h:40
 msgid "Force images in HTML mail to be loaded"
 msgstr "Tvungen lasting av bilder i HTML e-post"
 
-#: ../ui/evolution-mail-message.xml.h:43
+#: ../ui/evolution-mail-message.xml.h:42
 msgid "Forward the selected message in the body of a new message"
 msgstr "Videresend den valgte meldingen i kroppen av en ny melding"
 
-#: ../ui/evolution-mail-message.xml.h:44
+#: ../ui/evolution-mail-message.xml.h:43
 msgid "Forward the selected message quoted like a reply"
 msgstr "Videresend den valgte meldingen sitert som et svar"
 
-#: ../ui/evolution-mail-message.xml.h:45
+#: ../ui/evolution-mail-message.xml.h:44
 msgid "Forward the selected message to someone"
 msgstr "Videresend den valgte meldingen til noen"
 
-#: ../ui/evolution-mail-message.xml.h:46
+#: ../ui/evolution-mail-message.xml.h:45
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Videresend den valgte meldingen til noen som et vedlegg"
 
-#: ../ui/evolution-mail-message.xml.h:47
+#: ../ui/evolution-mail-message.xml.h:46
 msgid "Increase the text size"
 msgstr "Større tekst"
 
-#: ../ui/evolution-mail-message.xml.h:49
-msgid "Load _Images"
-msgstr "Last b_ilder"
-
-#: ../ui/evolution-mail-message.xml.h:50
-msgid "Mar_k as Read"
-msgstr "Mer_k som lest"
-
-#: ../ui/evolution-mail-message.xml.h:51
-msgid "Mark as I_mportant"
-msgstr "Merk som _viktig"
-
-#: ../ui/evolution-mail-message.xml.h:52
-msgid "Mark as U_nread"
-msgstr "Merk som _ulest"
-
-#: ../ui/evolution-mail-message.xml.h:53
-msgid "Mark as Unimp_ortant"
-msgstr "Merk som uv_iktig"
+#: ../ui/evolution-mail-message.xml.h:48
+msgid "Mar_k as"
+msgstr "Mer_k som"
 
-#: ../ui/evolution-mail-message.xml.h:56
+#: ../ui/evolution-mail-message.xml.h:49
 msgid "Mark the selected message(s) as having been read"
 msgstr "Merk valgt(e) melding(er) som lest"
 
-#: ../ui/evolution-mail-message.xml.h:57
+#: ../ui/evolution-mail-message.xml.h:50
 msgid "Mark the selected message(s) as important"
 msgstr "Merk valgt(e) melding(er) som viktige"
 
-#: ../ui/evolution-mail-message.xml.h:58
+#: ../ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected message(s) as junk"
 msgstr "Merk valgt(e) melding(er) som søppel"
 
-#: ../ui/evolution-mail-message.xml.h:59
+#: ../ui/evolution-mail-message.xml.h:52
 msgid "Mark the selected message(s) as not being junk"
 msgstr "Merk valgt(e) melding(er) som ikke søppel"
 
-#: ../ui/evolution-mail-message.xml.h:60
+#: ../ui/evolution-mail-message.xml.h:53
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Merk valgt(e) melding(er) som ulest"
 
-#: ../ui/evolution-mail-message.xml.h:61
+#: ../ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Merk valgt(e) melding(er) som uviktige"
 
-#: ../ui/evolution-mail-message.xml.h:62
+#: ../ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected messages for deletion"
 msgstr "Merk valgte meldinger for sletting"
 
-#: ../ui/evolution-mail-message.xml.h:63
+#: ../ui/evolution-mail-message.xml.h:56
+msgid "Message Source"
+msgstr "Meldingskilde"
+
+#: ../ui/evolution-mail-message.xml.h:57
 msgid "Move"
 msgstr "Flytt"
 
-#: ../ui/evolution-mail-message.xml.h:64
+#: ../ui/evolution-mail-message.xml.h:58
 msgid "Move selected message(s) to another folder"
 msgstr "Flytt valgt(e) melding(er) til en annen mappe"
 
-#: ../ui/evolution-mail-message.xml.h:66
+#: ../ui/evolution-mail-message.xml.h:60
 msgid "Next _Important Message"
 msgstr "Neste v_iktige melding"
 
-#: ../ui/evolution-mail-message.xml.h:67
+#: ../ui/evolution-mail-message.xml.h:61
 msgid "Next _Thread"
 msgstr "Neste _tråd"
 
-#: ../ui/evolution-mail-message.xml.h:68
+#: ../ui/evolution-mail-message.xml.h:62
 msgid "Next _Unread Message"
 msgstr "Neste _uleste melding"
 
-#: ../ui/evolution-mail-message.xml.h:69
+#: ../ui/evolution-mail-message.xml.h:63
 msgid "Not Junk"
 msgstr "Ikke søppel"
 
-#: ../ui/evolution-mail-message.xml.h:70
+#: ../ui/evolution-mail-message.xml.h:64
+msgid "Open a window for composing a mail message"
+msgstr "Åpne et vindu for å skrive en e-post melding"
+
+#: ../ui/evolution-mail-message.xml.h:65
 msgid "Open the selected message in a new window"
 msgstr "Åpne valgt melding i et nytt vindu"
 
-#: ../ui/evolution-mail-message.xml.h:71
+#: ../ui/evolution-mail-message.xml.h:66
 msgid "Open the selected message in the composer for editing"
 msgstr "Åpne valgt melding for redigering"
 
-#: ../ui/evolution-mail-message.xml.h:72
-msgid "Original Si_ze"
-msgstr "Opprinnelig st_ørrelse"
-
-#: ../ui/evolution-mail-message.xml.h:73
+#: ../ui/evolution-mail-message.xml.h:67
 msgid "P_revious Unread Message"
 msgstr "Fo_rrige uleste melding"
 
-#: ../ui/evolution-mail-message.xml.h:75
+#: ../ui/evolution-mail-message.xml.h:69
 msgid "Post a Repl_y"
 msgstr "Legg ut et s_var"
 
-#: ../ui/evolution-mail-message.xml.h:76
+#: ../ui/evolution-mail-message.xml.h:70
 msgid "Post a reply to a message in a Public folder"
 msgstr "Post et svar på en melding i en offentlig mappe"
 
-#: ../ui/evolution-mail-message.xml.h:77
+#: ../ui/evolution-mail-message.xml.h:71
 msgid "Pr_evious Important Message"
 msgstr "Forrig_e viktige melding"
 
-#: ../ui/evolution-mail-message.xml.h:78
+#: ../ui/evolution-mail-message.xml.h:72
 msgid "Preview the message to be printed"
 msgstr "Forhåndsvis meldingen som skal skrives ut"
 
-#: ../ui/evolution-mail-message.xml.h:82
+#: ../ui/evolution-mail-message.xml.h:76
 msgid "Print this message"
 msgstr "Skriv ut denne meldingen"
 
-#: ../ui/evolution-mail-message.xml.h:83
+#: ../ui/evolution-mail-message.xml.h:77
 msgid "Re_direct"
 msgstr "Om_diriger"
 
-#: ../ui/evolution-mail-message.xml.h:84
+#: ../ui/evolution-mail-message.xml.h:78
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Omdiriger (bounce) den valgte meldingen til noen"
 
-#: ../ui/evolution-mail-message.xml.h:89
+#: ../ui/evolution-mail-message.xml.h:82
 msgid "Reset the text to its original size"
 msgstr "Ta teksten tilbake til sin opprinnelige størrelse"
 
-#: ../ui/evolution-mail-message.xml.h:90
-msgid "S_earch in Message..."
-msgstr "Søk i m_elding..."
-
-#: ../ui/evolution-mail-message.xml.h:91
-msgid "S_maller"
-msgstr "_Mindre"
-
-#: ../ui/evolution-mail-message.xml.h:92
+#: ../ui/evolution-mail-message.xml.h:83
 msgid "Save the message as a text file"
 msgstr "Lagre meldingen som en tekstfil"
 
-#: ../ui/evolution-mail-message.xml.h:93
+#: ../ui/evolution-mail-message.xml.h:84
 msgid "Search for text in the body of the displayed message"
 msgstr "Søk etter tekst i kroppen av vist melding"
 
-#: ../ui/evolution-mail-message.xml.h:94
-msgid "Set up the page settings for your current printer"
-msgstr "Sett opp sideinnstillinger for din skriver"
+#: ../ui/evolution-mail-message.xml.h:85
+msgid "Select _All Text"
+msgstr "Marker _all tekst"
 
-#: ../ui/evolution-mail-message.xml.h:95
-msgid "Show Email _Source"
-msgstr "Vis e-post-kilde"
+#: ../ui/evolution-mail-message.xml.h:86
+msgid "Select all the text in a message"
+msgstr "Marker all tekst i meldingen"
 
-#: ../ui/evolution-mail-message.xml.h:96
-msgid "Show Full _Headers"
-msgstr "Vis fulle _headere"
+#: ../ui/evolution-mail-message.xml.h:87
+msgid "Set up the page settings for your current printer"
+msgstr "Sett opp sideinnstillinger for din skriver"
 
-#: ../ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:88
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Vis en blinkende markør i kroppen av meldinger som vises"
 
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:89
 msgid "Show message in the normal style"
 msgstr "Vis melding i normal stil"
 
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:90
 msgid "Show message with all email headers"
 msgstr "Vis melding med fulle e-post headere"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:91
 msgid "Show the raw email source of the message"
 msgstr "Vis e-post meldingen i sin råe form"
 
-#: ../ui/evolution-mail-message.xml.h:101
-msgid "Text Si_ze"
-msgstr "Tekstst_ørrelse"
+#: ../ui/evolution-mail-message.xml.h:92
+msgid "Un-delete the selected messages"
+msgstr "Angre sletting av valgte meldinger"
+
+#: ../ui/evolution-mail-message.xml.h:93
+msgid "Uni_mportant"
+msgstr "_Ikke viktig"
+
+#: ../ui/evolution-mail-message.xml.h:94
+msgid "VFolder on Recipients..."
+msgstr "Virtuell mappe for mottakere..."
+
+#: ../ui/evolution-mail-message.xml.h:95
+msgid "VFolder on S_ubject..."
+msgstr "Virtuell mappe for _emne..."
+
+#: ../ui/evolution-mail-message.xml.h:96
+msgid "VFolder on Sen_der..."
+msgstr "Virtuell mappe for avsen_der..."
+
+#: ../ui/evolution-mail-message.xml.h:97
+msgid "VFolder on _Mailing _List..."
+msgstr "Virtuell mappe på e-post_liste..."
+
+#: ../ui/evolution-mail-message.xml.h:98
+msgid "Zoom _Out"
+msgstr "Zoom _ut"
+
+#: ../ui/evolution-mail-message.xml.h:99
+msgid "_Caret Mode"
+msgstr "Markør_modus"
 
 #: ../ui/evolution-mail-message.xml.h:102
-msgid "Un-delete the selected messages"
-msgstr "Angre slett av den valgte meldingen"
+msgid "_Delete Message"
+msgstr "_Slett melding"
 
 #: ../ui/evolution-mail-message.xml.h:104
-msgid "_Attached"
-msgstr "Vedl_agt"
+msgid "_Find in Message..."
+msgstr "_Finn i melding..."
 
-#: ../ui/evolution-mail-message.xml.h:107
-msgid "_Create Filter From Message"
-msgstr "La_g filter fra melding"
-
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:106
 msgid "_Go To"
 msgstr "_Gå til"
 
-#: ../ui/evolution-mail-message.xml.h:112
-msgid "_Inline"
-msgstr "_Inline"
+#: ../ui/evolution-mail-message.xml.h:107
+msgid "_Important"
+msgstr "V_iktig"
 
-#: ../ui/evolution-mail-message.xml.h:113
-msgid "_Larger"
-msgstr "_Større"
+#: ../ui/evolution-mail-message.xml.h:108
+msgid "_Junk"
+msgstr "_Søppel"
 
-#: ../ui/evolution-mail-message.xml.h:114
-msgid "_Message Display"
-msgstr "_Meldingsvisning"
+#: ../ui/evolution-mail-message.xml.h:109
+msgid "_Load Images"
+msgstr "_Last bilder"
 
-#: ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Next Message"
 msgstr "_Neste melding"
 
-#: ../ui/evolution-mail-message.xml.h:117
-msgid "_Normal Display"
-msgstr "_Normal visning"
+#: ../ui/evolution-mail-message.xml.h:113
+msgid "_Normal Size"
+msgstr "_Normal størrelse"
 
-#: ../ui/evolution-mail-message.xml.h:118
-msgid "_Open Message"
-msgstr "_Åpne melding"
+#: ../ui/evolution-mail-message.xml.h:114
+msgid "_Not Junk"
+msgstr "_Ikke søppel"
 
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:115
+msgid "_Open in New Window"
+msgstr "_Åpne i _nytt vindu"
+
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Previous Message"
 msgstr "_Forrige melding"
 
-#: ../ui/evolution-mail-message.xml.h:122
-msgid "_Quoted"
-msgstr "_Sitert"
-
-#: ../ui/evolution-mail-message.xml.h:125 ../ui/evolution.xml.h:48
-msgid "_Tools"
-msgstr "Ve_rktøy"
-
-#: ../ui/evolution-mail-message.xml.h:126
-msgid "_Undelete"
-msgstr "A_ngre slett"
+#: ../ui/evolution-mail-message.xml.h:118
+msgid "_Read"
+msgstr "_Les"
 
-#: ../ui/evolution-mail-message.xml.h:127
-msgid "vFolder on Mailing _List..."
-msgstr "Virtuell mappe på e-post_liste..."
+#: ../ui/evolution-mail-message.xml.h:120
+msgid "_Save Message..."
+msgstr "_Lagre melding..."
 
-#: ../ui/evolution-mail-message.xml.h:128
-msgid "vFolder on Se_nder..."
-msgstr "Virtuell mappe på avse_nder..."
+#: ../ui/evolution-mail-message.xml.h:121
+msgid "_Undelete Message"
+msgstr "_Angre sletting av melding"
 
-#: ../ui/evolution-mail-message.xml.h:129
-msgid "vFolder on _Recipients..."
-msgstr "Virtuell mappe på mottake_re..."
+#: ../ui/evolution-mail-message.xml.h:122
+msgid "_Unread"
+msgstr "_Ulest"
 
-#: ../ui/evolution-mail-message.xml.h:130
-msgid "vFolder on _Subject..."
-msgstr "Virtuell mappe på e_mne..."
+#: ../ui/evolution-mail-message.xml.h:123
+msgid "_Zoom In"
+msgstr "_Zoom inn"
 
 #: ../ui/evolution-mail-messagedisplay.xml.h:1
-#: ../ui/evolution-message-composer.xml.h:3
-#: ../ui/evolution-signature-editor.xml.h:2 ../ui/evolution.xml.h:4
+#: ../ui/evolution-message-composer.xml.h:4
+#: ../ui/evolution-signature-editor.xml.h:2
 msgid "Close"
 msgstr "Lukk"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:5
+#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "Lukk dette vinduet"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:19
+#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:17
 msgid "Main toolbar"
 msgstr "Hovedverktøylinje"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:5
-#: ../ui/evolution-message-composer.xml.h:41 ../ui/evolution-subscribe.xml.h:9
-#: ../ui/evolution.xml.h:37
+#: ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../ui/evolution-message-composer.xml.h:40 ../ui/evolution-subscribe.xml.h:9
 msgid "_Close"
 msgstr "L_ukk"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:7
-#: ../ui/evolution-message-composer.xml.h:44
+#: ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution-message-composer.xml.h:43
 #: ../ui/evolution-signature-editor.xml.h:13
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:39
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:33
 msgid "_File"
 msgstr "_Fil"
 
@@ -16971,181 +17139,172 @@ msgstr "Legg ved"
 msgid "Attach a file"
 msgstr "Legg ved en fil"
 
-#: ../ui/evolution-message-composer.xml.h:4
+#: ../ui/evolution-message-composer.xml.h:3
+msgid "Check to get delivery notification when your message is read"
+msgstr "Kryss av for å be om melding når meldingen blir lest"
+
+#: ../ui/evolution-message-composer.xml.h:5
 #: ../ui/evolution-signature-editor.xml.h:3
 msgid "Close the current file"
 msgstr "Lukk aktiv fil"
 
-#: ../ui/evolution-message-composer.xml.h:5
+#: ../ui/evolution-message-composer.xml.h:6
 msgid "Delete all but signature"
 msgstr "Slett alt unntatt signatur"
 
-#: ../ui/evolution-message-composer.xml.h:6
+#: ../ui/evolution-message-composer.xml.h:7
 msgid "Encrypt this message with PGP"
 msgstr "Krypter denne meldingen med PGP"
 
-#: ../ui/evolution-message-composer.xml.h:7
-msgid "Encrypt this message with your S/MIME Encryption Cetificate"
-msgstr "Krypter denne meldingen med ditt S/MIME krypteringssertifikat"
-
 #: ../ui/evolution-message-composer.xml.h:8
+msgid "Encrypt this message with your S/MIME Encryption Certificate"
+msgstr "Krypter denne meldingen med ditt S/MIME-krypteringssertifikat"
+
+#: ../ui/evolution-message-composer.xml.h:9
 #: ../ui/evolution-signature-editor.xml.h:4
 msgid "For_mat"
 msgstr "For_mat"
 
-#: ../ui/evolution-message-composer.xml.h:9
+#: ../ui/evolution-message-composer.xml.h:10
 msgid "HT_ML"
 msgstr "HT_ML"
 
-#: ../ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-message-composer.xml.h:12
 msgid "Open a file"
 msgstr "Åpne en fil"
 
-#: ../ui/evolution-message-composer.xml.h:12
+#: ../ui/evolution-message-composer.xml.h:13
 msgid "PGP Encrypt"
 msgstr "Krypter med PGP"
 
-#: ../ui/evolution-message-composer.xml.h:13
+#: ../ui/evolution-message-composer.xml.h:14
 msgid "PGP Sign"
 msgstr "Signer med PGP"
 
-#: ../ui/evolution-message-composer.xml.h:14
+#: ../ui/evolution-message-composer.xml.h:15
+msgid "Request read receipt"
+msgstr "Spør om lesekvittering"
+
+#: ../ui/evolution-message-composer.xml.h:16
 msgid "S/MIME Encrypt"
 msgstr "Krypter med S/MIME"
 
-#: ../ui/evolution-message-composer.xml.h:15
+#: ../ui/evolution-message-composer.xml.h:17
 msgid "S/MIME Sign"
 msgstr "Signer med S/MIME"
 
-#: ../ui/evolution-message-composer.xml.h:17
+#: ../ui/evolution-message-composer.xml.h:19
 msgid "Save As"
 msgstr "Lagre som"
 
-#: ../ui/evolution-message-composer.xml.h:18
+#: ../ui/evolution-message-composer.xml.h:20
 msgid "Save _As..."
 msgstr "L_agre som..."
 
-#: ../ui/evolution-message-composer.xml.h:19
+#: ../ui/evolution-message-composer.xml.h:21
 msgid "Save _Draft"
 msgstr "L_agre utkast"
 
-#: ../ui/evolution-message-composer.xml.h:20
+#: ../ui/evolution-message-composer.xml.h:22
 msgid "Save in folder..."
 msgstr "Lagre i mappe..."
 
-#: ../ui/evolution-message-composer.xml.h:21
+#: ../ui/evolution-message-composer.xml.h:23
 #: ../ui/evolution-signature-editor.xml.h:9
 msgid "Save the current file"
 msgstr "Lagre aktiv fil"
 
-#: ../ui/evolution-message-composer.xml.h:22
+#: ../ui/evolution-message-composer.xml.h:24
 msgid "Save the current file with a different name"
 msgstr "Lagre aktiv fil med et nytt navn"
 
-#: ../ui/evolution-message-composer.xml.h:23
+#: ../ui/evolution-message-composer.xml.h:25
 msgid "Save the message in a specified folder"
 msgstr "Lagre meldingen i en spesifisert mappe"
 
-#: ../ui/evolution-message-composer.xml.h:25
+#: ../ui/evolution-message-composer.xml.h:27
 #: ../ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
 msgstr "Send meldingen i HTML-format"
 
-#: ../ui/evolution-message-composer.xml.h:26
+#: ../ui/evolution-message-composer.xml.h:28
 msgid "Send this message"
 msgstr "Send denne meldingen"
 
-#: ../ui/evolution-message-composer.xml.h:27
-msgid "Show / hide attachments"
-msgstr "Vis/skjul vedlegg"
-
-#: ../ui/evolution-message-composer.xml.h:28
-msgid "Show _attachments"
-msgstr "Vis _vedlegg"
-
 #: ../ui/evolution-message-composer.xml.h:29
-msgid "Show attachments"
-msgstr "Vis vedlegg"
-
-#: ../ui/evolution-message-composer.xml.h:30
 msgid "Sign this message with your PGP key"
 msgstr "Signer denne meldingen med din PGP-nøkkel"
 
-#: ../ui/evolution-message-composer.xml.h:31
+#: ../ui/evolution-message-composer.xml.h:30
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Signer denne meldingen med ditt S/MIME signatursertifikat"
 
-#: ../ui/evolution-message-composer.xml.h:32
+#: ../ui/evolution-message-composer.xml.h:31
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Slå av/på visning av BCC-feltet"
 
-#: ../ui/evolution-message-composer.xml.h:33
+#: ../ui/evolution-message-composer.xml.h:32
 msgid "Toggles whether the CC field is displayed"
 msgstr "Slå av/på visning av CC-feltet"
 
-#: ../ui/evolution-message-composer.xml.h:34
+#: ../ui/evolution-message-composer.xml.h:33
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Slå av/på visning av Fra-feltet"
 
-#: ../ui/evolution-message-composer.xml.h:35
+#: ../ui/evolution-message-composer.xml.h:34
 msgid "Toggles whether the Post-To field is displayed"
 msgstr "Slå av/på visning av Post-til feltet"
 
-#: ../ui/evolution-message-composer.xml.h:36
+#: ../ui/evolution-message-composer.xml.h:35
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Slå av/på visning av Svar-til feltet"
 
-#: ../ui/evolution-message-composer.xml.h:37
+#: ../ui/evolution-message-composer.xml.h:36
 msgid "Toggles whether the To field is displayed"
 msgstr "Slå av/på visning av Til-feltet"
 
-#: ../ui/evolution-message-composer.xml.h:38
+#: ../ui/evolution-message-composer.xml.h:37
 msgid "_Attachment..."
 msgstr "_Vedlegg..."
 
-#: ../ui/evolution-message-composer.xml.h:39
+#: ../ui/evolution-message-composer.xml.h:38
 msgid "_Bcc Field"
 msgstr "_Bcc-felt"
 
-#: ../ui/evolution-message-composer.xml.h:40
+#: ../ui/evolution-message-composer.xml.h:39
 msgid "_Cc Field"
 msgstr "_Cc-felt"
 
-#: ../ui/evolution-message-composer.xml.h:42
+#: ../ui/evolution-message-composer.xml.h:41
 msgid "_Delete all"
 msgstr "_Slett alle"
 
-#: ../ui/evolution-message-composer.xml.h:45
+#: ../ui/evolution-message-composer.xml.h:44
 msgid "_From Field"
 msgstr "_Fra-felt"
 
-#: ../ui/evolution-message-composer.xml.h:46
+#: ../ui/evolution-message-composer.xml.h:45
 #: ../ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr "Sett _inn"
 
-#: ../ui/evolution-message-composer.xml.h:47
+#: ../ui/evolution-message-composer.xml.h:46
 msgid "_Open..."
 msgstr "_Åpne..."
 
-#: ../ui/evolution-message-composer.xml.h:48
+#: ../ui/evolution-message-composer.xml.h:47
 msgid "_Post-To Field"
 msgstr "_Post-til-felt"
 
-#: ../ui/evolution-message-composer.xml.h:49
+#: ../ui/evolution-message-composer.xml.h:48
 msgid "_Reply-To Field"
 msgstr "Svar-til felt"
 
 #: ../ui/evolution-message-composer.xml.h:50
-#: ../ui/evolution-signature-editor.xml.h:15
-msgid "_Save"
-msgstr "_Lagre"
-
-#: ../ui/evolution-message-composer.xml.h:51
 msgid "_Security"
 msgstr "_Sikkerhet"
 
-#: ../ui/evolution-message-composer.xml.h:52
+#: ../ui/evolution-message-composer.xml.h:51
 msgid "_To Field"
 msgstr "_Til-felt"
 
@@ -17173,10 +17332,6 @@ msgstr "Lagre aktiv fil og lukk vinduet"
 msgid "Add folder to your list of subscribed folders"
 msgstr "Legg til mappe på listen over abonnerte mapper"
 
-#: ../ui/evolution-subscribe.xml.h:2
-msgid "F_older"
-msgstr "M_appe"
-
 #: ../ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "Les listen på nytt"
@@ -17197,6 +17352,10 @@ msgstr "Abonner"
 msgid "Unsubscribe"
 msgstr "Fjern abonnement"
 
+#: ../ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
+msgstr "_Reverser utvalg"
+
 #: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "Kopier valgt oppgave"
@@ -17253,153 +17412,157 @@ msgstr "Endre innstillinger for Evolution"
 msgid "Change the visibility of the toolbar"
 msgstr "Endre synlighet for verktøylinjen"
 
-#: ../ui/evolution.xml.h:6
+#: ../ui/evolution.xml.h:5
 msgid "Create a new window displaying this folder"
 msgstr "Opprett et nytt vindu som viser denne mappen"
 
-#: ../ui/evolution.xml.h:7
+#: ../ui/evolution.xml.h:6
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr ""
 
-#: ../ui/evolution.xml.h:8
+#: ../ui/evolution.xml.h:7
 msgid "Display window buttons with icons and text"
 msgstr ""
 
-#: ../ui/evolution.xml.h:9
+#: ../ui/evolution.xml.h:8
 msgid "Display window buttons with icons only"
 msgstr ""
 
-#: ../ui/evolution.xml.h:10
+#: ../ui/evolution.xml.h:9
 msgid "Display window buttons with text only"
 msgstr ""
 
-#: ../ui/evolution.xml.h:11
-msgid "E_xit"
-msgstr "A_vslutt"
-
-#: ../ui/evolution.xml.h:12
+#: ../ui/evolution.xml.h:10
 msgid "Evolution _FAQ"
 msgstr "Evolution _FAQ"
 
-#: ../ui/evolution.xml.h:13
+#: ../ui/evolution.xml.h:11
 msgid "Exit the program"
 msgstr "Avslutt programmet"
 
-#: ../ui/evolution.xml.h:14
+#: ../ui/evolution.xml.h:12
 msgid "Forget _Passwords"
 msgstr "Glem passor_d"
 
-#: ../ui/evolution.xml.h:15
+#: ../ui/evolution.xml.h:13
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Glem alle passord slik at du vil bli spurt om å oppgi dem igjen"
 
-#: ../ui/evolution.xml.h:16
+#: ../ui/evolution.xml.h:14
 msgid "Hide window buttons"
 msgstr "Skjul vindusknapper"
 
-#: ../ui/evolution.xml.h:17
+#: ../ui/evolution.xml.h:15
 msgid "Icons _and text"
 msgstr "Ikoner _og tekst"
 
-#: ../ui/evolution.xml.h:18
+#: ../ui/evolution.xml.h:16
 msgid "Import data from other programs"
 msgstr "Importer data fra andre programmer"
 
-#: ../ui/evolution.xml.h:20
+#: ../ui/evolution.xml.h:18
 msgid "New _Window"
 msgstr "Nytt _vindu"
 
-#: ../ui/evolution.xml.h:21
-msgid "Pi_lot Settings..."
-msgstr "Innstillinger for pi_lot..."
-
-#: ../ui/evolution.xml.h:22
+#: ../ui/evolution.xml.h:19
 msgid "Prefere_nces"
 msgstr "_Brukervalg"
 
-#: ../ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:20
 msgid "Send / Receive"
 msgstr "Send / motta"
 
-#: ../ui/evolution.xml.h:24
+#: ../ui/evolution.xml.h:21
 msgid "Send queued items and retrieve new items"
 msgstr "Send kølagte oppføringer og hent nye oppføringer"
 
-#: ../ui/evolution.xml.h:25
+#: ../ui/evolution.xml.h:22
 msgid "Set up Pilot configuration"
 msgstr "Konfigurer Pilot"
 
-#: ../ui/evolution.xml.h:26
+#: ../ui/evolution.xml.h:23
 msgid "Show information about Evolution"
 msgstr "Vis informasjon om Evolution"
 
-#: ../ui/evolution.xml.h:27
+#: ../ui/evolution.xml.h:24
 msgid "Submit Bug Report"
 msgstr "Send inn feilrapport"
 
-#: ../ui/evolution.xml.h:28
+#: ../ui/evolution.xml.h:25
 msgid "Submit _Bug Report"
 msgstr "Sen_d inn feilrapport"
 
-#: ../ui/evolution.xml.h:29
+#: ../ui/evolution.xml.h:26
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Send inn en feilrapport med Bug Buddy"
 
-#: ../ui/evolution.xml.h:30
+#: ../ui/evolution.xml.h:27
 msgid "Toggle whether we are working offline."
 msgstr "Skift til frakoblet arbeidsmodus."
 
-#: ../ui/evolution.xml.h:31
+#: ../ui/evolution.xml.h:28
 msgid "Tool_bar"
 msgstr "_Verktøylinje"
 
-#: ../ui/evolution.xml.h:32
+#: ../ui/evolution.xml.h:29
 msgid "Tool_bar style"
 msgstr "S_til for verktøylinje"
 
-#: ../ui/evolution.xml.h:33
-msgid "Window B_uttons"
-msgstr "Vinduskn_apper"
-
-#: ../ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:30
 msgid "_About Evolution..."
 msgstr "_Om Evolution..."
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:31
+msgid "_Close Window"
+msgstr "_Lukk vindu"
+
+#: ../ui/evolution.xml.h:34
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ../ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:35
 msgid "_Hide buttons"
 msgstr "_Skjul knapper"
 
-#: ../ui/evolution.xml.h:42
+#: ../ui/evolution.xml.h:36
 msgid "_Icons only"
 msgstr "Kun _ikoner"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:37
 msgid "_Import..."
 msgstr "_Importer..."
 
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:38
 msgid "_New"
 msgstr "_Ny"
 
-#: ../ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:39
 msgid "_Quick Reference"
 msgstr "_Hurtigreferanse"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:40
+msgid "_Quit"
+msgstr "A_vslutt"
+
+#: ../ui/evolution.xml.h:41
 msgid "_Send / Receive"
 msgstr "_Send / motta"
 
-#: ../ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:42
+msgid "_Switcher Appearance"
+msgstr ""
+
+#: ../ui/evolution.xml.h:43
+msgid "_Synchronization Options..."
+msgstr "Alternativer for _synkronisering..."
+
+#: ../ui/evolution.xml.h:44
 msgid "_Text only"
 msgstr "Kun _tekst"
 
-#: ../ui/evolution.xml.h:50
-msgid "_Window"
-msgstr "_Vindu"
+#: ../ui/evolution.xml.h:45
+msgid "_Tools"
+msgstr "Ve_rktøy"
 
 #: ../views/addressbook/galview.xml.h:1
 msgid "By _Company"
@@ -17496,11 +17659,11 @@ msgstr ""
 "tidssone.\n"
 "Bru høyre musknapp til å zoome ut."
 
-#: ../widgets/menus/gal-view-menus.c:292
+#: ../widgets/menus/gal-view-menus.c:291
 msgid "_Current View"
 msgstr "_Aktiv visning"
 
-#: ../widgets/menus/gal-view-menus.c:360
+#: ../widgets/menus/gal-view-menus.c:359
 msgid "Save Custom View..."
 msgstr "Lagre egendefinert visning..."
 
@@ -17511,7 +17674,7 @@ msgid "MTWTFSS"
 msgstr "MTOTFLS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1123
+#: ../widgets/misc/e-calendar-item.c:1099
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -17523,7 +17686,7 @@ msgstr "Forrige knapp"
 msgid "Month Calendar"
 msgstr "Månedskalender"
 
-#: ../widgets/misc/e-cell-date-edit.c:232 ../widgets/misc/e-dateedit.c:444
+#: ../widgets/misc/e-cell-date-edit.c:232 ../widgets/misc/e-dateedit.c:451
 msgid "Now"
 msgstr "Nå"
 
@@ -17624,59 +17787,34 @@ msgstr "Andre..."
 msgid "..."
 msgstr "..."
 
-#: ../widgets/misc/e-dateedit.c:313
+#: ../widgets/misc/e-dateedit.c:316
 msgid "Date and Time Entry"
 msgstr "Felt for dato & klokkeslett"
 
-#: ../widgets/misc/e-dateedit.c:332
+#: ../widgets/misc/e-dateedit.c:335
 msgid "Text entry to input date"
 msgstr ""
 
-#: ../widgets/misc/e-dateedit.c:333
+#: ../widgets/misc/e-dateedit.c:336
 msgid "Text Date Entry"
 msgstr ""
 
-#: ../widgets/misc/e-dateedit.c:350
+#: ../widgets/misc/e-dateedit.c:353
 msgid "Click this button to show a calendar"
 msgstr "Klikk på denne knappen for å vise en kalender"
 
-#: ../widgets/misc/e-dateedit.c:351
+#: ../widgets/misc/e-dateedit.c:354
 msgid "Date Button"
 msgstr "Datoknapp"
 
-#: ../widgets/misc/e-dateedit.c:371
+#: ../widgets/misc/e-dateedit.c:374
 msgid "Combo box to select time"
 msgstr ""
 
-#: ../widgets/misc/e-dateedit.c:372
+#: ../widgets/misc/e-dateedit.c:375
 msgid "Time Combo Box"
 msgstr ""
 
-#: ../widgets/misc/e-error.c:84 ../widgets/misc/e-error.c:85
-#: ../widgets/misc/e-error.c:127
-msgid "Evolution Error"
-msgstr "Evolution feil"
-
-#: ../widgets/misc/e-error.c:86 ../widgets/misc/e-error.c:87
-#: ../widgets/misc/e-error.c:125
-msgid "Evolution Warning"
-msgstr "Evolution advarsel"
-
-#: ../widgets/misc/e-error.c:124
-msgid "Evolution Information"
-msgstr "Evolution informasjon"
-
-#: ../widgets/misc/e-error.c:126
-msgid "Evolution Query"
-msgstr "Evolution spørring"
-
-#. setup a dummy error
-#: ../widgets/misc/e-error.c:438
-#, c-format
-msgid ""
-"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
-msgstr "<span weight=\"bold\">Intern feil, ukjent feil «%s» etterspurt</span>"
-
 #: ../widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr "Utvidet"
@@ -17753,8 +17891,8 @@ msgid "_Edit Saved Searches..."
 msgstr "R_ediger lagrede søk..."
 
 #: ../widgets/misc/e-filter-bar.h:94 ../widgets/misc/e-filter-bar.h:101
-msgid "_Advanced..."
-msgstr "_Avansert..."
+msgid "_Advanced Search..."
+msgstr "_Avansert søk..."
 
 #: ../widgets/misc/e-image-chooser.c:172
 msgid "Choose Image"
@@ -17784,43 +17922,43 @@ msgstr "Synkroniser kategorier:"
 
 #. To translators: This is the accessibility name of
 #. the search bar's text entry widget
-#: ../widgets/misc/e-search-bar.c:343
+#: ../widgets/misc/e-search-bar.c:345
 msgid "Search Text Entry"
 msgstr "Felt for søketekst"
 
-#: ../widgets/misc/e-search-bar.c:547
+#: ../widgets/misc/e-search-bar.c:549
 msgid "_Search"
 msgstr "_Søk"
 
-#: ../widgets/misc/e-search-bar.c:553
+#: ../widgets/misc/e-search-bar.c:555
 msgid "_Find Now"
 msgstr "_Finn nå "
 
-#: ../widgets/misc/e-search-bar.c:554 ../widgets/misc/e-search-bar.c:941
+#: ../widgets/misc/e-search-bar.c:556 ../widgets/misc/e-search-bar.c:943
 msgid "_Clear"
 msgstr "_Tøm"
 
-#: ../widgets/misc/e-search-bar.c:645
+#: ../widgets/misc/e-search-bar.c:647
 msgid "Search Type"
 msgstr "Type søk"
 
-#: ../widgets/misc/e-search-bar.c:849
+#: ../widgets/misc/e-search-bar.c:851
 msgid "Item ID"
 msgstr "ID for oppføring"
 
-#: ../widgets/misc/e-search-bar.c:856
+#: ../widgets/misc/e-search-bar.c:858
 msgid "Subitem ID"
 msgstr "ID for underoppføring"
 
-#: ../widgets/misc/e-search-bar.c:863
+#: ../widgets/misc/e-search-bar.c:865
 msgid "Text"
 msgstr "Tekst"
 
-#: ../widgets/misc/e-search-bar.c:943
+#: ../widgets/misc/e-search-bar.c:945
 msgid "Find _Now"
 msgstr "Finn _nå "
 
-#: ../widgets/misc/e-send-options.c:505
+#: ../widgets/misc/e-send-options.c:515
 msgid "When de_leted:"
 msgstr "Når s_lettet:"
 
@@ -17870,14 +18008,6 @@ msgstr ""
 
 #: ../widgets/misc/e-send-options.glade.h:12
 msgid ""
-"None\n"
-"Mail Receipt\n"
-msgstr ""
-"Ingen\n"
-"E-postkvittering\n"
-
-#: ../widgets/misc/e-send-options.glade.h:15
-msgid ""
 "Public\n"
 "Private\n"
 "Confidential\n"
@@ -17886,15 +18016,15 @@ msgstr ""
 "Privat\n"
 "Konfidensiell\n"
 
-#: ../widgets/misc/e-send-options.glade.h:19
+#: ../widgets/misc/e-send-options.glade.h:16
 msgid "R_eply requested"
 msgstr "Svar for_espurt"
 
-#: ../widgets/misc/e-send-options.glade.h:21
-msgid "Sta_tus  Tracking"
+#: ../widgets/misc/e-send-options.glade.h:18
+msgid "Sta_tus Tracking"
 msgstr "Sta_tusoppfølging"
 
-#: ../widgets/misc/e-send-options.glade.h:22
+#: ../widgets/misc/e-send-options.glade.h:19
 msgid ""
 "Undefined\n"
 "High\n"
@@ -17906,73 +18036,53 @@ msgstr ""
 "Standard\n"
 "Lav"
 
-#: ../widgets/misc/e-send-options.glade.h:26
+#: ../widgets/misc/e-send-options.glade.h:23
 msgid "W_ithin"
 msgstr "_Innen"
 
-#: ../widgets/misc/e-send-options.glade.h:27
-msgid "When acce_pted: "
-msgstr "Når go_dtatt: "
+#: ../widgets/misc/e-send-options.glade.h:24
+msgid "When acce_pted:"
+msgstr "Ved go_dkjenning:"
 
-#: ../widgets/misc/e-send-options.glade.h:28
+#: ../widgets/misc/e-send-options.glade.h:25
 msgid "When co_mpleted:"
-msgstr "Når full_ført:"
+msgstr "Ved full_føring:"
 
-#: ../widgets/misc/e-send-options.glade.h:29
-msgid "When decli_ned:    "
-msgstr "Når _avslått:"
+#: ../widgets/misc/e-send-options.glade.h:26
+msgid "When decli_ned:"
+msgstr "Ved _avslag:"
 
-#: ../widgets/misc/e-send-options.glade.h:30
+#: ../widgets/misc/e-send-options.glade.h:27
 msgid "_After:"
 msgstr "_Etter:"
 
-#: ../widgets/misc/e-send-options.glade.h:31
+#: ../widgets/misc/e-send-options.glade.h:28
 msgid "_All information"
 msgstr "_All informasjon"
 
-#: ../widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.glade.h:29
 msgid "_Delay message delivery"
 msgstr "_Utsett meldingslevering"
 
-#: ../widgets/misc/e-send-options.glade.h:33
+#: ../widgets/misc/e-send-options.glade.h:30
 msgid "_Delivered"
 msgstr "_Levert"
 
-#: ../widgets/misc/e-send-options.glade.h:35
-msgid "_Set expiration  date"
+#: ../widgets/misc/e-send-options.glade.h:32
+msgid "_Set expiration date"
 msgstr "_Sett utløpsdato"
 
-#: ../widgets/misc/e-send-options.glade.h:36
+#: ../widgets/misc/e-send-options.glade.h:33
 msgid "_Until:"
 msgstr "_Inntil:"
 
-#: ../widgets/misc/e-send-options.glade.h:37
+#: ../widgets/misc/e-send-options.glade.h:34
 msgid "_When convenient"
 msgstr "_Når det passer"
 
-#: ../widgets/misc/e-send-options.glade.h:38
-msgid "_When opened:     "
-msgstr "_Når den åpnes:"
-
-#. system:ask-save-file-exists-overwrite primary
-#: ../widgets/misc/e-system-errors.xml.h:4
-msgid "File exists \"{0}\"."
-msgstr "Filen eksisterer «{0}»."
-
-#. system:ask-save-file-exists-overwrite secondary
-#: ../widgets/misc/e-system-errors.xml.h:6
-msgid "Do you wish to overwrite it?"
-msgstr "Vil du overskrive den?"
-
-#. system:no-save-file primary
-#: ../widgets/misc/e-system-errors.xml.h:9
-msgid "Cannot save file \"{0}\"."
-msgstr "Kan ikke lagre fil «{0}»."
-
-#. system:no-load-file primary
-#: ../widgets/misc/e-system-errors.xml.h:13
-msgid "Cannot open file \"{0}\"."
-msgstr "Kan ikke åpne filen «{0}»."
+#: ../widgets/misc/e-send-options.glade.h:35
+msgid "_When opened:"
+msgstr "_Ved åpning:"
 
 #: ../widgets/misc/e-task-widget.c:208
 #, c-format
@@ -17987,3 +18097,256 @@ msgstr "%s (%d%% fullført)"
 #: ../widgets/misc/e-url-entry.c:107
 msgid "click here to go to url"
 msgstr "klikk her for å gå til lokasjonen"
+
+#~ msgid "end-time"
+#~ msgstr "slutt-tid"
+
+#~ msgid "location"
+#~ msgstr "lokasjon"
+
+#~ msgid "start-time"
+#~ msgstr "start-tid"
+
+#~ msgid "Show _Attachment Bar (drop attachments here)"
+#~ msgstr "Vis _vedleggsfeltet (slipp vedlegg her)"
+
+#~ msgid "Attachment Button: Press space key to toggle attachment bar"
+#~ msgstr "Vedleggsknapp: Trykk mellomrom for å slå av/på vedleggsfeletet"
+
+#~ msgid "Ad_vanced  send options"
+#~ msgstr "A_vanserte alternativer for sending"
+
+#~ msgid "N"
+#~ msgstr "N"
+
+#~ msgid "S"
+#~ msgstr "S"
+
+#~ msgid "W"
+#~ msgstr "V"
+
+#~ msgid "_Remember this password"
+#~ msgstr "Husk dette passo_rdet"
+
+#~ msgid "_Remember this password for the remainder of this session"
+#~ msgstr "Husk dette passo_rdet for resten av denne sesjonen"
+
+#~ msgid "<b>If</b>"
+#~ msgstr "<b>Hvis</b> "
+
+#~ msgid "Create New Folder"
+#~ msgstr "Opprett ny mappe"
+
+#~ msgid "Copying `%s' to `%s'"
+#~ msgstr "Kopierer «%s» til «%s»"
+
+#~ msgid "Rename the \"%s\" folder to:"
+#~ msgstr "Endre navn på mappe «%s» til:"
+
+#~ msgid "Rename Folder"
+#~ msgstr "Endre navn på mappe"
+
+#~ msgid "Folder names cannot contain '/'"
+#~ msgstr "Mappenavn kan ikke inneholde tegnet «/»"
+
+#~ msgid "_Print"
+#~ msgstr "S_kriv ut"
+
+#~ msgid "spamd port"
+#~ msgstr "port for spamd"
+
+#~ msgid "_Load images if sender is in address book"
+#~ msgstr "_Last bilder hvis avsender er i adresseboken"
+
+#~ msgid ""
+#~ "\n"
+#~ " Please read carefully the license agreement displayed\n"
+#~ " below and tick the check box for accepting it\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Vennligst les lisensavtalen som vises under nøye\n"
+#~ "og kryss av i ruten for å akseptere den\n"
+
+#~ msgid "{1}."
+#~ msgstr "{1}."
+
+#~ msgid "Mark  as default folder"
+#~ msgstr "Sett som forvalgt mappe"
+
+#~ msgid "Manage Plugins..."
+#~ msgstr "Håndter tillegg..."
+
+#~ msgid "%s%d/%s%d/%s%d %s%d:%s%d:%s%d"
+#~ msgstr "%s%d/%s%d/%s%d %s%d:%s%d:%s%d"
+
+#~ msgid "Invalid user"
+#~ msgstr "Ugyldig bruker"
+
+#~ msgid ""
+#~ "\n"
+#~ "You cannot share folder with specified user \"{0}\" \n"
+#~ msgstr ""
+#~ "\n"
+#~ "Du kan ikke dele en mappe med oppgitt bruker «{0}» \n"
+
+#~ msgid "Specify User"
+#~ msgstr "Oppgi bruker"
+
+#~ msgid ""
+#~ "\n"
+#~ "\tYou have to specify a user name whom you want to add to the list \n"
+#~ msgstr ""
+#~ "\n"
+#~ "\tDu må oppgi et brukernavn for brukeren du ønsker å legge til på "
+#~ "listen \n"
+
+#~ msgid "Closing connections..."
+#~ msgstr "Lukker forbindelser..."
+
+#~ msgid "Starting import"
+#~ msgstr "Starter import"
+
+#~ msgid ""
+#~ "If you quit the Evolution Setup Assistant now, all of the information "
+#~ "that you have entered will be forgotten. You will need to run this "
+#~ "assistant again before using Evolution.\n"
+#~ "\n"
+#~ "Do you want to quit using the Assistant now?"
+#~ msgstr ""
+#~ "Hvis du avslutter veiviser for oppsett av Evolution nå vil all "
+#~ "informasjon du har oppgitt hittil bli glemt. Du vil måtte kjøre denne "
+#~ "veiviseren igjen før du kan bruke Evolution.\n"
+#~ "\n"
+#~ "Vil du avslutte veiviseren nå?"
+
+#~ msgid "Importing Files"
+#~ msgstr "Importerer filer"
+
+#~ msgid "Timezone "
+#~ msgstr "Tidssone "
+
+#~ msgid ""
+#~ "You have successfully entered all of the information needed to set up "
+#~ "Evolution. \n"
+#~ "\n"
+#~ "Click the \"Apply\" button to save your settings. "
+#~ msgstr ""
+#~ "Du har fullført inntasting av all informasjon som trengs for å "
+#~ "konfigurere Evolution.\n"
+#~ "\n"
+#~ "Klikk på «Bruk» for å lagre dine innstillinger. "
+
+#~ msgid "Disable the mono plugin environment."
+#~ msgstr "Deaktiver mono-tilleggsmiljø."
+
+#~ msgid "Cannot start Evolution"
+#~ msgstr "Kan ikke starte Evolution."
+
+#~ msgid "Post Ne_w Message"
+#~ msgstr "Legg ut n_y melding"
+
+#~ msgid "_Filters..."
+#~ msgstr "_Filtre..."
+
+#~ msgid "vFolder _Editor..."
+#~ msgstr "R_edigering av virtuelle mapper..."
+
+#~ msgid "Hide _Read Messages"
+#~ msgstr "Skjul leste meldinge_r"
+
+#~ msgid "Mark All as _Read"
+#~ msgstr "Me_rk alle som lest"
+
+#~ msgid "Sh_ow Hidden Messages"
+#~ msgstr "_Vis skjulte meldinger"
+
+#~ msgid "_Folder"
+#~ msgstr "M_appe"
+
+#~ msgid "_Threaded Message List"
+#~ msgstr "Meldingsliste med _tråder"
+
+#~ msgid "Create _vFolder From Message"
+#~ msgstr "Lag _virtuell mappe fra melding"
+
+#~ msgid "F_orward As..."
+#~ msgstr "V_ideresend som..."
+
+#~ msgid "Filter _Junk"
+#~ msgstr "Filtrer s_øppel"
+
+#~ msgid "Mark as I_mportant"
+#~ msgstr "Merk som _viktig"
+
+#~ msgid "Mark as Unimp_ortant"
+#~ msgstr "Merk som uv_iktig"
+
+#~ msgid "Original Si_ze"
+#~ msgstr "Opprinnelig st_ørrelse"
+
+#~ msgid "S_earch in Message..."
+#~ msgstr "Søk i m_elding..."
+
+#~ msgid "S_maller"
+#~ msgstr "_Mindre"
+
+#~ msgid "Show Email _Source"
+#~ msgstr "Vis e-post-kilde"
+
+#~ msgid "Show Full _Headers"
+#~ msgstr "Vis fulle _headere"
+
+#~ msgid "Text Si_ze"
+#~ msgstr "Tekstst_ørrelse"
+
+#~ msgid "_Attached"
+#~ msgstr "Vedl_agt"
+
+#~ msgid "_Create Filter From Message"
+#~ msgstr "La_g filter fra melding"
+
+#~ msgid "_Inline"
+#~ msgstr "_Inline"
+
+#~ msgid "_Larger"
+#~ msgstr "_Større"
+
+#~ msgid "_Message Display"
+#~ msgstr "_Meldingsvisning"
+
+#~ msgid "_Open Message"
+#~ msgstr "_Åpne melding"
+
+#~ msgid "_Undelete"
+#~ msgstr "A_ngre slett"
+
+#~ msgid "Show / hide attachments"
+#~ msgstr "Vis/skjul vedlegg"
+
+#~ msgid "Show _attachments"
+#~ msgstr "Vis _vedlegg"
+
+#~ msgid "Show attachments"
+#~ msgstr "Vis vedlegg"
+
+#~ msgid "E_xit"
+#~ msgstr "A_vslutt"
+
+#~ msgid "Pi_lot Settings..."
+#~ msgstr "Innstillinger for pi_lot..."
+
+#~ msgid "Window B_uttons"
+#~ msgstr "Vinduskn_apper"
+
+#~ msgid "_Window"
+#~ msgstr "_Vindu"
+
+#~ msgid "_Advanced..."
+#~ msgstr "_Avansert..."
+
+#~ msgid ""
+#~ "None\n"
+#~ "Mail Receipt\n"
+#~ msgstr ""
+#~ "Ingen\n"
+#~ "E-postkvittering\n"