[evolution] Updated Norwegian bokmål translation

From: Kjartan Maraas <kmaraas src gnome org>
To: commits-list gnome org
Cc:
Subject: [evolution] Updated Norwegian bokmål translation
Date: Sun, 13 Jun 2010 21:52:00 +0000 (UTC)
commit 7f3377c78a560aa762e04d596b79f847c4acd870
Author: Kjartan Maraas <kmaraas gnome org>
Date:   Sun Jun 13 23:51:50 2010 +0200

    Updated Norwegian bokmÃ¥l translation

 po/nb.po | 3298 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 1691 insertions(+), 1607 deletions(-)
---
diff --git a/po/nb.po b/po/nb.po
index f712267..cdbdcdf 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -4,13 +4,13 @@
 # Terance Edward Sola <terance lyse net>, 2005.
 #
 #
-#: ../shell/main.c:497
+#: ../shell/main.c:502
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 2.30.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-24 16:12+0200\n"
-"PO-Revision-Date: 2010-05-24 16:18+0200\n"
+"POT-Creation-Date: 2010-06-13 23:37+0200\n"
+"PO-Revision-Date: 2010-06-13 23:51+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas gnome org>\n"
 "Language-Team: Norwegian bokmal <i18n-nb lister ping uio no>\n"
 "MIME-Version: 1.0\n"
@@ -84,41 +84,46 @@ msgid "Delete address book '{0}'?"
 msgstr "Slett adressebok Â«{0}Â»?"
 
 #: ../addressbook/addressbook.error.xml.h:13
+#: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:45
+msgid "Do _Not Delete"
+msgstr "Ikke s_lett"
+
+#: ../addressbook/addressbook.error.xml.h:14
 msgid "Error saving {0} to {1}: {2}"
 msgstr "Feil under lagring av {0} til {1}: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:14
+#: ../addressbook/addressbook.error.xml.h:15
 msgid "Failed to authenticate with LDAP server."
 msgstr "Kunne ikke autentisere mot LDAP-tjener."
 
 #. Unknown error
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/addressbook.error.xml.h:16
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1268
 msgid "Failed to delete contact"
 msgstr "Klarte ikke Ã¥ slette kontakt"
 
-#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "GroupWise Address book creation:"
 msgstr "Oppretting av GroupWise adressebok:"
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:18
 msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP-tjener svarte ikke med gyldig schema-informasjon."
 
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:19
 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:19
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "The Evolution address book has quit unexpectedly."
 msgstr "Evolution adressebok avsluttet uventet."
 
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:21
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr "Bildet du valgte er stort. Endre stÃ¸rrelse og lagre?"
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:22
 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 "
@@ -128,15 +133,15 @@ msgstr ""
 "stÃ¸tter denne funksjonaliteten eller sÃ¥ er den satt opp feil. SpÃ¸r din "
 "administrator for stÃ¸ttede sÃ¸kebaser."
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:23
 msgid "This address book could not be opened."
 msgstr "Denne adresseboken kunne ikke Ã¥pnes."
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:24
 msgid "This address book server does not have any suggested search bases."
 msgstr "Denne adresseboktjeneren har ingen foreslÃ¥tt sÃ¸kebase."
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:25
 msgid ""
 "This address book server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
@@ -144,31 +149,31 @@ msgstr ""
 "Adresseboktjeneren din er ikke tilgjengelig eller tjenernavnet er kanskje "
 "stavet feil. Eller sÃ¥ kan nettverkstilkoblingen din vÃ¦re slÃ¥tt av."
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:26
 msgid "This address book will be removed permanently."
 msgstr "Denne adresseboken vil bli slettet for godt."
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:27
 msgid "This server does not support LDAPv3 schema information."
 msgstr "Denne tjeneren stÃ¸tter ikke LDAPv3 schema-informasjon."
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "Unable to open address book"
 msgstr "Kan ikke Ã¥pne adressebok"
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "Unable to perform search."
 msgstr "Kan ikke utfÃ¸re sÃ¸k."
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Unable to save {0}."
 msgstr "Kan ikke lagre {0}."
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "Would you like to save your changes?"
 msgstr "Vil du lagre dine endringer?"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:32
 msgid ""
 "You are attempting to move a contact from one address book to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
@@ -176,7 +181,7 @@ msgstr ""
 "Du prÃ¸ver Ã¥ flytte en kontakt fra en adressebok til en annen men den kan "
 "ikke bli fjernet fra kilden. Vil du lagre en kopi i stedet?"
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:33
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
@@ -186,44 +191,44 @@ msgstr ""
 "muligens stÃ¸te pÃ¥ problemer. Tjeneren bÃ¸r oppgraderes til en stÃ¸ttet versjon "
 "for best ytelse."
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:34
 msgid "You do not have permission to delete contacts in this address book."
 msgstr "Du har ikke rettigheter til Ã¥ slette kontakter i denne adresseboken."
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:35
 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.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:36
 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/addressbook.error.xml.h:36 ../mail/em-vfolder-rule.c:521
+#: ../addressbook/addressbook.error.xml.h:37 ../mail/em-vfolder-rule.c:521
 #: ../plugins/groupwise-features/junk-settings.ui.h:4
 #: ../plugins/groupwise-features/properties.ui.h:10
 #: ../widgets/table/e-table-config.ui.h:18
 msgid "_Add"
 msgstr "_Legg til"
 
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../addressbook/addressbook.error.xml.h:38
 msgid "_Discard"
 msgstr "_Forkast"
 
-#: ../addressbook/addressbook.error.xml.h:38
+#: ../addressbook/addressbook.error.xml.h:39
 msgid "_Do not save"
 msgstr "_Ikke lagre"
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "_Resize"
 msgstr "End_re stÃ¸rrelse"
 
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/addressbook.error.xml.h:41
 msgid "_Use as it is"
 msgstr "Br_uk som den er"
 
@@ -243,7 +248,7 @@ msgstr "Kunne ikke lese pilotens adresseapplikasjonsblokk"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../calendar/gui/e-calendar-view.c:2020
+#: ../calendar/gui/e-calendar-view.c:2022
 msgid "Anniversary"
 msgstr "Bryllupsdag"
 
@@ -254,8 +259,8 @@ msgstr "Bryllupsdag"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
 #: ../addressbook/gui/widgets/eab-contact-display.c:582
-#: ../calendar/gui/e-calendar-view.c:2019 ../capplet/anjal-settings-main.c:118
-#: ../shell/main.c:115
+#: ../calendar/gui/e-calendar-view.c:2021 ../capplet/anjal-settings-main.c:118
+#: ../shell/main.c:116
 msgid "Birthday"
 msgstr "FÃ¸dselsdag"
 
@@ -275,14 +280,14 @@ msgid "Calendar:"
 msgstr "Kalender:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
-#: ../addressbook/importers/evolution-vcard-importer.c:916
+#: ../addressbook/importers/evolution-vcard-importer.c:934
 msgid "Contact"
 msgstr "Kontakt"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:590
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:605
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2570
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2584
 msgid "Contact Editor"
 msgstr "Kontaktredigering"
 
@@ -351,7 +356,7 @@ msgstr "Notater"
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:189
 #: ../addressbook/gui/widgets/eab-contact-display.c:71
 #: ../addressbook/gui/widgets/eab-contact-display.c:460
-#: ../calendar/gui/e-calendar-view.c:1723
+#: ../calendar/gui/e-calendar-view.c:1725
 msgid "Other"
 msgstr "Andre"
 
@@ -372,110 +377,114 @@ msgid "Web Addresses"
 msgstr "Nettadresser"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
+msgid "Web addresses"
+msgstr "Nettadresser"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:187
 #: ../addressbook/gui/widgets/eab-contact-display.c:69
 #: ../addressbook/gui/widgets/eab-contact-display.c:569
 msgid "Work"
 msgstr "Arbeid"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
 msgid "_Address:"
 msgstr "_Adresse:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
 msgid "_Anniversary:"
 msgstr "_Bryllupsdag:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
 msgid "_Assistant:"
 msgstr "_Assistent:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
 msgid "_Birthday:"
 msgstr "_FÃ¸dselsdag:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
 msgid "_Blog:"
 msgstr "_Blogg:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
-#: ../calendar/gui/dialogs/event-page.c:826
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
+#: ../calendar/gui/dialogs/event-page.c:882
 #: ../calendar/gui/dialogs/event-page.ui.h:14
 #: ../plugins/itip-formatter/itip-view.c:1921
 msgid "_Calendar:"
 msgstr "_Kalender:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
 msgid "_City:"
 msgstr "_By:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
 msgid "_Company:"
 msgstr "F_irma:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
 msgid "_Country:"
 msgstr "_Land:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
 msgid "_Department:"
 msgstr "Av_deling:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
 msgid "_File under:"
 msgstr "_Lagre under:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
 msgid "_Free/Busy:"
 msgstr "_Ledig/opptatt:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
 msgid "_Home Page:"
 msgstr "_Hjemmeside:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
 msgid "_Manager:"
 msgstr "_Leder:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
 msgid "_Office:"
 msgstr "K_ontor:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
 msgid "_PO Box:"
 msgstr "_Postboks:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
 msgid "_Profession:"
 msgstr "_Yrke:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
 msgid "_Spouse:"
 msgstr "_Ektefelle:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
 msgid "_State/Province:"
 msgstr "_Stat/Provins:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
 #: ../addressbook/gui/contact-editor/fullname.ui.h:17
 msgid "_Title:"
 msgstr "_Tittel:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
 msgid "_Video Chat:"
 msgstr "_Videoprat:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
 msgid "_Wants to receive HTML mail"
 msgstr "_Ã?nsker Ã¥ motta HTML-formatert e-post"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:50
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:6
 msgid "_Where:"
 msgstr "_Hvor:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:50
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:51
 msgid "_Zip/Postal Code:"
 msgstr "_Zip/postnummer:"
 
@@ -533,20 +542,20 @@ msgid "Error removing contact"
 msgstr "Feil under fjerning av kontakt"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:600
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2565
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2579
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Kontaktredigering - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2973
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2987
 msgid "Please select an image for this contact"
 msgstr "Vennligst velg et bilde for denne kontakten"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2974
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2988
 msgid "_No image"
 msgstr "_Uten bilde"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3247
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3261
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -554,23 +563,23 @@ msgstr ""
 "Kontaktdata er ugyldig:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3251
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3265
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "Â«%sÂ» har ugyldig format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3258
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3272
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%sÂ«%sÂ» har ugyldig format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3273
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3284
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3287
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3298
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%sÂ«%sÂ» er tom"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3298
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3312
 msgid "Invalid contact."
 msgstr "Ugyldig kontakt."
 
@@ -660,7 +669,7 @@ msgid "_Suffix:"
 msgstr "_Suffiks:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:676
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:683
 msgid "Contact List Editor"
 msgstr "Kontaktlisteredigering"
 
@@ -685,24 +694,24 @@ msgctxt "yes"
 msgid "_Select..."
 msgstr "_Velg..."
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:769
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:776
 msgid "Contact List Members"
 msgstr "Kontaktlistemedlemmer"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:917
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1333
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:924
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1340
 msgid "_Members"
 msgstr "_Medlemmer"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1172
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1179
 msgid "Error adding list"
 msgstr "Feil under innlegging av liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1186
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1193
 msgid "Error modifying list"
 msgstr "Feil ved endring av liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1200
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1207
 msgid "Error removing list"
 msgstr "Feil under fjerning av liste"
 
@@ -756,7 +765,7 @@ msgstr "Flett kontakt"
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
 #: ../modules/addressbook/e-book-shell-view-actions.c:904
-#: ../modules/calendar/e-cal-shell-view-actions.c:1685
+#: ../modules/calendar/e-cal-shell-view-actions.c:1687
 #: ../modules/calendar/e-memo-shell-view-actions.c:767
 #: ../modules/calendar/e-task-shell-view-actions.c:967
 msgid "Any field contains"
@@ -990,7 +999,7 @@ msgid "Radio"
 msgstr "Radio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:578
+#: ../calendar/gui/e-meeting-list-view.c:569
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Rolle"
@@ -1099,7 +1108,7 @@ msgstr "Annen e-post"
 
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:95
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:104
-#: ../addressbook/gui/widgets/ea-minicard-view.c:178
+#: ../addressbook/gui/widgets/ea-minicard-view.c:184
 msgid "evolution address book"
 msgstr "evolution adressebok"
 
@@ -1111,7 +1120,7 @@ msgstr "Ny kontakt"
 msgid "New Contact List"
 msgstr "Ny kontaktliste"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:161
+#: ../addressbook/gui/widgets/ea-minicard-view.c:167
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -1188,7 +1197,7 @@ msgstr "Videosamtale"
 #: ../calendar/gui/dialogs/calendar-setup.c:370
 #: ../modules/calendar/e-cal-shell-view-actions.c:218
 #: ../modules/calendar/e-cal-shell-view-actions.c:247
-#: ../modules/calendar/e-cal-shell-view.c:498
+#: ../modules/calendar/e-cal-shell-view.c:488
 #: ../plugins/groupwise-features/camel-gw-listener.c:421
 #: ../plugins/groupwise-features/camel-gw-listener.c:446
 #: ../plugins/groupwise-features/camel-gw-listener.c:561
@@ -1199,7 +1208,8 @@ msgstr "Kalender"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:563
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:17
-#: ../calendar/gui/dialogs/event-editor.c:116
+#: ../calendar/gui/dialogs/event-editor.c:125
+#: ../calendar/gui/dialogs/event-editor.c:352
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "Free/Busy"
 msgstr "Ledig/opptatt"
@@ -1233,7 +1243,7 @@ msgstr "Nettdagbok"
 #: ../addressbook/gui/widgets/eab-contact-display.c:586
 #: ../capplet/settings/mail-capplet-shell.c:350
 #: ../modules/addressbook/e-book-shell-backend.c:176
-#: ../modules/addressbook/e-book-shell-migrate.c:134
+#: ../modules/addressbook/e-book-shell-migrate.c:138
 #: ../modules/calendar/e-cal-shell-backend.c:180
 #: ../modules/calendar/e-cal-shell-migrate.c:151
 #: ../modules/calendar/e-memo-shell-backend.c:154
@@ -1477,7 +1487,7 @@ msgstr "Kopier kontakter til"
 msgid "Card View"
 msgstr "Kortvisning"
 
-#: ../addressbook/importers/evolution-csv-importer.c:654
+#: ../addressbook/importers/evolution-csv-importer.c:720
 #: ../addressbook/importers/evolution-ldif-importer.c:516
 #: ../addressbook/importers/evolution-vcard-importer.c:264
 #: ../calendar/importers/icalendar-importer.c:325
@@ -1485,27 +1495,27 @@ msgstr "Kortvisning"
 msgid "Importing..."
 msgstr "Importerer..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:937
+#: ../addressbook/importers/evolution-csv-importer.c:1008
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV eller Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:938
+#: ../addressbook/importers/evolution-csv-importer.c:1009
 msgid "Outlook CSV and Tab Importer"
 msgstr "Outlook CSV og Tab-import"
 
-#: ../addressbook/importers/evolution-csv-importer.c:946
+#: ../addressbook/importers/evolution-csv-importer.c:1017
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV eller Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:947
+#: ../addressbook/importers/evolution-csv-importer.c:1018
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Mozilla CSV og Tab-import"
 
-#: ../addressbook/importers/evolution-csv-importer.c:955
+#: ../addressbook/importers/evolution-csv-importer.c:1026
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV eller Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:956
+#: ../addressbook/importers/evolution-csv-importer.c:1027
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution CSV og Tab-import"
 
@@ -1527,7 +1537,7 @@ msgstr "Evolution vCard-import"
 
 #. Uncomment next if it is successful to get total number if pages in list view
 #. * g_object_get (operation, "n-pages", &n_pages, NULL)
-#: ../addressbook/printing/e-contact-print.c:733
+#: ../addressbook/printing/e-contact-print.c:737
 #, c-format
 msgid "Page %d"
 msgstr "Side %d"
@@ -1787,23 +1797,23 @@ msgstr "Slett notatliste Â«{0}Â»?"
 msgid "Delete task list '{0}'?"
 msgstr "Slett oppgaveliste Â«{0}Â»?"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:35
 msgid "Do _not Send"
 msgstr "Ikke se_nd"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:36
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "Nedlasting pÃ¥gÃ¥r. Vil du lagre avtalen?"
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:37
 msgid "Download in progress. Do you want to save the task?"
 msgstr "Nedlasting pÃ¥gÃ¥r. Vil du lagre oppgaven?"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:38
 msgid "Editor could not be loaded."
 msgstr "Redigeringskomponenten kunne ikke lastes."
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:39
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
@@ -1811,25 +1821,25 @@ msgstr ""
 "Invitasjoner vil sendes til alle deltakere via e-post slik at de kan godta "
 "denne oppgaven."
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:40
 msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 "Invitasjoner vil sendes til alle deltakere via e-post slik at de kan gi svar."
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:41
 msgid "Error loading calendar"
 msgstr "Feil under lasting av kalender"
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:42
 msgid "Error loading memo list"
 msgstr "Feil under lasting av notatliste"
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:43
 msgid "Error loading task list"
 msgstr "Feil under lasting av oppgaveliste"
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:44
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
@@ -1837,7 +1847,7 @@ msgstr ""
 "Hvis du ikke sender en avlysningsmelding vil ikke deltakerene vite at mÃ¸tet "
 "er avlyst."
 
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:45
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
@@ -1845,7 +1855,7 @@ msgstr ""
 "Hvis du ikke sender en avlysningsmelding vil ikke de andre deltakerene vite "
 "at notatet er slettet."
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:46
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
@@ -1853,7 +1863,7 @@ msgstr ""
 "Hvis du ikke sender en avlysningsmelding vil ikke de andre deltakerene vite "
 "at oppgaven er slettet."
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -1861,7 +1871,7 @@ msgstr ""
 "Sending av oppdatert informasjon lar andre deltakere holde sine kalendere "
 "oppdatert."
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -1869,7 +1879,7 @@ msgstr ""
 "Sending av oppdatert informasjon lar andre deltakere holde sine "
 "oppgavelister oppdatert."
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:49
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
@@ -1877,7 +1887,7 @@ msgstr ""
 "Noen vedlegg blir lastet ned. Avtalen vil bli lagret uten disse vedleggene "
 "hvis den blir lagret nÃ¥."
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:50
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -1885,91 +1895,91 @@ msgstr ""
 "Noen vedlegg blir lastet ned. Oppgaven vil bli lagret uten disse vedleggene "
 "hvis den blir lagret nÃ¥."
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:51
 msgid "Some features may not work properly with your current server."
 msgstr "Noen funksjoner vil kanskje ikke fungere med denne tjeneren."
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:52
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Evolution-kalender har avsluttet uventet."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:53
 msgid "The Evolution calendars have quit unexpectedly."
 msgstr "Evolution-kalender har avsluttet uventet."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:54
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Evolution-notater har avsluttet uventet."
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:55
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Evolution-oppgaver har avsluttet uventet."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:56
 msgid "The calendar is not marked for offline usage."
 msgstr "Kalenderen er ikke merket for frakoblet bruk."
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:57
 msgid "The memo list is not marked for offline usage."
 msgstr "Notatlisten er ikke merket for frakoblet bruk."
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:58
 msgid "The task list is not marked for offline usage."
 msgstr "Oppgavelisten er ikke merket for frakoblet bruk."
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:59
 msgid "This calendar will be removed permanently."
 msgstr "Denne kalenderen vil bli fjernet permanent."
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:60
 msgid "This memo list will be removed permanently."
 msgstr "Denne notatlisten vil bli fjernet permanent."
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:61
 msgid "This task list will be removed permanently."
 msgstr "Denne oppgavelisten vil bli fjernet permanent."
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:62
 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:62
+#: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to save your changes to this meeting?"
 msgstr "Vil du lagre dine endringer i dette mÃ¸tet?"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to save your changes to this memo?"
 msgstr "Vil du lagre dine endringer i dette notatet?"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:65
 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:65
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "Vil du sende en avlysingsmelding for dette notatet?"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "Vil du sende en avlysningsmelding til alle deltakere?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:68
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Vil du sende mÃ¸teinvitasjoner til deltakerene?"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to send this task to participants?"
 msgstr "Vil du sende denne oppgaven til deltakere?"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:70
 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:70
+#: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to send updated task information to participants?"
 msgstr "Vil du sende oppdatert oppgaveinformasjon til deltakere?"
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:72
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -1979,57 +1989,57 @@ msgstr ""
 "muligens stÃ¸te pÃ¥ problemer. Tjeneren bÃ¸r oppgraderes til en stÃ¸ttet versjon "
 "for Ã¥ unngÃ¥ problemer."
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:73
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "Du har endret denne avtalen, men ikke lagret den."
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:74
 msgid "You have changed this meeting, but not yet saved it."
 msgstr "Du har endret dette mÃ¸tet, men ikke lagret det."
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:75
 msgid "You have changed this task, but not yet saved it."
 msgstr "Du har endret denne oppgaven, men ikke lagret den."
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:76
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "Du har endret dette notatet, men ikke lagret den."
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:77
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr ""
 "Kalenderene dine vil ikke vÃ¦re tilgjengelige fÃ¸r Evolution startes pÃ¥ nytt."
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:78
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr ""
 "Notatene dine vil ikke vÃ¦re tilgjengelige fÃ¸r Evolution startes pÃ¥ nytt."
 
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:79
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr ""
 "Oppgavene dine vil ikke vÃ¦re tilgjengelige fÃ¸r Evolution startes pÃ¥ nytt."
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:80
 #: ../composer/mail-composer.error.xml.h:24
 msgid "_Discard Changes"
 msgstr "_Forkast endringer"
 
-#: ../calendar/calendar.error.xml.h:80 ../composer/e-composer-actions.c:309
+#: ../calendar/calendar.error.xml.h:81 ../composer/e-composer-actions.c:309
 msgid "_Save"
 msgstr "_Lagre"
 
-#: ../calendar/calendar.error.xml.h:81
+#: ../calendar/calendar.error.xml.h:82
 msgid "_Save Changes"
 msgstr "_Lagre endringer"
 
-#: ../calendar/calendar.error.xml.h:82
-#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:134
+#: ../calendar/calendar.error.xml.h:83
+#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:133
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "_Send"
 
-#: ../calendar/calendar.error.xml.h:83
+#: ../calendar/calendar.error.xml.h:84
 msgid "_Send Notice"
 msgstr "_Send melding"
 
@@ -2102,8 +2112,8 @@ msgstr "Avvis _alle"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1573
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1579
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
 #: ../calendar/gui/e-itip-control.c:1175
 #: ../plugins/itip-formatter/itip-view.c:1043
 msgid "Location:"
@@ -2118,11 +2128,11 @@ msgid "_Dismiss"
 msgstr "A_vvis"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1016
+#: ../calendar/gui/dialogs/comp-editor.c:1021
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
 #: ../mail/e-mail-browser.c:151
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1625
+#: ../shell/e-shell-window-actions.c:1646
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "R_ediger"
@@ -2152,32 +2162,32 @@ msgstr "sted for avtalen"
 msgid "minutes"
 msgstr "minutter"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1434
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1556
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1454
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1576
 msgid "No summary available."
 msgstr "Sammendrag er ikke tilgjengelig."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1443
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1445
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1463
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1465
 msgid "No description available."
 msgstr "Ingen beskrivelse tilgjengelig."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1453
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1473
 msgid "No location information available."
 msgstr "Stedsinformasjon er ikke tilgjengelig."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1496
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1516
 #, c-format
 msgid "You have %d alarms"
 msgstr "Du har %d alarmer"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1669
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1689
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1722
 #: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1673
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1693
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -2189,7 +2199,7 @@ msgstr ""
 "er konfigurert til Ã¥ sende e-post. Evolution vil vise\n"
 "en vanlig dialog med pÃ¥minnelsen i stedet."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1708
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1728
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2205,7 +2215,7 @@ msgstr ""
 "\n"
 "Er du sikker pÃ¥ at du vil kjÃ¸re dette programmet?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1743
 msgid "Do not ask me about this program again."
 msgstr "Ikke spÃ¸r meg om dette programmet igjen."
 
@@ -2374,7 +2384,7 @@ msgid "Last alarm time"
 msgstr "Siste varslingstid"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Level beyond which the message should be logged."
 msgstr "Over dette nivÃ¥et skal meldingen logges."
 
@@ -2569,14 +2579,10 @@ msgid "Show type field in the event/task/meeting editor"
 msgstr "Vis typefelt ved redigering av hendelse/oppgave/mÃ¸te"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
-msgid "Show week number in Day and Work Week View"
-msgstr "Vis ukenummer i dag- og arbeidsukevisning"
+msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
+msgstr "Vis ukenummer i dagvisning, arbeidsukevisning og datonavigator"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
-msgid "Show week numbers in date navigator"
-msgstr "Vis ukenummer i datovelger"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid ""
 "Shows the second time zone in a Day View, if set. Value is similar to one "
 "used in a 'timezone' key."
@@ -2584,23 +2590,23 @@ msgstr ""
 "Viser sekundÃ¦rtidssone i en dagvisning hvis den er satt. Verdien er lik den "
 "som brukes i nÃ¸kkelen Â«tidssoneÂ»."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid "Task layout style"
 msgstr "Stil for utforming av oppgaver"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid "Task preview pane position (horizontal)"
 msgstr "Posisjon for forhÃ¥ndsvisning av oppgaver (horisontal)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Task preview pane position (vertical)"
 msgstr "Posisjon for forhÃ¥ndsvisning av oppgaver (vertikal)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Tasks due today color"
 msgstr "Farge for oppgaver som gÃ¥r ut i dag"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -2609,7 +2615,7 @@ msgstr ""
 "URL-mal som brukes som reservelÃ¸sning for ledig/opptatt, %u er erstattet med "
 "brukerdelen av e-postadressen og %d er erstattet med domenet."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -2617,25 +2623,25 @@ msgstr ""
 "Den forvalgte tidssonen Ã¥ bruke for datoer og tidspunkt i kalenderen som en "
 "uoversatt Olsen tidssonedatabaselokasjon som Â«America/New YorkÂ»."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the memo list. \"0\" (Classic View) places the preview pane below the memo "
 "list. \"1\" (Vertical View) places the preview pane next to the memo list."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the task list. \"0\" (Classic View) places the preview pane below the task "
 "list. \"1\" (Vertical View) places the preview pane next to the task list."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
 msgid "The second timezone for a Day View"
 msgstr "SekundÃ¦r tidssone for dagvisning"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid ""
 "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
 "debug messages."
@@ -2643,19 +2649,19 @@ msgstr ""
 "Denne har tre mulige verdier. 0 for feil. 1 for advarsler. 2 for "
 "feilsÃ¸kingsmeldinger."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid "Time divisions"
 msgstr "Oppdeling av tid"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Time the last alarm ran, in time_t."
 msgstr "Tid for forrige alarm, som time_t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Timezone"
 msgstr "Tidssone"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
@@ -2663,70 +2669,70 @@ msgstr ""
 "Gjennomsiktighet for hendelser i kalendervisningen (En verdi mellom 0 "
 "(gjennomsiktig) og 1 (ugjennomsiktig)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Twenty four hour time format"
 msgstr "24-timers tidsformat"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid "URI of the highlighted (\"primary\") calendar"
 msgstr "URI for merket (Â«primÃ¦rÂ») kalender"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid "URI of the highlighted (\"primary\") memo list"
 msgstr "URI for uthevet (Â«primÃ¦rÂ») notatliste"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 msgid "URI of the highlighted (\"primary\") task list"
 msgstr "URI for uthevet (Â«primÃ¦rÂ») oppgaveliste"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "Enhet for forvalgt pÃ¥minnelse. Â«minutesÂ», Â«hoursÂ», eller Â«daysÂ»."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Enheter for Ã¥ bestemme nÃ¥r oppgaver skal skjules. Â«minutesÂ», Â«hoursÂ» eller "
 "Â«daysÂ»."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid "Use system timezone"
 msgstr "Bruk systemets tidssone"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
 msgid "Use the system timezone instead of the timezone selected in Evolution."
 msgstr ""
 "Bruk systemets tidssone i stedet for tidssonen som er valgt i Evolution."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 msgid "Vertical pane position"
 msgstr "Posisjon til vertikalt felt"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
 msgid "Week start"
 msgstr "Ukestart"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "Dag uken starter pÃ¥. Fra sÃ¸ndag (0) til lÃ¸rdag (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "Om varslingsfeltet skal brukes for alarmer."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr ""
 "Om det skal spÃ¸rres etter bekreftelse ved sletting av en avtale eller "
 "oppgave."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr ""
 "Om det skal spÃ¸rres etter bekreftelse ved tÃ¸mming av avtaler eller oppgaver."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -2734,83 +2740,79 @@ msgstr ""
 "Komprimere helger i mÃ¥nedsvisningen slik at lÃ¸rdag og sÃ¸ndag bruker plassen "
 "til en ukedag."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
 msgid "Whether to display the end time of events in the week and month views."
 msgstr ""
 "Om tidspunktet en hendelse slutter pÃ¥ skal vises i uke- og mÃ¥nedsvisninger."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr ""
 "Om Marcus Bains-linjen (linjen pÃ¥ nÃ¥vÃ¦rende tid) skal vises i kalenderen."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Om fullfÃ¸rte oppgaver skal skjules i oppgavevisningen."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
 msgid "Whether to scroll a Month View by a week, not by a month."
 msgstr "Om mÃ¥nedsvisning skal rulles per uke, og ikke per mÃ¥ned."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
 msgid "Whether to set a default reminder for appointments."
 msgstr "Om en forvalgt pÃ¥minnelse skal bli satt for avtaler."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "Om RSVP-feltet skal vises redigering av hendelse/oppgave/mÃ¸te"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "Om kategorifeltet skal vises i redigering av hendelse/mÃ¸te"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "Om rollefeltet skal vises i redigering av hendelse/oppgave/mÃ¸te"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "Om statusfeltet skal vises i redigering av hendelse/oppgave/mÃ¸te"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
 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.h:119
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "Om felt for tidssone skal vises i redigering av hendelse/mÃ¸te"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:119
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "Om typefelt skal vises i redigering av hendelse/oppgave/mÃ¸te"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
-msgid "Whether to show week number in the Day and Work Week View."
-msgstr "Om ukenummer skal vises i dag- og arbeidsukevisning"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
-msgid "Whether to show week numbers in the date navigator."
-msgstr "Om ukenummer skal vises i minikalenderen"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
+msgid "Whether to show week numbers in various places in the Calendar."
+msgstr "Om ukenummer skal vises pÃ¥ relevante steder i kalenderen."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
 msgid "Work days"
 msgstr "Arbeidsdager"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
 msgid "Workday end hour"
 msgstr "Hvilken time arbeidsdagen slutter"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
 msgid "Workday end minute"
 msgstr "Hvilket minutt arbeidsdagen slutter"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:126
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
 msgid "Workday start hour"
 msgstr "Hvilken time arbeidsdagen starter"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:127
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
 msgid "Workday start minute"
 msgstr "Hvilket minutt arbeidsdagen starter"
 
@@ -2860,7 +2862,7 @@ msgid "Classification"
 msgstr "Klassifisering"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:235
-#: ../calendar/gui/e-cal-model.c:499 ../calendar/gui/e-task-table.c:489
+#: ../calendar/gui/e-cal-model.c:510 ../calendar/gui/e-task-table.c:489
 #: ../calendar/gui/memotypes.xml.h:6
 #: ../plugins/email-custom-header/email-custom-header.c:323
 #: ../widgets/misc/e-send-options.ui.h:2
@@ -2904,19 +2906,20 @@ msgid "Organizer"
 msgstr "Organisator"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:234
-#: ../calendar/gui/e-cal-model.c:497 ../calendar/gui/e-task-table.c:488
+#: ../calendar/gui/e-cal-model.c:508 ../calendar/gui/e-task-table.c:488
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Privat"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:233
-#: ../calendar/gui/e-cal-model.c:488 ../calendar/gui/e-cal-model.c:495
+#: ../calendar/gui/e-cal-model.c:499 ../calendar/gui/e-cal-model.c:506
 #: ../calendar/gui/e-task-table.c:487 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Offentlig"
 
 #: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:305
+#: ../calendar/gui/dialogs/event-editor.c:319
+#: ../calendar/gui/dialogs/event-editor.c:340
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:4
 msgid "Recurrence"
 msgstr "Gjeninntreffelse"
@@ -2984,6 +2987,7 @@ msgid "Add Alarm"
 msgstr "Legg til varsel"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
+#: ../calendar/gui/dialogs/event-editor.c:357
 msgid "Alarm"
 msgstr "Alarm"
 
@@ -2999,7 +3003,7 @@ msgstr "Egendefinert lyd for varsel"
 msgid "Mes_sage:"
 msgstr "Be_skjed:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:78
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:79
 msgid "Options"
 msgstr "Alternativer"
 
@@ -3089,29 +3093,29 @@ msgid "Alarms"
 msgstr "Varsel"
 
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:107
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:156
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:76
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:108
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:157
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:75
 #: ../calendar/gui/e-day-view-time-item.c:797
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "Ingen"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:183
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:184
 #: ../calendar/gui/e-day-view-time-item.c:824
 #: ../calendar/gui/e-timezone-entry.c:319
 msgid "Select..."
 msgstr "Velg..."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:496
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:504
 msgid "Selected Calendars for Alarms"
 msgstr "Kalendere valgt for varsel"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:790
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:789
 msgid "Ti_me and date:"
 msgstr "T_id og dato:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:791
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:790
 msgid "_Date only:"
 msgstr "Kun _dato:"
 
@@ -3149,7 +3153,7 @@ msgid "Alerts"
 msgstr "Varsel"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:11
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:30
 #: ../modules/addressbook/autocompletion-config.c:153
 msgid "Date/Time Format"
 msgstr "Fromat for dato ogklokkeslett"
@@ -3184,7 +3188,7 @@ msgstr "Fredag"
 #: ../calendar/gui/dialogs/calendar-setup.c:369
 #: ../calendar/gui/dialogs/calendar-setup.c:380
 #: ../calendar/gui/dialogs/calendar-setup.c:391
-#: ../mail/em-folder-properties.c:200 ../mail/mail-config.ui.h:55
+#: ../mail/em-folder-properties.c:200 ../mail/mail-config.ui.h:56
 #: ../modules/addressbook/addressbook-config.c:1005
 #: ../plugins/itip-formatter/itip-formatter.c:2675
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
@@ -3207,7 +3211,7 @@ msgid "Monday"
 msgstr "Mandag"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:23
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:83
 msgid "Pick a color"
 msgstr "Velg en farge"
 
@@ -3245,156 +3249,152 @@ msgid "Show a _reminder"
 msgstr "Vis en _pÃ¥minnelse"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
-msgid "Show week _numbers in date navigator"
-msgstr "Vis uke_nummer i datonavigasjon"
+msgid "Show week _numbers"
+msgstr "Vis uke_nummer"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
-msgid "Show week n_umber in Day and Work Week View"
-msgstr "Vis uken_ummer i dag- og arbeidsukevisning"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
 #: ../calendar/gui/dialogs/recurrence-page.c:1118
 #: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "SÃ¸ndag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
 msgid "T_asks due today:"
 msgstr "Oppg_aver som gÃ¥r ut i dag:"
 
 #. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
 msgid "T_hu"
 msgstr "T_o."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
 #: ../calendar/gui/dialogs/calendar-setup.c:381
 msgid "Task List"
 msgstr "Oppgaveliste"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
 msgid "Template:"
 msgstr "Mal:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
 #: ../calendar/gui/dialogs/recurrence-page.c:1115
 #: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
 #: ../e-util/e-non-intrusive-error-dialog.c:287
 #: ../widgets/misc/e-dateedit.c:592
 msgid "Time"
 msgstr "Tid"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
 #: ../calendar/gui/dialogs/event-page.ui.h:12
 msgid "Time _zone:"
 msgstr "Tids_sone:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
 msgid "Time format:"
 msgstr "Tidformat:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
 #: ../calendar/gui/dialogs/recurrence-page.c:1113
 #: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "Tirsdag"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
 msgid "Use s_ystem time zone"
 msgstr "Bruk s_ystemets tidssone"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
 #: ../calendar/gui/dialogs/recurrence-page.c:1114
 #: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "Onsdag"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
 msgid "Wee_k starts on:"
 msgstr "Uk_en starter pÃ¥:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
-#: ../modules/calendar/e-cal-shell-view-actions.c:1637
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
+#: ../modules/calendar/e-cal-shell-view-actions.c:1639
 msgid "Work Week"
 msgstr "Arbeidsuke"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
 msgid "Work days:"
 msgstr "Arbeidsdager:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
 msgid "_12 hour (AM/PM)"
 msgstr "_12 timer (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
 msgid "_24 hour"
 msgstr "_24 timer"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
 msgid "_Ask for confirmation when deleting items"
 msgstr "SpÃ¸r etter bekreftelse ved sletting _av oppfÃ¸ringer"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
 msgid "_Compress weekends in month view"
 msgstr "_Komprimer helger i mÃ¥nedsvisning"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
 msgid "_Day begins:"
 msgstr "_Dagen begynner:"
 
 #. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
 msgid "_Fri"
 msgstr "_Fr."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
 msgid "_Hide completed tasks after"
 msgstr "Sk_jul utfÃ¸rte oppgaver etter"
 
 #. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
 msgid "_Mon"
 msgstr "_Ma."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
 msgid "_Overdue tasks:"
 msgstr "UtgÃ¥tte _oppgaver:"
 
 #. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
 msgid "_Sat"
 msgstr "L_Ã¸."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:65
 msgid "_Show appointment end times in week and month view"
 msgstr "Vi_s tid for avtalers slutt i ukes- og mÃ¥nedsvisning"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:67
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:66
 msgid "_Time divisions:"
 msgstr "Oppdeling av _tid:"
 
 #. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:69
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:68
 msgid "_Tue"
 msgstr "_Ti."
 
 #. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:71
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:70
 msgid "_Wed"
 msgstr "_On."
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:73
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:72
 msgid "before every anniversary/birthday"
 msgstr "fÃ¸r hvert jubileum/bursdag"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:75
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:74
 msgid "before every appointment"
 msgstr "fÃ¸r hver avtale"
 
@@ -3407,7 +3407,7 @@ msgstr "Type:"
 msgid "_Type:"
 msgstr "_Type:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:156
+#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:157
 #: ../modules/addressbook/ldap-config.ui.h:26
 #: ../plugins/groupwise-features/properties.ui.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
@@ -3510,246 +3510,242 @@ msgstr "%s  Du har ikke gjort endringer. Oppdater redigering?"
 msgid "Validation error: %s"
 msgstr "Valideringsfeil: %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:238
+#: ../calendar/gui/dialogs/comp-editor.c:242
 msgid "Could not save attachments"
 msgstr "Kunne ikke lagre vedlegg"
 
-#: ../calendar/gui/dialogs/comp-editor.c:506
+#: ../calendar/gui/dialogs/comp-editor.c:511
 msgid "Could not update object"
 msgstr "Kunne ikke oppdatere objekt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:605
+#: ../calendar/gui/dialogs/comp-editor.c:610
 msgid "Edit Appointment"
 msgstr "Rediger avtale"
 
-#: ../calendar/gui/dialogs/comp-editor.c:612
+#: ../calendar/gui/dialogs/comp-editor.c:617
 #, c-format
 msgid "Meeting - %s"
 msgstr "MÃ¸te- %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:614
+#: ../calendar/gui/dialogs/comp-editor.c:619
 #, c-format
 msgid "Appointment - %s"
 msgstr "Avtale - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:620
+#: ../calendar/gui/dialogs/comp-editor.c:625
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tildelt oppgave - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:622
+#: ../calendar/gui/dialogs/comp-editor.c:627
 #, c-format
 msgid "Task - %s"
 msgstr "Oppgave - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:627
+#: ../calendar/gui/dialogs/comp-editor.c:632
 #, c-format
 msgid "Memo - %s"
 msgstr "Notat - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:643
+#: ../calendar/gui/dialogs/comp-editor.c:648
 msgid "No Summary"
 msgstr "Ingen sammendrag"
 
-#: ../calendar/gui/dialogs/comp-editor.c:752
+#: ../calendar/gui/dialogs/comp-editor.c:757
 msgid "Keep original item?"
 msgstr "Behold opprinnelig oppfÃ¸ring?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:939
+#: ../calendar/gui/dialogs/comp-editor.c:944
 msgid "Click here to close the current window"
 msgstr "Klikk her for Ã¥ lukke dette vinduet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:946 ../mail/e-mail-browser.c:116
-#: ../shell/e-shell-window-actions.c:1464
+#: ../calendar/gui/dialogs/comp-editor.c:951 ../mail/e-mail-browser.c:116
+#: ../shell/e-shell-window-actions.c:1485
 #: ../widgets/misc/e-focus-tracker.c:115 ../widgets/misc/e-focus-tracker.c:550
 #: ../widgets/misc/e-web-view.c:398 ../widgets/misc/e-web-view.c:1051
 msgid "Copy the selection"
 msgstr "Kopier utvalget"
 
-#: ../calendar/gui/dialogs/comp-editor.c:953 ../mail/e-mail-browser.c:123
-#: ../shell/e-shell-window-actions.c:1471
+#: ../calendar/gui/dialogs/comp-editor.c:958 ../mail/e-mail-browser.c:123
+#: ../shell/e-shell-window-actions.c:1492
 #: ../widgets/misc/e-focus-tracker.c:108 ../widgets/misc/e-focus-tracker.c:545
 #: ../widgets/misc/e-web-view.c:1045
 msgid "Cut the selection"
 msgstr "Klipp ut utvalget"
 
-#: ../calendar/gui/dialogs/comp-editor.c:960
-#: ../shell/e-shell-window-actions.c:1478
+#: ../calendar/gui/dialogs/comp-editor.c:965
+#: ../shell/e-shell-window-actions.c:1499
 #: ../widgets/misc/e-focus-tracker.c:129 ../widgets/misc/e-focus-tracker.c:560
 msgid "Delete the selection"
 msgstr "Slett utvalget"
 
-#: ../calendar/gui/dialogs/comp-editor.c:967
+#: ../calendar/gui/dialogs/comp-editor.c:972
 msgid "Click here to view help available"
 msgstr "klikk her for Ã¥ vise tilgjengelig hjelp"
 
-#: ../calendar/gui/dialogs/comp-editor.c:974 ../mail/e-mail-browser.c:130
-#: ../shell/e-shell-window-actions.c:1513
+#: ../calendar/gui/dialogs/comp-editor.c:979 ../mail/e-mail-browser.c:130
+#: ../shell/e-shell-window-actions.c:1534
 #: ../widgets/misc/e-focus-tracker.c:122 ../widgets/misc/e-focus-tracker.c:555
 #: ../widgets/misc/e-web-view.c:1057
 msgid "Paste the clipboard"
 msgstr "Lim inn fra utklippstavlen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:995
+#: ../calendar/gui/dialogs/comp-editor.c:1000
 msgid "Click here to save the current window"
 msgstr "Klikk her for Ã¥ lagre dette vinduet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1002 ../mail/e-mail-browser.c:137
-#: ../shell/e-shell-window-actions.c:1583
+#: ../calendar/gui/dialogs/comp-editor.c:1007 ../mail/e-mail-browser.c:137
+#: ../shell/e-shell-window-actions.c:1604
 #: ../widgets/misc/e-focus-tracker.c:136 ../widgets/misc/e-focus-tracker.c:565
 msgid "Select all text"
 msgstr "Velg all tekst"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1009
+#: ../calendar/gui/dialogs/comp-editor.c:1014
 msgid "_Classification"
 msgstr "K_lassifisering"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1023 ../mail/e-mail-browser.c:144
-#: ../shell/e-shell-window-actions.c:1632
+#: ../calendar/gui/dialogs/comp-editor.c:1028 ../mail/e-mail-browser.c:144
+#: ../shell/e-shell-window-actions.c:1653
 #: ../widgets/misc/e-signature-editor.c:217
 msgid "_File"
 msgstr "_Fil"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1030
-#: ../shell/e-shell-window-actions.c:1639
+#: ../calendar/gui/dialogs/comp-editor.c:1035
+#: ../shell/e-shell-window-actions.c:1660
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1037
+#: ../calendar/gui/dialogs/comp-editor.c:1042
 msgid "_Insert"
 msgstr "Sett _inn"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1044
+#: ../calendar/gui/dialogs/comp-editor.c:1049
 #: ../composer/e-composer-actions.c:353
 msgid "_Options"
 msgstr "_Alternativer"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1051 ../mail/e-mail-browser.c:158
-#: ../shell/e-shell-window-actions.c:1674 ../smime/gui/smime-ui.ui.h:45
+#: ../calendar/gui/dialogs/comp-editor.c:1056 ../mail/e-mail-browser.c:158
+#: ../shell/e-shell-window-actions.c:1695 ../smime/gui/smime-ui.ui.h:45
 msgid "_View"
 msgstr "_Vis"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1061
+#: ../calendar/gui/dialogs/comp-editor.c:1066
 #: ../composer/e-composer-actions.c:281
 msgid "_Attachment..."
 msgstr "_Vedlegg..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1063
+#: ../calendar/gui/dialogs/comp-editor.c:1068
 msgid "Click here to attach a file"
 msgstr "klikk her for Ã¥ legge ved en fil"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1071
+#: ../calendar/gui/dialogs/comp-editor.c:1076
 msgid "_Categories"
 msgstr "_Kategorier"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1073
+#: ../calendar/gui/dialogs/comp-editor.c:1078
 msgid "Toggles whether to display categories"
 msgstr "SlÃ¥r av/pÃ¥ visning av kategorier"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1079
+#: ../calendar/gui/dialogs/comp-editor.c:1084
 msgid "Time _Zone"
 msgstr "Tids_sone"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1081
+#: ../calendar/gui/dialogs/comp-editor.c:1086
 msgid "Toggles whether the time zone is displayed"
 msgstr "SlÃ¥r av/pÃ¥ visning av tidssone"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1090
+#: ../calendar/gui/dialogs/comp-editor.c:1095
 msgid "Pu_blic"
 msgstr "O_ffentlig"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1092
+#: ../calendar/gui/dialogs/comp-editor.c:1097
 msgid "Classify as public"
 msgstr "Klassifiser som offentlig"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1097
+#: ../calendar/gui/dialogs/comp-editor.c:1102
 msgid "_Private"
 msgstr "_Privat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1099
+#: ../calendar/gui/dialogs/comp-editor.c:1104
 msgid "Classify as private"
 msgstr "Klassifiser som privat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1104
+#: ../calendar/gui/dialogs/comp-editor.c:1109
 msgid "_Confidential"
 msgstr "_Konfidensiell"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1106
+#: ../calendar/gui/dialogs/comp-editor.c:1111
 msgid "Classify as confidential"
 msgstr "Klassifiser som konfidensiell"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1114
+#: ../calendar/gui/dialogs/comp-editor.c:1119
 msgid "R_ole Field"
 msgstr "R_olle-felt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1116
+#: ../calendar/gui/dialogs/comp-editor.c:1121
 msgid "Toggles whether the Role field is displayed"
 msgstr "SlÃ¥r av/pÃ¥ visning av rolle-feltet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1122
+#: ../calendar/gui/dialogs/comp-editor.c:1127
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1124
+#: ../calendar/gui/dialogs/comp-editor.c:1129
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "SlÃ¥r av/pÃ¥ visning av RSVP-feltet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1130
+#: ../calendar/gui/dialogs/comp-editor.c:1135
 msgid "_Status Field"
 msgstr "_Status-felt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1132
+#: ../calendar/gui/dialogs/comp-editor.c:1137
 msgid "Toggles whether the Status field is displayed"
 msgstr "SlÃ¥r av/pÃ¥ visning av status-feltet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1138
+#: ../calendar/gui/dialogs/comp-editor.c:1143
 msgid "_Type Field"
 msgstr "_Type felt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1140
+#: ../calendar/gui/dialogs/comp-editor.c:1145
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "SlÃ¥r av/pÃ¥ visning av deltakertype-feltet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1164
+#: ../calendar/gui/dialogs/comp-editor.c:1169
 #: ../composer/e-composer-private.c:70
 msgid "Recent _Documents"
 msgstr "Siste _dokumenter"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1692
-#: ../composer/e-composer-actions.c:477
+#: ../calendar/gui/dialogs/comp-editor.c:1704
+#: ../composer/e-composer-actions.c:469
 msgid "Attach"
 msgstr "Legg ved"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1747
-msgid "Save"
-msgstr "Lagre"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2031
-#: ../calendar/gui/dialogs/comp-editor.c:2080
-#: ../calendar/gui/dialogs/comp-editor.c:2974
+#: ../calendar/gui/dialogs/comp-editor.c:2025
+#: ../calendar/gui/dialogs/comp-editor.c:2074
+#: ../calendar/gui/dialogs/comp-editor.c:3017
 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:2942
+#: ../calendar/gui/dialogs/comp-editor.c:2985
 #: ../plugins/prefer-plain/prefer-plain.c:64
 msgid "attachment"
 msgstr "vedlegg"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3004
+#: ../calendar/gui/dialogs/comp-editor.c:3047
 msgid "Unable to use current version!"
 msgstr "Kan ikke bruke denne versjonen!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:91
+#: ../calendar/gui/dialogs/copy-source-dialog.c:92
 msgid "Could not open source"
 msgstr "Kunne ikke Ã¥pne kilde"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:99
+#: ../calendar/gui/dialogs/copy-source-dialog.c:100
 msgid "Could not open destination"
 msgstr "Kunne ikke Ã¥pne destinasjon"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:108
+#: ../calendar/gui/dialogs/copy-source-dialog.c:109
 msgid "Destination is read only"
 msgstr "Destinasjonen er skrivebeskyttet"
 
@@ -3821,133 +3817,147 @@ msgstr "Deleger til:"
 msgid "Enter Delegate"
 msgstr "Skriv inn delegat"
 
-#: ../calendar/gui/dialogs/event-editor.c:205
+#: ../calendar/gui/dialogs/event-editor.c:214
 msgid "_Alarms"
 msgstr "V_arsel"
 
-#: ../calendar/gui/dialogs/event-editor.c:207
+#: ../calendar/gui/dialogs/event-editor.c:216
 msgid "Click here to set or unset alarms for this event"
 msgstr "Klikk her for Ã¥ sette eller fjerne varsling for denne hendelsen"
 
-#: ../calendar/gui/dialogs/event-editor.c:215
+#: ../calendar/gui/dialogs/event-editor.c:224
 msgid "Show Time as _Busy"
 msgstr "Vis tiden som _opptatt"
 
-#: ../calendar/gui/dialogs/event-editor.c:217
+#: ../calendar/gui/dialogs/event-editor.c:226
 msgid "Toggles whether to show time as busy"
 msgstr "SlÃ¥r av/pÃ¥ visning av tid som opptatt"
 
-#: ../calendar/gui/dialogs/event-editor.c:226
+#: ../calendar/gui/dialogs/event-editor.c:235
 msgid "_Recurrence"
 msgstr "Gjeninnt_reffelse"
 
-#: ../calendar/gui/dialogs/event-editor.c:228
+#: ../calendar/gui/dialogs/event-editor.c:237
 msgid "Make this a recurring event"
 msgstr "GjÃ¸r denne hendelsen til repeterende"
 
-#: ../calendar/gui/dialogs/event-editor.c:233
+#: ../calendar/gui/dialogs/event-editor.c:242
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
 #: ../plugins/groupwise-features/send-options.c:210
 #: ../widgets/misc/e-send-options.ui.h:22
 msgid "Send Options"
 msgstr "Alternativer for sending"
 
-#: ../calendar/gui/dialogs/event-editor.c:235
-#: ../calendar/gui/dialogs/task-editor.c:124
+#: ../calendar/gui/dialogs/event-editor.c:244
+#: ../calendar/gui/dialogs/task-editor.c:126
 msgid "Insert advanced send options"
 msgstr "Sett inn avanserte alternativer for sending"
 
-#: ../calendar/gui/dialogs/event-editor.c:243
+#: ../calendar/gui/dialogs/event-editor.c:252
 msgid "All _Day Event"
 msgstr "Avtale som varer hele _dagen"
 
-#: ../calendar/gui/dialogs/event-editor.c:245
+#: ../calendar/gui/dialogs/event-editor.c:254
 msgid "Toggles whether to have All Day Event"
 msgstr "SlÃ¥r av/pÃ¥ hendelser som varer hele dagen"
 
-#: ../calendar/gui/dialogs/event-editor.c:254
+#: ../calendar/gui/dialogs/event-editor.c:263
 msgid "_Free/Busy"
 msgstr "_Ledig/opptatt"
 
-#: ../calendar/gui/dialogs/event-editor.c:256
+#: ../calendar/gui/dialogs/event-editor.c:265
 msgid "Query free / busy information for the attendees"
 msgstr "SlÃ¥ opp ledig/opptatt informasjon for deltakerene"
 
-#: ../calendar/gui/dialogs/event-editor.c:302
-msgid "Appoint_ment"
-msgstr "Av_tale"
+#: ../calendar/gui/dialogs/event-editor.c:316 ../calendar/gui/print.c:2588
+msgid "Appointment"
+msgstr "Avtale"
 
-#: ../calendar/gui/dialogs/event-page.c:751
+#: ../calendar/gui/dialogs/event-editor.c:380
+#: ../calendar/gui/dialogs/event-page.ui.h:6
+#: ../calendar/gui/e-meeting-list-view.c:148
+msgid "Attendees"
+msgstr "Deltakere"
+
+#: ../calendar/gui/dialogs/event-editor.c:573
+msgid "Print this event"
+msgstr "Skriv ut denne hendelsen"
+
+#: ../calendar/gui/dialogs/event-page.c:766
+msgid "Event's start time is in the past"
+msgstr "Starttid for hendelsen er passert"
+
+#: ../calendar/gui/dialogs/event-page.c:807
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr "Hendelsen kan ikke redigeres fordi kalenderen er skrivebeskyttet"
 
-#: ../calendar/gui/dialogs/event-page.c:755
+#: ../calendar/gui/dialogs/event-page.c:811
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "Hendelsen kan ikke redigeres i sin helhet fordi du ikke er organisator"
 
-#: ../calendar/gui/dialogs/event-page.c:767
-#: ../calendar/gui/dialogs/event-page.c:2721
+#: ../calendar/gui/dialogs/event-page.c:823
+#: ../calendar/gui/dialogs/event-page.c:2775
 msgid "This event has alarms"
 msgstr "Denne hendelsen har varsel"
 
-#: ../calendar/gui/dialogs/event-page.c:833
+#: ../calendar/gui/dialogs/event-page.c:890
 #: ../calendar/gui/dialogs/event-page.ui.h:11
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
 msgid "Or_ganizer:"
 msgstr "Or_ganisator:"
 
-#: ../calendar/gui/dialogs/event-page.c:880
+#: ../calendar/gui/dialogs/event-page.c:937
 msgid "_Delegatees"
 msgstr "_Delegater"
 
-#: ../calendar/gui/dialogs/event-page.c:882
+#: ../calendar/gui/dialogs/event-page.c:939
 msgid "Atte_ndees"
 msgstr "De_ltakere"
 
-#: ../calendar/gui/dialogs/event-page.c:1097
+#: ../calendar/gui/dialogs/event-page.c:1154
 msgid "Event with no start date"
 msgstr "Hendelse uten startdato"
 
-#: ../calendar/gui/dialogs/event-page.c:1100
+#: ../calendar/gui/dialogs/event-page.c:1157
 msgid "Event with no end date"
 msgstr "Hendelse uten sluttdato"
 
-#: ../calendar/gui/dialogs/event-page.c:1271
-#: ../calendar/gui/dialogs/memo-page.c:660
-#: ../calendar/gui/dialogs/task-page.c:864
+#: ../calendar/gui/dialogs/event-page.c:1328
+#: ../calendar/gui/dialogs/memo-page.c:686
+#: ../calendar/gui/dialogs/task-page.c:907
 msgid "Start date is wrong"
 msgstr "Startdato er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:1281
+#: ../calendar/gui/dialogs/event-page.c:1338
 msgid "End date is wrong"
 msgstr "Sluttdato er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:1304
+#: ../calendar/gui/dialogs/event-page.c:1361
 msgid "Start time is wrong"
 msgstr "Tid for start er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:1311
+#: ../calendar/gui/dialogs/event-page.c:1368
 msgid "End time is wrong"
 msgstr "Tid for slutt er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:1473
-#: ../calendar/gui/dialogs/memo-page.c:701
-#: ../calendar/gui/dialogs/task-page.c:924
+#: ../calendar/gui/dialogs/event-page.c:1530
+#: ../calendar/gui/dialogs/memo-page.c:727
+#: ../calendar/gui/dialogs/task-page.c:967
 msgid "The organizer selected no longer has an account."
 msgstr "Valgt organisator har ingen konto lenger."
 
-#: ../calendar/gui/dialogs/event-page.c:1479
-#: ../calendar/gui/dialogs/memo-page.c:707
-#: ../calendar/gui/dialogs/task-page.c:930
+#: ../calendar/gui/dialogs/event-page.c:1536
+#: ../calendar/gui/dialogs/memo-page.c:733
+#: ../calendar/gui/dialogs/task-page.c:973
 msgid "An organizer is required."
 msgstr "En organisator kreves."
 
-#: ../calendar/gui/dialogs/event-page.c:1504
-#: ../calendar/gui/dialogs/task-page.c:954
+#: ../calendar/gui/dialogs/event-page.c:1561
+#: ../calendar/gui/dialogs/task-page.c:997
 msgid "At least one attendee is required."
 msgstr "Minst en deltaker kreves."
 
-#: ../calendar/gui/dialogs/event-page.c:2594
+#: ../calendar/gui/dialogs/event-page.c:2649
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Kunne ikke Ã¥pne kalender Â«%sÂ»."
@@ -3958,40 +3968,40 @@ msgstr "Kunne ikke Ã¥pne kalender Â«%sÂ»."
 #. on behalf of some other user
 #. Translators: This string is used when we are creating a Task
 #. on behalf of some other user
-#: ../calendar/gui/dialogs/event-page.c:2638
-#: ../calendar/gui/dialogs/memo-page.c:920
-#: ../calendar/gui/dialogs/task-page.c:1746
+#: ../calendar/gui/dialogs/event-page.c:2693
+#: ../calendar/gui/dialogs/memo-page.c:946
+#: ../calendar/gui/dialogs/task-page.c:1787
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Du opptrer pÃ¥ vegne av %s"
 
-#: ../calendar/gui/dialogs/event-page.c:2940
+#: ../calendar/gui/dialogs/event-page.c:2994
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d dag fÃ¸r avtalen"
 msgstr[1] "%d dager fÃ¸r avtalen"
 
-#: ../calendar/gui/dialogs/event-page.c:2946
+#: ../calendar/gui/dialogs/event-page.c:3000
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d time fÃ¸r avtalen"
 msgstr[1] "%d timer fÃ¸r avtalen"
 
-#: ../calendar/gui/dialogs/event-page.c:2952
+#: ../calendar/gui/dialogs/event-page.c:3006
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minutt fÃ¸r avtalen"
 msgstr[1] "%d minutter fÃ¸r avtalen"
 
-#: ../calendar/gui/dialogs/event-page.c:2965
+#: ../calendar/gui/dialogs/event-page.c:3019
 msgid "Customize"
 msgstr "Tilpass"
 
 #. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:2967
+#: ../calendar/gui/dialogs/event-page.c:3021
 msgctxt "cal-alarms"
 msgid "None"
 msgstr "Ingen"
@@ -4014,11 +4024,6 @@ msgstr "15 minutter fÃ¸r avtalen"
 msgid "Atte_ndees..."
 msgstr "De_ltakere..."
 
-#: ../calendar/gui/dialogs/event-page.ui.h:6
-#: ../calendar/gui/e-meeting-list-view.c:148
-msgid "Attendees"
-msgstr "Deltakere"
-
 #: ../calendar/gui/dialogs/event-page.ui.h:9
 msgid "Custom Alarm:"
 msgstr "Egendefinert varsel:"
@@ -4065,23 +4070,31 @@ msgstr "til"
 msgid "Memo"
 msgstr "Notat"
 
-#: ../calendar/gui/dialogs/memo-page.c:350
+#: ../calendar/gui/dialogs/memo-editor.c:156
+msgid "Print this memo"
+msgstr "Skriv ut dette notatet"
+
+#: ../calendar/gui/dialogs/memo-page.c:338
+msgid "Memo's start date is in the past"
+msgstr "Startdato for notatet er passert"
+
+#: ../calendar/gui/dialogs/memo-page.c:376
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr "Notatet kan ikke redigeres fordi valgt notatliste er skrivebeskyttet"
 
-#: ../calendar/gui/dialogs/memo-page.c:354
+#: ../calendar/gui/dialogs/memo-page.c:380
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "Notatet kan ikke redigeres i sin helhet fordi du ikke er organisator"
 
-#: ../calendar/gui/dialogs/memo-page.c:881
+#: ../calendar/gui/dialogs/memo-page.c:907
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Kan ikke Ã¥pne notater i Â«%sÂ»."
 
-#: ../calendar/gui/dialogs/memo-page.c:1048 ../em-format/em-format-quote.c:215
-#: ../em-format/em-format.c:939 ../mail/em-format-html.c:2242
-#: ../mail/em-format-html.c:2301 ../mail/em-format-html.c:2325
-#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:79
+#: ../calendar/gui/dialogs/memo-page.c:1081 ../em-format/em-format-quote.c:215
+#: ../em-format/em-format.c:939 ../mail/em-format-html.c:2276
+#: ../mail/em-format-html.c:2335 ../mail/em-format-html.c:2359
+#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:80
 msgid "To"
 msgstr "Til"
 
@@ -4100,7 +4113,7 @@ msgid "T_o:"
 msgstr "T_il:"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.c:383
+#: ../calendar/gui/dialogs/task-page.c:426
 #: ../calendar/gui/dialogs/task-page.ui.h:9
 msgid "_Group:"
 msgstr "_Gruppe:"
@@ -4285,7 +4298,7 @@ msgstr "Hver"
 msgid "Exceptions"
 msgstr "Unntak"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:86
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:87
 msgid "Preview"
 msgstr "ForhÃ¥ndsvis"
 
@@ -4317,12 +4330,12 @@ msgstr "Send mine alarmer med denne hendelsen"
 msgid "Notify new attendees _only"
 msgstr "Varsle _kun nye deltakere"
 
-#: ../calendar/gui/dialogs/task-details-page.c:379
-#: ../calendar/gui/dialogs/task-details-page.c:399
+#: ../calendar/gui/dialogs/task-details-page.c:350
+#: ../calendar/gui/dialogs/task-details-page.c:372
 msgid "Completed date is wrong"
 msgstr "Dato for ferdigstilling er feil"
 
-#: ../calendar/gui/dialogs/task-details-page.c:486
+#: ../calendar/gui/dialogs/task-details-page.c:483
 msgid "Web Page"
 msgstr "Nettside"
 
@@ -4343,7 +4356,7 @@ msgstr "FullfÃ¸rt"
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
 #: ../calendar/gui/e-cal-component-preview.c:314
 #: ../calendar/gui/e-task-table.c:510 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1125 ../widgets/misc/e-send-options.ui.h:13
+#: ../mail/message-list.c:1132 ../widgets/misc/e-send-options.ui.h:13
 msgid "High"
 msgstr "HÃ¸y"
 
@@ -4362,15 +4375,15 @@ msgstr "Under arbeid"
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
 #: ../calendar/gui/e-cal-component-preview.c:318
 #: ../calendar/gui/e-task-table.c:512 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1123 ../widgets/misc/e-send-options.ui.h:14
+#: ../mail/message-list.c:1130 ../widgets/misc/e-send-options.ui.h:14
 msgid "Low"
 msgstr "Lav"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
 #: ../calendar/gui/e-cal-component-preview.c:316
-#: ../calendar/gui/e-cal-model.c:1243 ../calendar/gui/e-task-table.c:511
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1124
+#: ../calendar/gui/e-cal-model.c:1254 ../calendar/gui/e-task-table.c:511
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1131
 #: ../widgets/misc/e-send-options.ui.h:16
 msgid "Normal"
 msgstr "Normal"
@@ -4397,8 +4410,8 @@ msgstr "Stat_us:"
 #. Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/dialogs/task-details-page.ui.h:18
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:1771
-#: ../calendar/gui/e-meeting-list-view.c:603
+#: ../calendar/gui/e-calendar-view.c:1773
+#: ../calendar/gui/e-meeting-list-view.c:594
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
 #: ../mail/message-list.etspec.h:17
@@ -4425,46 +4438,59 @@ msgstr "_Prioritet:"
 msgid "_Web Page:"
 msgstr "_Nettside:"
 
-#: ../calendar/gui/dialogs/task-editor.c:112
+#: ../calendar/gui/dialogs/task-editor.c:114
 msgid "_Status Details"
 msgstr "Detaljert _status"
 
-#: ../calendar/gui/dialogs/task-editor.c:114
+#: ../calendar/gui/dialogs/task-editor.c:116
 msgid "Click to change or view the status details of the task"
 msgstr "Klikk for Ã¥ endre/vise detaljer om status for oppgaven"
 
-#: ../calendar/gui/dialogs/task-editor.c:122
+#: ../calendar/gui/dialogs/task-editor.c:124
 #: ../plugins/groupwise-features/mail-send-options.c:200
 msgid "_Send Options"
 msgstr "Alternativer for _sending"
 
-#: ../calendar/gui/dialogs/task-editor.c:322
-msgid "_Task"
-msgstr "_Oppgave"
+#: ../calendar/gui/dialogs/task-editor.c:325 ../calendar/gui/print.c:2590
+#: ../widgets/misc/e-send-options.c:502
+msgid "Task"
+msgstr "Oppgave"
 
-#: ../calendar/gui/dialogs/task-editor.c:325
+#: ../calendar/gui/dialogs/task-editor.c:328
 msgid "Task Details"
 msgstr "Oppgavedetaljer"
 
-#: ../calendar/gui/dialogs/task-page.c:336
+#: ../calendar/gui/dialogs/task-editor.c:370
+msgid "Print this task"
+msgstr "Skriv ut denne oppgaven"
+
+#: ../calendar/gui/dialogs/task-page.c:343
+msgid "Task's start date is in the past"
+msgstr "Startdato for oppgaven er passert"
+
+#: ../calendar/gui/dialogs/task-page.c:344
+msgid "Task's due date is in the past"
+msgstr "Ferdigdato for oppgaven er passert"
+
+#: ../calendar/gui/dialogs/task-page.c:379
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr ""
 "Oppgaven kan ikke redigeres fordi valgt oppgaveliste er skrivebeskyttet"
 
-#: ../calendar/gui/dialogs/task-page.c:340
+#: ../calendar/gui/dialogs/task-page.c:383
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr "Oppgaven kan ikke redigeres i sin helhet fordi du ikke er organisator"
 
-#: ../calendar/gui/dialogs/task-page.c:391
+#: ../calendar/gui/dialogs/task-page.c:434
 #: ../calendar/gui/dialogs/task-page.ui.h:4
 msgid "Organi_zer:"
 msgstr "Organi_sator:"
 
-#: ../calendar/gui/dialogs/task-page.c:837
+#: ../calendar/gui/dialogs/task-page.c:880
 msgid "Due date is wrong"
 msgstr "Ferdigdato er feil"
 
-#: ../calendar/gui/dialogs/task-page.c:1703
+#: ../calendar/gui/dialogs/task-page.c:1744
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Kan ikke Ã¥pne oppgaver i Â«%sÂ»."
@@ -4592,7 +4618,7 @@ msgstr "Prioritet:"
 
 #: ../calendar/gui/e-cal-component-preview.c:337
 #: ../calendar/gui/e-itip-control.c:1227 ../calendar/gui/e-itip-control.ui.h:4
-#: ../mail/mail-config.ui.h:36
+#: ../mail/mail-config.ui.h:37
 msgid "Description:"
 msgstr "Beskrivelse:"
 
@@ -4648,23 +4674,21 @@ msgctxt "cal-task-status"
 msgid "None"
 msgstr "Ingen"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1249
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1260
 #: ../calendar/gui/e-meeting-list-view.c:187
 #: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:179
 #: ../calendar/gui/e-meeting-store.c:829
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Ja"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1249
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1260
 #: ../calendar/gui/e-meeting-list-view.c:188
 #: ../calendar/gui/e-meeting-store.c:181
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Nei"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:501 ../calendar/gui/e-itip-control.c:1210
+#: ../calendar/gui/e-cal-model.c:512 ../calendar/gui/e-itip-control.c:1210
 #: ../calendar/gui/e-itip-control.c:1349
 #: ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-list-view.c:177
@@ -4677,15 +4701,15 @@ msgstr "Nei"
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: ../calendar/gui/e-cal-model.c:1245
+#: ../calendar/gui/e-cal-model.c:1256
 msgid "Recurring"
 msgstr "Gjeninntreffer"
 
-#: ../calendar/gui/e-cal-model.c:1247
+#: ../calendar/gui/e-cal-model.c:1258
 msgid "Assigned"
 msgstr "Tildelt"
 
-#: ../calendar/gui/e-cal-model.c:2141
+#: ../calendar/gui/e-cal-model.c:2156
 #, c-format
 msgid "Opening %s"
 msgstr "Ã?pner %s"
@@ -4722,7 +4746,7 @@ msgid "Start date"
 msgstr "Startdato"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-meeting-list-view.c:566
+#: ../calendar/gui/e-meeting-list-view.c:557
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:7
 #: ../widgets/misc/e-attachment-tree-view.c:572
@@ -4755,7 +4779,7 @@ msgstr "Sletter valgte objekter"
 msgid "Updating objects"
 msgstr "Oppdaterer objekter"
 
-#: ../calendar/gui/e-calendar-view.c:1718
+#: ../calendar/gui/e-calendar-view.c:1720
 #: ../calendar/gui/e-itip-control.c:1195
 #: ../calendar/gui/e-meeting-list-view.c:199
 #: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
@@ -4763,7 +4787,7 @@ msgstr "Oppdaterer objekter"
 msgid "Accepted"
 msgstr "Godtatt"
 
-#: ../calendar/gui/e-calendar-view.c:1719
+#: ../calendar/gui/e-calendar-view.c:1721
 #: ../calendar/gui/e-itip-control.c:1205
 #: ../calendar/gui/e-meeting-list-view.c:200
 #: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
@@ -4771,27 +4795,27 @@ msgstr "Godtatt"
 msgid "Declined"
 msgstr "AvslÃ¥tt"
 
-#: ../calendar/gui/e-calendar-view.c:1720
+#: ../calendar/gui/e-calendar-view.c:1722
 #: ../calendar/gui/e-meeting-list-view.c:201
 #: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
 #: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "Tentative"
 msgstr "Tentativ"
 
-#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-calendar-view.c:1723
 #: ../calendar/gui/e-meeting-list-view.c:202
 #: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
 #: ../plugins/itip-formatter/itip-formatter.c:2339
 msgid "Delegated"
 msgstr "Delegert"
 
-#: ../calendar/gui/e-calendar-view.c:1722
+#: ../calendar/gui/e-calendar-view.c:1724
 msgid "Needs action"
 msgstr "Krever handling"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
 #. To Translators: It will display "Organizer: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-view.c:1867 ../calendar/gui/e-memo-table.c:527
+#: ../calendar/gui/e-calendar-view.c:1869 ../calendar/gui/e-memo-table.c:527
 #: ../calendar/gui/e-task-table.c:742
 #, c-format
 msgid "Organizer: %s <%s>"
@@ -4799,20 +4823,20 @@ msgstr "Organisator: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:1871 ../calendar/gui/e-memo-table.c:532
+#: ../calendar/gui/e-calendar-view.c:1873 ../calendar/gui/e-memo-table.c:532
 #: ../calendar/gui/e-task-table.c:745
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organisator: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1887 ../calendar/gui/print.c:2624
+#: ../calendar/gui/e-calendar-view.c:1889 ../calendar/gui/print.c:2624
 #, c-format
 msgid "Location: %s"
 msgstr "Sted: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1918
+#: ../calendar/gui/e-calendar-view.c:1920
 #, c-format
 msgid "Time: %s %s"
 msgstr "Tidspunkt: %s %s"
@@ -4855,7 +4879,7 @@ msgstr "Vis den andre tidssonen"
 #. 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:878 ../calendar/gui/e-day-view.c:1879
+#: ../calendar/gui/e-day-view-top-item.c:878 ../calendar/gui/e-day-view.c:1878
 #: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1744
 msgid "%A %d %B"
 msgstr "%A %d %B"
@@ -4866,10 +4890,10 @@ msgstr "%A %d %B"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:882 ../calendar/gui/e-day-view.c:1896
+#: ../calendar/gui/e-day-view-top-item.c:882 ../calendar/gui/e-day-view.c:1895
 #: ../calendar/gui/e-week-view-main-item.c:227
-#: ../calendar/gui/ea-gnome-calendar.c:200
-#: ../modules/calendar/e-cal-shell-view-private.c:916
+#: ../calendar/gui/ea-gnome-calendar.c:202
+#: ../modules/calendar/e-cal-shell-view-private.c:1014
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -4878,27 +4902,27 @@ msgstr "%a %d %b"
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:886 ../calendar/gui/e-day-view.c:1912
+#: ../calendar/gui/e-day-view-top-item.c:886 ../calendar/gui/e-day-view.c:1911
 #: ../calendar/gui/e-week-view-main-item.c:241
-#: ../calendar/gui/ea-gnome-calendar.c:230
-#: ../modules/calendar/e-cal-shell-view-private.c:952
+#: ../calendar/gui/ea-gnome-calendar.c:232
+#: ../modules/calendar/e-cal-shell-view-private.c:1050
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1076 ../calendar/gui/e-week-view.c:748
+#: ../calendar/gui/e-day-view.c:1077 ../calendar/gui/e-week-view.c:749
 #: ../calendar/gui/print.c:819
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1079 ../calendar/gui/e-week-view.c:751
+#: ../calendar/gui/e-day-view.c:1080 ../calendar/gui/e-week-view.c:752
 #: ../calendar/gui/print.c:821
 msgid "pm"
 msgstr "pm"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2638
+#: ../calendar/gui/e-day-view.c:2637
 #, c-format
 msgid "Week %d"
 msgstr "Uke %d"
@@ -5258,7 +5282,7 @@ msgstr "Velg en handling:"
 
 #. To translators: RSVP means "please reply"
 #: ../calendar/gui/e-itip-control.c:2302
-#: ../calendar/gui/e-meeting-list-view.c:591
+#: ../calendar/gui/e-meeting-list-view.c:582
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -5294,7 +5318,7 @@ msgid "Send Latest Information"
 msgstr "Send siste informasjon"
 
 #: ../calendar/gui/e-itip-control.c:2465
-#: ../modules/mail/e-mail-shell-view-actions.c:974
+#: ../modules/mail/e-mail-shell-view-actions.c:976
 #: ../widgets/misc/e-activity-proxy.c:298
 msgid "Cancel"
 msgstr "Avbryt"
@@ -5398,7 +5422,7 @@ msgid "Needs Action"
 msgstr "Trenger handling"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:546
+#: ../calendar/gui/e-meeting-list-view.c:537
 msgid "Attendee                          "
 msgstr "Deltaker                          "
 
@@ -5409,7 +5433,7 @@ msgstr "Under arbeid"
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:458
-#: ../calendar/gui/e-meeting-time-sel.c:2366
+#: ../calendar/gui/e-meeting-time-sel.c:2370
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B, %Y"
 
@@ -5418,7 +5442,7 @@ msgstr "%A, %d %B, %Y"
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:462
-#: ../calendar/gui/e-meeting-time-sel.c:2397
+#: ../calendar/gui/e-meeting-time-sel.c:2401
 msgid "%a %m/%d/%Y"
 msgstr "%a %d.%m.%Y"
 
@@ -5513,7 +5537,7 @@ msgid "Member"
 msgstr "Medlem"
 
 #: ../calendar/gui/e-memo-table.c:411
-#: ../modules/calendar/e-cal-shell-content.c:465
+#: ../modules/calendar/e-cal-shell-content.c:467
 #: ../modules/calendar/e-memo-shell-view-actions.c:218
 #: ../modules/calendar/e-memo-shell-view-actions.c:233
 #: ../modules/calendar/e-memo-shell-view.c:289
@@ -5572,7 +5596,7 @@ msgstr "%d%%"
 #: ../calendar/gui/e-task-table.c:628 ../calendar/gui/print.c:2052
 #: ../calendar/importers/icalendar-importer.c:81
 #: ../calendar/importers/icalendar-importer.c:828
-#: ../modules/calendar/e-cal-shell-content.c:427
+#: ../modules/calendar/e-cal-shell-content.c:428
 #: ../modules/calendar/e-task-shell-view-actions.c:241
 #: ../modules/calendar/e-task-shell-view-actions.c:256
 #: ../modules/calendar/e-task-shell-view.c:437
@@ -5644,23 +5668,23 @@ msgstr "vis kalenderhendelse"
 msgid "Grab Focus"
 msgstr "Ta fokus"
 
-#: ../calendar/gui/ea-cal-view.c:300
+#: ../calendar/gui/ea-cal-view.c:304
 msgid "New Appointment"
 msgstr "Ny avtale"
 
-#: ../calendar/gui/ea-cal-view.c:301
+#: ../calendar/gui/ea-cal-view.c:305
 msgid "New All Day Event"
 msgstr "Ny avtale som varer hele dagen"
 
-#: ../calendar/gui/ea-cal-view.c:302
+#: ../calendar/gui/ea-cal-view.c:306
 msgid "New Meeting"
 msgstr "Nytt mÃ¸te"
 
-#: ../calendar/gui/ea-cal-view.c:303
+#: ../calendar/gui/ea-cal-view.c:307
 msgid "Go to Today"
 msgstr "GÃ¥ til i dag"
 
-#: ../calendar/gui/ea-cal-view.c:304
+#: ../calendar/gui/ea-cal-view.c:308
 msgid "Go to Date"
 msgstr "GÃ¥ til dato"
 
@@ -5669,7 +5693,7 @@ msgstr "GÃ¥ til dato"
 msgid "a table to view and select the current time range"
 msgstr "en tabell som viser og velger aktivt tidsomrÃ¥de"
 
-#: ../calendar/gui/ea-day-view.c:148 ../calendar/gui/ea-week-view.c:146
+#: ../calendar/gui/ea-day-view.c:152 ../calendar/gui/ea-week-view.c:151
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -5678,14 +5702,14 @@ msgstr[1] "Har %d hendelser."
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:153 ../calendar/gui/ea-week-view.c:148
+#: ../calendar/gui/ea-day-view.c:157 ../calendar/gui/ea-week-view.c:154
 msgid "It has no events."
 msgstr "Har ingen hendelser."
 
 #. To translators: First %s is the week, for example "July 10th -
 #. July 14th, 2006". Second %s is the number of events in this work
 #. week, for example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:160
+#: ../calendar/gui/ea-day-view.c:164
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Arbeidsukevisning: %s. %s"
@@ -5693,47 +5717,47 @@ msgstr "Arbeidsukevisning: %s. %s"
 #. To translators: First %s is the day, for example "Thursday July
 #. 13th, 2006". Second %s is the number of events on this day, for
 #. example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:166
+#: ../calendar/gui/ea-day-view.c:170
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Dagvisning: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:197
+#: ../calendar/gui/ea-day-view.c:204
 msgid "calendar view for a work week"
 msgstr "kalendervisning for en arbeidsuke"
 
-#: ../calendar/gui/ea-day-view.c:199
+#: ../calendar/gui/ea-day-view.c:206
 msgid "calendar view for one or more days"
 msgstr "kalendervisning for en eller flere dager"
 
-#: ../calendar/gui/ea-gnome-calendar.c:46
-#: ../calendar/gui/ea-gnome-calendar.c:54
+#: ../calendar/gui/ea-gnome-calendar.c:48
+#: ../calendar/gui/ea-gnome-calendar.c:56
 #: ../calendar/importers/icalendar-importer.c:860
 msgid "Gnome Calendar"
 msgstr "GNOME kalender"
 
-#: ../calendar/gui/ea-gnome-calendar.c:197
-#: ../modules/calendar/e-cal-shell-view-private.c:912
+#: ../calendar/gui/ea-gnome-calendar.c:199
+#: ../modules/calendar/e-cal-shell-view-private.c:1010
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
-#: ../calendar/gui/ea-gnome-calendar.c:202
-#: ../calendar/gui/ea-gnome-calendar.c:207
+#: ../calendar/gui/ea-gnome-calendar.c:204
 #: ../calendar/gui/ea-gnome-calendar.c:209
-#: ../modules/calendar/e-cal-shell-view-private.c:919
-#: ../modules/calendar/e-cal-shell-view-private.c:925
-#: ../modules/calendar/e-cal-shell-view-private.c:928
+#: ../calendar/gui/ea-gnome-calendar.c:211
+#: ../modules/calendar/e-cal-shell-view-private.c:1017
+#: ../modules/calendar/e-cal-shell-view-private.c:1023
+#: ../modules/calendar/e-cal-shell-view-private.c:1026
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: ../calendar/gui/ea-gnome-calendar.c:226
-#: ../calendar/gui/ea-gnome-calendar.c:232
-#: ../calendar/gui/ea-gnome-calendar.c:238
+#: ../calendar/gui/ea-gnome-calendar.c:228
+#: ../calendar/gui/ea-gnome-calendar.c:234
 #: ../calendar/gui/ea-gnome-calendar.c:240
-#: ../modules/calendar/e-cal-shell-view-private.c:945
-#: ../modules/calendar/e-cal-shell-view-private.c:956
-#: ../modules/calendar/e-cal-shell-view-private.c:963
-#: ../modules/calendar/e-cal-shell-view-private.c:966
+#: ../calendar/gui/ea-gnome-calendar.c:242
+#: ../modules/calendar/e-cal-shell-view-private.c:1043
+#: ../modules/calendar/e-cal-shell-view-private.c:1054
+#: ../modules/calendar/e-cal-shell-view-private.c:1061
+#: ../modules/calendar/e-cal-shell-view-private.c:1064
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -5745,25 +5769,25 @@ msgstr "Hoppeknapp"
 msgid "Click here, you can find more events."
 msgstr "Klikk her for Ã¥ finne flere hendelser."
 
-#: ../calendar/gui/ea-week-view.c:153
+#: ../calendar/gui/ea-week-view.c:159
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "MÃ¥nedsvisning: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:157
+#: ../calendar/gui/ea-week-view.c:163
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Ukevisning: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:188
+#: ../calendar/gui/ea-week-view.c:197
 msgid "calendar view for a month"
 msgstr "kalendervisning for en mÃ¥ned"
 
-#: ../calendar/gui/ea-week-view.c:190
+#: ../calendar/gui/ea-week-view.c:199
 msgid "calendar view for one or more weeks"
 msgstr "kalendervisning for en eller flere uker"
 
-#: ../calendar/gui/gnome-cal.c:2240
+#: ../calendar/gui/gnome-cal.c:2280
 msgid "Purging"
 msgstr "TÃ¸mmer"
 
@@ -5816,7 +5840,7 @@ msgid "Select Date"
 msgstr "Velg dato"
 
 #: ../calendar/gui/goto-dialog.ui.h:13
-#: ../modules/calendar/e-cal-shell-view-actions.c:1310
+#: ../modules/calendar/e-cal-shell-view-actions.c:1312
 msgid "Select _Today"
 msgstr "Velg i _dag"
 
@@ -6130,14 +6154,6 @@ msgstr " (Ferdig "
 msgid "Due "
 msgstr "Ferdig "
 
-#: ../calendar/gui/print.c:2588
-msgid "Appointment"
-msgstr "Avtale"
-
-#: ../calendar/gui/print.c:2590 ../widgets/misc/e-send-options.c:502
-msgid "Task"
-msgstr "Oppgave"
-
 #: ../calendar/gui/print.c:2615
 #, c-format
 msgid "Summary: %s"
@@ -6220,8 +6236,8 @@ msgid "Reminder!"
 msgstr "PÃ¥minnelse!"
 
 #: ../calendar/importers/icalendar-importer.c:662
-msgid "vCalendar files (.vcf)"
-msgstr "vCalendar-filer (.vcf)"
+msgid "vCalendar files (.vcs)"
+msgstr "vCalendar-filer (.vcs)"
 
 #: ../calendar/importers/icalendar-importer.c:663
 msgid "Evolution vCalendar importer"
@@ -6236,25 +6252,25 @@ msgid "Evolution Calendar intelligent importer"
 msgstr "Intelligent import for Evolution kalender"
 
 #: ../calendar/importers/icalendar-importer.c:926
-#: ../calendar/importers/icalendar-importer.c:1237
+#: ../calendar/importers/icalendar-importer.c:1243
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "MÃ¸te"
 
 #: ../calendar/importers/icalendar-importer.c:926
-#: ../calendar/importers/icalendar-importer.c:1237
+#: ../calendar/importers/icalendar-importer.c:1243
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "Hendelse"
 
 #: ../calendar/importers/icalendar-importer.c:929
-#: ../calendar/importers/icalendar-importer.c:1238
+#: ../calendar/importers/icalendar-importer.c:1244
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "Oppgave"
 
 #: ../calendar/importers/icalendar-importer.c:932
-#: ../calendar/importers/icalendar-importer.c:1239
+#: ../calendar/importers/icalendar-importer.c:1245
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "Notat"
@@ -6306,7 +6322,7 @@ msgstr "Klassifisering"
 #. Translators: Appointment's summary
 #. Translators: Column header for a component summary
 #: ../calendar/importers/icalendar-importer.c:984
-#: ../calendar/importers/icalendar-importer.c:1278
+#: ../calendar/importers/icalendar-importer.c:1284
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "Sammendrag"
@@ -6320,7 +6336,7 @@ msgstr "Lokasjon"
 #. Translators: Appointment's start time
 #. Translators: Column header for a component start date/time
 #: ../calendar/importers/icalendar-importer.c:998
-#: ../calendar/importers/icalendar-importer.c:1274
+#: ../calendar/importers/icalendar-importer.c:1280
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "Start"
@@ -6375,7 +6391,7 @@ msgid "Description"
 msgstr "Beskrivelse"
 
 #. Translators: Column header for a component type; it can be Event, Task or Memo
-#: ../calendar/importers/icalendar-importer.c:1270
+#: ../calendar/importers/icalendar-importer.c:1276
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "Type"
@@ -7938,7 +7954,7 @@ msgid "Save as..."
 msgstr "Lagre som..."
 
 #: ../composer/e-composer-actions.c:283
-#: ../widgets/misc/e-attachment-view.c:327
+#: ../widgets/misc/e-attachment-view.c:329
 msgid "Attach a file"
 msgstr "Legg ved en fil"
 
@@ -7979,7 +7995,7 @@ msgstr "Lagre som ut_kast"
 msgid "Save as draft"
 msgstr "Lagre som utkast"
 
-#: ../composer/e-composer-actions.c:330 ../composer/e-composer-private.c:281
+#: ../composer/e-composer-actions.c:330 ../composer/e-composer-private.c:290
 msgid "S_end"
 msgstr "S_end"
 
@@ -8064,42 +8080,26 @@ msgid "Toggles whether the CC field is displayed"
 msgstr "SlÃ¥ av/pÃ¥ visning av CC-feltet"
 
 #: ../composer/e-composer-actions.c:427
-msgid "_From Field"
-msgstr "_Fra-felt"
-
-#: ../composer/e-composer-actions.c:429
-msgid "Toggles whether the From chooser is displayed"
-msgstr "SlÃ¥ av/pÃ¥ visning av Fra-feltet"
-
-#: ../composer/e-composer-actions.c:435
 msgid "_Reply-To Field"
 msgstr "Svar-til felt"
 
-#: ../composer/e-composer-actions.c:437
+#: ../composer/e-composer-actions.c:429
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "SlÃ¥ av/pÃ¥ visning av Svar-til feltet"
 
-#: ../composer/e-composer-actions.c:480
+#: ../composer/e-composer-actions.c:472
 msgid "Save Draft"
 msgstr "Lagre utkast"
 
-#: ../composer/e-composer-header.c:129
-msgid "Show"
-msgstr "Vis"
-
-#: ../composer/e-composer-header.c:137
-msgid "Hide"
-msgstr "Skjul"
-
-#: ../composer/e-composer-header-table.c:41
+#: ../composer/e-composer-header-table.c:40
 msgid "Enter the recipients of the message"
 msgstr "Skriv inn mottakerene for meldingen"
 
-#: ../composer/e-composer-header-table.c:43
+#: ../composer/e-composer-header-table.c:42
 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-composer-header-table.c:46
+#: ../composer/e-composer-header-table.c:45
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -8107,41 +8107,26 @@ msgstr ""
 "Skriv inn adressene som skal motta en kopi av meldingen uten Ã¥ vises i "
 "mottakerlisten for meldingen."
 
-#: ../composer/e-composer-header-table.c:958
+#: ../composer/e-composer-header-table.c:961
 msgid "Fr_om:"
 msgstr "Fr_a:"
 
-#: ../composer/e-composer-header-table.c:958
-#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:937
-#: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:77
-msgid "From"
-msgstr "Fra"
-
-#: ../composer/e-composer-header-table.c:967
+#: ../composer/e-composer-header-table.c:970
 msgid "_Reply-To:"
 msgstr "Sva_r-til:"
 
-#: ../composer/e-composer-header-table.c:972
+#: ../composer/e-composer-header-table.c:974
 msgid "_To:"
 msgstr "_Til:"
 
-#: ../composer/e-composer-header-table.c:978
+#: ../composer/e-composer-header-table.c:979
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:978 ../mail/em-filter-i18n.h:8
-msgid "CC"
-msgstr "Cc"
-
 #: ../composer/e-composer-header-table.c:984
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-composer-header-table.c:984 ../mail/em-filter-i18n.h:6
-msgid "BCC"
-msgstr "Bcc"
-
 #: ../composer/e-composer-header-table.c:989
 msgid "_Post To:"
 msgstr "_Post til:"
@@ -8162,40 +8147,40 @@ msgstr "Klikk her for Ã¥ fÃ¥ opp adresseboken"
 msgid "Click here to select folders to post to"
 msgstr "Klikk her for Ã¥ velge mapper Ã¥ poste til"
 
-#: ../composer/e-composer-private.c:199
+#: ../composer/e-composer-private.c:208
 msgid "Undo the last action"
 msgstr "Angre siste handling"
 
-#: ../composer/e-composer-private.c:203
+#: ../composer/e-composer-private.c:212
 msgid "Redo the last undone action"
 msgstr "Gjenopprett siste angrede handling"
 
-#: ../composer/e-composer-private.c:207
+#: ../composer/e-composer-private.c:216
 msgid "Search for text"
 msgstr "SÃ¸k etter tekst"
 
-#: ../composer/e-composer-private.c:211
+#: ../composer/e-composer-private.c:220
 msgid "Search for and replace text"
 msgstr "SÃ¸k etter / erstatt tekst"
 
-#: ../composer/e-composer-private.c:301
+#: ../composer/e-composer-private.c:310
 msgid "Save draft"
 msgstr "Lagre utkast"
 
 #. Check buttons
-#: ../composer/e-msg-composer.c:188
+#: ../composer/e-msg-composer.c:199
 #: ../plugins/attachment-reminder/attachment-reminder.c:122
 msgid "_Do not show this message again."
 msgstr "Ikke vis _denne meldingen igjen."
 
-#: ../composer/e-msg-composer.c:1005
+#: ../composer/e-msg-composer.c:1030
 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:1012
+#: ../composer/e-msg-composer.c:1041
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -8203,15 +8188,15 @@ msgstr ""
 "Kan ikke kryptere utgÃ¥ende melding: Sertifikat for kryptering ikke satt for "
 "denne kontoen"
 
-#: ../composer/e-msg-composer.c:1405
+#: ../composer/e-msg-composer.c:1462
 msgid "Unable to reconstruct message from autosave file"
 msgstr "Kunne ikke gjenopprette melding fra automatisk lagret fil"
 
-#: ../composer/e-msg-composer.c:1471 ../composer/e-msg-composer.c:1678
+#: ../composer/e-msg-composer.c:1528 ../composer/e-msg-composer.c:1735
 msgid "Compose Message"
 msgstr "Skriv melding"
 
-#: ../composer/e-msg-composer.c:3334
+#: ../composer/e-msg-composer.c:3436
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr ""
 "Redigering inneholder en meldingskropp som ikke er tekst, og som ikke kan "
@@ -8359,64 +8344,79 @@ msgstr "plugg"
 msgid "Anjal email client"
 msgstr "Anjal e-postprogram"
 
-#: ../capplet/settings/mail-account-view.c:56
+#: ../capplet/settings/mail-account-view.c:74
 msgid "Please enter your full name."
 msgstr "Vennligst oppgi ditt fulle navn."
 
-#: ../capplet/settings/mail-account-view.c:57
+#: ../capplet/settings/mail-account-view.c:75
 msgid "Please enter your email address."
 msgstr "Vennligst oppgi din e-postadresse."
 
-#: ../capplet/settings/mail-account-view.c:58
+#: ../capplet/settings/mail-account-view.c:76
 msgid "The email address you have entered is invalid."
 msgstr "E-postadressen du oppga er ugyldig."
 
-#: ../capplet/settings/mail-account-view.c:182
+#: ../capplet/settings/mail-account-view.c:77
+msgid "Please enter your password."
+msgstr "Vennligst oppgi ditt passord."
+
+#: ../capplet/settings/mail-account-view.c:256
+#: ../plugins/caldav/caldav-source.c:66
+msgid "CalDAV"
+msgstr "CalDAV"
+
+#: ../capplet/settings/mail-account-view.c:360
+#: ../plugins/google-account-setup/google-contacts-source.c:53
+#: ../plugins/google-account-setup/google-source.c:81
+msgid "Google"
+msgstr "Google"
+
+#: ../capplet/settings/mail-account-view.c:464
 msgid "Personal details:"
 msgstr "Personlige detaljer:"
 
-#: ../capplet/settings/mail-account-view.c:189
+#: ../capplet/settings/mail-account-view.c:471
 msgid "Name:"
 msgstr "Navn:"
 
-#: ../capplet/settings/mail-account-view.c:198
+#: ../capplet/settings/mail-account-view.c:480
 msgid "Email address:"
 msgstr "E-postadresse:"
 
-#: ../capplet/settings/mail-account-view.c:208
-msgid "Receiving details:"
-msgstr "Detaljer for mottak:"
+#: ../capplet/settings/mail-account-view.c:490
+msgid "<span size=\"large\" weight=\"bold\">Details:</span>"
+msgstr "<span size=\"large\" weight=\"bold\">Detaljer:</span>"
+
+#: ../capplet/settings/mail-account-view.c:496
+msgid "<span size=\"large\" weight=\"bold\">Receiving</span>"
+msgstr "<span size=\"large\" weight=\"bold\">Mottar</span>"
 
-#: ../capplet/settings/mail-account-view.c:215
-#: ../capplet/settings/mail-account-view.c:265
+#: ../capplet/settings/mail-account-view.c:501
 msgid "Server type:"
 msgstr "Tjenertype:"
 
-#: ../capplet/settings/mail-account-view.c:224
-#: ../capplet/settings/mail-account-view.c:274
+#: ../capplet/settings/mail-account-view.c:510
 msgid "Server address:"
 msgstr "Tjeneradresse:"
 
-#: ../capplet/settings/mail-account-view.c:233
-#: ../capplet/settings/mail-account-view.c:283
+#: ../capplet/settings/mail-account-view.c:519
 msgid "Username:"
 msgstr "Brukernavn:"
 
-#: ../capplet/settings/mail-account-view.c:242
-#: ../capplet/settings/mail-account-view.c:292
+#: ../capplet/settings/mail-account-view.c:528
 msgid "Use encryption:"
 msgstr "Bruk kryptering:"
 
-#: ../capplet/settings/mail-account-view.c:247
-#: ../capplet/settings/mail-account-view.c:297
+#: ../capplet/settings/mail-account-view.c:533
+#: ../capplet/settings/mail-account-view.c:566
 msgid "never"
 msgstr "aldri"
 
-#: ../capplet/settings/mail-account-view.c:258
-msgid "Sending details:"
-msgstr "Detaljer for utsendelse:"
+#: ../capplet/settings/mail-account-view.c:545
+msgid "<span size=\"large\" weight=\"bold\">Sending</span>"
+msgstr "<span size=\"large\" weight=\"bold\">Sender</span>"
 
-#: ../capplet/settings/mail-account-view.c:316
+#: ../capplet/settings/mail-account-view.c:585
 msgid ""
 "To use the email application you'll need to setup an account. Put your email "
 "address and password in below and we'll try and work out all the settings. "
@@ -8426,7 +8426,7 @@ msgstr ""
 "postadresse og passord under sÃ¥ skal vi prÃ¸ve ut alle innstillingene. Hvis "
 "det ikke lar seg gjÃ¸re automatisk mÃ¥ du oppgi detaljer for tjeneren ogsÃ¥."
 
-#: ../capplet/settings/mail-account-view.c:318
+#: ../capplet/settings/mail-account-view.c:587
 msgid ""
 "Sorry, we can't work out the settings to get your mail automatically. Please "
 "enter them below. We've tried to make a start with the details you just "
@@ -8436,11 +8436,11 @@ msgstr ""
 "automatisk. Vennligst oppgi dem nedenfor. Har forsÃ¸kt Ã¥ lage et utgangspunkt "
 "med detaljene du nettopp oppga, men du mÃ¥ kanskje endre dem."
 
-#: ../capplet/settings/mail-account-view.c:320
+#: ../capplet/settings/mail-account-view.c:589
 msgid "You can specify more options to configure the account."
 msgstr "Du kan oppgi flere alternativer for Ã¥ konfigurere kontoen."
 
-#: ../capplet/settings/mail-account-view.c:322
+#: ../capplet/settings/mail-account-view.c:591
 msgid ""
 "Now we need your settings for sending mail. We've tried to make some guesses "
 "but you should check them over to make sure."
@@ -8448,11 +8448,11 @@ msgstr ""
 "NÃ¥ trengs innstillingene for Ã¥ sende e-post. Har prÃ¸vd Ã¥ gjette litt men du "
 "bÃ¸r se over dem for Ã¥ vÃ¦re sikker."
 
-#: ../capplet/settings/mail-account-view.c:323
+#: ../capplet/settings/mail-account-view.c:592
 msgid "You can specify your default settings for your account."
 msgstr "Du kan oppgi forvalgte innstillinger for kontoen."
 
-#: ../capplet/settings/mail-account-view.c:324
+#: ../capplet/settings/mail-account-view.c:593
 msgid ""
 "Time to check things over before we try and connect to the server and fetch "
 "your mail."
@@ -8460,86 +8460,125 @@ msgstr ""
 "Se over innstillingene fÃ¸r forsÃ¸k pÃ¥ Ã¥ koble til tjeneren for Ã¥ hente e-"
 "posten din."
 
-#: ../capplet/settings/mail-account-view.c:339
-#: ../mail/em-account-editor.c:2059 ../mail/em-account-editor.c:2190
-#: ../mail/mail-config.ui.h:60
+#: ../capplet/settings/mail-account-view.c:608
+#: ../mail/em-account-editor.c:2086 ../mail/em-account-editor.c:2217
+#: ../mail/mail-config.ui.h:61
 msgid "Identity"
 msgstr "Identitet"
 
-#: ../capplet/settings/mail-account-view.c:339
+#: ../capplet/settings/mail-account-view.c:608
 msgid "Next - Receiving mail"
 msgstr "Neste - mottak av e-post"
 
-#: ../capplet/settings/mail-account-view.c:340
+#: ../capplet/settings/mail-account-view.c:609
 msgid "Receiving mail"
 msgstr "Mottak av e-post"
 
-#: ../capplet/settings/mail-account-view.c:340
-#: ../capplet/settings/mail-account-view.c:341
+#: ../capplet/settings/mail-account-view.c:609
+#: ../capplet/settings/mail-account-view.c:610
 msgid "Next - Sending mail"
 msgstr "Neste - Utsendelse av e-post"
 
-#: ../capplet/settings/mail-account-view.c:340
+#: ../capplet/settings/mail-account-view.c:609
 msgid "Back - Identity"
 msgstr "Tilbake - Identitet"
 
-#: ../capplet/settings/mail-account-view.c:340
+#: ../capplet/settings/mail-account-view.c:609
 msgid "Next - Receiving options"
 msgstr "Neste - Alternativer for mottak"
 
-#: ../capplet/settings/mail-account-view.c:341
+#: ../capplet/settings/mail-account-view.c:610
 msgid "Receiving options"
 msgstr "Alternativer for mottak"
 
-#: ../capplet/settings/mail-account-view.c:341
-#: ../capplet/settings/mail-account-view.c:343
+#: ../capplet/settings/mail-account-view.c:610
+#: ../capplet/settings/mail-account-view.c:612
 msgid "Back - Receiving mail"
 msgstr "Tilbake - Mottak av e-post"
 
-#: ../capplet/settings/mail-account-view.c:343
+#: ../capplet/settings/mail-account-view.c:612
 msgid "Sending mail"
 msgstr "Utsendelse av e-post"
 
-#: ../capplet/settings/mail-account-view.c:343
-#: ../capplet/settings/mail-account-view.c:344
+#: ../capplet/settings/mail-account-view.c:612
+#: ../capplet/settings/mail-account-view.c:613
 msgid "Next - Review account"
 msgstr "Neste - Se over konto"
 
-#: ../capplet/settings/mail-account-view.c:343
+#: ../capplet/settings/mail-account-view.c:612
 msgid "Next - Defaults"
 msgstr "Neste - Forvalg"
 
-#: ../capplet/settings/mail-account-view.c:343
+#: ../capplet/settings/mail-account-view.c:612
 msgid "Back - Receiving options"
 msgstr "Tilbake - Alternativer for mottak"
 
-#: ../capplet/settings/mail-account-view.c:344
-#: ../mail/em-account-editor.c:2769 ../mail/mail-config.ui.h:33
+#: ../capplet/settings/mail-account-view.c:613
+#: ../mail/em-account-editor.c:2791 ../mail/mail-config.ui.h:34
 msgid "Defaults"
 msgstr "Forvalg"
 
-#: ../capplet/settings/mail-account-view.c:344
+#: ../capplet/settings/mail-account-view.c:613
 msgid "Back - Sending mail"
 msgstr "Tilbake - Utsendelse av e-post"
 
-#: ../capplet/settings/mail-account-view.c:346
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Review account"
 msgstr "Se over konto"
 
-#: ../capplet/settings/mail-account-view.c:346
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Finish"
 msgstr "FullfÃ¸r"
 
-#: ../capplet/settings/mail-account-view.c:346
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Back - Sending"
 msgstr "Tilbake - Utsendelse"
 
-#: ../capplet/settings/mail-account-view.c:680
+#: ../capplet/settings/mail-account-view.c:719
+msgid "Setup Google contacts with Evolution"
+msgstr "Sett opp Google-kontakter i Evolution"
+
+#: ../capplet/settings/mail-account-view.c:720
+msgid "Setup Google calendar with Evolution"
+msgstr "Sett opp Google-kalender i Evolution."
+
+#: ../capplet/settings/mail-account-view.c:725
+msgid "You may need to enable IMAP access."
+msgstr "Du mÃ¥ kanskje slÃ¥ pÃ¥ IMAP-tilgang."
+
+#: ../capplet/settings/mail-account-view.c:733
+msgid "<span size=\"large\" weight=\"bold\">Google account settings:</span>"
+msgstr "<span size=\"large\" weight=\"bold\">Innstillinger for Google-konto:</span>"
+
+#: ../capplet/settings/mail-account-view.c:757
+msgid "Setup Yahoo calendar with Evolution"
+msgstr "Sett opp Yahoo-kalender i Evolution"
+
+#: ../capplet/settings/mail-account-view.c:761
+msgid ""
+"Yahoo calendars are named as firstname_lastname. We have tried to form the "
+"calendar name. So please confirm and re-enter the calendar name if it is not "
+"correct."
+msgstr "Yahoo-kalendere har navn som fornavn_etternavn. Vi har prÃ¸vd Ã¥ utforme kalendernavnet. Vennligst bekreft og oppgi kalendernavnet pÃ¥ nytt hvis det ikke er korrekt."
+
+#: ../capplet/settings/mail-account-view.c:768
+msgid "<span size=\"large\" weight=\"bold\">Yahoo account settings:</span>"
+msgstr "<span size=\"large\" weight=\"bold\">Innstillinger for Yahoo-konto:</span>"
+
+#: ../capplet/settings/mail-account-view.c:780
+msgid "Yahoo Calendar name:"
+msgstr "Navn pÃ¥ Yahoo-kalender"
+
+#: ../capplet/settings/mail-account-view.c:1023
+msgid "Password:"
+msgstr "Passord:"
+
+#: ../capplet/settings/mail-account-view.c:1091
 #: ../capplet/settings/mail-settings-view.c:267
 msgid "Close Tab"
 msgstr "Lukk fane"
 
-#: ../capplet/settings/mail-account-view.c:690
+#: ../capplet/settings/mail-account-view.c:1101
 msgid "Account Wizard"
 msgstr "Kontoveiviser"
 
@@ -8549,13 +8588,13 @@ msgstr "Evolution kontoassistent"
 
 #. create the local source group
 #: ../capplet/settings/mail-capplet-shell.c:342 ../mail/e-mail-migrate.c:659
-#: ../mail/e-mail-store.c:227 ../mail/em-folder-tree-model.c:145
-#: ../mail/em-folder-tree-model.c:148 ../mail/em-folder-tree-model.c:151
-#: ../mail/em-folder-tree-model.c:153 ../mail/em-folder-tree-model.c:160
-#: ../mail/em-folder-tree-model.c:162 ../mail/mail-vfolder.c:211
-#: ../mail/message-list.c:1607
+#: ../mail/e-mail-store.c:227 ../mail/em-folder-tree-model.c:148
+#: ../mail/em-folder-tree-model.c:151 ../mail/em-folder-tree-model.c:154
+#: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:163
+#: ../mail/em-folder-tree-model.c:165 ../mail/mail-vfolder.c:211
+#: ../mail/message-list.c:1614
 #: ../modules/addressbook/e-book-shell-backend.c:125
-#: ../modules/addressbook/e-book-shell-migrate.c:126
+#: ../modules/addressbook/e-book-shell-migrate.c:130
 #: ../modules/calendar/e-cal-shell-backend.c:121
 #: ../modules/calendar/e-cal-shell-backend.c:133
 #: ../modules/calendar/e-cal-shell-migrate.c:141
@@ -8591,7 +8630,7 @@ msgstr "Varsling om kalenderhendelser"
 msgid "Evolution Alarm Notify"
 msgstr "Evolution varslingstjeneste"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:823
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:824
 #: ../shell/e-shell-window-private.c:251
 msgid "Evolution"
 msgstr "Evolution"
@@ -8732,7 +8771,7 @@ msgstr "Synlig"
 
 #. strftime format of a weekday and a date.
 #: ../e-util/e-datetime-format.c:196
-#: ../modules/calendar/e-cal-shell-view-actions.c:1788
+#: ../modules/calendar/e-cal-shell-view-actions.c:1790
 #: ../plugins/itip-formatter/itip-view.c:191
 #: ../widgets/table/e-cell-date-edit.c:311
 msgid "Today"
@@ -8811,13 +8850,15 @@ msgstr "Loggmeldinger:"
 msgid "Log Level"
 msgstr "LoggnivÃ¥"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2686
+#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2696
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Meldinger"
 
 #: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:109
-#: ../shell/e-shell-window-actions.c:1450
+#: ../shell/e-shell-window-actions.c:1457
+#: ../shell/e-shell-window-actions.c:1464
+#: ../shell/e-shell-window-actions.c:1471
 msgid "Close this window"
 msgstr "Lukk dette vinduet"
 
@@ -8884,7 +8925,7 @@ msgstr "Vil du overskrive den?"
 msgid "File exists \"{0}\"."
 msgstr "Filen Â«{0}Â» eksisterer."
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:133
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:132
 msgid "_Overwrite"
 msgstr "_Overskriv"
 
@@ -8896,60 +8937,66 @@ msgstr "Kunne ikke Ã¥pne lenken."
 msgid "Could not display help for Evolution."
 msgstr "Kunne ikke vise hjelp for Evolution."
 
-#: ../e-util/gconf-bridge.c:1304
+#: ../e-util/gconf-bridge.c:1281
 #, c-format
 msgid "GConf error: %s"
 msgstr "GConf-feil: %s"
 
-#: ../e-util/gconf-bridge.c:1315
+#: ../e-util/gconf-bridge.c:1292
 msgid "All further errors shown only on terminal."
 msgstr "Alle videre feil blir kun vist pÃ¥ konsollet."
 
-#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:938
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:937
+#: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
 #: ../modules/mail/em-mailer-prefs.c:78
+msgid "From"
+msgstr "Fra"
+
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:938
+#: ../modules/mail/em-mailer-prefs.c:79
 msgid "Reply-To"
 msgstr "Svar-til"
 
 #: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:940
-#: ../mail/em-format-html.c:2243 ../mail/em-format-html.c:2305
-#: ../mail/em-format-html.c:2328 ../modules/mail/em-mailer-prefs.c:80
+#: ../mail/em-format-html.c:2277 ../mail/em-format-html.c:2339
+#: ../mail/em-format-html.c:2362 ../modules/mail/em-mailer-prefs.c:81
 msgid "Cc"
 msgstr "Cc"
 
 #: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:941
-#: ../mail/em-format-html.c:2244 ../mail/em-format-html.c:2309
-#: ../mail/em-format-html.c:2331 ../modules/mail/em-mailer-prefs.c:81
+#: ../mail/em-format-html.c:2278 ../mail/em-format-html.c:2343
+#: ../mail/em-format-html.c:2365 ../modules/mail/em-mailer-prefs.c:82
 msgid "Bcc"
 msgstr "Bcc"
 
 #: ../em-format/em-format-quote.c:347 ../em-format/em-format.c:942
 #: ../mail/e-mail-tag-editor.c:328 ../mail/em-filter-i18n.h:74
-#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:82
+#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:83
 #: ../plugins/groupwise-features/properties.ui.h:6 ../smime/lib/e-cert.c:1140
 msgid "Subject"
 msgstr "Emne"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:358 ../mail/em-format-html.c:2425
-#: ../modules/mail/em-mailer-prefs.c:1138
+#: ../em-format/em-format-quote.c:358 ../mail/em-format-html.c:2459
+#: ../modules/mail/em-mailer-prefs.c:1144
 msgid "Mailer"
 msgstr "E-postprogram"
 
-#: ../em-format/em-format-quote.c:423 ../mail/em-composer-utils.c:1220
+#: ../em-format/em-format-quote.c:423 ../mail/em-composer-utils.c:1193
 msgid "-------- Forwarded Message --------"
 msgstr "---------Videresendt melding-------"
 
 #: ../em-format/em-format.c:943 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:83 ../widgets/misc/e-dateedit.c:524
+#: ../modules/mail/em-mailer-prefs.c:84 ../widgets/misc/e-dateedit.c:524
 #: ../widgets/misc/e-dateedit.c:546
 msgid "Date"
 msgstr "Dato"
 
-#: ../em-format/em-format.c:944 ../modules/mail/em-mailer-prefs.c:84
+#: ../em-format/em-format.c:944 ../modules/mail/em-mailer-prefs.c:85
 msgid "Newsgroups"
 msgstr "Nyhetsgrupper"
 
-#: ../em-format/em-format.c:945 ../modules/mail/em-mailer-prefs.c:85
+#: ../em-format/em-format.c:945 ../modules/mail/em-mailer-prefs.c:86
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "Ansikt"
@@ -9207,7 +9254,7 @@ msgstr "Mangler dato."
 msgid "Missing file name."
 msgstr "Mangler filnavn."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:74
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
 msgid "Missing name."
 msgstr "Mangler navn."
 
@@ -9284,7 +9331,7 @@ msgstr "i fremtiden"
 msgid "months"
 msgstr "mÃ¥neder"
 
-#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:180
+#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:181
 msgid "seconds"
 msgstr "sekunder"
 
@@ -9301,7 +9348,7 @@ msgid "years"
 msgstr "Ã¥r"
 
 #: ../mail/e-mail-attachment-bar.c:90 ../mail/e-mail-attachment-bar.c:95
-#: ../mail/em-format-html-display.c:1020 ../mail/mail-config.ui.h:14
+#: ../mail/em-format-html-display.c:1028 ../mail/mail-config.ui.h:15
 #: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:118
 #: ../widgets/misc/e-attachment-paned.c:123
 msgid "Attachment"
@@ -9319,7 +9366,7 @@ msgstr "Ikonvisning"
 msgid "List View"
 msgstr "Listevisning"
 
-#: ../mail/e-mail-browser.c:262
+#: ../mail/e-mail-browser.c:264
 msgid "(No Subject)"
 msgstr "(Uten emne)"
 
@@ -9368,7 +9415,7 @@ msgid "_Later"
 msgstr "_Senere"
 
 #: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:476
+#: ../modules/mail/e-mail-shell-view-actions.c:478
 msgid "Add Label"
 msgstr "Legg til etikett"
 
@@ -9392,30 +9439,30 @@ msgstr "Farge"
 #: ../plugins/caldav/caldav-browse-server.c:1163
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
 #: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/menus/gal-define-views-dialog.c:335
+#: ../widgets/menus/gal-define-views-dialog.c:334
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
 msgid "Name"
 msgstr "Navn"
 
 #: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:283
-#: ../mail/em-folder-tree-model.c:675 ../mail/em-folder-tree.c:2706
+#: ../mail/em-folder-tree-model.c:706 ../mail/em-folder-tree.c:2729
 #: ../modules/mail/e-mail-shell-view-private.c:953
 msgid "Inbox"
 msgstr "Innboks"
 
-#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:668
+#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:699
 msgid "Drafts"
 msgstr "Skisser"
 
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:678
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:709
 msgid "Outbox"
 msgstr "Utboks"
 
-#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:680
+#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:711
 msgid "Sent"
 msgstr "Sendt"
 
-#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:671
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:702
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 #: ../plugins/templates/templates.c:572
 msgid "Templates"
@@ -9458,7 +9505,7 @@ msgstr "Kunne ikke opprette lokale e-postmapper i Â«%sÂ»: %s"
 #. XXX e-error should provide a widget layout and API suitable
 #. *     for packing additional widgets to the right of the alert
 #. *     icon.  But for now, screw it.
-#: ../mail/e-mail-reader-utils.c:108
+#: ../mail/e-mail-reader-utils.c:109
 #: ../modules/calendar/e-task-shell-view-actions.c:570
 msgid "Do not ask me again"
 msgstr "Ikke spÃ¸r meg igjen"
@@ -9798,7 +9845,7 @@ msgid "Redirect (bounce) the selected message to someone"
 msgstr "Omdiriger (bounce) den valgte meldingen til noen"
 
 #: ../mail/e-mail-reader.c:1419
-#: ../modules/calendar/e-cal-shell-view-actions.c:1457
+#: ../modules/calendar/e-cal-shell-view-actions.c:1459
 #: ../modules/mail/e-mail-attachment-handler.c:139
 msgid "Reply to _All"
 msgstr "Svar til _alle"
@@ -9988,7 +10035,7 @@ msgstr "Henter melding Â«%sÂ»"
 
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:2462 ../mail/mail-config.ui.h:30
+#: ../mail/e-mail-reader.c:2464 ../mail/mail-config.ui.h:31
 #: ../plugins/google-account-setup/google-source.c:303
 #: ../plugins/google-account-setup/google-source.c:537
 #: ../plugins/google-account-setup/google-source.c:659
@@ -9996,33 +10043,33 @@ msgstr "Henter melding Â«%sÂ»"
 msgid "Default"
 msgstr "Forvalgt"
 
-#: ../mail/e-mail-reader.c:2583
+#: ../mail/e-mail-reader.c:2585
 #: ../modules/mail/e-mail-attachment-handler.c:132
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: ../mail/e-mail-reader.c:2584
+#: ../mail/e-mail-reader.c:2586
 msgid "Forward the selected message to someone"
 msgstr "Videresend den valgte meldingen til noen"
 
-#: ../mail/e-mail-reader.c:2629 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:2631 ../mail/em-filter-i18n.h:14
 #: ../plugins/groupwise-features/share-folder.c:753
 msgid "Delete"
 msgstr "Slett"
 
-#: ../mail/e-mail-reader.c:2633
-#: ../modules/calendar/e-cal-shell-view-actions.c:1303
+#: ../mail/e-mail-reader.c:2639
+#: ../modules/calendar/e-cal-shell-view-actions.c:1305
 #: ../widgets/misc/e-calendar.c:193
 msgid "Next"
 msgstr "Neste"
 
-#: ../mail/e-mail-reader.c:2637
-#: ../modules/calendar/e-cal-shell-view-actions.c:1296
+#: ../mail/e-mail-reader.c:2643
+#: ../modules/calendar/e-cal-shell-view-actions.c:1298
 #: ../widgets/misc/e-calendar.c:169
 msgid "Previous"
 msgstr "Forrige"
 
-#: ../mail/e-mail-reader.c:2641 ../mail/mail-dialogs.ui.h:19
+#: ../mail/e-mail-reader.c:2653 ../mail/mail-dialogs.ui.h:19
 msgid "Reply"
 msgstr "Svar"
 
@@ -10032,7 +10079,7 @@ msgstr "Merk for oppfÃ¸lging"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:499 ../mail/mail-config.ui.h:74
+#: ../mail/em-account-editor.c:499 ../mail/mail-config.ui.h:75
 #: ../modules/addressbook/ldap-config.ui.h:9
 msgid "No encryption"
 msgstr "Ingen kryptering"
@@ -10040,7 +10087,7 @@ msgstr "Ingen kryptering"
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
-#: ../mail/em-account-editor.c:503 ../mail/mail-config.ui.h:128
+#: ../mail/em-account-editor.c:503 ../mail/mail-config.ui.h:129
 #: ../modules/addressbook/ldap-config.ui.h:20
 msgid "TLS encryption"
 msgstr "TLS-kryptering"
@@ -10048,7 +10095,7 @@ msgstr "TLS-kryptering"
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
-#: ../mail/em-account-editor.c:507 ../mail/mail-config.ui.h:99
+#: ../mail/em-account-editor.c:507 ../mail/mail-config.ui.h:100
 #: ../modules/addressbook/ldap-config.ui.h:12
 msgid "SSL encryption"
 msgstr "SSL-kryptering"
@@ -10072,34 +10119,34 @@ msgstr ""
 "og kryss av i ruten for Ã¥ akseptere den\n"
 
 #. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:876 ../widgets/misc/e-signature-combo-box.c:75
+#: ../mail/em-account-editor.c:885 ../widgets/misc/e-signature-combo-box.c:75
 msgctxt "mail-signature"
 msgid "None"
 msgstr "Ingen"
 
-#: ../mail/em-account-editor.c:960
+#: ../mail/em-account-editor.c:969
 msgid "Never"
 msgstr "Aldri"
 
-#: ../mail/em-account-editor.c:961
+#: ../mail/em-account-editor.c:970
 msgid "Always"
 msgstr "Alltid"
 
-#: ../mail/em-account-editor.c:962
+#: ../mail/em-account-editor.c:971
 msgid "Ask for each message"
 msgstr "SpÃ¸r for hver melding"
 
 #. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1699 ../widgets/misc/e-account-tree-view.c:124
+#: ../mail/em-account-editor.c:1708 ../widgets/misc/e-account-tree-view.c:124
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "Ingen"
 
-#: ../mail/em-account-editor.c:2056
+#: ../mail/em-account-editor.c:2083
 msgid "Mail Configuration"
 msgstr "E-post-konfigurasjon"
 
-#: ../mail/em-account-editor.c:2057
+#: ../mail/em-account-editor.c:2084
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -10109,7 +10156,7 @@ msgstr ""
 "\n"
 "Klikk Â«FramoverÂ» for Ã¥ begynne."
 
-#: ../mail/em-account-editor.c:2060
+#: ../mail/em-account-editor.c:2087
 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 "
@@ -10119,20 +10166,20 @@ msgstr ""
 "mÃ¥ ikke nÃ¸dvendigvis fylles ut, hvis du ikke Ã¸nsker Ã¥ inkludere denne "
 "informasjonen i meldingene du sender."
 
-#: ../mail/em-account-editor.c:2062 ../mail/em-account-editor.c:2227
-#: ../mail/mail-config.ui.h:92
+#: ../mail/em-account-editor.c:2089 ../mail/em-account-editor.c:2256
+#: ../mail/mail-config.ui.h:93
 msgid "Receiving Email"
 msgstr "Innkommende e-post"
 
-#: ../mail/em-account-editor.c:2063
+#: ../mail/em-account-editor.c:2090
 msgid "Please configure the following account settings."
 msgstr "Vennligst konfigurer fÃ¸lgende kontoinnstillinger."
 
-#: ../mail/em-account-editor.c:2065 ../mail/em-account-editor.c:2705
+#: ../mail/em-account-editor.c:2092 ../mail/em-account-editor.c:2727
 msgid "Sending Email"
 msgstr "UtgÃ¥ende e-post"
 
-#: ../mail/em-account-editor.c:2066
+#: ../mail/em-account-editor.c:2093
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -10140,11 +10187,11 @@ 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/em-account-editor.c:2068
+#: ../mail/em-account-editor.c:2095
 msgid "Account Management"
 msgstr "HÃ¥ndtering av konti"
 
-#: ../mail/em-account-editor.c:2069
+#: ../mail/em-account-editor.c:2096
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -10152,11 +10199,11 @@ msgstr ""
 "Vennligst oppgi et beskrivende navn for denne kontoen i feltet under.\n"
 "Dette navnet vil kun bli brukt som et visningsnavn."
 
-#: ../mail/em-account-editor.c:2073
+#: ../mail/em-account-editor.c:2100
 msgid "Done"
 msgstr "Ferdig"
 
-#: ../mail/em-account-editor.c:2074
+#: ../mail/em-account-editor.c:2101
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10170,56 +10217,48 @@ msgstr ""
 "\n"
 "Klikk Â«BrukÂ» for Ã¥ lagre dine innstillinger."
 
-#: ../mail/em-account-editor.c:2514
+#: ../mail/em-account-editor.c:2543
 msgid "Check for _new messages every"
 msgstr "Se etter _nye meldinger hver(t)"
 
-#: ../mail/em-account-editor.c:2522
+#: ../mail/em-account-editor.c:2551
 msgid "minu_tes"
 msgstr "minu_tter"
 
-#: ../mail/em-account-editor.c:2892 ../mail/mail-config.ui.h:106
+#: ../mail/em-account-editor.c:2914 ../mail/mail-config.ui.h:107
 msgid "Security"
 msgstr "Sikkerhet"
 
 #. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2937 ../mail/em-account-editor.c:3005
+#: ../mail/em-account-editor.c:2959 ../mail/em-account-editor.c:3027
 msgid "Receiving Options"
 msgstr "Alternativer for mottak"
 
-#: ../mail/em-account-editor.c:2938 ../mail/em-account-editor.c:3006
+#: ../mail/em-account-editor.c:2960 ../mail/em-account-editor.c:3028
 msgid "Checking for New Messages"
 msgstr "Ser etter nye meldinger"
 
-#: ../mail/em-account-editor.c:3474
-msgid "Account Editor"
-msgstr "Kontoredigering"
-
-#: ../mail/em-account-editor.c:3474
-msgid "Evolution Account Assistant"
-msgstr "Evolution kontoassistent"
-
 #. Translators: First %s is an email address, second %s is the subject of the email, third %s is the date
-#: ../mail/em-composer-utils.c:1570
+#: ../mail/em-composer-utils.c:1542
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr "Din melding til %s om Â«%sÂ» den %s er har blitt lest."
 
 #. Translators: %s is the subject of the email message
-#: ../mail/em-composer-utils.c:1618
+#: ../mail/em-composer-utils.c:1590
 #, c-format
 msgid "Delivery Notification for: \"%s\""
 msgstr "Varsling om ny e-post for Â«%sÂ»"
 
-#: ../mail/em-composer-utils.c:1947
+#: ../mail/em-composer-utils.c:1919
 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:1994
+#: ../mail/em-composer-utils.c:1966
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10227,15 +10266,15 @@ msgstr ""
 "${AbbrevWeekdayName}, ${Day}.${Month}.${Year} kl. ${24Hour}.${Minute} "
 "${TimeZone}, skrev ${Sender}:"
 
-#: ../mail/em-composer-utils.c:2138
+#: ../mail/em-composer-utils.c:2110
 msgid "-----Original Message-----"
 msgstr "-----Opprinnelig melding-----"
 
-#: ../mail/em-composer-utils.c:2319
+#: ../mail/em-composer-utils.c:2290
 msgid "Posting destination"
 msgstr "Destinasjon for post"
 
-#: ../mail/em-composer-utils.c:2320
+#: ../mail/em-composer-utils.c:2291
 msgid "Choose folders to post the message to."
 msgstr "Velg mapper meldingen skal postes til."
 
@@ -10256,10 +10295,18 @@ msgstr "Tilegn farge"
 msgid "Assign Score"
 msgstr "Gi poeng"
 
+#: ../mail/em-filter-i18n.h:6
+msgid "BCC"
+msgstr "Bcc"
+
 #: ../mail/em-filter-i18n.h:7
 msgid "Beep"
 msgstr "Pip"
 
+#: ../mail/em-filter-i18n.h:8
+msgid "CC"
+msgstr "Cc"
+
 #: ../mail/em-filter-i18n.h:9
 msgid "Completed On"
 msgstr "FullfÃ¸rt"
@@ -10348,7 +10395,7 @@ msgstr "er ikke satt"
 msgid "is set"
 msgstr "er satt"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:63
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:64
 msgid "Junk"
 msgstr "UÃ¸nsket e-post"
 
@@ -10529,28 +10576,28 @@ msgid "Folder _name:"
 msgstr "Mappe_navn:"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:146 ../mail/em-folder-tree-model.c:149
-#: ../mail/em-folder-tree-model.c:155 ../mail/em-folder-tree-model.c:157
-#: ../mail/em-folder-tree-model.c:164 ../mail/em-folder-tree-model.c:166
+#: ../mail/em-folder-tree-model.c:149 ../mail/em-folder-tree-model.c:152
+#: ../mail/em-folder-tree-model.c:158 ../mail/em-folder-tree-model.c:160
+#: ../mail/em-folder-tree-model.c:167 ../mail/em-folder-tree-model.c:169
 #: ../mail/mail-vfolder.c:1070 ../mail/mail-vfolder.c:1135
 msgid "Search Folders"
 msgstr "SÃ¸kemapper"
 
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:171 ../mail/em-folder-tree-model.c:173
+#: ../mail/em-folder-tree-model.c:174 ../mail/em-folder-tree-model.c:176
 msgid "UNMATCHED"
 msgstr "UTEN TREFF"
 
-#: ../mail/em-folder-tree-model.c:743 ../mail/em-folder-tree-model.c:1086
+#: ../mail/em-folder-tree-model.c:774 ../mail/em-folder-tree-model.c:1117
 msgid "Loading..."
 msgstr "Laster..."
 
-#: ../mail/em-folder-tree.c:183
+#: ../mail/em-folder-tree.c:184
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanner mapper i Â«%sÂ»"
 
-#: ../mail/em-folder-tree.c:596
+#: ../mail/em-folder-tree.c:597
 msgid "Folder names cannot contain '/'"
 msgstr "Mappenavn kan ikke inneholde tegnet Â«/Â»"
 
@@ -10572,37 +10619,37 @@ msgstr "Mappenavn kan ikke inneholde tegnet Â«/Â»"
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:1078
+#: ../mail/em-folder-tree.c:1079
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1286
+#: ../mail/em-folder-tree.c:1287
 msgid "Mail Folder Tree"
 msgstr "Tre for e-postmapper"
 
-#: ../mail/em-folder-tree.c:1583 ../mail/em-folder-utils.c:92
+#: ../mail/em-folder-tree.c:1593 ../mail/em-folder-utils.c:92
 #, c-format
 msgid "Moving folder %s"
 msgstr "Flytter mappe %s"
 
-#: ../mail/em-folder-tree.c:1585 ../mail/em-folder-utils.c:94
+#: ../mail/em-folder-tree.c:1595 ../mail/em-folder-utils.c:94
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopierer mappe %s"
 
-#: ../mail/em-folder-tree.c:1592 ../mail/message-list.c:2106
+#: ../mail/em-folder-tree.c:1602 ../mail/message-list.c:2113
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Flytter meldinger til mappe %s"
 
-#: ../mail/em-folder-tree.c:1594 ../mail/message-list.c:2108
+#: ../mail/em-folder-tree.c:1604 ../mail/message-list.c:2115
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopierer meldinger til mappe %s"
 
-#: ../mail/em-folder-tree.c:1609
+#: ../mail/em-folder-tree.c:1619
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Kan ikke slippe melding(er) toppnivÃ¥ for lageret"
 
@@ -10635,7 +10682,7 @@ msgstr "Spesifiser hvor mappen skal opprettes:"
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Fjerner abonnement pÃ¥ mappe Â«%sÂ»"
 
-#: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1533
+#: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1567
 msgid "Unsigned"
 msgstr "Usignert"
 
@@ -10647,7 +10694,7 @@ msgstr ""
 "Denne meldingen er ikke signert. Du har ingen garanti for at meldingen er "
 "autentisk."
 
-#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1534
+#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1568
 msgid "Valid signature"
 msgstr "Gyldig signatur"
 
@@ -10659,7 +10706,7 @@ msgstr ""
 "Denne meldingen er signert og gyldig hvilket betyr denne meldingen hÃ¸yst "
 "sannsynlig er autentisk."
 
-#: ../mail/em-format-html-display.c:92 ../mail/em-format-html.c:1535
+#: ../mail/em-format-html-display.c:92 ../mail/em-format-html.c:1569
 msgid "Invalid signature"
 msgstr "Ugyldig signatur"
 
@@ -10671,7 +10718,7 @@ msgstr ""
 "Signaturen for denne meldingen kan ikke verifiseres. Den kan vÃ¦re endret "
 "under overfÃ¸ring."
 
-#: ../mail/em-format-html-display.c:93 ../mail/em-format-html.c:1536
+#: ../mail/em-format-html-display.c:93 ../mail/em-format-html.c:1570
 msgid "Valid signature, but cannot verify sender"
 msgstr "Gyldig signatur, men kan ikke verifisere avsender"
 
@@ -10683,7 +10730,7 @@ msgstr ""
 "Denne meldingen er signert med en gyldig signatur, men avsender av meldingen "
 "kan ikke verifiseres."
 
-#: ../mail/em-format-html-display.c:94 ../mail/em-format-html.c:1537
+#: ../mail/em-format-html-display.c:94 ../mail/em-format-html.c:1571
 msgid "Signature exists, but need public key"
 msgstr "Signatur eksisterer, men trenger offentlig nÃ¸kkel"
 
@@ -10695,7 +10742,7 @@ msgstr ""
 "Denne meldingen er signert med en gyldig signatur, men det finnes ingen "
 "tilhÃ¸rende offentlig nÃ¸kkel."
 
-#: ../mail/em-format-html-display.c:101 ../mail/em-format-html.c:1543
+#: ../mail/em-format-html-display.c:101 ../mail/em-format-html.c:1577
 msgid "Unencrypted"
 msgstr "Ukryptert"
 
@@ -10707,7 +10754,7 @@ msgstr ""
 "Denne meldingen er ikke kryptert. Innholdet kan vises under overfÃ¸ring over "
 "Internett."
 
-#: ../mail/em-format-html-display.c:102 ../mail/em-format-html.c:1544
+#: ../mail/em-format-html-display.c:102 ../mail/em-format-html.c:1578
 msgid "Encrypted, weak"
 msgstr "Kryptert, svak"
 
@@ -10721,7 +10768,7 @@ msgstr ""
 "vanskelig, men ikke umulig for en utenforstÃ¥ende Ã¥ se innholdet i denne "
 "meldingen pÃ¥ noenlunde kort tid."
 
-#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1545
+#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1579
 msgid "Encrypted"
 msgstr "Kryptert"
 
@@ -10733,7 +10780,7 @@ 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:104 ../mail/em-format-html.c:1546
+#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1580
 msgid "Encrypted, strong"
 msgstr "Kryptert, sterk"
 
@@ -10775,72 +10822,72 @@ msgstr "UtgÃ¥tt:"
 msgid "by"
 msgstr "innen"
 
-#: ../mail/em-format-html-display.c:948 ../mail/em-format-html-display.c:992
+#: ../mail/em-format-html-display.c:953 ../mail/em-format-html-display.c:1000
 msgid "View _Unformatted"
 msgstr "Vis uformattert"
 
-#: ../mail/em-format-html-display.c:950
+#: ../mail/em-format-html-display.c:955
 msgid "Hide _Unformatted"
 msgstr "Skjul _uformatterte"
 
-#: ../mail/em-format-html-display.c:1012
+#: ../mail/em-format-html-display.c:1020
 msgid "O_pen With"
 msgstr "Ã?_pne med"
 
-#: ../mail/em-format-html-print.c:163
+#: ../mail/em-format-html-print.c:162
 #, c-format
 msgid "Page %d of %d"
 msgstr "Side %d av %d"
 
-#: ../mail/em-format-html.c:147
+#: ../mail/em-format-html.c:151
 msgid "Formatting message"
 msgstr "Formatterer melding"
 
-#: ../mail/em-format-html.c:338
+#: ../mail/em-format-html.c:345
 msgid "Formatting Message..."
 msgstr "Formatterer melding..."
 
-#: ../mail/em-format-html.c:1380 ../mail/em-format-html.c:1389
+#: ../mail/em-format-html.c:1414 ../mail/em-format-html.c:1423
 #, c-format
 msgid "Retrieving '%s'"
 msgstr "Henter Â«%sÂ»"
 
-#: ../mail/em-format-html.c:1854
+#: ../mail/em-format-html.c:1888
 msgid "Unknown external-body part."
 msgstr "Ukjent del av ekstern kropp."
 
-#: ../mail/em-format-html.c:1862
+#: ../mail/em-format-html.c:1896
 msgid "Malformed external-body part."
 msgstr "Feilutformet del for ekstern kropp."
 
-#: ../mail/em-format-html.c:1892
+#: ../mail/em-format-html.c:1926
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Peker til FTP-tjener (%s)"
 
-#: ../mail/em-format-html.c:1903
+#: ../mail/em-format-html.c:1937
 #, 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:1905
+#: ../mail/em-format-html.c:1939
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Peker til lokal fil (%s)"
 
-#: ../mail/em-format-html.c:1926
+#: ../mail/em-format-html.c:1960
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Peker til eksterne data (%s)"
 
-#: ../mail/em-format-html.c:1937
+#: ../mail/em-format-html.c:1971
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Peker til ukjente eksterne data (Â«%sÂ»-type)"
 
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
-#: ../mail/em-format-html.c:2600
+#: ../mail/em-format-html.c:2634
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "Denne meldingen ble sendt av %s pÃ¥ vegne av %s"
@@ -11203,14 +11250,25 @@ msgid ""
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:65
+msgid "Enable to use a similar message list view settings for all folders"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:66
+#, fuzzy
+msgid "Enable to use a similar message list view settings for all folders."
+msgstr ""
+"Aktiver dette for Ã¥ bruke mellomrom-tasten til Ã¥ gÃ¥ forover i "
+"meldingsvisning, meldingsliste og mapper."
+
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid "Enable/disable caret mode"
 msgstr "Aktiver/deaktiver markÃ¸rmodus"
 
-#: ../mail/evolution-mail.schemas.in.h:66 ../mail/mail-config.ui.h:47
+#: ../mail/evolution-mail.schemas.in.h:68 ../mail/mail-config.ui.h:48
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "Bruk samme koding for filnavn som Outlook/GMail"
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid ""
 "Encode file names in the mail headers same as Outlook or GMail do, to let "
 "them display correctly file names with UTF-8 letters sent by Evolution, "
@@ -11218,19 +11276,23 @@ msgid ""
 "standard."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:70
+msgid "Flush Outbox after filtering"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "Height of the message-list pane"
 msgstr "HÃ¸yde pÃ¥ e-postlistefeltet"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "Height of the message-list pane."
 msgstr "HÃ¸yde pÃ¥ e-postlistefeltet."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Skjuler per-mappe forhÃ¥ndsvisning og fjerner utvalget"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -11238,7 +11300,7 @@ msgstr ""
 "SpÃ¸r brukeren om han virkelig vil gjÃ¸re det hvis han prÃ¸ver Ã¥ Ã¥pne 10 eller "
 "flere e-poster pÃ¥ en gang."
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid ""
 "If there isn't a builtin viewer for a particular MIME type inside Evolution, "
 "any MIME types appearing in this list which map to a Bonobo component viewer "
@@ -11249,7 +11311,7 @@ msgstr ""
 "enhver MIME-type i denne listen som har en tilsvarende Bonobo-komponent for "
 "visnin."
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid ""
 "Initial height of the \"Filter Editor\" window. The value updates as the "
 "user resizes the window vertically."
@@ -11257,7 +11319,7 @@ msgstr ""
 "Initiell hÃ¸yde for Â«FilterredigeringÂ»-vinduet. Verdien oppdateres ettersom "
 "bruker endrer stÃ¸rrelse pÃ¥ vinduet vertikalt."
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid ""
 "Initial height of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window vertically."
@@ -11265,7 +11327,7 @@ msgstr ""
 "Initiell hÃ¸yde for Â«Rediger sÃ¸kemapperÂ»-vinduet. Verdien oppdateres ettersom "
 "bruker endrer stÃ¸rrelse pÃ¥ vinduet vertikalt."
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
@@ -11273,7 +11335,7 @@ msgstr ""
 "Initiell hÃ¸yde for Â«Send og motta e-postÂ»-vinduet. Verdien oppdateres "
 "ettersom bruker endrer stÃ¸rrelse pÃ¥ vinduet vertikalt."
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid ""
 "Initial maximize state of the \"Filter Editor\" window. The value updates "
 "when the user maximizes or unmaximizes the window. Note, this particular "
@@ -11281,7 +11343,7 @@ msgid ""
 "maximized. This key exists only as an implementation detail."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid ""
 "Initial maximize state of the \"Search Folder Editor\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -11289,7 +11351,7 @@ msgid ""
 "window cannot be maximized. This key exists only as an implementation detail."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -11298,7 +11360,7 @@ msgid ""
 "detail."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:82
 #, fuzzy
 msgid ""
 "Initial width of the \"Filter Editor\" window. The value updates as the user "
@@ -11307,7 +11369,7 @@ msgstr ""
 "Initiell bredde pÃ¥ Â«Send og motta e-postÂ»-vinduet. Verdien oppdateres "
 "ettersom bruker endrer stÃ¸rrelse pÃ¥ vinduet horisontalt."
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:83
 #, fuzzy
 msgid ""
 "Initial width of the \"Search Folder Editor\" window. The value updates as "
@@ -11316,7 +11378,7 @@ msgstr ""
 "Initiell bredde pÃ¥ Â«Send og motta e-postÂ»-vinduet. Verdien oppdateres "
 "ettersom bruker endrer stÃ¸rrelse pÃ¥ vinduet horisontalt."
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -11324,7 +11386,7 @@ msgstr ""
 "Initiell bredde pÃ¥ Â«Send og motta e-postÂ»-vinduet. Verdien oppdateres "
 "ettersom bruker endrer stÃ¸rrelse pÃ¥ vinduet horisontalt."
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -11334,37 +11396,35 @@ msgstr ""
 "en sÃ¸kemappe sletter meldingene permanent, og ikke bare fjerner dem fra "
 "sÃ¸keresultatene."
 
-#: ../mail/evolution-mail.schemas.in.h:83
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Last time Empty Junk was run"
-msgstr "Sist gang mapper for uÃ¸nsket e-post ble tÃ¸mt"
+msgstr "Siste gang mapper for uÃ¸nsket e-post ble tÃ¸mt"
 
-#: ../mail/evolution-mail.schemas.in.h:84
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Last time Empty Trash was run"
-msgstr "Sist gang papirkurven ble tÃ¸mt"
+msgstr "Siste gang papirkurven ble tÃ¸mt"
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Layout style"
 msgstr "Stil for utforming"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "List of Labels and their associated colors"
 msgstr "Liste over etiketter og deres assosierte farger"
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "List of MIME types to check for Bonobo component viewers"
 msgstr "Liste over MIME-typer som skal se etter bonobo-komponentvisere"
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "List of accepted licenses"
 msgstr "Liste med godtatte lisenser"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "List of accounts"
 msgstr "Liste med kontoer"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -11373,15 +11433,15 @@ msgstr ""
 "innholder strenger som er undermapper relativt til /apps/evolution/mail/"
 "accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "List of custom headers and whether they are enabled."
 msgstr "Liste over tillpassede topptekster og om de er slÃ¥tt pÃ¥."
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "List of dictionary language codes used for spell checking."
 msgstr "Liste med sprÃ¥kkoder for ordliste som skal brukes for stavekontroll."
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -11390,15 +11450,15 @@ msgstr ""
 "inneholder strenger som inneholder Â«name:colorÂ» hvor Â«colorÂ» bruker HTML hex "
 "koding."
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "List of protocol names whose license has been accepted."
 msgstr "Liste over protokollnavn som har en godkjent lisens."
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Load images for HTML messages over HTTP"
 msgstr "Last bilder for HTML-meldinger og HTTP"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid ""
 "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
 "Never load images off the net. \"1\" - Load images in messages from "
@@ -11408,114 +11468,113 @@ msgstr ""
 "last bilder fra nettet Â«1Â» - Last bilder i e-poster fra kontakter Â«2Â» - Alltid "
 "last bilder fra nettet."
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Log filter actions"
 msgstr "LoggfÃ¸r filterhandlinger"
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Log filter actions to the specified log file."
 msgstr "Logg filterhandlinger til oppgitt loggfil."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Logfile to log filter actions"
 msgstr "Loggfil med filterhandlinger"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Logfile to log filter actions."
 msgstr "Loggfil med filterhandlinger."
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Mail browser height"
 msgstr "HÃ¸yde pÃ¥ e-postleser"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "Mail browser maximized"
 msgstr "E-postleser maksimert"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Mail browser width"
 msgstr "Bredde pÃ¥ e-postleser"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Mark as Seen after specified timeout"
 msgstr "Merk som Â«lestÂ» etter spesifisert tidsgrense"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Mark as Seen after specified timeout."
 msgstr "Merk som Â«settÂ» etter spesifisert tidsgrense."
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Mark citations in the message \"Preview\""
 msgstr "Merk sitat in e-posten Â«ForhÃ¥ndsvisningÂ»"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Merk sitat in e-posten Â«ForhÃ¥ndsvisningÂ»."
 
-#: ../mail/evolution-mail.schemas.in.h:109
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Message text limit for display"
-msgstr "Meldingsvisning"
+msgstr "Grense for tekst i meldingsvisning"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "Stil pÃ¥ e-postvisning (Â«normalÂ», Â«full headersÂ», Â«sourceÂ»)"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Minimum days between emptying the junk on exit"
 msgstr ""
 "Minimum antall dager mellom tÃ¸mming av mapper for uÃ¸nsket e-post ved "
 "avslutting"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Minimum antall dager mellom tÃ¸mming av papirkurven ved avslutting"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr ""
 "Minste tidsperiode mellom tÃ¸mming av mapper for uÃ¸nsket e-post ved "
 "avslutting, i dager."
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 "Minste tidsperiode mellom tÃ¸mming av papirkurven ved avslutting, i dager."
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Antall adresser som skal vises i Til/Cc/Bcc"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Prompt on empty subject"
 msgstr "Stopp og spÃ¸r ved tomt emne"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Stopp og spÃ¸r fÃ¸r en mappe blir tÃ¸mt."
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Stopp og spÃ¸r nÃ¥r en en e-post uten emne skal bli sendt."
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Prompt when deleting messages in search folder"
 msgstr "SpÃ¸r ved sletting av meldinger fra sÃ¸kemappe"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Prompt when user expunges"
 msgstr "Stopp og spÃ¸r fÃ¸r tÃ¸mming"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Prompt when user only fills Bcc"
 msgstr "Stopp og spÃ¸r nÃ¥r bare Â«BccÂ» er utfylt"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "SpÃ¸r nÃ¥r bruker prÃ¸ver Ã¥ Ã¥pne 10 eller flere meldinger samtidig"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -11523,130 +11582,126 @@ msgstr ""
 "SpÃ¸r nÃ¥r bruker prÃ¸ver Ã¥ sende HTML-meldinger til mottakere som ikke Ã¸nsker "
 "Ã¥ motta HTML-meldinger."
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "SpÃ¸r nÃ¥r bruker prÃ¸ver Ã¥ sende en melding uten Til- eller Cc-mottakere."
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "SpÃ¸r nÃ¥r bruker prÃ¸ver Ã¥ sende uÃ¸nsket HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Prompt while marking multiple messages"
 msgstr "SpÃ¸r ved merking av flere meldinger"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Put personalized signatures at the top of replies"
 msgstr "Plasser personlige signaturer pÃ¥ toppen av svar"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Put the cursor at the bottom of replies"
 msgstr "Plasser markÃ¸r ved bunnen av svar"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "Gjenkjenn smilefjes i tekst og erstatt dem med bilder."
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Recognize links in text and replace them."
 msgstr "Gjenkjenn lenker i tekst og erstatt dem."
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Run junk test on incoming mail."
 msgstr "Sjekk om innkommende e-post er uÃ¸nsket."
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Save directory"
 msgstr "Lagre katalog"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Search for the sender photo in local address books"
 msgstr "SÃ¸k etter bilde av avsender i lokale adressebÃ¸ker"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "Send HTML mail by default"
 msgstr "Send HTML e-post som forvalg"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "Send HTML mail by default."
 msgstr "Send HTML e-post som forvalg."
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "Sender email-address column in the message list"
 msgstr "Kolonne for avsenders e-postadresse i meldingslisten"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Server synchronization interval"
 msgstr "Intervall for serversynkronisering"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "Vis Â«BccÂ» feltet nÃ¥r meldinger sendes"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "Vis Â«CcÂ» feltet nÃ¥r meldinger sendes"
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "Vis Â«FraÂ» feltet nÃ¥r du poster til en nyhetsgruppe"
 
-#: ../mail/evolution-mail.schemas.in.h:142
-msgid "Show \"From\" field when sending a mail message"
-msgstr "Vis Â«FraÂ» feltet nÃ¥r meldinger sendes"
-
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr "Vis Â«Svar-tilÂ» feltet nÃ¥r du poster til en nyhetsgruppe"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "Vis Â«Svar-tilÂ» feltet nÃ¥r meldinger sendes"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Show Animations"
 msgstr "Vis animasjoner"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Show all message headers"
 msgstr "Vis alle meldingshoder"
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Show all the headers when viewing a messages."
 msgstr "Vis alle meldingshoder nÃ¥r en melding vises."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Show animated images as animations."
 msgstr "Vis animerte bilder som animasjoner."
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Vis slettede meldinger i meldingslisten (gjennomstreket)."
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Show deleted messages in the message-list"
 msgstr "Vis slettede meldinger i meldingslisten"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Show image animations"
 msgstr "Vis bildeanimasjoner"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Show original \"Date\" header value."
 msgstr "Vis opprinnelig verdi for Â«DateÂ»-meldingshode."
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "Show photo of the sender"
 msgstr "Vis bilde av avsender"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -11654,7 +11709,7 @@ msgstr ""
 "Vis Â«BccÂ»-feltet nÃ¥r en melding sendes. Dette kontrolleres fra Â«VisÂ»-menyen "
 "nÃ¥r en e-postkonto velges."
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -11662,7 +11717,7 @@ msgstr ""
 "Vis Â«CcÂ»-feltet nÃ¥r en melding sendes. Dette kontrolleres fra Â«VisÂ»-menyen nÃ¥r "
 "en e-postkonto velges."
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -11670,15 +11725,7 @@ msgstr ""
 "Vis Â«FraÂ»-feltet nÃ¥r en melding sendes til en nyhetsgruppe. Dette "
 "kontrolleres fra Â«VisÂ»-menyen nÃ¥r en e-postkonto velges."
 
-#: ../mail/evolution-mail.schemas.in.h:157
-msgid ""
-"Show the \"From\" field when sending a mail message. This is controlled from "
-"the View menu when a mail account is chosen."
-msgstr ""
-"Vis Â«FraÂ»-feltet nÃ¥r en melding sendes. Dette kontrolleres fra Â«VisÂ»-menyen "
-"nÃ¥r en e-postkonto velges."
-
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -11686,7 +11733,7 @@ msgstr ""
 "Vis Â«Svar-tilÂ»-feltet nÃ¥r en melding sendes til en nyhetsgruppe. Dette "
 "kontrolleres fra Â«VisÂ»-menyen nÃ¥r en e-postkonto velges."
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -11694,64 +11741,64 @@ msgstr ""
 "Vis Â«Svar-tilÂ»-feltet nÃ¥r en melding sendes. Dette kontrolleres fra Â«VisÂ»-"
 "menyen nÃ¥r en e-postkonto velges."
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr "Vis avsenders e-postadresse i en egen kolonne i meldingslisten."
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid ""
 "Show the original \"Date\" header (with a local time only if the time zone "
 "differs). Otherwise always show \"Date\" header value in a user preferred "
 "format and local time zone."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Vis bilde av avsender i meldingsomrÃ¥det."
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Spell check inline"
 msgstr "Stavekontroll i meldingen"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Spell checking color"
 msgstr "Farge for stavekontroll"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Spell checking languages"
 msgstr "SprÃ¥k for stavekontroll"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Subscribe dialog default height"
 msgstr "Forvalgt hÃ¸yde pÃ¥ abonneringsvinduet"
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Subscribe dialog default width"
 msgstr "Forvalgt bredde pÃ¥ abonneringsvinduet"
 
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "Terminal font"
 msgstr "Terminalskrift"
 
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "The default plugin for Junk hook"
 msgstr "Forvalgt tillegg for uÃ¸nsket e-post"
 
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:171
 #, fuzzy
 msgid ""
 "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr "Sist gang mapper for uÃ¸nsket e-post ble tÃ¸mt i dager siden epoch."
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:172
 #, fuzzy
 msgid ""
 "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr "Sist gang papirkurven ble tÃ¸mt i dager."
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the message list. \"0\" (Classic View) places the preview pane below the "
@@ -11759,15 +11806,15 @@ msgid ""
 "message list."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "The terminal font for mail display."
 msgstr "Terminalskrift for meldingsvisning."
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "The variable width font for mail display."
 msgstr "Skrift med variabel bredde for meldingsvisning."
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -11775,7 +11822,7 @@ msgstr ""
 "Denne har tre mulige verdier. Â«0Â» for feil. Â«1Â» for advarsler. Â«2Â» for "
 "feilsÃ¸kingsmeldinger."
 
-#: ../mail/evolution-mail.schemas.in.h:176
+#: ../mail/evolution-mail.schemas.in.h:177
 #, fuzzy
 msgid ""
 "This decides the max size of the message text that will be displayed under "
@@ -11785,7 +11832,7 @@ msgstr ""
 "Bestemmer maksimal stÃ¸rrelse for tekstdelen som kan formatteres i evolution. "
 "Forvalg er 4MB / 4096 KB og oppgis i KB."
 
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -11795,7 +11842,7 @@ msgstr ""
 "tillegg er aktivert. Hvis forvalgt tillegg deaktiveres vil ikke de andre "
 "brukes."
 
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
@@ -11804,7 +11851,7 @@ msgstr ""
 "Dette fjerner markering fra e-posten i listen og fjerner forhÃ¥ndsvisning for "
 "den mappen."
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -11816,18 +11863,18 @@ msgstr ""
 "&lt;header enabled&gt; - sett Â«enabledÂ» hvis toppteksten skal vises i e-"
 "postvisningen. "
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local address book only to exclude "
 "mail sent by known contacts from junk filtering."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:182
 msgid "This option would help in improving the speed of fetching."
 msgstr "Dette valget vil Ã¸ke hastigheten ved henting."
 
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:183
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -11835,7 +11882,7 @@ msgstr ""
 "Setter antall adresser som skal vises i forvalgt listevisning for meldinger. "
 "Etter dette vises Â«...Â»."
 
-#: ../mail/evolution-mail.schemas.in.h:183
+#: ../mail/evolution-mail.schemas.in.h:184
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -11843,7 +11890,7 @@ msgstr ""
 "Denne innstillingen spesifiserer om trÃ¥der skal vÃ¦re i utvidet eller "
 "sammenslÃ¥tt tilstand som forvalg. Evolution mÃ¥ startes pÃ¥ nytt."
 
-#: ../mail/evolution-mail.schemas.in.h:184
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -11853,79 +11900,79 @@ msgstr ""
 "melding i hver trÃ¥d i stedet for meldingens dato. Evolution mÃ¥ startes pÃ¥ "
 "nytt."
 
-#: ../mail/evolution-mail.schemas.in.h:185
+#: ../mail/evolution-mail.schemas.in.h:186
 msgid "Thread the message-list based on Subject"
 msgstr "Lag trÃ¥der av e-postlisten basert pÃ¥ emne"
 
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../mail/evolution-mail.schemas.in.h:187
 msgid "Timeout for marking message as seen"
 msgstr "Tidsgrense for Ã¥ merke e-post som sett"
 
-#: ../mail/evolution-mail.schemas.in.h:187
+#: ../mail/evolution-mail.schemas.in.h:188
 msgid "Timeout for marking message as seen."
 msgstr "Tidsavbrydd Ã¥ merke e-poster som sett."
 
-#: ../mail/evolution-mail.schemas.in.h:188
+#: ../mail/evolution-mail.schemas.in.h:189
 msgid "UID string of the default account."
 msgstr "UID-streng for forvalgt konto."
 
-#: ../mail/evolution-mail.schemas.in.h:189
+#: ../mail/evolution-mail.schemas.in.h:190
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr "Farge for understreking av feilstavede ord ved bruk av stavekontroll."
 
-#: ../mail/evolution-mail.schemas.in.h:190
+#: ../mail/evolution-mail.schemas.in.h:191
 msgid "Use SpamAssassin daemon and client"
 msgstr "Bruk SpamAssassin tjener og klient"
 
-#: ../mail/evolution-mail.schemas.in.h:191
+#: ../mail/evolution-mail.schemas.in.h:192
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "Bruk SpamAssassin tjener og klient (spamd/spamc)."
 
-#: ../mail/evolution-mail.schemas.in.h:192
+#: ../mail/evolution-mail.schemas.in.h:193
 msgid "Use custom fonts"
 msgstr "Bruk egendefinerte skrifter"
 
-#: ../mail/evolution-mail.schemas.in.h:193
+#: ../mail/evolution-mail.schemas.in.h:194
 msgid "Use custom fonts for displaying mail."
 msgstr "Bruk tilpassede skrifttyper for e-postvisning."
 
-#: ../mail/evolution-mail.schemas.in.h:194
+#: ../mail/evolution-mail.schemas.in.h:195
 msgid "Use only local spam tests."
 msgstr "Bruk bare lokale tester for uÃ¸nsket e-post."
 
-#: ../mail/evolution-mail.schemas.in.h:195
+#: ../mail/evolution-mail.schemas.in.h:196
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Bruk bare lokale tester for uÃ¸nsket e-post (ingen DNS)."
 
-#: ../mail/evolution-mail.schemas.in.h:196
+#: ../mail/evolution-mail.schemas.in.h:197
 msgid ""
 "Users get all up in arms over where the cursor should go when replying to a "
 "message. This determines whether the cursor is placed at the top of the "
 "message or the bottom."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:197
+#: ../mail/evolution-mail.schemas.in.h:198
 msgid ""
 "Users get all up in arms over where their signature should go when replying "
 "to a message. This determines whether the signature is placed at the top of "
 "the message or the bottom."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:198
+#: ../mail/evolution-mail.schemas.in.h:199
 msgid "Variable width font"
 msgstr "Skrift for variabel bredde"
 
-#: ../mail/evolution-mail.schemas.in.h:199
+#: ../mail/evolution-mail.schemas.in.h:200
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr ""
 "Om en forespÃ¸rsel om lesekvittering skal legges til alle meldinger som "
 "forvalg."
 
-#: ../mail/evolution-mail.schemas.in.h:200
+#: ../mail/evolution-mail.schemas.in.h:201
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr "SlÃ¥ av eller pÃ¥ bruk av ellipse for mappenavn i sidelinjen."
 
-#: ../mail/evolution-mail.schemas.in.h:201
+#: ../mail/evolution-mail.schemas.in.h:202
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -11933,15 +11980,22 @@ msgstr ""
 "Om e-poster skal sorteres etter emner nÃ¥r de ikke inneholder Â«In-Reply-ToÂ» "
 "eller referansetopptekster."
 
-#: ../mail/evolution-mail.schemas.in.h:202
+#: ../mail/evolution-mail.schemas.in.h:203
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "Om trÃ¥der sorteres basert pÃ¥ siste melding i den trÃ¥den"
 
-#: ../mail/evolution-mail.schemas.in.h:203
+#: ../mail/evolution-mail.schemas.in.h:204
+msgid ""
+"Whether to flush Outbox after filtering is done. Outbox flush will happen "
+"only when there was used any 'Forward to' filter action and approximately "
+"one minute after the last action invocation."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:205
 msgid "Width of the message-list pane"
 msgstr "Bredde pÃ¥ e-postlistefeltet"
 
-#: ../mail/evolution-mail.schemas.in.h:204
+#: ../mail/evolution-mail.schemas.in.h:206
 msgid "Width of the message-list pane."
 msgstr "Bredde pÃ¥ e-postlistefeltet."
 
@@ -11949,7 +12003,7 @@ msgstr "Bredde pÃ¥ e-postlistefeltet."
 msgid "Importing Elm data"
 msgstr "Importerer data fra Elm"
 
-#: ../mail/importers/elm-importer.c:325 ../mail/importers/pine-importer.c:372
+#: ../mail/importers/elm-importer.c:325 ../mail/importers/pine-importer.c:400
 #: ../modules/mail/e-mail-shell-view.c:952
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
 #: ../widgets/misc/e-send-options.c:499
@@ -12016,20 +12070,20 @@ msgstr "Importerer Â«%sÂ»"
 msgid "Scanning %s"
 msgstr "SÃ¸ker i %s"
 
-#: ../mail/importers/pine-importer.c:219
+#: ../mail/importers/pine-importer.c:221
 msgid "Importing Pine data"
 msgstr "Importerer data fra Pine"
 
-#: ../mail/importers/pine-importer.c:377
+#: ../mail/importers/pine-importer.c:405
 #: ../modules/addressbook/addressbook-config.c:1006
 msgid "Address Book"
 msgstr "Adressebok"
 
-#: ../mail/importers/pine-importer.c:419
+#: ../mail/importers/pine-importer.c:447
 msgid "Evolution Pine importer"
 msgstr "Import fra Pine for Evolutions"
 
-#: ../mail/importers/pine-importer.c:420
+#: ../mail/importers/pine-importer.c:448
 msgid "Import mail from Pine."
 msgstr "Importer e-post fra Pine."
 
@@ -12119,410 +12173,414 @@ msgstr "Alltid krypter til _meg selv ved sending av krypterte meldinger"
 msgid "Always request rea_d receipt"
 msgstr "Allti_d be om lesekvittering"
 
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:14
+msgid "Apply the same _view settings to all folders"
+msgstr "Bruk samme _visningsinnstillinger for alle mapper"
+
+#: ../mail/mail-config.ui.h:16
 #: ../modules/addressbook/addressbook-config.c:1013
 msgid "Authentication"
 msgstr "Autentisering"
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:17
 msgid "Automatically insert _emoticon images"
 msgstr "S_ett inn smilefjes automatisk"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:18
 msgid "C_haracter set:"
 msgstr "Te_gnsett:"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:19
 msgid "Ch_eck for Supported Types"
 msgstr "Sj_ekk stÃ¸ttede typer"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:20
 msgid "Check cu_stom headers for junk"
 msgstr "_Sjekk egendefinerte meldingshoder for uÃ¸nsket e-post"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:21
 msgid "Check incoming _messages for junk"
 msgstr "Sjekk om innkommende _meldinger er uÃ¸nsket"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:22
 msgid "Check spelling while I _type"
 msgstr "Sjekk s_taving mens jeg skriver"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:23
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Sjekker om innkommende e-post er uÃ¸nsket"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:24
 msgid "Cle_ar"
 msgstr "_TÃ¸m"
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:25
 msgid "Clea_r"
 msgstr "TÃ¸_m"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:26
 msgid "Color for _misspelled words:"
 msgstr "_Farge for feilstavede ord:"
 
-#: ../mail/mail-config.ui.h:26
+#: ../mail/mail-config.ui.h:27
 msgid "Composing Messages"
 msgstr "Skriver meldinger"
 
-#: ../mail/mail-config.ui.h:27 ../plugins/plugin-manager/plugin-manager.c:146
+#: ../mail/mail-config.ui.h:28 ../plugins/plugin-manager/plugin-manager.c:146
 msgid "Configuration"
 msgstr "Konfigurasjon"
 
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:29
 msgid "Confirm _when expunging a folder"
 msgstr "_Bekreft ved tÃ¸mming av en mappe"
 
-#: ../mail/mail-config.ui.h:31
+#: ../mail/mail-config.ui.h:32
 msgid "Default Behavior"
 msgstr "Forvalgt oppfÃ¸rsel"
 
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:33
 msgid "Default character e_ncoding:"
 msgstr "Forvalgt teg_nkoding:"
 
-#: ../mail/mail-config.ui.h:34
+#: ../mail/mail-config.ui.h:35
 msgid "Delete Mail"
 msgstr "Slett e-post"
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:36
 msgid "Delete junk messages on e_xit"
 msgstr "Slett uÃ¸nsket e-post nÃ¥r programmet a_vsluttes"
 
-#: ../mail/mail-config.ui.h:37
+#: ../mail/mail-config.ui.h:38
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "Signer _utgÃ¥ende meldinger digitalt (som forvalg)"
 
-#: ../mail/mail-config.ui.h:38
+#: ../mail/mail-config.ui.h:39
 msgid "Displayed Message Headers"
 msgstr "Viste meldingshoder"
 
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:40
 msgid "Do not display messages when text si_ze exceeds"
 msgstr "Ikke vis meldinger nÃ¥r tekstst_Ã¸rrelsen overstiger"
 
-#: ../mail/mail-config.ui.h:40
+#: ../mail/mail-config.ui.h:41
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "Ikke mer_k meldinger som uÃ¸nsket hvis avsender finnes i adresseboken"
 
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:42
 msgid "Do not quote"
 msgstr "Ikke siter"
 
-#: ../mail/mail-config.ui.h:42
+#: ../mail/mail-config.ui.h:43
 msgid "Drafts _Folder:"
 msgstr "Mappe _for skisser:"
 
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:44
 msgid "Email _Address:"
 msgstr "E-post_adresse:"
 
-#: ../mail/mail-config.ui.h:44
+#: ../mail/mail-config.ui.h:45
 msgid "Empty trash folders on e_xit"
 msgstr "_TÃ¸m papirkurven nÃ¥r programmet avsluttes"
 
-#: ../mail/mail-config.ui.h:45
+#: ../mail/mail-config.ui.h:46
 msgid "Enable Magic S_pacebar"
 msgstr "Aktiver magi_sk mellomromtast"
 
-#: ../mail/mail-config.ui.h:46
+#: ../mail/mail-config.ui.h:47
 msgid "Enable Sea_rch Folders"
 msgstr "Aktiver sÃ¸kemappe_r"
 
-#: ../mail/mail-config.ui.h:48
+#: ../mail/mail-config.ui.h:49
 msgid "Encry_ption certificate:"
 msgstr "Sertifikat for kry_ptering:"
 
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:50
 msgid "Encrypt out_going messages (by default)"
 msgstr "Krypter ut_gÃ¥ende meldinger (som forvalg)"
 
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:51
 msgid "Fi_xed-width:"
 msgstr "Fast _bredde:"
 
-#: ../mail/mail-config.ui.h:51
+#: ../mail/mail-config.ui.h:52
 msgid "Fix_ed width Font:"
 msgstr "Skrift med fast br_edde:"
 
-#: ../mail/mail-config.ui.h:52
+#: ../mail/mail-config.ui.h:53
 msgid "Font Properties"
 msgstr "Egenskaper for skrift"
 
-#: ../mail/mail-config.ui.h:53
+#: ../mail/mail-config.ui.h:54
 msgid "Format messages in _HTML"
 msgstr "Formater meldinger med _HTML"
 
-#: ../mail/mail-config.ui.h:54
+#: ../mail/mail-config.ui.h:55
 msgid "Full Nam_e:"
 msgstr "_Fullt navn:"
 
-#: ../mail/mail-config.ui.h:56
+#: ../mail/mail-config.ui.h:57
 msgid "HTML Messages"
 msgstr "HTML-meldinger"
 
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:58
 msgid "H_TTP Proxy:"
 msgstr "H_TTP-proxy:"
 
-#: ../mail/mail-config.ui.h:58
+#: ../mail/mail-config.ui.h:59
 msgid "Headers"
 msgstr "Meldingshoder"
 
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:60
 msgid "Highlight _quotations with"
 msgstr "_Merk sitering med"
 
-#: ../mail/mail-config.ui.h:61
+#: ../mail/mail-config.ui.h:62
 msgid "Inline"
 msgstr "I meldingen"
 
-#: ../mail/mail-config.ui.h:62
+#: ../mail/mail-config.ui.h:63
 msgid "Inline (Outlook style)"
 msgstr "I meldingen (som i Outlook)"
 
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.ui.h:65
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.ui.h:65 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:66 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "Etiketter"
 
-#: ../mail/mail-config.ui.h:66
+#: ../mail/mail-config.ui.h:67
 msgid "Languages Table"
 msgstr "SprÃ¥ktabell"
 
-#: ../mail/mail-config.ui.h:67
+#: ../mail/mail-config.ui.h:68
 msgid "Loading Images"
 msgstr "Laster bilder"
 
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:69
 msgid "Mail Headers Table"
 msgstr "Tabell med meldingshoder"
 
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:70
 msgid "Mailbox location"
 msgstr "Plassering av postboks"
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:71
 msgid "Message Display"
 msgstr "Meldingsvisning"
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:72
 msgid "Message Fonts"
 msgstr "Skrift for melding"
 
-#: ../mail/mail-config.ui.h:72
+#: ../mail/mail-config.ui.h:73
 msgid "Message Receipts"
 msgstr "Meldingsmottakere"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:74
 msgid "No _Proxy for:"
 msgstr "Ingen _proxy for:"
 
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:76
 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.ui.h:76
+#: ../mail/mail-config.ui.h:77
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr ""
 "Alternativet vil ignoreres hvis det finnes treff for egendefinerte "
 "meldingshoder for uÃ¸nsket e-post."
 
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:78
 #: ../plugins/publish-calendar/publish-calendar.ui.h:10
 msgid "Optional Information"
 msgstr "Valgfri informasjon"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:80
 msgid "Or_ganization:"
 msgstr "Or_ganisasjon:"
 
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:81
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG-nÃ¸_kkel ID:"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:82
 msgid "Pass_word:"
 msgstr "Pass_ord:"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:84
 msgid "Port:"
 msgstr "Port:"
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:85
 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.ui.h:85
+#: ../mail/mail-config.ui.h:86
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:88
 msgid "Printed Fonts"
 msgstr "Skrifter pÃ¥ utskrift"
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:89
 msgid "Proxy Settings"
 msgstr "Innstillinger for proxy"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:90
 msgid "Quoted"
 msgstr "Sitert"
 
-#: ../mail/mail-config.ui.h:90
+#: ../mail/mail-config.ui.h:91
 msgid "Re_member password"
 msgstr "_Husk passord"
 
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:92
 msgid "Re_ply-To:"
 msgstr "S_var-til:"
 
-#: ../mail/mail-config.ui.h:93
+#: ../mail/mail-config.ui.h:94
 msgid "Remember _password"
 msgstr "Husk _passord"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:95
 msgid "Required Information"
 msgstr "NÃ¸dvendig informasjon"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:96
 msgid "SHA1"
 msgstr "SHA1"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:97
 msgid "SHA256"
 msgstr "SHA256"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:98
 msgid "SHA384"
 msgstr "SHA384"
 
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:99
 msgid "SHA512"
 msgstr "SHA512"
 
-#: ../mail/mail-config.ui.h:100
+#: ../mail/mail-config.ui.h:101
 msgid "SSL is not supported in this build of Evolution"
 msgstr "SSL er ikke stÃ¸ttet i denne versjonen av Evolution  "
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:102
 msgid "S_earch for sender photograph only in local address books"
 msgstr "Kun sÃ¸k etter bilde av avs_ender i lokale adressebÃ¸ker"
 
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:103
 msgid "S_elect..."
 msgstr "V_elg..."
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:104
 msgid "S_end message receipts:"
 msgstr "Send kvittering for m_eldinger:"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:105
 msgid "S_tandard Font:"
 msgstr "Forvalg_t skrift:"
 
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:106
 msgid "Secure MIME (S/MIME)"
 msgstr "Sikker MIME (S/MIME)"
 
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:108
 msgid "Select Drafts Folder"
 msgstr "Velg mappe for skisser"
 
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:109
 msgid "Select HTML fixed width font"
 msgstr "Velg skrift med fast bredde for HTML"
 
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:110
 msgid "Select HTML fixed width font for printing"
 msgstr "Velg skrift med fast bredde for bruk ved utskrift av HTML"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:111
 msgid "Select HTML variable width font"
 msgstr "Velg skrift med variabel bredde for HTML"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:112
 msgid "Select HTML variable width font for printing"
 msgstr "Velg skrift med variabel bredde for bruk ved utskrift av HTML"
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:113
 msgid "Select Sent Folder"
 msgstr "Velg mappe for sendte meldinger"
 
-#: ../mail/mail-config.ui.h:113
+#: ../mail/mail-config.ui.h:114
 msgid "Sender Photograph"
 msgstr "Bilde av avsender"
 
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:115
 msgid "Sending Mail"
 msgstr "UtgÃ¥ende e-post"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:116
 msgid "Sent _Messages Folder:"
 msgstr "Mappe for sendte _meldinger:"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:117
 msgid "Sent and Draft Messages"
 msgstr "Sendte meldinger og skisser"
 
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:118
 msgid "Ser_ver requires authentication"
 msgstr "Tjener kre_ver autentisering"
 
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:119
 msgid "Server Configuration"
 msgstr "Tjenerkonfigurasjon"
 
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:120
 msgid "Server _Type:"
 msgstr "Tjener_type:"
 
-#: ../mail/mail-config.ui.h:120
+#: ../mail/mail-config.ui.h:121
 msgid "Si_gning algorithm:"
 msgstr "Si_gneringsalgoritme:"
 
-#: ../mail/mail-config.ui.h:121
+#: ../mail/mail-config.ui.h:122
 msgid "Sig_natures"
 msgstr "Sig_naturer"
 
-#: ../mail/mail-config.ui.h:122
+#: ../mail/mail-config.ui.h:123
 msgid "Sig_ning certificate:"
 msgstr "Sertifikat for sig_nering:"
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:124
 msgid "Signat_ure:"
 msgstr "Signat_ur:"
 
-#: ../mail/mail-config.ui.h:124
+#: ../mail/mail-config.ui.h:125
 msgid "Signatures"
 msgstr "Signaturer"
 
-#: ../mail/mail-config.ui.h:125
+#: ../mail/mail-config.ui.h:126
 msgid "Signing _algorithm:"
 msgstr "Signerings_algoritme:"
 
-#: ../mail/mail-config.ui.h:126
+#: ../mail/mail-config.ui.h:127
 msgid "Spell Checking"
 msgstr "Stavekontroll"
 
-#: ../mail/mail-config.ui.h:127
+#: ../mail/mail-config.ui.h:128
 msgid "Start _typing at the bottom on replying"
 msgstr "S_tart skriving under meldingen ved svar"
 
-#: ../mail/mail-config.ui.h:129
+#: ../mail/mail-config.ui.h:130
 msgid "T_ype:"
 msgstr "T_ype:"
 
-#: ../mail/mail-config.ui.h:130
+#: ../mail/mail-config.ui.h:131
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -12530,7 +12588,7 @@ msgstr ""
 "SprÃ¥klisten som vises her reflekterer kun de sprÃ¥kene du har installert en "
 "ordbok for."
 
-#: ../mail/mail-config.ui.h:131
+#: ../mail/mail-config.ui.h:132
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12541,11 +12599,11 @@ msgstr ""
 "for visning pÃ¥ skjermen."
 
 #. Translators: Section name for options related to Top Posting. See Edit|Preferences|Composer Preferences for better understanding
-#: ../mail/mail-config.ui.h:135
+#: ../mail/mail-config.ui.h:136
 msgid "Top Posting Option"
 msgstr "Alternativ for Â«topp-postingÂ»"
 
-#: ../mail/mail-config.ui.h:136
+#: ../mail/mail-config.ui.h:137
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12553,162 +12611,162 @@ msgstr ""
 "Skriv navnet du vil referere til denne kontoen.\n"
 "For eksempel Â«ArbeidÂ» eller Â«PersonligÂ»"
 
-#: ../mail/mail-config.ui.h:138
+#: ../mail/mail-config.ui.h:139
 msgid "Us_ername:"
 msgstr "Bruk_ernavn:"
 
-#: ../mail/mail-config.ui.h:139
+#: ../mail/mail-config.ui.h:140
 msgid "Use Authe_ntication"
 msgstr "Bruk aute_ntisering"
 
-#: ../mail/mail-config.ui.h:140 ../plugins/caldav/caldav-source.c:225
+#: ../mail/mail-config.ui.h:141 ../plugins/caldav/caldav-source.c:225
 #: ../plugins/google-account-setup/google-contacts-source.c:286
 #: ../plugins/google-account-setup/google-source.c:623
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:260
 msgid "User_name:"
 msgstr "Bruker_navn:"
 
-#: ../mail/mail-config.ui.h:141
+#: ../mail/mail-config.ui.h:142
 msgid "V_ariable-width:"
 msgstr "V_ariabel bredde:"
 
-#: ../mail/mail-config.ui.h:142
+#: ../mail/mail-config.ui.h:143
 msgid "_Add Signature"
 msgstr "_Legg til signatur"
 
-#: ../mail/mail-config.ui.h:143
+#: ../mail/mail-config.ui.h:144
 msgid "_Always load images from the Internet"
 msgstr "_Alltid last bilder fra Internett"
 
-#: ../mail/mail-config.ui.h:144
+#: ../mail/mail-config.ui.h:145
 msgid "_Authentication Type"
 msgstr "_Autentiseringstype"
 
-#: ../mail/mail-config.ui.h:145
+#: ../mail/mail-config.ui.h:146
 msgid "_Default junk plugin:"
 msgstr "_Forvalgt tillegg for uÃ¸nsket e-post:"
 
-#: ../mail/mail-config.ui.h:146
+#: ../mail/mail-config.ui.h:147
 msgid "_Direct connection to the Internet"
 msgstr "_Direkte tilkobling til internett"
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:148
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "Ikke signer _mÃ¸teforespÃ¸rsler (for kompatibilitet med Outlook)"
 
-#: ../mail/mail-config.ui.h:148
+#: ../mail/mail-config.ui.h:149
 msgid "_Forward style:"
 msgstr "_Videresendingsstil:"
 
-#: ../mail/mail-config.ui.h:149
+#: ../mail/mail-config.ui.h:150
 msgid "_Keep Signature above the original message on replying"
 msgstr "_Behold signaturen over opprinnelig melding ved svar"
 
-#: ../mail/mail-config.ui.h:150
+#: ../mail/mail-config.ui.h:151
 msgid "_Languages"
 msgstr "_SprÃ¥k"
 
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:152
 msgid "_Load images in messages from contacts"
 msgstr "_Last bilder i meldinger fra kontakter"
 
-#: ../mail/mail-config.ui.h:152
+#: ../mail/mail-config.ui.h:153
 msgid "_Lookup in local address book only"
 msgstr "S_lÃ¥ kun opp i lokale adressebokmapper"
 
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:154
 msgid "_Make this my default account"
 msgstr "_Bruk denne som forvalgt konto"
 
-#: ../mail/mail-config.ui.h:154
+#: ../mail/mail-config.ui.h:155
 msgid "_Manual proxy configuration:"
 msgstr "_Manuell konfigurasjon av proxy:"
 
-#: ../mail/mail-config.ui.h:155
+#: ../mail/mail-config.ui.h:156
 msgid "_Mark messages as read after"
 msgstr "_Merk meldinger som lest etter"
 
-#: ../mail/mail-config.ui.h:157
+#: ../mail/mail-config.ui.h:158
 msgid "_Never load images from the Internet"
 msgstr "Aldri last bilder fra Internett"
 
-#: ../mail/mail-config.ui.h:158
+#: ../mail/mail-config.ui.h:159
 msgid "_Path:"
 msgstr "S_ti:"
 
-#: ../mail/mail-config.ui.h:159
+#: ../mail/mail-config.ui.h:160
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "S_pÃ¸r ved sending av HTML-meldinger til kontakter som ikke Ã¸nsker dem"
 
-#: ../mail/mail-config.ui.h:160
+#: ../mail/mail-config.ui.h:161
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "S_pÃ¸r ved sending av meldinger med tomt emnefelt"
 
-#: ../mail/mail-config.ui.h:161
+#: ../mail/mail-config.ui.h:162
 msgid "_Reply style:"
 msgstr "Sva_rstil:"
 
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:163
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: ../mail/mail-config.ui.h:163
+#: ../mail/mail-config.ui.h:164
 msgid "_Secure HTTP Proxy:"
 msgstr "_Sikker HTTP-proxy:"
 
-#: ../mail/mail-config.ui.h:164
+#: ../mail/mail-config.ui.h:165
 msgid "_Select..."
 msgstr "_Velg..."
 
-#: ../mail/mail-config.ui.h:165 ../modules/addressbook/ldap-config.ui.h:29
+#: ../mail/mail-config.ui.h:166 ../modules/addressbook/ldap-config.ui.h:29
 #: ../plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "_Server:"
 msgstr "Tj_ener:"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:167
+#: ../mail/mail-config.ui.h:168
 msgid "_Show image animations"
 msgstr "Vi_s animasjoner"
 
-#: ../mail/mail-config.ui.h:168
+#: ../mail/mail-config.ui.h:169
 msgid "_Show the photograph of sender in the message preview"
 msgstr "Vi_s bilde av avsender i forhÃ¥ndsvisning av meldingen"
 
 #. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
-#: ../mail/mail-config.ui.h:170
+#: ../mail/mail-config.ui.h:171
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_SlÃ¥ sammen Til/Cc/Bcc-hoder til "
 
-#: ../mail/mail-config.ui.h:171
+#: ../mail/mail-config.ui.h:172
 msgid "_Use Secure Connection:"
 msgstr "Br_uk sikker forbindelse:"
 
-#: ../mail/mail-config.ui.h:172
+#: ../mail/mail-config.ui.h:173
 msgid "_Use system defaults"
 msgstr "Br_uk systemets forvalg"
 
-#: ../mail/mail-config.ui.h:173
+#: ../mail/mail-config.ui.h:174
 msgid "_Use the same fonts as other applications"
 msgstr "Br_uk samme skrifter som andre programmer"
 
-#: ../mail/mail-config.ui.h:174 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/mail-config.ui.h:175 ../smime/gui/smime-ui.ui.h:47
 msgid "a"
 msgstr "a"
 
 #. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
-#: ../mail/mail-config.ui.h:176
+#: ../mail/mail-config.ui.h:177
 msgid "addresses"
 msgstr "adresser"
 
-#: ../mail/mail-config.ui.h:177 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:178 ../smime/gui/smime-ui.ui.h:48
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:178
+#: ../mail/mail-config.ui.h:179
 msgid "color"
 msgstr "farge"
 
-#: ../mail/mail-config.ui.h:179
+#: ../mail/mail-config.ui.h:180
 msgid "description"
 msgstr "beskrivelse"
 
@@ -13046,34 +13104,34 @@ msgstr "Venter..."
 msgid "Checking for new mail"
 msgstr "Ser etter nye meldinger"
 
-#: ../mail/mail-session.c:208
+#: ../mail/mail-session.c:220
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Skriv inn passord for %s"
 
-#: ../mail/mail-session.c:210
+#: ../mail/mail-session.c:222
 msgid "Enter Passphrase"
 msgstr "Skriv inn passord"
 
-#: ../mail/mail-session.c:213
+#: ../mail/mail-session.c:225
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Skriv inn passord for %s"
 
-#: ../mail/mail-session.c:215
+#: ../mail/mail-session.c:227
 msgid "Enter Password"
 msgstr "Skriv inn passord"
 
-#: ../mail/mail-session.c:257
+#: ../mail/mail-session.c:269
 msgid "User canceled operation."
 msgstr "Operasjon avbrutt av bruker."
 
-#: ../mail/mail-session.c:667
+#: ../mail/mail-session.c:701
 msgid ""
 "No destination address provided, forward of the message has been cancelled."
 msgstr "Ingen mÃ¥ladresse oppgitt. Videresending av meldingen ble avbrutt."
 
-#: ../mail/mail-session.c:673
+#: ../mail/mail-session.c:707
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr "Fant ingen konto Ã¥ bruke. Videresending av meldingen ble avbrutt."
 
@@ -13349,64 +13407,64 @@ msgstr "Kunne ikke lagre signaturfil."
 msgid "Delete messages in Search Folder \"{0}\"?"
 msgstr "Slett meldinger i sÃ¸kemappe Â«{0}Â»?"
 
-#: ../mail/mail.error.xml.h:45
-msgid "Do not d_elete"
-msgstr "Ikke sl_ett"
-
 #: ../mail/mail.error.xml.h:46
-msgid "Do not delete"
-msgstr "Ikke slett"
+msgid "Do _Not Disable"
+msgstr "I_kke slÃ¥ av"
 
 #: ../mail/mail.error.xml.h:47
-msgid "Do not disable"
-msgstr "Ikke deaktiver"
+msgid "Do _Not Send"
+msgstr "Ikke se_nd"
 
 #: ../mail/mail.error.xml.h:48
+msgid "Do _Not Synchronize"
+msgstr "Ikke sy_nkroniser"
+
+#: ../mail/mail.error.xml.h:49
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
 msgstr "Vil du synkronisere mapper som er merket for frakoblet bruk lokalt?"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:50
 msgid "Do you want to mark all messages as read?"
 msgstr "Vil du merke alle meldinger som lest?"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:51
 msgid "Do you wish to save your changes?"
 msgstr "Vil du lagre dine endringer?"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:52
 msgid "Enter password."
 msgstr "Oppgi passord."
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:53
 msgid "Error loading filter definitions."
 msgstr "Feil under lasting av filterdefinisjoner."
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:54
 msgid "Error while performing operation."
 msgstr "Feil under utfÃ¸ring av operasjon."
 
 #. Translators: the {0} is replaced with an operation name, which failed.
 #. It can be basically anything run asynchronously, like "Fetching Mail",
 #. "Sending message" and others, mostly from mail-ops.c file.
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:58
 msgid "Error while {0}."
 msgstr "Feil under {0}."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:59
 msgid "File exists but cannot overwrite it."
 msgstr "Filen eksisterer men kan ikke overskrives."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:60
 msgid "File exists but is not a regular file."
 msgstr "Filen eksisterer, men den er ikke en vanlig fil."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:61
 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:61
+#: ../mail/mail.error.xml.h:62
 msgid ""
 "If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
@@ -13414,16 +13472,16 @@ msgstr ""
 "Hvis du sletter mappen vil alt innhold i denne og undermapper slettes "
 "permanent."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:63
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
 msgstr "Hvis du sletter mappen vil alt innhold i denne bli slettet permanent."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:64
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "Hvis du fortsetter vil stedfortrederkontoer bli slettet permanent."
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:65
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -13431,11 +13489,11 @@ msgstr ""
 "Hvis du fortsetter vil all kontoinformasjon og\n"
 "mellomtjenerinformasjon bli slettet permanent."
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:67
 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:67
+#: ../mail/mail.error.xml.h:68
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -13443,23 +13501,23 @@ msgstr ""
 "Hvis du avslutter vil ikke disse meldingene sendes fÃ¸r Evolution startes "
 "igjen."
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:69
 msgid "Ignore"
 msgstr "Ignorer"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:70
 msgid "Invalid authentication"
 msgstr "Ugyldig autentisering"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:71
 msgid "Mail Deletion Failed"
 msgstr "Sletting av e-post feilet"
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:72
 msgid "Mail filters automatically updated."
 msgstr "E-postfiltre oppdatert automatisk."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:73
 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 "
@@ -13471,27 +13529,27 @@ msgstr ""
 "meldingen likevel. For Ã¥ unngÃ¥ dette bÃ¸r du legge inn minst en mottaker i "
 "Til: eller Cc:."
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:74
 msgid "Missing folder."
 msgstr "Mangler mappe."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:76
 msgid "No sources selected."
 msgstr "Ingen kilder valgt."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:77
 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:77
+#: ../mail/mail.error.xml.h:78
 msgid "Please check your account settings and try again."
 msgstr "Vennligst sjekk innstillingene for kontoen og prÃ¸v igjen."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:79
 msgid "Please enable the account or send using another account."
 msgstr "Vennligst sjekk kontoen eller send fra en annen konto."
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:80
 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."
@@ -13499,7 +13557,7 @@ 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:80
+#: ../mail/mail.error.xml.h:81
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -13508,55 +13566,47 @@ msgstr ""
 "Sjekk at fÃ¸lgende mottakere kan og Ã¸nsker Ã¥ motta e-post som HTML:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:83
 msgid "Please provide an unique name to identify this signature."
 msgstr "Oppgi et unikt navn for Ã¥ identifisere denne signaturen."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:84
 msgid "Please wait."
 msgstr "Vennligst vent."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:85
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Det oppsto et problem under migrering av gammel meldingsmappe Â«{0}Â»."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:86
 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:86
+#: ../mail/mail.error.xml.h:87
 msgid "Read receipt requested."
 msgstr "Lesekvittering etterspurt."
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:88
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "Vil du virkelig slette mappen Â«{0}Â» og alle undermapper?"
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:89
 msgid "Really delete folder \"{0}\"?"
 msgstr "Vil du virkelig slette mappen Â«{0}Â»?"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:90
 msgid "Search Folders automatically updated."
 msgstr "SÃ¸kemapper oppdatert automatisk."
 
-#: ../mail/mail.error.xml.h:90
-msgid "Send Receipt"
-msgstr "Send kvittering"
-
 #: ../mail/mail.error.xml.h:91
 msgid "Signature Already Exists"
 msgstr "Signaturen eksisterer allerede"
 
 #: ../mail/mail.error.xml.h:92
-msgid "Synchronize"
-msgstr "Synkroniser"
-
-#: ../mail/mail.error.xml.h:93
 msgid "Synchronize folders locally for offline usage?"
 msgstr "Synkroniser mapper lokalt for frakoblet bruk?"
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:93
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -13564,7 +13614,7 @@ msgstr ""
 "Systemmapper kreves for at Evolution skal fungere korrekt og du kan ikke "
 "endre navn pÃ¥, flytte eller slette disse."
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:94
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -13580,7 +13630,7 @@ msgstr ""
 "meldingen likevel. For Ã¥ unngÃ¥ dette bÃ¸r du legge inn minst en mottaker i "
 "Til: eller Cc:."
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:97
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -13588,7 +13638,7 @@ msgstr ""
 "FÃ¸lgende mottaker ble ikke gjenkjent som en gyldig e-postadresse:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:99
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
@@ -13596,11 +13646,11 @@ msgstr ""
 "FÃ¸lgende mottakere ble ikke gjenkjent som gyldige e-postadresser:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:101
 msgid "The script file must exist and be executable."
 msgstr "Skriptfilen mÃ¥ eksistere og vÃ¦re kjÃ¸rbar."
 
-#: ../mail/mail.error.xml.h:103
+#: ../mail/mail.error.xml.h:102
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -13608,20 +13658,20 @@ msgstr ""
 "Denne mappen er lagt til implisitt. GÃ¥ til redigering av sÃ¸kemapper og legg "
 "den inn eksplisitt hvis det er nÃ¸dvendig."
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:104
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr ""
 "Denne meldingen kan ikke sendes fordi kontoen du sender med ikke er aktiv"
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:105
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr ""
 "Denne meldingen kan ikke sendes fordi du ikke har oppgitt noen mottakere"
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:106
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -13629,25 +13679,25 @@ msgstr ""
 "Tjener stÃ¸tter ikke denne typen autentisering. Det kan hende den ikke "
 "stÃ¸tter autentisering i det hele tatt."
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:107
 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:109
+#: ../mail/mail.error.xml.h:108
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
 msgstr "Dette vil merke alle meldinger i valgt mappe med undermapper som lest."
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:109
 msgid "This will mark all messages as read in the selected folder."
 msgstr "Dette vil merke alle meldinger i valgt mappe som lest."
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:110
 msgid "Unable to connect to the GroupWise server."
 msgstr "Kunne ikke koble til GroupWise-tjener."
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:111
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -13655,19 +13705,19 @@ msgstr ""
 "Kan ikke Ã¥pne skisse-mappen for denne kontoen. Vil du bruke forvalgt mappe "
 "for skisser i stedet?"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:112
 msgid "Unable to read license file."
 msgstr "Kan ikke lese lisensfilen."
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:113
 msgid "Use _Default"
 msgstr "Bruk _forvalg"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:114
 msgid "Use default drafts folder?"
 msgstr "Bruk forvalgt mappe for skisser?"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:115
 msgid ""
 "Warning: Deleting messages from a Search Folder will delete the actual "
 "message from one of your local or remote folders.\n"
@@ -13677,31 +13727,31 @@ msgstr ""
 "meldingene fra dine lokale eller eksterne mapper.\n"
 "Vil du virkelig gjÃ¸re dette?"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:117
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Du har ikke tilstrekkelige rettigheter til Ã¥ slette denne meldingen."
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:118
 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:120
+#: ../mail/mail.error.xml.h:119
 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:121
+#: ../mail/mail.error.xml.h:120
 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:122
+#: ../mail/mail.error.xml.h:121
 msgid "You must name this Search Folder."
 msgstr "Du mÃ¥ gi navn til denne sÃ¸kemappen."
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:122
 msgid "You must specify a folder."
 msgstr "Du mÃ¥ oppgi en mappe."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:123
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -13711,111 +13761,121 @@ msgstr ""
 "Enten ved Ã¥ velge mappene individuelt og/eller Ã¥ velge alle lokale mapper, "
 "alle eksterne mapper eller begge deler."
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:125
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "Din pÃ¥logging pÃ¥ tjener Â«{0}Â» som Â«{0}Â» feilet."
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:126
 msgid "_Append"
 msgstr "_Legg til"
 
+#: ../mail/mail.error.xml.h:127
+#: ../plugins/groupwise-features/junk-settings.ui.h:5
+#: ../plugins/publish-calendar/publish-calendar.c:596
+msgid "_Disable"
+msgstr "_Deaktiver"
+
 #: ../mail/mail.error.xml.h:128
 msgid "_Discard changes"
 msgstr "_Forkast endringene"
 
 #: ../mail/mail.error.xml.h:129
-msgid "_Do not Synchronize"
-msgstr "I_kke synkroniser"
-
-#: ../mail/mail.error.xml.h:130
-#: ../modules/mail/e-mail-shell-view-actions.c:825
+#: ../modules/mail/e-mail-shell-view-actions.c:827
 msgid "_Empty Trash"
 msgstr "_TÃ¸m papirkurven"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:130
 msgid "_Expunge"
 msgstr "T_Ã¸m"
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:131
 msgid "_Open Messages"
 msgstr "_Ã?pne meldinger"
 
-#: ../mail/message-list.c:1112
+#: ../mail/mail.error.xml.h:134
+msgid "_Send Receipt"
+msgstr "_Send kvittering"
+
+#: ../mail/mail.error.xml.h:135
+msgid "_Synchronize"
+msgstr "_Synkroniser"
+
+#: ../mail/message-list.c:1119
 msgid "Unseen"
 msgstr "Ulest"
 
-#: ../mail/message-list.c:1113
+#: ../mail/message-list.c:1120
 msgid "Seen"
 msgstr "Lest"
 
-#: ../mail/message-list.c:1114
+#: ../mail/message-list.c:1121
 msgid "Answered"
 msgstr "Besvart"
 
-#: ../mail/message-list.c:1115
+#: ../mail/message-list.c:1122
 msgid "Forwarded"
 msgstr "Videresendt"
 
-#: ../mail/message-list.c:1116
+#: ../mail/message-list.c:1123
 msgid "Multiple Unseen Messages"
 msgstr "Flere uleste meldinger"
 
-#: ../mail/message-list.c:1117
+#: ../mail/message-list.c:1124
 msgid "Multiple Messages"
 msgstr "Flere meldinger"
 
-#: ../mail/message-list.c:1121
+#: ../mail/message-list.c:1128
 msgid "Lowest"
 msgstr "Lavest"
 
-#: ../mail/message-list.c:1122
+#: ../mail/message-list.c:1129
 msgid "Lower"
 msgstr "Lavere"
 
-#: ../mail/message-list.c:1126
+#: ../mail/message-list.c:1133
 msgid "Higher"
 msgstr "HÃ¸yere"
 
-#: ../mail/message-list.c:1127
+#: ../mail/message-list.c:1134
 msgid "Highest"
 msgstr "HÃ¸yest"
 
-#: ../mail/message-list.c:1737 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1744 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1744 ../plugins/itip-formatter/itip-view.c:205
+#: ../mail/message-list.c:1751 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "I dag %l:%M %p"
 
-#: ../mail/message-list.c:1753
+#: ../mail/message-list.c:1760
 msgid "Yesterday %l:%M %p"
 msgstr "I gÃ¥r %l:%M %p"
 
-#: ../mail/message-list.c:1765
+#: ../mail/message-list.c:1772
 msgid "%a %l:%M %p"
 msgstr "%a %H.%M"
 
-#: ../mail/message-list.c:1773
+#: ../mail/message-list.c:1780
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H.%M"
 
-#: ../mail/message-list.c:1775
+#: ../mail/message-list.c:1782
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../mail/message-list.c:2527
+#: ../mail/message-list.c:2537
 msgid "Select all visible messages"
 msgstr "Velg alle synlige meldinger"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4212 ../mail/message-list.c:4606
+#: ../mail/message-list.c:4222 ../mail/message-list.c:4616
 msgid "Generating message list"
 msgstr "Genererer meldingsliste"
 
-#: ../mail/message-list.c:4445
+#: ../mail/message-list.c:4455
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -13823,7 +13883,7 @@ msgstr ""
 "Ingen meldinger passer dine sÃ¸kekriterier. Du kan enten tÃ¸mme sÃ¸ket med "
 "menyoppfÃ¸ringen SÃ¸k->TÃ¸m eller endre det."
 
-#: ../mail/message-list.c:4447
+#: ../mail/message-list.c:4457
 msgid "There are no messages in this folder."
 msgstr "Det er ingen meldinger i denne mappen."
 
@@ -13861,27 +13921,27 @@ msgid "Subject - Trimmed"
 msgstr "Forkortet emne"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1216
+#: ../modules/mail/e-mail-shell-view-actions.c:1218
 msgid "Body contains"
 msgstr "Kropp inneholder"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1223
+#: ../modules/mail/e-mail-shell-view-actions.c:1225
 msgid "Message contains"
 msgstr "Melding inneholder"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1230
+#: ../modules/mail/e-mail-shell-view-actions.c:1232
 msgid "Recipients contain"
 msgstr "Mottakere inneholder"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1237
+#: ../modules/mail/e-mail-shell-view-actions.c:1239
 msgid "Sender contains"
 msgstr "Avsender inneholder"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1244
+#: ../modules/mail/e-mail-shell-view-actions.c:1246
 msgid "Subject contains"
 msgstr "Emne inneholder"
 
@@ -14058,7 +14118,7 @@ msgstr "Om forhÃ¥ndsvisningsomrÃ¥det skal vises."
 
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
 #: ../modules/addressbook/autocompletion-config.c:159
-#: ../modules/mail/em-mailer-prefs.c:1159
+#: ../modules/mail/em-mailer-prefs.c:1165
 msgid "_Table column:"
 msgstr "Kolonne i _tabell:"
 
@@ -14072,7 +14132,7 @@ msgstr "Alltid vi_s adresse for automatisk fullfÃ¸rt kontakt"
 
 #. Create the LDAP source group
 #: ../modules/addressbook/e-book-shell-backend.c:191
-#: ../modules/addressbook/e-book-shell-migrate.c:144
+#: ../modules/addressbook/e-book-shell-migrate.c:148
 msgid "On LDAP Servers"
 msgstr "PÃ¥ LDAP-tjenere"
 
@@ -14157,10 +14217,10 @@ msgid "Show properties of the selected address book"
 msgstr "Vis egenskaper for valgt adressebok"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:699
-#: ../modules/calendar/e-cal-shell-view-actions.c:1352
+#: ../modules/calendar/e-cal-shell-view-actions.c:1354
 #: ../modules/calendar/e-memo-shell-view-actions.c:619
 #: ../modules/calendar/e-task-shell-view-actions.c:744
-#: ../modules/mail/e-mail-shell-view-actions.c:909
+#: ../modules/mail/e-mail-shell-view-actions.c:911
 msgid "_Rename..."
 msgstr "End_re navn..."
 
@@ -14241,7 +14301,7 @@ msgid "Send a message to the selected contacts"
 msgstr "Send en melding til valgte kontakter"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:785
-#: ../modules/calendar/e-cal-shell-view-actions.c:1494
+#: ../modules/calendar/e-cal-shell-view-actions.c:1496
 #: ../modules/calendar/e-task-shell-view-actions.c:802
 msgid "_Actions"
 msgstr "H_andlinger"
@@ -14249,12 +14309,12 @@ msgstr "H_andlinger"
 #: ../modules/addressbook/e-book-shell-view-actions.c:792
 #: ../modules/calendar/e-memo-shell-view-actions.c:656
 #: ../modules/calendar/e-task-shell-view-actions.c:809
-#: ../modules/mail/e-mail-shell-view-actions.c:1032
+#: ../modules/mail/e-mail-shell-view-actions.c:1034
 msgid "_Preview"
 msgstr "_ForhÃ¥ndsvis"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:801
-#: ../modules/calendar/e-cal-shell-view-actions.c:1511
+#: ../modules/calendar/e-cal-shell-view-actions.c:1513
 #: ../modules/calendar/e-memo-shell-view-actions.c:669
 #: ../modules/calendar/e-task-shell-view-actions.c:822
 msgid "_Delete"
@@ -14281,7 +14341,7 @@ msgstr "Vis vindu for forhÃ¥ndsvisning av kontakter"
 #: ../modules/addressbook/e-book-shell-view-actions.c:863
 #: ../modules/calendar/e-memo-shell-view-actions.c:726
 #: ../modules/calendar/e-task-shell-view-actions.c:891
-#: ../modules/mail/e-mail-shell-view-actions.c:1126
+#: ../modules/mail/e-mail-shell-view-actions.c:1128
 msgid "_Classic View"
 msgstr "_Klassisk visning"
 
@@ -14292,7 +14352,7 @@ msgstr "Vis forhÃ¥ndsvisning av kontakt under kontaktlisten"
 #: ../modules/addressbook/e-book-shell-view-actions.c:870
 #: ../modules/calendar/e-memo-shell-view-actions.c:733
 #: ../modules/calendar/e-task-shell-view-actions.c:898
-#: ../modules/mail/e-mail-shell-view-actions.c:1133
+#: ../modules/mail/e-mail-shell-view-actions.c:1135
 msgid "_Vertical View"
 msgstr "_Vertikal visning"
 
@@ -14301,24 +14361,24 @@ msgid "Show contact preview alongside the contact list"
 msgstr "Vis forhÃ¥ndsvisning av kontakt ved siden av kontaktlisten"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:880
-#: ../modules/calendar/e-cal-shell-view-actions.c:1654
+#: ../modules/calendar/e-cal-shell-view-actions.c:1656
 #: ../modules/calendar/e-memo-shell-view-actions.c:743
 #: ../modules/calendar/e-task-shell-view-actions.c:915
 msgid "Any Category"
 msgstr "Enhver kategori"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:887
-#: ../modules/calendar/e-cal-shell-view-actions.c:1668
+#: ../modules/calendar/e-cal-shell-view-actions.c:1670
 #: ../modules/calendar/e-memo-shell-view-actions.c:750
 #: ../modules/calendar/e-task-shell-view-actions.c:950
 msgid "Unmatched"
 msgstr "Ingen treff"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:897
-#: ../modules/calendar/e-cal-shell-view-actions.c:1678
+#: ../modules/calendar/e-cal-shell-view-actions.c:1680
 #: ../modules/calendar/e-memo-shell-view-actions.c:760
 #: ../modules/calendar/e-task-shell-view-actions.c:960
-#: ../modules/mail/e-mail-shell-view-actions.c:1209
+#: ../modules/mail/e-mail-shell-view-actions.c:1211
 #: ../shell/e-shell-content.c:441
 msgid "Advanced Search"
 msgstr "Avansert sÃ¸k"
@@ -14523,7 +14583,7 @@ msgid "_Appointment"
 msgstr "_Avtale"
 
 #: ../modules/calendar/e-cal-shell-backend.c:457
-#: ../modules/calendar/e-cal-shell-view-actions.c:1431
+#: ../modules/calendar/e-cal-shell-view-actions.c:1433
 msgid "Create a new appointment"
 msgstr "Opprett en ny avtale"
 
@@ -14551,7 +14611,7 @@ msgid "Cale_ndar"
 msgstr "Kale_nder"
 
 #: ../modules/calendar/e-cal-shell-backend.c:481
-#: ../modules/calendar/e-cal-shell-view-actions.c:1326
+#: ../modules/calendar/e-cal-shell-view-actions.c:1328
 msgid "Create a new calendar"
 msgstr "Opprett en ny kalender"
 
@@ -14560,7 +14620,7 @@ msgstr "Opprett en ny kalender"
 msgid "Calendar and Tasks"
 msgstr "Kalender og oppgaver"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:168
+#: ../modules/calendar/e-cal-shell-sidebar.c:169
 #: ../modules/calendar/e-memo-shell-sidebar.c:163
 #: ../modules/calendar/e-task-shell-sidebar.c:163
 #, c-format
@@ -14571,16 +14631,20 @@ msgstr ""
 "Feil pÃ¥ %s\n"
 " %s"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:227
+#: ../modules/calendar/e-cal-shell-sidebar.c:228
 msgid "Loading calendars"
 msgstr "Laster kalendere"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:633
+#: ../modules/calendar/e-cal-shell-sidebar.c:648
+msgid "_New Calendar..."
+msgstr "_Ny kalender..."
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:665
 msgid "Calendar Selector"
 msgstr "Kalendervelger"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:974
+#: ../modules/calendar/e-cal-shell-sidebar.c:1007
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Ã?pner kalender pÃ¥ %s"
@@ -14627,111 +14691,111 @@ msgstr "hendelse"
 msgid "Save as iCalendar"
 msgstr "Lagre som iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1282
+#: ../modules/calendar/e-cal-shell-view-actions.c:1284
 #: ../modules/calendar/e-memo-shell-view-actions.c:584
 msgid "_Copy..."
 msgstr "_Kopier..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1289
+#: ../modules/calendar/e-cal-shell-view-actions.c:1291
 msgid "D_elete Calendar"
 msgstr "Sl_ett kalender"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1291
+#: ../modules/calendar/e-cal-shell-view-actions.c:1293
 msgid "Delete the selected calendar"
 msgstr "Slett valgt kalender"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1298
+#: ../modules/calendar/e-cal-shell-view-actions.c:1300
 msgid "Go Back"
 msgstr "GÃ¥ tilbake"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1305
+#: ../modules/calendar/e-cal-shell-view-actions.c:1307
 msgid "Go Forward"
 msgstr "GÃ¥ fremover"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1312
+#: ../modules/calendar/e-cal-shell-view-actions.c:1314
 msgid "Select today"
 msgstr "Velg i dag"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1317
+#: ../modules/calendar/e-cal-shell-view-actions.c:1319
 msgid "Select _Date"
 msgstr "Velg _dato"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1319
+#: ../modules/calendar/e-cal-shell-view-actions.c:1321
 msgid "Select a specific date"
 msgstr "Velg en spesifikk dato"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1324
+#: ../modules/calendar/e-cal-shell-view-actions.c:1326
 msgid "_New Calendar"
 msgstr "_Ny kalender"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1338
+#: ../modules/calendar/e-cal-shell-view-actions.c:1340
 #: ../modules/calendar/e-task-shell-view-actions.c:793
 msgid "Purg_e"
 msgstr "Fj_ern"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1340
+#: ../modules/calendar/e-cal-shell-view-actions.c:1342
 msgid "Purge old appointments and meetings"
 msgstr "Fjern gamle avtaler og mÃ¸ter"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1345
+#: ../modules/calendar/e-cal-shell-view-actions.c:1347
 #: ../modules/calendar/e-memo-shell-view-actions.c:612
 #: ../modules/calendar/e-task-shell-view-actions.c:737
 msgid "Re_fresh"
 msgstr "O_ppdater"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1347
+#: ../modules/calendar/e-cal-shell-view-actions.c:1349
 msgid "Refresh the selected calendar"
 msgstr "Oppdater valgt kalender"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1354
+#: ../modules/calendar/e-cal-shell-view-actions.c:1356
 msgid "Rename the selected calendar"
 msgstr "Endre navn pÃ¥ valgt kalender"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1359
+#: ../modules/calendar/e-cal-shell-view-actions.c:1361
 msgid "Show _Only This Calendar"
 msgstr "Vis k_un denne kalenderen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1366
+#: ../modules/calendar/e-cal-shell-view-actions.c:1368
 msgid "Cop_y to Calendar..."
 msgstr "Kop_ier til kalender..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1373
+#: ../modules/calendar/e-cal-shell-view-actions.c:1375
 msgid "_Delegate Meeting..."
 msgstr "_Deleger mÃ¸te..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1380
+#: ../modules/calendar/e-cal-shell-view-actions.c:1382
 msgid "_Delete Appointment"
 msgstr "_Slett avtale"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1382
+#: ../modules/calendar/e-cal-shell-view-actions.c:1384
 msgid "Delete selected appointments"
 msgstr "Slett valgte avtaler"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1387
+#: ../modules/calendar/e-cal-shell-view-actions.c:1389
 msgid "Delete This _Occurrence"
 msgstr "Slett denne _hendelsen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1389
+#: ../modules/calendar/e-cal-shell-view-actions.c:1391
 msgid "Delete this occurrence"
 msgstr "Slett denne oppfÃ¸ringen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1394
+#: ../modules/calendar/e-cal-shell-view-actions.c:1396
 msgid "Delete All Occ_urrences"
 msgstr "Slett alle oppf_Ã¸ringer"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1396
+#: ../modules/calendar/e-cal-shell-view-actions.c:1398
 msgid "Delete all occurrences"
 msgstr "Slett alle oppfÃ¸ringer"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1401
+#: ../modules/calendar/e-cal-shell-view-actions.c:1403
 msgid "New All Day _Event..."
 msgstr "Ny avtale som varer h_ele dagen..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1403
+#: ../modules/calendar/e-cal-shell-view-actions.c:1405
 msgid "Create a new all day event"
 msgstr "Opprett en ny avtale for hele dagen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1408
+#: ../modules/calendar/e-cal-shell-view-actions.c:1410
 #: ../modules/calendar/e-cal-shell-view-memopad.c:243
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:317
 #: ../modules/calendar/e-memo-shell-view-actions.c:577
@@ -14739,128 +14803,128 @@ msgstr "Opprett en ny avtale for hele dagen"
 msgid "_Forward as iCalendar..."
 msgstr "_Videresend som iCalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1415
+#: ../modules/calendar/e-cal-shell-view-actions.c:1417
 msgid "New _Meeting..."
 msgstr "Nytt _mÃ¸te..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1417
+#: ../modules/calendar/e-cal-shell-view-actions.c:1419
 msgid "Create a new meeting"
 msgstr "Lag et nytt mÃ¸te"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1422
+#: ../modules/calendar/e-cal-shell-view-actions.c:1424
 msgid "Mo_ve to Calendar..."
 msgstr "Fl_ytt til kalender..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1429
+#: ../modules/calendar/e-cal-shell-view-actions.c:1431
 msgid "New _Appointment..."
 msgstr "Ny _avtale..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1436
+#: ../modules/calendar/e-cal-shell-view-actions.c:1438
 msgid "Make this Occurrence _Movable"
 msgstr "GjÃ¸r denne hendelsen _flyttbar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1443
+#: ../modules/calendar/e-cal-shell-view-actions.c:1445
 msgid "_Open Appointment"
 msgstr "_Ã?pne avtale"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1445
+#: ../modules/calendar/e-cal-shell-view-actions.c:1447
 msgid "View the current appointment"
 msgstr "Vis denne avtalen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1450
+#: ../modules/calendar/e-cal-shell-view-actions.c:1452
 msgid "_Reply"
 msgstr "Sva_r"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1464
+#: ../modules/calendar/e-cal-shell-view-actions.c:1466
 #: ../modules/calendar/e-cal-shell-view-memopad.c:271
 msgid "Save as iCalendar..."
 msgstr "Lagre som iCalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1471
+#: ../modules/calendar/e-cal-shell-view-actions.c:1473
 msgid "_Schedule Meeting..."
 msgstr "_Sett opp mÃ¸te..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1473
+#: ../modules/calendar/e-cal-shell-view-actions.c:1475
 msgid "Converts an appointment to a meeting"
 msgstr "Konverter en avtale til et mÃ¸te"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1478
+#: ../modules/calendar/e-cal-shell-view-actions.c:1480
 msgid "Conv_ert to Appointment..."
 msgstr "Konv_erter til avtale..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1480
+#: ../modules/calendar/e-cal-shell-view-actions.c:1482
 msgid "Converts a meeting to an appointment"
 msgstr "Konverterer et mÃ¸te til en avtale"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1485
+#: ../modules/calendar/e-cal-shell-view-actions.c:1487
 msgid "Quit"
 msgstr "Avslutt"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1609
+#: ../modules/calendar/e-cal-shell-view-actions.c:1611
 msgid "Day"
 msgstr "Dag"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1611
+#: ../modules/calendar/e-cal-shell-view-actions.c:1613
 msgid "Show one day"
 msgstr "Vis en dag"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1616
+#: ../modules/calendar/e-cal-shell-view-actions.c:1618
 msgid "List"
 msgstr "Liste"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1618
+#: ../modules/calendar/e-cal-shell-view-actions.c:1620
 msgid "Show as list"
 msgstr "Vis som liste"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1623
+#: ../modules/calendar/e-cal-shell-view-actions.c:1625
 msgid "Month"
 msgstr "MÃ¥ned"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1625
+#: ../modules/calendar/e-cal-shell-view-actions.c:1627
 msgid "Show one month"
 msgstr "Vis en mÃ¥ned"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1630
+#: ../modules/calendar/e-cal-shell-view-actions.c:1632
 msgid "Week"
 msgstr "Uke"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1632
+#: ../modules/calendar/e-cal-shell-view-actions.c:1634
 msgid "Show one week"
 msgstr "Vis en uke"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1639
+#: ../modules/calendar/e-cal-shell-view-actions.c:1641
 msgid "Show one work week"
 msgstr "Vis en arbeidsuke"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1647
+#: ../modules/calendar/e-cal-shell-view-actions.c:1649
 msgid "Active Appointments"
 msgstr "Aktive avtaler"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1661
+#: ../modules/calendar/e-cal-shell-view-actions.c:1663
 msgid "Next 7 Days' Appointments"
 msgstr "Avtaler for de neste 7 dagene"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1692
+#: ../modules/calendar/e-cal-shell-view-actions.c:1694
 #: ../modules/calendar/e-memo-shell-view-actions.c:774
 #: ../modules/calendar/e-task-shell-view-actions.c:974
 msgid "Description contains"
 msgstr "Beskrivelse inneholder"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1699
+#: ../modules/calendar/e-cal-shell-view-actions.c:1701
 #: ../modules/calendar/e-memo-shell-view-actions.c:781
 #: ../modules/calendar/e-task-shell-view-actions.c:981
 msgid "Summary contains"
 msgstr "Sammendrag inneholder"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1711
+#: ../modules/calendar/e-cal-shell-view-actions.c:1713
 msgid "Print this calendar"
 msgstr "Skriv ut denne kalenderen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1718
+#: ../modules/calendar/e-cal-shell-view-actions.c:1720
 msgid "Preview the calendar to be printed"
 msgstr "ForhÃ¥ndsvis kalenderen som skal skrives ut"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1791
+#: ../modules/calendar/e-cal-shell-view-actions.c:1793
 msgid "Go To"
 msgstr "GÃ¥ til"
 
@@ -15306,269 +15370,269 @@ msgstr "Brukervalg for redigering"
 msgid "Network Preferences"
 msgstr "Brukervalg for nettverk"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:818
+#: ../modules/mail/e-mail-shell-view-actions.c:820
 #: ../modules/mail/e-mail-shell-view.c:875
 msgid "_Disable Account"
 msgstr "_Deaktiver konto"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:820
+#: ../modules/mail/e-mail-shell-view-actions.c:822
 msgid "Disable this account"
 msgstr "Deaktiver denne kontoen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:827
+#: ../modules/mail/e-mail-shell-view-actions.c:829
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "Fjern alle slettede meldinger fra alle mapper permanent"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:832
+#: ../modules/mail/e-mail-shell-view-actions.c:834
 msgid "C_reate Search Folder From Search..."
 msgstr "Opp_rett sÃ¸kemappe fra sÃ¸k..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:839
+#: ../modules/mail/e-mail-shell-view-actions.c:841
 msgid "_Download Messages for Offline Usage"
 msgstr "Last ne_d meldinger for frakoblet bruk"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:841
+#: ../modules/mail/e-mail-shell-view-actions.c:843
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr ""
 "Last ned meldinger fra kontoer og mapper som er merket for frakoblet bruk"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:846
+#: ../modules/mail/e-mail-shell-view-actions.c:848
 msgid "Fl_ush Outbox"
 msgstr "T_Ã¸m utboks"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:853
+#: ../modules/mail/e-mail-shell-view-actions.c:855
 msgid "_Copy Folder To..."
 msgstr "_Kopier mappe til..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:855
+#: ../modules/mail/e-mail-shell-view-actions.c:857
 msgid "Copy the selected folder into another folder"
 msgstr "Kopier valgt mappe til en annen mappe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:862
+#: ../modules/mail/e-mail-shell-view-actions.c:864
 msgid "Permanently remove this folder"
 msgstr "Fjern denne mappen permanent"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:867
+#: ../modules/mail/e-mail-shell-view-actions.c:869
 msgid "E_xpunge"
 msgstr "T_Ã¸m"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:869
+#: ../modules/mail/e-mail-shell-view-actions.c:871
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Fjern alle slettede meldinger fra denne mappen permanent"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:874
+#: ../modules/mail/e-mail-shell-view-actions.c:876
 msgid "Mar_k All Messages as Read"
 msgstr "Mer_k alle meldinger som lest"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:876
+#: ../modules/mail/e-mail-shell-view-actions.c:878
 msgid "Mark all messages in the folder as read"
 msgstr "Merk alle meldinger i en mappe som lest"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:881
+#: ../modules/mail/e-mail-shell-view-actions.c:883
 msgid "_Move Folder To..."
 msgstr "Flytt _mappe til..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:883
+#: ../modules/mail/e-mail-shell-view-actions.c:885
 msgid "Move the selected folder into another folder"
 msgstr "Flytt valgt mappe til en annen mappe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:888
+#: ../modules/mail/e-mail-shell-view-actions.c:890
 msgid "_New..."
 msgstr "_Ny..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:890
+#: ../modules/mail/e-mail-shell-view-actions.c:892
 msgid "Create a new folder for storing mail"
 msgstr "Lag en ny mappe for lagring av meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:897
+#: ../modules/mail/e-mail-shell-view-actions.c:899
 msgid "Change the properties of this folder"
 msgstr "Endre egenskaper for denne mappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:904
+#: ../modules/mail/e-mail-shell-view-actions.c:906
 msgid "Refresh the folder"
 msgstr "Oppdater mappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:911
+#: ../modules/mail/e-mail-shell-view-actions.c:913
 msgid "Change the name of this folder"
 msgstr "Endre navn pÃ¥ denne mappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:916
+#: ../modules/mail/e-mail-shell-view-actions.c:918
 msgid "Select Message _Thread"
 msgstr "Velg meldings_trÃ¥d"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:918
+#: ../modules/mail/e-mail-shell-view-actions.c:920
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Velg alle meldinger i samme trÃ¥d som den valgte meldingen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:923
+#: ../modules/mail/e-mail-shell-view-actions.c:925
 msgid "Select Message S_ubthread"
 msgstr "Velg _undertrÃ¥d for melding"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:925
+#: ../modules/mail/e-mail-shell-view-actions.c:927
 msgid "Select all replies to the currently selected message"
 msgstr "Velg alle svar til den valgt melding"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:930
+#: ../modules/mail/e-mail-shell-view-actions.c:932
 msgid "_Unsubscribe"
 msgstr "_Fjern abonnement"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:932
+#: ../modules/mail/e-mail-shell-view-actions.c:934
 msgid "Unsubscribe from the selected folder"
 msgstr "Fjern abonnement pÃ¥ valgt mappe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:937
+#: ../modules/mail/e-mail-shell-view-actions.c:939
 msgid "Empty _Trash"
 msgstr "TÃ¸m _papirkurven"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:939
+#: ../modules/mail/e-mail-shell-view-actions.c:941
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "Fjern alle slettede meldinger fra alle kontoer permanent"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:944
+#: ../modules/mail/e-mail-shell-view-actions.c:946
 msgid "_New Label"
 msgstr "_Ny etikett"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:953
+#: ../modules/mail/e-mail-shell-view-actions.c:955
 msgid "N_one"
 msgstr "_Ingen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:976
+#: ../modules/mail/e-mail-shell-view-actions.c:978
 msgid "Cancel the current mail operation"
 msgstr "Avbryt aktiv e-postoperasjon"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:981
+#: ../modules/mail/e-mail-shell-view-actions.c:983
 msgid "Collapse All _Threads"
 msgstr "SlÃ¥ sammen alle _trÃ¥der"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:983
+#: ../modules/mail/e-mail-shell-view-actions.c:985
 msgid "Collapse all message threads"
 msgstr "SlÃ¥ sammen alle meldingstrÃ¥der"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:988
+#: ../modules/mail/e-mail-shell-view-actions.c:990
 msgid "E_xpand All Threads"
 msgstr "Ut_vid alle trÃ¥der"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:990
+#: ../modules/mail/e-mail-shell-view-actions.c:992
 msgid "Expand all message threads"
 msgstr "Utvid alle meldingstrÃ¥der"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:995
+#: ../modules/mail/e-mail-shell-view-actions.c:997
 msgid "_Message Filters"
 msgstr "_Meldingsfiltre"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:997
+#: ../modules/mail/e-mail-shell-view-actions.c:999
 msgid "Create or edit rules for filtering new mail"
 msgstr "Opprett eller rediger regler for filtrering av ny e-post"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1002
+#: ../modules/mail/e-mail-shell-view-actions.c:1004
 msgid "Search F_olders"
 msgstr "SÃ¸k i _mapper"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1004
+#: ../modules/mail/e-mail-shell-view-actions.c:1006
 msgid "Create or edit search folder definitions"
 msgstr "Opprett eller rediger sÃ¸kemappedefinisjoner"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1009
+#: ../modules/mail/e-mail-shell-view-actions.c:1011
 msgid "_Subscriptions..."
 msgstr "_Abonnement..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1011
+#: ../modules/mail/e-mail-shell-view-actions.c:1013
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Abonner eller fjern abonnement pÃ¥ mapper pÃ¥ eksterne tjenere"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1018
+#: ../modules/mail/e-mail-shell-view-actions.c:1020
 msgid "F_older"
 msgstr "M_appe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1025
+#: ../modules/mail/e-mail-shell-view-actions.c:1027
 msgid "_Label"
 msgstr "_Etikett"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1065
+#: ../modules/mail/e-mail-shell-view-actions.c:1067
 msgid "_New Folder..."
 msgstr "_Ny mappe..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1089
+#: ../modules/mail/e-mail-shell-view-actions.c:1091
 msgid "Show Message _Preview"
 msgstr "Vis _forhÃ¥ndsvisning av melding"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1091
+#: ../modules/mail/e-mail-shell-view-actions.c:1093
 msgid "Show message preview pane"
 msgstr "Vis omrÃ¥de for forhÃ¥ndsvisning av melding"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1097
+#: ../modules/mail/e-mail-shell-view-actions.c:1099
 msgid "Show _Deleted Messages"
 msgstr "Vis slette_de meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1099
+#: ../modules/mail/e-mail-shell-view-actions.c:1101
 msgid "Show deleted messages with a line through them"
 msgstr "Vis slettede meldinger som gjennomstreket i meldingslisten."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1105
+#: ../modules/mail/e-mail-shell-view-actions.c:1107
 msgid "_Group By Threads"
 msgstr "_Grupper etter trÃ¥der"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1107
+#: ../modules/mail/e-mail-shell-view-actions.c:1109
 msgid "Threaded message list"
 msgstr "Meldingsliste med trÃ¥der"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1128
+#: ../modules/mail/e-mail-shell-view-actions.c:1130
 msgid "Show message preview below the message list"
 msgstr "Vis meldingen under meldingslisten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1135
+#: ../modules/mail/e-mail-shell-view-actions.c:1137
 msgid "Show message preview alongside the message list"
 msgstr "Vis meldingen ved siden av meldingslisten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1143
+#: ../modules/mail/e-mail-shell-view-actions.c:1145
 msgid "All Messages"
 msgstr "Alle meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1150
+#: ../modules/mail/e-mail-shell-view-actions.c:1152
 msgid "Important Messages"
 msgstr "Viktige meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1157
+#: ../modules/mail/e-mail-shell-view-actions.c:1159
 msgid "Last 5 Days' Messages"
 msgstr "Meldinger fra de siste 5 dagene"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1164
+#: ../modules/mail/e-mail-shell-view-actions.c:1166
 msgid "Messages Not Junk"
 msgstr "Meldinger som ikke er uÃ¸nsket e-post"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1171
+#: ../modules/mail/e-mail-shell-view-actions.c:1173
 msgid "Messages with Attachments"
 msgstr "Meldinger med vedlegg"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1178
+#: ../modules/mail/e-mail-shell-view-actions.c:1180
 msgid "No Label"
 msgstr "Ingen etikett"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1185
+#: ../modules/mail/e-mail-shell-view-actions.c:1187
 msgid "Read Messages"
 msgstr "Leste meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1192
+#: ../modules/mail/e-mail-shell-view-actions.c:1194
 msgid "Recent Messages"
 msgstr "Nye meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1199
+#: ../modules/mail/e-mail-shell-view-actions.c:1201
 msgid "Unread Messages"
 msgstr "Uleste meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1251
+#: ../modules/mail/e-mail-shell-view-actions.c:1253
 msgid "Subject or Addresses contain"
 msgstr "Emne eller adresser inneholder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1261
+#: ../modules/mail/e-mail-shell-view-actions.c:1263
 msgid "All Accounts"
 msgstr "Alle konti"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1268
+#: ../modules/mail/e-mail-shell-view-actions.c:1270
 msgid "Current Account"
 msgstr "Denne kontoen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1275
+#: ../modules/mail/e-mail-shell-view-actions.c:1277
 msgid "Current Folder"
 msgstr "Denne mappen"
 
@@ -15641,77 +15705,85 @@ msgstr "SÃ¸k i konto"
 msgid "Proxy _Logout"
 msgstr "_Logg ut proxy"
 
-#: ../modules/mail/em-composer-prefs.c:472
+#: ../modules/mail/em-account-prefs.c:129
+msgid "Evolution Account Assistant"
+msgstr "Evolution kontoassistent"
+
+#: ../modules/mail/em-account-prefs.c:178
+msgid "Account Editor"
+msgstr "Kontoredigering"
+
+#: ../modules/mail/em-composer-prefs.c:473
 #: ../plugins/plugin-manager/plugin-manager.c:349
 #: ../plugins/publish-calendar/publish-calendar.c:827
 #: ../widgets/misc/e-account-tree-view.c:205
 msgid "Enabled"
 msgstr "Aktivert"
 
-#: ../modules/mail/em-composer-prefs.c:476
+#: ../modules/mail/em-composer-prefs.c:477
 msgid "Language(s)"
 msgstr "SprÃ¥k"
 
-#: ../modules/mail/em-mailer-prefs.c:96
+#: ../modules/mail/em-mailer-prefs.c:97
 msgid "Every time"
 msgstr "Hver gang"
 
-#: ../modules/mail/em-mailer-prefs.c:97
+#: ../modules/mail/em-mailer-prefs.c:98
 msgid "Once per day"
 msgstr "En gang om dagen"
 
-#: ../modules/mail/em-mailer-prefs.c:98
+#: ../modules/mail/em-mailer-prefs.c:99
 msgid "Once per week"
 msgstr "En gang i uken"
 
-#: ../modules/mail/em-mailer-prefs.c:99
+#: ../modules/mail/em-mailer-prefs.c:100
 msgid "Once per month"
 msgstr "En gang i mÃ¥neden"
 
-#: ../modules/mail/em-mailer-prefs.c:224
+#: ../modules/mail/em-mailer-prefs.c:225
 msgid "Add Custom Junk Header"
 msgstr "Legg til egendefinert meldingshoder for uÃ¸nsket e-post"
 
-#: ../modules/mail/em-mailer-prefs.c:232
+#: ../modules/mail/em-mailer-prefs.c:233
 msgid "Header Name:"
 msgstr "Navn pÃ¥ meldingshode:"
 
-#: ../modules/mail/em-mailer-prefs.c:233
+#: ../modules/mail/em-mailer-prefs.c:234
 msgid "Header Value Contains:"
 msgstr "Verdi i meldingshode inneholder:"
 
-#: ../modules/mail/em-mailer-prefs.c:333
+#: ../modules/mail/em-mailer-prefs.c:334
 msgid "Header"
 msgstr "Topptekst"
 
-#: ../modules/mail/em-mailer-prefs.c:337
+#: ../modules/mail/em-mailer-prefs.c:338
 msgid "Contains Value"
 msgstr "Inneholder verdi"
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:730 ../modules/mail/em-mailer-prefs.c:801
+#: ../modules/mail/em-mailer-prefs.c:731 ../modules/mail/em-mailer-prefs.c:802
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "Tillegg %s er tilgjengelig og filen er installert."
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:738 ../modules/mail/em-mailer-prefs.c:810
+#: ../modules/mail/em-mailer-prefs.c:739 ../modules/mail/em-mailer-prefs.c:811
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
 msgstr ""
 "%s-tillegg er ikke tilgjengelig. Vennligst sjekk om pakken er installert."
 
-#: ../modules/mail/em-mailer-prefs.c:774
+#: ../modules/mail/em-mailer-prefs.c:775
 msgid "No junk plugin available"
 msgstr "Ingen tillegg for uÃ¸nsket e-post tilgjengelig"
 
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1161
+#: ../modules/mail/em-mailer-prefs.c:1167
 msgid "_Date header:"
 msgstr "_Datohode:"
 
-#: ../modules/mail/em-mailer-prefs.c:1162
+#: ../modules/mail/em-mailer-prefs.c:1168
 msgid "Show _original header value"
 msgstr "Vis _opprinnelig verdi for hode"
 
@@ -15745,6 +15817,51 @@ msgstr "Testtillegg for Python"
 msgid "Test Plugin for Python EPlugin loader."
 msgstr "Testtillegg for Python EPlugin laster."
 
+#: ../modules/startup-wizard/evolution-startup-wizard.c:270
+#: ../widgets/misc/e-import-assistant.c:389
+msgid "Please select the information that you would like to import:"
+msgstr "Vennligst velg informasjon du Ã¸nsker Ã¥ importere:"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:302
+#: ../widgets/misc/e-import-assistant.c:545
+#, c-format
+msgid "From %s:"
+msgstr "Fra %s:"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:313
+#: ../modules/startup-wizard/evolution-startup-wizard.c:410
+msgid "Importing Files"
+msgstr "Importerer filer"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:388
+msgid "Import cancelled. Click \"Forward\" to continue."
+msgstr "Import avbrutt. Klikk Â«FremoverÂ» for Ã¥ fortsette."
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:406
+msgid "Import complete. Click \"Forward\" to continue."
+msgstr "Import fullfÃ¸rt. Klikk Â«FremoverÂ» for Ã¥ fortsette."
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:466
+msgid "Evolution Setup Assistant"
+msgstr "Konfigurasjonsassistent for Evolution"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:472
+msgid "Welcome"
+msgstr "Velkommen"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:477
+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 "
+"programmer. \n"
+"\n"
+"Vennligst klikk Â«FremoverÂ» for Ã¥ fortsette. "
+
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
 msgid "Add local address books to Evolution."
 msgstr "Legg til lokale adressebÃ¸ker i Evolution."
@@ -16075,33 +16192,33 @@ msgstr ""
 "som du svarer pÃ¥ meldinger. Fyller ogsÃ¥ ut IM-kontaktinformasjon fra dine "
 "vennelister."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:153
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:154
 #, c-format
 msgid "Bogofilter is not available. Please install it first."
 msgstr "Bogofilter er ikke tilgjengelig. Vennligst installer programmet fÃ¸rst."
 
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:157
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "En feil oppsto under start av %s: %s."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:185
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:186
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "Underprosess til Bogofilter svarer ikke. Terminerer..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:187
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:188
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "Venting pÃ¥ underprosess til Bogofilter avbrutt. Terminerer..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:210
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:211
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "RÃ¸r til Bogofilter feilet. Feilkode: %d."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:394
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:396
 msgid "Convert message text to _Unicode"
 msgstr "Konverter tekst i meldinger til _Unicode"
 
@@ -16148,6 +16265,7 @@ msgstr ""
 
 #: ../plugins/caldav/caldav-browse-server.c:203
 #: ../plugins/caldav/caldav-browse-server.c:1254 ../plugins/face/face.c:169
+#: ../smime/gui/certificate-manager.c:100
 msgid "Unknown error"
 msgstr "Ukjent feil"
 
@@ -16226,10 +16344,6 @@ msgstr "Tjener-URL Â«%sÂ» er ikke en gyldig URL"
 msgid "Browse for a CalDAV calendar"
 msgstr "Se etter en CalDAV-kalender"
 
-#: ../plugins/caldav/caldav-source.c:66
-msgid "CalDAV"
-msgstr "CalDAV"
-
 #: ../plugins/caldav/caldav-source.c:216
 #: ../plugins/calendar-http/calendar-http.c:100
 msgid "_URL:"
@@ -16642,11 +16756,6 @@ msgstr "Filen kunne ikke leses"
 msgid "The file you selected does not look like a valid .png image. Error: {0}"
 msgstr "Filen du valgte ser ikke ut som et gyldig .png-bilde. Feil: {0}"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:53
-#: ../plugins/google-account-setup/google-source.c:81
-msgid "Google"
-msgstr "Google"
-
 #: ../plugins/google-account-setup/google-contacts-source.c:274
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:236
 msgid "Server"
@@ -16667,8 +16776,8 @@ msgstr ""
 "%s"
 
 #: ../plugins/google-account-setup/google-source.c:548
-#: ../plugins/mail-to-task/mail-to-task.c:718
-#: ../plugins/mail-to-task/mail-to-task.c:934
+#: ../plugins/mail-to-task/mail-to-task.c:736
+#: ../plugins/mail-to-task/mail-to-task.c:952
 msgid "Unknown error."
 msgstr "Ukjent feil."
 
@@ -16775,11 +16884,6 @@ msgstr "E-post:"
 msgid "Junk List:"
 msgstr "Liste med uÃ¸nsket e-post:"
 
-#: ../plugins/groupwise-features/junk-settings.ui.h:5
-#: ../plugins/publish-calendar/publish-calendar.c:596
-msgid "_Disable"
-msgstr "_Deaktiver"
-
 #: ../plugins/groupwise-features/junk-settings.ui.h:6
 msgid "_Enable"
 msgstr "Aktiv_er"
@@ -17856,17 +17960,14 @@ msgid "Itip Formatter"
 msgstr "Formattering av iTip"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
-msgid ""
-"&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
-"&quot;{1}&quot;?"
-msgstr ""
-"&quot;{0}&quot; har delegert mÃ¸tet. Vil du legge til delegat &quot;{1}&quot;?"
+msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
+msgstr "'{0}' har delegert mÃ¸tet. Vil du legge til delegat '{1}'?"
 
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "This meeting has been delegated"
 msgstr "Dette mÃ¸tet er delegert"
 
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
 msgid ""
 "This response is not from a current attendee. Add the sender as an attendee?"
 msgstr ""
@@ -17950,16 +18051,15 @@ msgstr "Om ikonet skal blinke eller ikke."
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "Im nye meldinger kun skal varsles i innboksen."
 
-#: ../plugins/mail-notification/mail-notification.c:346
+#: ../plugins/mail-notification/mail-notification.c:355
 msgid "Evolution's Mail Notification"
 msgstr "Varsling om ny e-post for Evolution"
 
-#: ../plugins/mail-notification/mail-notification.c:368
+#: ../plugins/mail-notification/mail-notification.c:377
 msgid "Mail Notification Properties"
 msgstr "Egenskaper for varsling om ny e-post"
 
-#. To translators: '%d' is the count of mails received and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:499
+#: ../plugins/mail-notification/mail-notification.c:513
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -17974,67 +18074,69 @@ msgstr[1] ""
 "Du har mottatt %d nye meldinger\n"
 "i %s."
 
-#. To Translators: "From:" is preceding a new mail sender address, like "From: user example com"
-#: ../plugins/mail-notification/mail-notification.c:510
+#. Translators: "From:" is preceding a new mail
+#. * sender address, like "From: user example com"
+#: ../plugins/mail-notification/mail-notification.c:525
 #, c-format
 msgid "From: %s"
 msgstr "Fra: %s"
 
-#. To Translators: "Subject:" is preceding a new mail subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:522
+#. Translators: "Subject:" is preceding a new mail
+#. * subject, like "Subject: It happened again"
+#: ../plugins/mail-notification/mail-notification.c:538
 #, c-format
 msgid "Subject: %s"
 msgstr "Emne: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:531
+#: ../plugins/mail-notification/mail-notification.c:548
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "Du har mottatt %d ny melding."
 msgstr[1] "Du har mottatt %d nye meldinger."
 
-#: ../plugins/mail-notification/mail-notification.c:549
-#: ../plugins/mail-notification/mail-notification.c:554
+#: ../plugins/mail-notification/mail-notification.c:568
+#: ../plugins/mail-notification/mail-notification.c:575
 msgid "New email"
 msgstr "Ny e-post"
 
-#: ../plugins/mail-notification/mail-notification.c:608
+#: ../plugins/mail-notification/mail-notification.c:636
 msgid "Show icon in _notification area"
 msgstr "Vis ikon i varslingsomrÃ¥det"
 
-#: ../plugins/mail-notification/mail-notification.c:636
+#: ../plugins/mail-notification/mail-notification.c:664
 msgid "B_link icon in notification area"
 msgstr "B_linkende ikon i varslingsomrÃ¥det"
 
-#: ../plugins/mail-notification/mail-notification.c:646
+#: ../plugins/mail-notification/mail-notification.c:674
 msgid "Popup _message together with the icon"
 msgstr "Vis _melding sammen med ikonet"
 
-#: ../plugins/mail-notification/mail-notification.c:831
+#: ../plugins/mail-notification/mail-notification.c:861
 msgid "_Play sound when new messages arrive"
 msgstr "S_pill en lydfil nÃ¥r nye meldinger ankommer"
 
-#: ../plugins/mail-notification/mail-notification.c:860
+#: ../plugins/mail-notification/mail-notification.c:890
 msgid "_Beep"
 msgstr "_Pip"
 
-#: ../plugins/mail-notification/mail-notification.c:873
+#: ../plugins/mail-notification/mail-notification.c:903
 msgid "Use sound _theme"
 msgstr "Bruk lyd_tema"
 
-#: ../plugins/mail-notification/mail-notification.c:892
+#: ../plugins/mail-notification/mail-notification.c:922
 msgid "Play _file:"
 msgstr "Spill av lyd_fil:"
 
-#: ../plugins/mail-notification/mail-notification.c:903
+#: ../plugins/mail-notification/mail-notification.c:933
 msgid "Select sound file"
 msgstr "Velg en lydfil"
 
-#: ../plugins/mail-notification/mail-notification.c:961
+#: ../plugins/mail-notification/mail-notification.c:991
 msgid "Notify new messages for _Inbox only"
 msgstr "Varslingsmelding kun for _innboks"
 
-#: ../plugins/mail-notification/mail-notification.c:970
+#: ../plugins/mail-notification/mail-notification.c:1000
 msgid "Generate a _D-Bus message"
 msgstr "Genererer en _D-Bus-melding"
 
@@ -18079,7 +18181,10 @@ msgstr ""
 "Valgt notatliste inneholder notatet Â«%sÂ» allerede. Vil du redigere det gamle "
 "notatet?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:512
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:515
 msgid ""
 "Selected calendar contains some events for the given mails already. Would "
 "you like to create new events anyway?"
@@ -18087,7 +18192,10 @@ msgstr ""
 "Valgt kalender inneholder noen hendelser for disse e-postene allerede. Vil "
 "du lage nye hendelser likevel?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:515
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:521
 msgid ""
 "Selected task list contains some tasks for the given mails already. Would "
 "you like to create new tasks anyway?"
@@ -18095,7 +18203,10 @@ msgstr ""
 "Valgt oppgaveliste inneholder noen oppgaver for disse meldingene allerede. "
 "Vil du lage nye oppgaver likevel?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:518
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:527
 msgid ""
 "Selected memo list contains some memos for the given mails already. Would "
 "you like to create new memos anyway?"
@@ -18103,7 +18214,10 @@ msgstr ""
 "Valgt notatliste inneholder noen notater for disse meldingene allerede. Vil "
 "du lage nye notater likevel?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:536
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:548
 msgid ""
 "Selected calendar contains an event for the given mail already. Would you "
 "like to create new event anyway?"
@@ -18113,7 +18227,10 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:542
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:557
 msgid ""
 "Selected task list contains a task for the given mail already. Would you "
 "like to create new task anyway?"
@@ -18123,7 +18240,10 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:548
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:566
 msgid ""
 "Selected memo list contains a memo for the given mail already. Would you "
 "like to create new memo anyway?"
@@ -18133,25 +18253,25 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:607
+#: ../plugins/mail-to-task/mail-to-task.c:625
 msgid "[No Summary]"
 msgstr "[Ingen sammendrag]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:618
+#: ../plugins/mail-to-task/mail-to-task.c:636
 msgid "Invalid object returned from a server"
 msgstr "Ugyldig objekt returnert fra en tjener"
 
-#: ../plugins/mail-to-task/mail-to-task.c:689
+#: ../plugins/mail-to-task/mail-to-task.c:707
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "En feil oppsto under prosessering: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:718
+#: ../plugins/mail-to-task/mail-to-task.c:736
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Kan ikke Ã¥pne kalender. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:725
+#: ../plugins/mail-to-task/mail-to-task.c:743
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
@@ -18159,7 +18279,7 @@ msgstr ""
 "Valgt kilde er skrivebeskyttet og hendelser kan ikke opprettes der. Velg en "
 "annen kilde."
 
-#: ../plugins/mail-to-task/mail-to-task.c:728
+#: ../plugins/mail-to-task/mail-to-task.c:746
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -18167,7 +18287,7 @@ msgstr ""
 "Valgt kilde er skrivebeskyttet og oppgaver kan ikke opprettes der. Velg en "
 "annen kilde."
 
-#: ../plugins/mail-to-task/mail-to-task.c:731
+#: ../plugins/mail-to-task/mail-to-task.c:749
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
@@ -18175,40 +18295,40 @@ msgstr ""
 "Valgt kilde er skrivebeskyttet og notater kan ikke opprettes der. Velg en "
 "annen kilde."
 
-#: ../plugins/mail-to-task/mail-to-task.c:934
+#: ../plugins/mail-to-task/mail-to-task.c:952
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "Fant ikke kildeliste %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1053
+#: ../plugins/mail-to-task/mail-to-task.c:1071
 msgid "Create an _Event"
 msgstr "Lag en h_endelse"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1055
+#: ../plugins/mail-to-task/mail-to-task.c:1073
 msgid "Create a new event from the selected message"
 msgstr " Lag en ny hendelse fra den valgte meldingen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1060
+#: ../plugins/mail-to-task/mail-to-task.c:1078
 msgid "Create a Mem_o"
 msgstr "Lag et n_otat"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1062
+#: ../plugins/mail-to-task/mail-to-task.c:1080
 msgid "Create a new memo from the selected message"
 msgstr "Lag et nytt notat fra den valgte meldingen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1067
+#: ../plugins/mail-to-task/mail-to-task.c:1085
 msgid "Create a _Task"
 msgstr "Lag en o_ppgave"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1069
+#: ../plugins/mail-to-task/mail-to-task.c:1087
 msgid "Create a new task from the selected message"
 msgstr "Lag en ny oppgave fra den valgte meldingen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1077
+#: ../plugins/mail-to-task/mail-to-task.c:1095
 msgid "Create a _Meeting"
 msgstr "Lag et _mÃ¸te"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1079
+#: ../plugins/mail-to-task/mail-to-task.c:1097
 msgid "Create a new meeting from the selected message"
 msgstr "Lag et nytt mÃ¸te fra den valgte meldingen"
 
@@ -18368,15 +18488,15 @@ msgstr ""
 "Vil du merke meldinger som lest kun i denne mappen, eller i valgt mappe og "
 "undermapper i tillegg?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:181
+#: ../plugins/mark-all-read/mark-all-read.c:188
 msgid "In Current Folder and _Subfolders"
 msgstr "I denne mappen og _undermapper"
 
-#: ../plugins/mark-all-read/mark-all-read.c:195
+#: ../plugins/mark-all-read/mark-all-read.c:202
 msgid "In Current _Folder Only"
 msgstr "Kun i _denne mappen"
 
-#: ../plugins/mark-all-read/mark-all-read.c:418
+#: ../plugins/mark-all-read/mark-all-read.c:425
 msgid "Mark Me_ssages as Read"
 msgstr "Merk meldinger _som lest"
 
@@ -18690,48 +18810,48 @@ msgstr "Ny lokasjon"
 msgid "Edit Location"
 msgstr "Rediger lokasjon"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:120
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:121
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "SpamAssassin ble ikke funnet, kode: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:128
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:136
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:129
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:137
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr "Klarte ikke Ã¥ opprette rÃ¸r: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:175
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:176
 #, c-format
 msgid "Error after fork: %s"
 msgstr "Feil etter kjÃ¸ring av fork(): %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:230
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:231
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
 msgstr "Underprosess til SpamAssassin svarer ikke. Terminerer..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:232
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:233
 #, c-format
 msgid "Wait for SpamAssassin child process interrupted, terminating..."
 msgstr "Venting pÃ¥ underprosess til SpamAssassin avbrutt. Terminerer..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:241
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:242
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr "RÃ¸r til SpamAssassin feilet. Feilkode: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:504
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:505
 #, c-format
 msgid "SpamAssassin is not available. Please install it first."
 msgstr ""
 "SpamAssassin er ikke tilgjengelig. Vennligst installer programmet fÃ¸rst."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:924
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:926
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "Dette vil gjÃ¸re SpamAssassin mer pÃ¥litelig, men tregere"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:932
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:934
 msgid "I_nclude remote tests"
 msgstr "Inkluder eksterne tester"
 
@@ -18868,58 +18988,6 @@ msgstr "Lagre valgt notatliste til disk"
 msgid "Save the selected task list to disk"
 msgstr "Lagre valgt oppgaveliste til disk"
 
-#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-msgid "Guides you through your initial account setup."
-msgstr "Leder deg gjennom fÃ¸rste oppsett av kontoen."
-
-#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
-msgid "Setup Assistant"
-msgstr "Veiviser for oppsett"
-
-#: ../plugins/startup-wizard/startup-wizard.c:117
-msgid "Evolution Setup Assistant"
-msgstr "Konfigurasjonsassistent for Evolution"
-
-#: ../plugins/startup-wizard/startup-wizard.c:122
-msgid "Welcome"
-msgstr "Velkommen"
-
-#: ../plugins/startup-wizard/startup-wizard.c:125
-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 "
-"programmer. \n"
-"\n"
-"Vennligst klikk Â«FremoverÂ» for Ã¥ fortsette. "
-
-#: ../plugins/startup-wizard/startup-wizard.c:160
-#: ../widgets/misc/e-import-assistant.c:389
-msgid "Please select the information that you would like to import:"
-msgstr "Vennligst velg informasjon du Ã¸nsker Ã¥ importere:"
-
-#: ../plugins/startup-wizard/startup-wizard.c:175
-#: ../widgets/misc/e-import-assistant.c:545
-#, c-format
-msgid "From %s:"
-msgstr "Fra %s:"
-
-#: ../plugins/startup-wizard/startup-wizard.c:192
-msgid "Importing files"
-msgstr "Importerer filer"
-
-#: ../plugins/startup-wizard/startup-wizard.c:258
-msgid "Importing data."
-msgstr "Importerer data."
-
-#: ../plugins/startup-wizard/startup-wizard.c:264
-msgid "Please wait"
-msgstr "Vennligst vent"
-
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
 msgid "Sort mail message threads by subject."
 msgstr "Sorter e-postmeldingstrÃ¥der etter emne."
@@ -19175,7 +19243,7 @@ msgstr "Sidelinjen er synlig"
 msgid "Skip development warning dialog"
 msgstr "Hopp over varseldialogen om utviklingsversjonen"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:321
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:320
 msgid "Start in offline mode"
 msgstr "Start i frakoblet modus"
 
@@ -19377,317 +19445,318 @@ msgstr "Kjartan Maraas <kmaraas gnome org>"
 msgid "Evolution Website"
 msgstr "Evolution nettsted"
 
-#: ../shell/e-shell-window-actions.c:1228
+#: ../shell/e-shell-window-actions.c:1235
 msgid "Bug Buddy is not installed."
 msgstr "Bug Buddy er ikke installert."
 
-#: ../shell/e-shell-window-actions.c:1230
+#: ../shell/e-shell-window-actions.c:1237
 msgid "Bug Buddy could not be run."
 msgstr "Bug Buddy kunne ikke kjÃ¸res."
 
-#: ../shell/e-shell-window-actions.c:1347
+#: ../shell/e-shell-window-actions.c:1354
 msgid "GNOME Pilot is not installed."
 msgstr "GNOME Pilot er ikke installert."
 
-#: ../shell/e-shell-window-actions.c:1349
+#: ../shell/e-shell-window-actions.c:1356
 msgid "GNOME Pilot could not be run."
 msgstr "GNOME Pilot kunne ikke kjÃ¸res."
 
-#: ../shell/e-shell-window-actions.c:1443
+#: ../shell/e-shell-window-actions.c:1450
 msgid "Show information about Evolution"
 msgstr "Vis informasjon om Evolution"
 
-#: ../shell/e-shell-window-actions.c:1448
+#: ../shell/e-shell-window-actions.c:1455
+#: ../shell/e-shell-window-actions.c:1469
 msgid "_Close Window"
 msgstr "_Lukk vindu"
 
-#: ../shell/e-shell-window-actions.c:1455
+#: ../shell/e-shell-window-actions.c:1476
 msgid "_Contents"
 msgstr "_Innhold"
 
-#: ../shell/e-shell-window-actions.c:1457
+#: ../shell/e-shell-window-actions.c:1478
 msgid "Open the Evolution User Guide"
 msgstr "Ã?pne Evolutions brukermanual"
 
-#: ../shell/e-shell-window-actions.c:1483
+#: ../shell/e-shell-window-actions.c:1504
 msgid "Evolution _FAQ"
 msgstr "Evolution _OSS"
 
-#: ../shell/e-shell-window-actions.c:1485
+#: ../shell/e-shell-window-actions.c:1506
 msgid "Open the Frequently Asked Questions webpage"
 msgstr "Ã?pne nettside med ofte stilte spÃ¸rsmÃ¥l"
 
-#: ../shell/e-shell-window-actions.c:1490
+#: ../shell/e-shell-window-actions.c:1511
 msgid "_Forget Passwords"
 msgstr "_Glem passord"
 
-#: ../shell/e-shell-window-actions.c:1492
+#: ../shell/e-shell-window-actions.c:1513
 msgid "Forget all remembered passwords"
 msgstr "Glem alle lagrede passord"
 
-#: ../shell/e-shell-window-actions.c:1497
+#: ../shell/e-shell-window-actions.c:1518
 msgid "I_mport..."
 msgstr "I_mporter..."
 
-#: ../shell/e-shell-window-actions.c:1499
+#: ../shell/e-shell-window-actions.c:1520
 msgid "Import data from other programs"
 msgstr "Importer data fra andre programmer"
 
-#: ../shell/e-shell-window-actions.c:1504
+#: ../shell/e-shell-window-actions.c:1525
 msgid "New _Window"
 msgstr "Nytt _vindu"
 
-#: ../shell/e-shell-window-actions.c:1506
+#: ../shell/e-shell-window-actions.c:1527
 msgid "Create a new window displaying this view"
 msgstr "Opprett et nytt vindu med denne visningen"
 
-#: ../shell/e-shell-window-actions.c:1520
+#: ../shell/e-shell-window-actions.c:1541
 msgid "Configure Evolution"
 msgstr "Konfigurer Evolution"
 
-#: ../shell/e-shell-window-actions.c:1525
+#: ../shell/e-shell-window-actions.c:1546
 msgid "_Quick Reference"
 msgstr "_Hurtigreferanse"
 
-#: ../shell/e-shell-window-actions.c:1527
+#: ../shell/e-shell-window-actions.c:1548
 msgid "Show Evolution's shortcut keys"
 msgstr "Vis snarveitaster for Evolution"
 
-#: ../shell/e-shell-window-actions.c:1534
+#: ../shell/e-shell-window-actions.c:1555
 msgid "Exit the program"
 msgstr "Avslutt programmet"
 
-#: ../shell/e-shell-window-actions.c:1539
+#: ../shell/e-shell-window-actions.c:1560
 msgid "_Advanced Search..."
 msgstr "_Avansert sÃ¸k..."
 
-#: ../shell/e-shell-window-actions.c:1541
+#: ../shell/e-shell-window-actions.c:1562
 msgid "Construct a more advanced search"
 msgstr "Sett sammen et mer avansert sÃ¸k"
 
-#: ../shell/e-shell-window-actions.c:1548
+#: ../shell/e-shell-window-actions.c:1569
 msgid "Clear the current search parameters"
 msgstr "TÃ¸m aktive sÃ¸keparametere"
 
-#: ../shell/e-shell-window-actions.c:1553
+#: ../shell/e-shell-window-actions.c:1574
 msgid "_Edit Saved Searches..."
 msgstr "R_ediger lagrede sÃ¸k..."
 
-#: ../shell/e-shell-window-actions.c:1555
+#: ../shell/e-shell-window-actions.c:1576
 msgid "Manage your saved searches"
 msgstr "HÃ¥ndter dine lagrede sÃ¸k"
 
-#: ../shell/e-shell-window-actions.c:1562
+#: ../shell/e-shell-window-actions.c:1583
 msgid "Click here to change the search type"
 msgstr "Klikk her for Ã¥ endre sÃ¸ketype"
 
-#: ../shell/e-shell-window-actions.c:1567
+#: ../shell/e-shell-window-actions.c:1588
 msgid "_Find Now"
 msgstr "_Finn nÃ¥ "
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1569
+#: ../shell/e-shell-window-actions.c:1590
 msgid "Execute the current search parameters"
 msgstr "KjÃ¸r aktive sÃ¸keparametere"
 
-#: ../shell/e-shell-window-actions.c:1574
+#: ../shell/e-shell-window-actions.c:1595
 msgid "_Save Search..."
 msgstr "_Lagre sÃ¸k..."
 
-#: ../shell/e-shell-window-actions.c:1576
+#: ../shell/e-shell-window-actions.c:1597
 msgid "Save the current search parameters"
 msgstr "Lagre aktive sÃ¸keparametere"
 
-#: ../shell/e-shell-window-actions.c:1588
+#: ../shell/e-shell-window-actions.c:1609
 msgid "Send / _Receive"
 msgstr "Send / _motta"
 
-#: ../shell/e-shell-window-actions.c:1590
+#: ../shell/e-shell-window-actions.c:1611
 msgid "Send queued items and retrieve new items"
 msgstr "Send kÃ¸lagte oppfÃ¸ringer og hent nye oppfÃ¸ringer"
 
-#: ../shell/e-shell-window-actions.c:1595
+#: ../shell/e-shell-window-actions.c:1616
 msgid "Submit _Bug Report..."
 msgstr "Sen_d inn feilrapport..."
 
-#: ../shell/e-shell-window-actions.c:1597
+#: ../shell/e-shell-window-actions.c:1618
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Send inn en feilrapport med Bug Buddy"
 
-#: ../shell/e-shell-window-actions.c:1602
+#: ../shell/e-shell-window-actions.c:1623
 msgid "GNOME Pilot _Synchronization..."
 msgstr "GNOME-pilot-_synkronisering..."
 
-#: ../shell/e-shell-window-actions.c:1604
+#: ../shell/e-shell-window-actions.c:1625
 msgid "Set up GNOME Pilot configuration"
 msgstr "Konfigurer konfigurasjon av GNOME-pilot"
 
-#: ../shell/e-shell-window-actions.c:1609
+#: ../shell/e-shell-window-actions.c:1630
 msgid "_Work Offline"
 msgstr "Ar_beid frakoblet"
 
-#: ../shell/e-shell-window-actions.c:1611
+#: ../shell/e-shell-window-actions.c:1632
 msgid "Put Evolution into offline mode"
 msgstr "Sett Evolution i frakoblet modus"
 
-#: ../shell/e-shell-window-actions.c:1616
+#: ../shell/e-shell-window-actions.c:1637
 msgid "_Work Online"
 msgstr "Ar_beid tilkoblet"
 
-#: ../shell/e-shell-window-actions.c:1618
+#: ../shell/e-shell-window-actions.c:1639
 msgid "Put Evolution into online mode"
 msgstr "Sett Evolution i tilkoblet modus"
 
-#: ../shell/e-shell-window-actions.c:1646
+#: ../shell/e-shell-window-actions.c:1667
 msgid "Lay_out"
 msgstr "Utf_orming"
 
-#: ../shell/e-shell-window-actions.c:1653
+#: ../shell/e-shell-window-actions.c:1674
 msgid "_New"
 msgstr "_Ny"
 
-#: ../shell/e-shell-window-actions.c:1660
+#: ../shell/e-shell-window-actions.c:1681
 msgid "_Search"
 msgstr "_SÃ¸k"
 
-#: ../shell/e-shell-window-actions.c:1667
+#: ../shell/e-shell-window-actions.c:1688
 msgid "_Switcher Appearance"
 msgstr "Ut_seende for bytter"
 
-#: ../shell/e-shell-window-actions.c:1681
+#: ../shell/e-shell-window-actions.c:1702
 msgid "_Window"
 msgstr "_Vindu"
 
-#: ../shell/e-shell-window-actions.c:1710
+#: ../shell/e-shell-window-actions.c:1731
 msgid "Show Side _Bar"
 msgstr "Vis si_delinje"
 
-#: ../shell/e-shell-window-actions.c:1712
+#: ../shell/e-shell-window-actions.c:1733
 msgid "Show the side bar"
 msgstr "Vis sidelinjen"
 
-#: ../shell/e-shell-window-actions.c:1718
+#: ../shell/e-shell-window-actions.c:1739
 msgid "Show _Buttons"
 msgstr "Vis _knapper"
 
-#: ../shell/e-shell-window-actions.c:1720
+#: ../shell/e-shell-window-actions.c:1741
 msgid "Show the switcher buttons"
 msgstr "Vis knapper for bytter"
 
-#: ../shell/e-shell-window-actions.c:1726
+#: ../shell/e-shell-window-actions.c:1747
 msgid "Show _Status Bar"
 msgstr "Vis _statuslinje"
 
-#: ../shell/e-shell-window-actions.c:1728
+#: ../shell/e-shell-window-actions.c:1749
 msgid "Show the status bar"
 msgstr "Vis statuslinjen"
 
-#: ../shell/e-shell-window-actions.c:1734
+#: ../shell/e-shell-window-actions.c:1755
 msgid "Show _Tool Bar"
 msgstr "Vis verk_tÃ¸ylinjen"
 
-#: ../shell/e-shell-window-actions.c:1736
+#: ../shell/e-shell-window-actions.c:1757
 msgid "Show the tool bar"
 msgstr "Vis verktÃ¸ylinjen"
 
-#: ../shell/e-shell-window-actions.c:1758
+#: ../shell/e-shell-window-actions.c:1779
 msgid "_Icons Only"
 msgstr "Kun _ikoner"
 
-#: ../shell/e-shell-window-actions.c:1760
+#: ../shell/e-shell-window-actions.c:1781
 msgid "Display window buttons with icons only"
 msgstr "Vis bare ikoner pÃ¥ vinduknapper"
 
-#: ../shell/e-shell-window-actions.c:1765
+#: ../shell/e-shell-window-actions.c:1786
 msgid "_Text Only"
 msgstr "Kun _tekst"
 
-#: ../shell/e-shell-window-actions.c:1767
+#: ../shell/e-shell-window-actions.c:1788
 msgid "Display window buttons with text only"
 msgstr "Vis bare tekst pÃ¥ vinduknapper"
 
-#: ../shell/e-shell-window-actions.c:1772
+#: ../shell/e-shell-window-actions.c:1793
 msgid "Icons _and Text"
 msgstr "Ikoner _og tekst"
 
-#: ../shell/e-shell-window-actions.c:1774
+#: ../shell/e-shell-window-actions.c:1795
 msgid "Display window buttons with icons and text"
 msgstr "Vis tekst og ikoner pÃ¥ vinduknapper"
 
-#: ../shell/e-shell-window-actions.c:1779
+#: ../shell/e-shell-window-actions.c:1800
 msgid "Tool_bar Style"
 msgstr "S_til for verktÃ¸ylinje"
 
-#: ../shell/e-shell-window-actions.c:1781
+#: ../shell/e-shell-window-actions.c:1802
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr ""
 "Vis vinduknapper ved Ã¥ bruke instillinger for verktÃ¸ylinjen pÃ¥ skrivebordet"
 
-#: ../shell/e-shell-window-actions.c:1789
+#: ../shell/e-shell-window-actions.c:1810
 msgid "Define Views..."
 msgstr "Definer visninger..."
 
-#: ../shell/e-shell-window-actions.c:1791
+#: ../shell/e-shell-window-actions.c:1812
 msgid "Create or edit views"
 msgstr "Opprett eller rediger visninger"
 
-#: ../shell/e-shell-window-actions.c:1796
+#: ../shell/e-shell-window-actions.c:1817
 msgid "Save Custom View..."
 msgstr "Lagre egendefinert visning..."
 
-#: ../shell/e-shell-window-actions.c:1798
+#: ../shell/e-shell-window-actions.c:1819
 msgid "Save current custom view"
 msgstr "Lagre aktiv egendefinert visning"
 
-#: ../shell/e-shell-window-actions.c:1805
+#: ../shell/e-shell-window-actions.c:1826
 msgid "C_urrent View"
 msgstr "A_ktiv visning"
 
-#: ../shell/e-shell-window-actions.c:1815
+#: ../shell/e-shell-window-actions.c:1836
 msgid "Custom View"
 msgstr "Egendefinert visning"
 
-#: ../shell/e-shell-window-actions.c:1817
+#: ../shell/e-shell-window-actions.c:1838
 msgid "Current view is a customized view"
 msgstr "Aktiv visning er en egendefinert visning"
 
-#: ../shell/e-shell-window-actions.c:1827
+#: ../shell/e-shell-window-actions.c:1848
 msgid "Change the page settings for your current printer"
 msgstr "Endre sideinnstillingene for din skriver"
 
-#: ../shell/e-shell-window-actions.c:2204
+#: ../shell/e-shell-window-actions.c:2227
 #, c-format
 msgid "Switch to %s"
 msgstr "Bytt til %s"
 
-#: ../shell/e-shell-window-actions.c:2417
+#: ../shell/e-shell-window-actions.c:2440
 msgid "Execute these search parameters"
 msgstr "KjÃ¸r disse sÃ¸keparameterene"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:573
+#: ../shell/e-shell-window-private.c:574
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window.c:382
+#: ../shell/e-shell-window.c:416
 msgid "New"
 msgstr "Ny"
 
-#: ../shell/e-shell.c:218
+#: ../shell/e-shell.c:226
 msgid "Preparing to go offline..."
 msgstr "Forbereder frakoblet bruk..."
 
-#: ../shell/e-shell.c:268
+#: ../shell/e-shell.c:276
 msgid "Preparing to go online..."
 msgstr "Forbereder tilkoblet bruk..."
 
-#: ../shell/e-shell.c:336
+#: ../shell/e-shell.c:335
 msgid "Preparing to quit..."
 msgstr "Forbereder avslutting..."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:172
+#: ../shell/main.c:173
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19722,7 +19791,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:196
+#: ../shell/main.c:197
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19730,55 +19799,55 @@ msgstr ""
 "Takk\n"
 "Evolution utviklerene\n"
 
-#: ../shell/main.c:203
+#: ../shell/main.c:204
 msgid "Do not tell me again"
 msgstr "Ikke gi beskjed igjen"
 
-#: ../shell/main.c:317
+#: ../shell/main.c:316
 msgid "Start Evolution activating the specified component"
 msgstr "Aktiver oppgitt komponent ved oppstart av Evolution"
 
-#: ../shell/main.c:319
+#: ../shell/main.c:318
 msgid "Apply the given geometry to the main window"
 msgstr "Bruk oppgitt geometri pÃ¥ hovedvinduet"
 
-#: ../shell/main.c:323
+#: ../shell/main.c:322
 msgid "Start in online mode"
 msgstr "Start i tilkoblet modus"
 
-#: ../shell/main.c:325
+#: ../shell/main.c:324
 msgid "Start in \"express\" mode"
 msgstr "Start i Â«ekspressÂ»-modus"
 
-#: ../shell/main.c:328
+#: ../shell/main.c:327
 msgid "Forcibly shut down Evolution"
 msgstr "Tvungen nedstenging av Evolution"
 
-#: ../shell/main.c:331
+#: ../shell/main.c:330
 msgid "Send the debugging output of all components to a file."
 msgstr "Send feilsÃ¸kingsutskrift for alle komponentene til en fil."
 
-#: ../shell/main.c:333
+#: ../shell/main.c:332
 msgid "Disable loading of any plugins."
 msgstr "SlÃ¥ av lasting av tillegg."
 
-#: ../shell/main.c:335
+#: ../shell/main.c:334
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Deaktiver forhÃ¥ndsvisningsomrÃ¥det for e-post, kontakter og oppgaver."
 
-#: ../shell/main.c:339
+#: ../shell/main.c:338
 msgid "Import URIs or file names given as rest of arguments."
 msgstr "Importer URIer eller filnavn gitt som argumenter."
 
-#: ../shell/main.c:341
+#: ../shell/main.c:340
 msgid "Request a running Evolution process to quit"
 msgstr "Be en kjÃ¸rende Evolution-prosess om Ã¥ stenge ned"
 
-#: ../shell/main.c:458
+#: ../shell/main.c:463
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution personlig informasjonshÃ¥ndterer og e-postklient"
 
-#: ../shell/main.c:509
+#: ../shell/main.c:514
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19953,55 +20022,67 @@ msgstr ""
 "sertifikatet stoler du heller ikke pÃ¥ at dette sertifikatet er autentisk med "
 "mindre annet indikeres her"
 
-#: ../smime/gui/certificate-manager.c:135
-#: ../smime/gui/certificate-manager.c:382
-#: ../smime/gui/certificate-manager.c:610
+#: ../smime/gui/certificate-manager.c:148
+#: ../smime/gui/certificate-manager.c:460
+#: ../smime/gui/certificate-manager.c:697
 msgid "Select a certificate to import..."
 msgstr "Velg et sertifikat som skal importeres..."
 
-#: ../smime/gui/certificate-manager.c:144
+#: ../smime/gui/certificate-manager.c:157
 msgid "All PKCS12 files"
 msgstr "Alle PKCS12-filer"
 
-#: ../smime/gui/certificate-manager.c:150
-#: ../smime/gui/certificate-manager.c:397
-#: ../smime/gui/certificate-manager.c:624
+#: ../smime/gui/certificate-manager.c:163
+#: ../smime/gui/certificate-manager.c:475
+#: ../smime/gui/certificate-manager.c:711
 msgid "All files"
 msgstr "Alle filer"
 
-#: ../smime/gui/certificate-manager.c:274
-#: ../smime/gui/certificate-manager.c:487
-#: ../smime/gui/certificate-manager.c:712
+#: ../smime/gui/certificate-manager.c:182
+msgid "Failed to import user's certificate"
+msgstr "Klarte ikke Ã¥ importere brukers sertifikat"
+
+#: ../smime/gui/certificate-manager.c:352
+#: ../smime/gui/certificate-manager.c:574
+#: ../smime/gui/certificate-manager.c:808
 msgid "Certificate Name"
 msgstr "Navn pÃ¥ sertifikat"
 
-#: ../smime/gui/certificate-manager.c:283
-#: ../smime/gui/certificate-manager.c:505
+#: ../smime/gui/certificate-manager.c:361
+#: ../smime/gui/certificate-manager.c:592
 msgid "Purposes"
 msgstr "Hensikter"
 
-#: ../smime/gui/certificate-manager.c:292 ../smime/gui/smime-ui.ui.h:32
+#: ../smime/gui/certificate-manager.c:370 ../smime/gui/smime-ui.ui.h:32
 #: ../smime/lib/e-cert.c:566
 msgid "Serial Number"
 msgstr "Serienummer"
 
-#: ../smime/gui/certificate-manager.c:300
+#: ../smime/gui/certificate-manager.c:378
 msgid "Expires"
 msgstr "UtgÃ¥r"
 
-#: ../smime/gui/certificate-manager.c:391
+#: ../smime/gui/certificate-manager.c:469
 msgid "All email certificate files"
 msgstr "Alle sertifikatfiler for e-post"
 
-#: ../smime/gui/certificate-manager.c:496
+#: ../smime/gui/certificate-manager.c:502
+msgid "Failed to import contact's certificate"
+msgstr "Klarte ikke Ã¥ importere kontaktens sertifikat"
+
+#: ../smime/gui/certificate-manager.c:583
 msgid "E-Mail Address"
 msgstr "E-postadresse"
 
-#: ../smime/gui/certificate-manager.c:619
+#: ../smime/gui/certificate-manager.c:706
 msgid "All CA certificate files"
 msgstr "Alle CA-sertifikatfiler"
 
-#: ../smime/gui/certificate-manager.c:1052
+#: ../smime/gui/certificate-manager.c:737
+msgid "Failed to import certificate authority's certificate"
+msgstr "Klarte ikke Ã¥ importere sertifikatmyndighetens sertifikat"
+
+#: ../smime/gui/certificate-manager.c:1148
 msgid "Certificates"
 msgstr "Sertifikater"
 
@@ -20213,8 +20294,7 @@ msgstr "_Sikkerhetskopier"
 msgid "_Edit CA Trust"
 msgstr "R_ediger tillit til CA"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:711
+#: ../smime/lib/e-cert-db.c:907
 msgid "Certificate already exists"
 msgstr "Sertifikatet eksisterer allerede"
 
@@ -20518,14 +20598,14 @@ msgstr ""
 msgid "_Selection"
 msgstr "_Utvalg"
 
-#: ../widgets/menus/gal-define-views-dialog.c:347
+#: ../widgets/menus/gal-define-views-dialog.c:346
 #: ../widgets/menus/gal-define-views.ui.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "Definer visninger for %s"
 
-#: ../widgets/menus/gal-define-views-dialog.c:355
-#: ../widgets/menus/gal-define-views-dialog.c:357
+#: ../widgets/menus/gal-define-views-dialog.c:354
+#: ../widgets/menus/gal-define-views-dialog.c:356
 msgid "Define Views"
 msgstr "Definer visninger"
 
@@ -20538,7 +20618,7 @@ msgstr "Definer visninger for Â«%sÂ»"
 msgid "Table"
 msgstr "Tabell"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:274
 msgid "Save Current View"
 msgstr "Lagre aktiv visning"
 
@@ -20652,28 +20732,28 @@ msgstr[1] "Lagre vedlegg"
 msgid "attachment.dat"
 msgstr "vedlegg.dat"
 
-#: ../widgets/misc/e-attachment-view.c:299
+#: ../widgets/misc/e-attachment-view.c:301
 msgid "S_ave All"
 msgstr "L_agre alle"
 
-#: ../widgets/misc/e-attachment-view.c:325
+#: ../widgets/misc/e-attachment-view.c:327
 msgid "A_dd Attachment..."
 msgstr "Legg til ve_dlegg..."
 
-#: ../widgets/misc/e-attachment-view.c:349
+#: ../widgets/misc/e-attachment-view.c:351
 msgid "_Hide"
 msgstr "_Skjul"
 
-#: ../widgets/misc/e-attachment-view.c:356
+#: ../widgets/misc/e-attachment-view.c:358
 msgid "_View Inline"
 msgstr "_Vis i meldingsteksten"
 
-#: ../widgets/misc/e-attachment-view.c:638
+#: ../widgets/misc/e-attachment-view.c:640
 #, c-format
 msgid "Open with \"%s\""
 msgstr "Ã?pne med Â«%sÂ»"
 
-#: ../widgets/misc/e-attachment-view.c:641
+#: ../widgets/misc/e-attachment-view.c:643
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "Ã?pne dette vedlegget i %s"
@@ -20821,7 +20901,7 @@ msgid "File _type:"
 msgstr "Fil_type:"
 
 #: ../widgets/misc/e-import-assistant.c:326
-#: ../widgets/misc/e-import-assistant.c:875
+#: ../widgets/misc/e-import-assistant.c:909
 msgid "Choose the destination for this import"
 msgstr "Velg mÃ¥l det skal importeres til"
 
@@ -20847,34 +20927,38 @@ msgstr ""
 "Netscape, Elm, iCalendar. Fant ingen innstillinger som kunne importeres. "
 "Hvis du vil prÃ¸ve igjen kan du klikke pÃ¥ Â«TilbakeÂ»-knappen."
 
-#: ../widgets/misc/e-import-assistant.c:874
+#. Install a custom "Cancel Import" button.
+#: ../widgets/misc/e-import-assistant.c:766
+msgid "_Cancel Import"
+msgstr "A_vbryt import"
+
+#: ../widgets/misc/e-import-assistant.c:908
 msgid "Preview data to be imported"
 msgstr "ForhÃ¥ndsvis data som skal importeres"
 
-#: ../widgets/misc/e-import-assistant.c:879
-#: ../widgets/misc/e-import-assistant.c:888
-#: ../widgets/misc/e-import-assistant.c:1265
-#: ../widgets/misc/e-import-assistant.c:1338
-#: ../widgets/misc/e-import-assistant.c:1348
+#: ../widgets/misc/e-import-assistant.c:914
+#: ../widgets/misc/e-import-assistant.c:927
+#: ../widgets/misc/e-import-assistant.c:1285
+#: ../widgets/misc/e-import-assistant.c:1358
+#: ../widgets/misc/e-import-assistant.c:1368
 msgid "Import Data"
 msgstr "Importer data"
 
-#. multiple importers found, be able to choose from them
-#: ../widgets/misc/e-import-assistant.c:884
+#: ../widgets/misc/e-import-assistant.c:922
 msgid "Select what type of file you want to import from the list."
 msgstr "Velg hvilken type fil du vil importere fra listen."
 
-#: ../widgets/misc/e-import-assistant.c:1256
-#: ../widgets/misc/e-import-assistant.c:1291
+#: ../widgets/misc/e-import-assistant.c:1276
+#: ../widgets/misc/e-import-assistant.c:1311
 msgid "Evolution Import Assistant"
 msgstr "Importeringsassistent for Evolution"
 
-#: ../widgets/misc/e-import-assistant.c:1273
-#: ../widgets/misc/e-import-assistant.c:1325
+#: ../widgets/misc/e-import-assistant.c:1293
+#: ../widgets/misc/e-import-assistant.c:1345
 msgid "Import Location"
 msgstr "Importer lokasjon"
 
-#: ../widgets/misc/e-import-assistant.c:1284
+#: ../widgets/misc/e-import-assistant.c:1304
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
@@ -20884,19 +20968,19 @@ msgstr ""
 "Gjennom denne veiviseren vil du ledes gjennom import av eksterne filer til "
 "Evolution."
 
-#: ../widgets/misc/e-import-assistant.c:1300
+#: ../widgets/misc/e-import-assistant.c:1320
 msgid "Importer Type"
 msgstr "Type import"
 
-#: ../widgets/misc/e-import-assistant.c:1309
+#: ../widgets/misc/e-import-assistant.c:1329
 msgid "Select Information to Import"
 msgstr "Velg informasjon som skal importeres"
 
-#: ../widgets/misc/e-import-assistant.c:1317
+#: ../widgets/misc/e-import-assistant.c:1337
 msgid "Select a File"
 msgstr "Velg en fil"
 
-#: ../widgets/misc/e-import-assistant.c:1332
+#: ../widgets/misc/e-import-assistant.c:1352
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "Klikk pÃ¥ Â«BrukÂ» for Ã¥ starte import av filen til Evolution."
 
@@ -20938,7 +21022,7 @@ msgstr "Synkroniser private oppfÃ¸ringer:"
 msgid "Sync Categories:"
 msgstr "Synkroniser kategorier:"
 
-#: ../widgets/misc/e-preferences-window.c:218
+#: ../widgets/misc/e-preferences-window.c:266
 msgid "Evolution Preferences"
 msgstr "Evolution brukervalg"
 
@@ -21287,7 +21371,7 @@ msgid "A_vailable Fields:"
 msgstr "T_ilgjengelige felter:"
 
 #: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1697
+#: ../widgets/table/e-table-header-item.c:1702
 msgid "Ascending"
 msgstr "Stigende"
 
@@ -21300,7 +21384,7 @@ msgid "Clear _All"
 msgstr "Fjern _alt"
 
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1697
+#: ../widgets/table/e-table-header-item.c:1702
 msgid "Descending"
 msgstr "Synkende"
 
@@ -21399,60 +21483,60 @@ msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d oppfÃ¸ring)"
 msgstr[1] "%s (%d oppfÃ¸ringer)"
 
-#: ../widgets/table/e-table-header-item.c:1541
+#: ../widgets/table/e-table-header-item.c:1546
 msgid "Customize Current View"
 msgstr "Tilpass aktiv visning"
 
-#: ../widgets/table/e-table-header-item.c:1562
+#: ../widgets/table/e-table-header-item.c:1567
 msgid "Sort _Ascending"
 msgstr "Sorter s_tigende"
 
-#: ../widgets/table/e-table-header-item.c:1565
+#: ../widgets/table/e-table-header-item.c:1570
 msgid "Sort _Descending"
 msgstr "Sorter s_ynkende"
 
-#: ../widgets/table/e-table-header-item.c:1568
+#: ../widgets/table/e-table-header-item.c:1573
 msgid "_Unsort"
 msgstr "_Fjern sortering"
 
-#: ../widgets/table/e-table-header-item.c:1571
+#: ../widgets/table/e-table-header-item.c:1576
 msgid "Group By This _Field"
 msgstr "Grupper etter dette _feltet"
 
-#: ../widgets/table/e-table-header-item.c:1574
+#: ../widgets/table/e-table-header-item.c:1579
 msgid "Group By _Box"
 msgstr "Grupper etter _boks"
 
-#: ../widgets/table/e-table-header-item.c:1578
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Remove This _Column"
 msgstr "Fjern denne _kolonnen"
 
-#: ../widgets/table/e-table-header-item.c:1581
+#: ../widgets/table/e-table-header-item.c:1586
 msgid "Add a C_olumn..."
 msgstr "Legg til en k_olonne..."
 
-#: ../widgets/table/e-table-header-item.c:1585
+#: ../widgets/table/e-table-header-item.c:1590
 msgid "A_lignment"
 msgstr "_Justering"
 
-#: ../widgets/table/e-table-header-item.c:1588
+#: ../widgets/table/e-table-header-item.c:1593
 msgid "B_est Fit"
 msgstr "B_este tilpasning"
 
-#: ../widgets/table/e-table-header-item.c:1591
+#: ../widgets/table/e-table-header-item.c:1596
 msgid "Format Column_s..."
 msgstr "For_mater kolonner..."
 
-#: ../widgets/table/e-table-header-item.c:1595
+#: ../widgets/table/e-table-header-item.c:1600
 msgid "Custo_mize Current View..."
 msgstr "T_ilpass aktiv visning..."
 
-#: ../widgets/table/e-table-header-item.c:1654
+#: ../widgets/table/e-table-header-item.c:1659
 msgid "_Sort By"
 msgstr "_Sorter etter"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1672
+#: ../widgets/table/e-table-header-item.c:1677
 msgid "_Custom"
 msgstr "E_gendefinert"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]