Updated Norwegian bokmål translation

author: Kjartan Maraas <kmaraas@gnome.org> 2012-01-07 03:46:35 +0800
committer: Kjartan Maraas <kmaraas@gnome.org> 2012-01-07 03:46:35 +0800
commit: d690aaea2687f9cc32571accb65a60e6b390acd9 (patch)
tree: 87d0c7a4e06366836df142156cf634c1a450c601
parent: 02bcba4fad4a8a9254b1179f3442d056098cf9a3 (diff)
download: gsoc2013-evolution-d690aaea2687f9cc32571accb65a60e6b390acd9.tar.gz
gsoc2013-evolution-d690aaea2687f9cc32571accb65a60e6b390acd9.tar.zst
gsoc2013-evolution-d690aaea2687f9cc32571accb65a60e6b390acd9.zip
1 files changed, 5718 insertions, 5683 deletions
diff --git a/po/nb.po b/po/nb.po
index e277fea69f..f25b26435e 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,7 +1,7 @@
 # Norwegian bokmål translation of evolution.
 # Copyright (C) 1998-2004, 2005 Free Software Foundation, Inc.
 #
-# Kjartan Maraas <kmaraas@gnome.org>, 1998-2011.
+# Kjartan Maraas <kmaraas@gnome.org>, 1998-2012.
 # Terance Edward Sola <terance@lyse.net>, 2005.
 # Torstein Adolf Winterseth <kvikende@fsfe.org>, 2010.
 #: ../shell/main.c:570
@@ -9,544 +9,544 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution 3.3.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 22:31+0100\n"
-"PO-Revision-Date: 2011-12-14 22:34+0100\n"
+"POT-Creation-Date: 2012-01-06 20:44+0100\n"
+"PO-Revision-Date: 2012-01-06 20:46+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
-"Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
+"Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n"
 "Language: Norsk bokmål\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. For Translators: {0} is the name of the address book source
+#: ../addressbook/addressbook.error.xml.h:1
+msgid "This address book could not be opened."
+msgstr "Denne adresseboken kunne ikke åpnes."
+
 #: ../addressbook/addressbook.error.xml.h:2
 msgid ""
-"'{0}' is a read-only address book and cannot be modified. Please select a "
-"different address book from the side bar in the Contacts view."
+"This address book server might be unreachable or the server name may be "
+"misspelled or your network connection could be down."
 msgstr ""
-"«{0}» er en skrivebeskyttet adressebok og kan ikke endres. Velg en annen "
-"adressebok fra sidelinjen i kontaktvisning."
+"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:3
-msgid ""
-"A contact already exists with this address. Would you like to add a new card "
-"with the same address anyway?"
-msgstr ""
-"En kontakt med denne adressen eksisterer allerede. Vil du legge til en ny "
-"kontakt med samme adresse likevel?"
+msgid "Failed to authenticate with LDAP server."
+msgstr "Kunne ikke autentisere mot LDAP-tjener."
 
 #: ../addressbook/addressbook.error.xml.h:4
 msgid ""
-"A contact list named '{0}' is already in this contact list. Would you like "
-"to add it anyway?"
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
 msgstr ""
-"En kontaktliste med navn «{0}» eksisterer allerede i denne kontaktlisten. "
-"Vil du legge den til likevel?"
+"Sjekk at passordet er stavet riktig og at bruker en støttet "
+"innloggingsmetode. Husk at mange passord skiller mellom små og store "
+"bokstaver, pass på at «Caps Lock»-knappen ikke er på."
 
 #: ../addressbook/addressbook.error.xml.h:5
-msgid "Add with duplicates"
-msgstr "Legg til med duplikater"
+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:6
-msgid "Address '{0}' already exists."
-msgstr "Adressen «{0}» eksisterer allerede."
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+"Denne LDAP-tjeneren bruker kanskje en gammel versjon av LDAP som ikke "
+"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:7
-msgid "Cannot add new contact"
-msgstr "Kan ikke legge til ny kontakt"
+msgid "This server does not support LDAPv3 schema information."
+msgstr "Denne tjeneren støtter ikke LDAPv3 schema-informasjon."
 
 #: ../addressbook/addressbook.error.xml.h:8
-msgid "Cannot move contact."
-msgstr "Kan ikke flytte kontakt."
+msgid "Could not get schema information for LDAP server."
+msgstr "Kunne ikke hente schema-informasjon fra LDAP-tjener."
 
 #: ../addressbook/addressbook.error.xml.h:9
-msgid "Category editor not available."
-msgstr "Kategori editor ikke tilgjengelig."
+msgid "LDAP server did not respond with valid schema information."
+msgstr "LDAP-tjener svarte ikke med gyldig schema-informasjon."
 
 #: ../addressbook/addressbook.error.xml.h:10
-msgid ""
-"Check to make sure your password is spelled correctly and that you are using "
-"a supported login method. Remember that many passwords are case sensitive; "
-"your caps lock might be on."
-msgstr ""
-"Sjekk at passordet er stavet riktig og at bruker en støttet "
-"innloggingsmetode. Husk at mange passord skiller mellom små og store "
-"bokstaver, pass på at «Caps Lock»-knappen ikke er på."
+msgid "Could not remove address book."
+msgstr "Kunne ikke fjerne adressebok."
 
 #: ../addressbook/addressbook.error.xml.h:11
-msgid "Could not get schema information for LDAP server."
-msgstr "Kunne ikke hente schema-informasjon fra LDAP-tjener."
+msgid "Delete address book '{0}'?"
+msgstr "Slett adressebok «{0}»?"
 
 #: ../addressbook/addressbook.error.xml.h:12
-msgid "Could not remove address book."
-msgstr "Kunne ikke fjerne adressebok."
+msgid "This address book will be removed permanently."
+msgstr "Denne adresseboken vil bli slettet for godt."
 
 #: ../addressbook/addressbook.error.xml.h:13
-msgid ""
-"Currently you can only access the GroupWise System Address Book from "
-"Evolution. Please use some other GroupWise mail client once to get your "
-"GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
-msgstr ""
-"Foreløpig kan du kun aksessere systemadresseboken for GroupWise fra "
-"Evolution. Vennligst bruk en annen GroupWise-klient en gang for å få tak i "
-"dine ofte brukte kontakter og mappene for personlige kontakter fra GroupWise."
+#: ../calendar/calendar.error.xml.h:7 ../mail/mail.error.xml.h:63
+msgid "Do _Not Delete"
+msgstr "Ikke s_lett"
 
 #: ../addressbook/addressbook.error.xml.h:14
-msgid "Delete address book '{0}'?"
-msgstr "Slett adressebok «{0}»?"
+msgid "Category editor not available."
+msgstr "Kategori editor ikke tilgjengelig."
 
 #: ../addressbook/addressbook.error.xml.h:15
-#: ../calendar/calendar.error.xml.h:37 ../mail/mail.error.xml.h:44
-msgid "Do _Not Delete"
-msgstr "Ikke s_lett"
+msgid "Unable to open address book"
+msgstr "Kan ikke åpne adressebok"
 
 #: ../addressbook/addressbook.error.xml.h:16
-msgid "Error saving {0} to {1}: {2}"
-msgstr "Feil under lagring av {0} til {1}: {2}"
+msgid "Unable to perform search."
+msgstr "Kan ikke utføre søk."
 
 #: ../addressbook/addressbook.error.xml.h:17
-msgid "Failed to authenticate with LDAP server."
-msgstr "Kunne ikke autentisere mot LDAP-tjener."
+msgid "Would you like to save your changes?"
+msgstr "Vil du lagre dine endringer?"
 
 #: ../addressbook/addressbook.error.xml.h:18
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1278
-msgid "Failed to delete contact"
-msgstr "Klarte ikke å slette kontakt"
+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:19
-msgid "GroupWise Address book creation:"
-msgstr "Oppretting av GroupWise adressebok:"
+msgid "_Discard"
+msgstr "_Forkast"
 
 #: ../addressbook/addressbook.error.xml.h:20
-msgid "LDAP server did not respond with valid schema information."
-msgstr "LDAP-tjener svarte ikke med gyldig schema-informasjon."
+msgid "Cannot move contact."
+msgstr "Kan ikke flytte kontakt."
 
 #: ../addressbook/addressbook.error.xml.h:21
-msgid "List '{0}' is already in this contact list."
-msgstr "Liste «{0}» er allerede i kontaktlisten."
+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?"
+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:22
-msgid "Skip duplicates"
-msgstr "Hopp over duplikater"
+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:23
-msgid "Some addresses already exist in this contact list."
-msgstr "Noen adresser eksisterer allerede i denne kontaktlisten."
+msgid "_Resize"
+msgstr "End_re størrelse"
 
 #: ../addressbook/addressbook.error.xml.h:24
-msgid "Some features may not work properly with your current server"
-msgstr "Noen funksjoner vil kanskje ikke fungere med denne tjeneren "
+msgid "_Use as it is"
+msgstr "Br_uk som den er"
 
 #: ../addressbook/addressbook.error.xml.h:25
-msgid "The Evolution address book has quit unexpectedly."
-msgstr "Evolution adressebok avsluttet uventet."
+msgid "_Do not save"
+msgstr "_Ikke lagre"
 
 #: ../addressbook/addressbook.error.xml.h:26
-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?"
+msgid "Unable to save {0}."
+msgstr "Kan ikke lagre {0}."
 
 #: ../addressbook/addressbook.error.xml.h:27
-msgid ""
-"This LDAP server may use an older version of LDAP, which does not support "
-"this functionality or it may be misconfigured. Ask your administrator for "
-"supported search bases."
-msgstr ""
-"Denne LDAP-tjeneren bruker kanskje en gammel versjon av LDAP som ikke "
-"støtter denne funksjonaliteten eller så er den satt opp feil. Spør din "
-"administrator for støttede søkebaser."
+msgid "Error saving {0} to {1}: {2}"
+msgstr "Feil under lagring av {0} til {1}: {2}"
 
 #: ../addressbook/addressbook.error.xml.h:28
-msgid "This address book could not be opened."
-msgstr "Denne adresseboken kunne ikke åpnes."
-
-#: ../addressbook/addressbook.error.xml.h:29
-msgid "This address book server does not have any suggested search bases."
-msgstr "Denne adresseboktjeneren har ingen foreslått søkebase."
+msgid "The Evolution address book has quit unexpectedly."
+msgstr "Evolution adressebok avsluttet uventet."
 
+#. Translators: {0} is replaced with an address book name which will not be available
 #: ../addressbook/addressbook.error.xml.h:30
 msgid ""
-"This address book server might be unreachable or the server name may be "
-"misspelled or your network connection could be down."
+"Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
-"Adresseboktjeneren din er ikke tilgjengelig eller tjenernavnet er kanskje "
-"stavet feil. Eller så kan nettverkstilkoblingen din være slått av."
+"Dine kontakter for {0} vil ikke være tilgjengelige før Evolution startes på "
+"nytt."
 
 #: ../addressbook/addressbook.error.xml.h:31
-msgid "This address book will be removed permanently."
-msgstr "Denne adresseboken vil bli slettet for godt."
+msgid "Address '{0}' already exists."
+msgstr "Adressen «{0}» eksisterer allerede."
 
 #: ../addressbook/addressbook.error.xml.h:32
-msgid "This server does not support LDAPv3 schema information."
-msgstr "Denne tjeneren støtter ikke LDAPv3 schema-informasjon."
+msgid ""
+"A contact already exists with this address. Would you like to add a new card "
+"with the same address anyway?"
+msgstr ""
+"En kontakt med denne adressen eksisterer allerede. Vil du legge til en ny "
+"kontakt med samme adresse likevel?"
 
-#: ../addressbook/addressbook.error.xml.h:33
-msgid "Unable to open address book"
-msgstr "Kan ikke åpne adressebok"
+#: ../addressbook/addressbook.error.xml.h:33 ../mail/em-vfolder-rule.c:595
+#: ../widgets/table/e-table-config.ui.h:6
+msgid "_Add"
+msgstr "_Legg til"
 
 #: ../addressbook/addressbook.error.xml.h:34
-msgid "Unable to perform search."
-msgstr "Kan ikke utføre søk."
+msgid "Some addresses already exist in this contact list."
+msgstr "Noen adresser eksisterer allerede i denne kontaktlisten."
 
 #: ../addressbook/addressbook.error.xml.h:35
-msgid "Unable to save {0}."
-msgstr "Kan ikke lagre {0}."
+msgid ""
+"You are trying to add addresses that are part of this list already. Would "
+"you like to add them anyway?"
+msgstr ""
+"Du prøver å legge til adresser som allerede er en del av denne listen. Vil "
+"du legge dem til likevel?"
 
 #: ../addressbook/addressbook.error.xml.h:36
-msgid "Would you like to save your changes?"
-msgstr "Vil du lagre dine endringer?"
+msgid "Skip duplicates"
+msgstr "Hopp over duplikater"
 
 #: ../addressbook/addressbook.error.xml.h:37
-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?"
-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?"
+msgid "Add with duplicates"
+msgstr "Legg til med duplikater"
 
 #: ../addressbook/addressbook.error.xml.h:38
-msgid ""
-"You are connecting to an unsupported GroupWise server and may encounter "
-"problems using Evolution. For best results the server should be upgraded to "
-"a supported version"
-msgstr ""
-"Du prøver å koble til en GroupWise-tjener som ikke er støttet og kan "
-"muligens støte på problemer. Tjeneren bør oppgraderes til en støttet versjon "
-"for best ytelse."
+msgid "List '{0}' is already in this contact list."
+msgstr "Liste «{0}» er allerede i kontaktlisten."
 
 #: ../addressbook/addressbook.error.xml.h:39
 msgid ""
-"You are trying to add addresses that are part of this list already. Would "
-"you like to add them anyway?"
+"A contact list named '{0}' is already in this contact list. Would you like "
+"to add it anyway?"
 msgstr ""
-"Du prøver å legge til adresser som allerede er en del av denne listen. Vil "
-"du legge dem til likevel?"
+"En kontaktliste med navn «{0}» eksisterer allerede i denne kontaktlisten. "
+"Vil du legge den til likevel?"
 
 #: ../addressbook/addressbook.error.xml.h:40
-msgid "You do not have permission to delete contacts in this address book."
-msgstr "Du har ikke rettigheter til å slette kontakter i denne adresseboken."
+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:41
 msgid ""
-"You have made modifications to this contact. Do you want to save these "
-"changes?"
+"You are connecting to an unsupported GroupWise server and may encounter "
+"problems using Evolution. For best results the server should be upgraded to "
+"a supported version"
 msgstr ""
-"Du har gjort endringer for denne kontakten. Vil du lagre disse endringene?"
+"Du prøver å koble til en GroupWise-tjener som ikke er støttet og kan "
+"muligens støte på problemer. Tjeneren bør oppgraderes til en støttet versjon "
+"for best ytelse."
+
+#: ../addressbook/addressbook.error.xml.h:42
+msgid "GroupWise Address book creation:"
+msgstr "Oppretting av GroupWise adressebok:"
 
-#. Translators: {0} is replaced with an address book name which will not be available
 #: ../addressbook/addressbook.error.xml.h:43
 msgid ""
-"Your contacts for {0} will not be available until Evolution is restarted."
+"Currently you can only access the GroupWise System Address Book from "
+"Evolution. Please use some other GroupWise mail client once to get your "
+"GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
 msgstr ""
-"Dine kontakter for {0} vil ikke være tilgjengelige før Evolution startes på "
-"nytt."
+"Foreløpig kan du kun aksessere systemadresseboken for GroupWise fra "
+"Evolution. Vennligst bruk en annen GroupWise-klient en gang for å få tak i "
+"dine ofte brukte kontakter og mappene for personlige kontakter fra GroupWise."
 
-#: ../addressbook/addressbook.error.xml.h:44 ../mail/em-vfolder-rule.c:595
-#: ../widgets/table/e-table-config.ui.h:18
-msgid "_Add"
-msgstr "_Legg til"
+#: ../addressbook/addressbook.error.xml.h:44
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1278
+msgid "Failed to delete contact"
+msgstr "Klarte ikke å slette kontakt"
 
 #: ../addressbook/addressbook.error.xml.h:45
-msgid "_Discard"
-msgstr "_Forkast"
+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:46
-msgid "_Do not save"
-msgstr "_Ikke lagre"
-
-#: ../addressbook/addressbook.error.xml.h:47
-msgid "_Resize"
-msgstr "End_re størrelse"
+msgid "Cannot add new contact"
+msgstr "Kan ikke legge til ny kontakt"
 
+#. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:48
-msgid "_Use as it is"
-msgstr "Br_uk som den er"
+msgid ""
+"'{0}' is a read-only address book and cannot be modified. Please select a "
+"different address book from the side bar in the Contacts view."
+msgstr ""
+"«{0}» er en skrivebeskyttet adressebok og kan ikke endres. Velg en annen "
+"adressebok fra sidelinjen i kontaktvisning."
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:717
-#: ../calendar/gui/e-calendar-view.c:2068
-msgid "Anniversary"
-msgstr "Bryllupsdag"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:654
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:676
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2937
+msgid "Contact Editor"
+msgstr "Kontaktredigering"
 
-#. XXX Allow the category icons to be referenced as named
-#. *     icons, since GtkAction does not support GdkPixbufs.
-#. Get the icon file for some default category.  Doesn't matter
-#. * which, so long as it has an icon.  We're just interested in
-#. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
-#: ../addressbook/gui/widgets/eab-contact-display.c:716
-#: ../calendar/gui/e-calendar-view.c:2067 ../capplet/anjal-settings-main.c:78
-#: ../shell/main.c:134
-msgid "Birthday"
-msgstr "Fødselsdag"
+msgid "Image"
+msgstr "Bilde"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:3
+msgid "Nic_kname:"
+msgstr "_Kallenavn:"
 
-#. Translators: an accessibility name
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
-msgid "Blog:"
-msgstr "Blogg:"
+msgid "_File under:"
+msgstr "_Lagre under:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../calendar/gui/dialogs/event-page.ui.h:3
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
+msgid "_Where:"
+msgstr "_Hvor:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
+#: ../calendar/gui/dialogs/event-page.ui.h:16
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
 msgstr "Kate_gorier …"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
-msgid "Calendar:"
-msgstr "Kalender:"
-
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
-#: ../addressbook/importers/evolution-vcard-importer.c:990
-msgid "Contact"
-msgstr "Kontakt"
+msgid "Full _Name..."
+msgstr "Fullt _navn …"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:654
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:676
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2933
-msgid "Contact Editor"
-msgstr "Kontaktredigering"
+msgid "_Wants to receive HTML mail"
+msgstr "_Ønsker å motta HTML-formatert e-post"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/merging/eab-contact-merging.c:390
-#: ../addressbook/gui/widgets/eab-contact-display.c:635
-#: ../addressbook/gui/widgets/eab-contact-display.c:643
-#: ../addressbook/gui/widgets/eab-contact-display.c:1043
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: ../addressbook/gui/merging/eab-contact-merging.c:392
+#: ../addressbook/gui/widgets/eab-contact-display.c:638
+#: ../addressbook/gui/widgets/eab-contact-display.c:646
+#: ../addressbook/gui/widgets/eab-contact-display.c:1046
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 #: ../smime/lib/e-cert.c:833
 msgid "Email"
 msgstr "E-post"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
-msgid "Free/Busy:"
-msgstr "Ledig/opptatt:"
+msgid "Telephone"
+msgstr "Telefon"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
-msgid "Full _Name..."
-msgstr "Fullt _navn …"
+msgid "Instant Messaging"
+msgstr "Øyeblikksmeldinger"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:198
-#: ../addressbook/gui/widgets/eab-contact-display.c:78
-#: ../addressbook/gui/widgets/eab-contact-display.c:1348
-#: ../widgets/misc/e-contact-map.c:297
-msgid "Home"
-msgstr "Hjemme"
+#: ../addressbook/importers/evolution-vcard-importer.c:990
+msgid "Contact"
+msgstr "Kontakt"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
-msgid "Home Page:"
-msgstr "Hjemmeside:"
+msgid "_Home Page:"
+msgstr "_Hjemmeside:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
-msgid "Image"
-msgstr "Bilde"
+#: ../calendar/gui/dialogs/event-page.c:710
+#: ../calendar/gui/dialogs/event-page.ui.h:22
+#: ../plugins/itip-formatter/itip-view.c:1971
+msgid "_Calendar:"
+msgstr "_Kalender:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
-msgid "Instant Messaging"
-msgstr "Øyeblikksmeldinger"
+msgid "_Free/Busy:"
+msgstr "_Ledig/opptatt:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
-msgid "Job"
-msgstr "Jobb"
+msgid "_Video Chat:"
+msgstr "_Videoprat:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
-msgid "Mailing Address"
-msgstr "Postadresse"
+msgid "Home Page:"
+msgstr "Hjemmeside:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
-#: ../calendar/gui/dialogs/task-details-page.ui.h:11
-msgid "Miscellaneous"
-msgstr "Forskjellig"
+msgid "Calendar:"
+msgstr "Kalender:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
-msgid "Nic_kname:"
-msgstr "_Kallenavn:"
+msgid "Free/Busy:"
+msgstr "Ledig/opptatt:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
-msgid "Notes"
-msgstr "Notater"
+msgid "Video Chat:"
+msgstr "Videoprat:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:199
-#: ../addressbook/gui/widgets/eab-contact-display.c:79
-#: ../addressbook/gui/widgets/eab-contact-display.c:409
-#: ../calendar/gui/e-cal-model.c:3445
-msgid "Other"
-msgstr "Andre"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
-msgid "Personal Information"
-msgstr "Personlig informasjon"
+msgid "_Blog:"
+msgstr "_Blogg:"
 
+#. Translators: an accessibility name
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
-msgid "Telephone"
-msgstr "Telefon"
+msgid "Blog:"
+msgstr "Blogg:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
-msgid "Video Chat:"
-msgstr "Videoprat:"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
 msgid "Web Addresses"
 msgstr "Nettadresser"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
 msgid "Web addresses"
 msgstr "Nettadresser"
 
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
+msgid "_Profession:"
+msgstr "_Yrke:"
+
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:197
-#: ../addressbook/gui/widgets/eab-contact-display.c:77
-#: ../addressbook/gui/widgets/eab-contact-display.c:696
-#: ../addressbook/gui/widgets/eab-contact-display.c:1345
-#: ../widgets/misc/e-contact-map.c:305
-msgid "Work"
-msgstr "Arbeid"
+#: ../addressbook/gui/contact-editor/fullname.ui.h:14
+msgid "_Title:"
+msgstr "_Tittel:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
-msgid "_Address:"
-msgstr "_Adresse:"
+msgid "_Company:"
+msgstr "F_irma:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
-msgid "_Anniversary:"
-msgstr "_Bryllupsdag:"
+msgid "_Department:"
+msgstr "Av_deling:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
-msgid "_Assistant:"
-msgstr "_Assistent:"
+msgid "_Manager:"
+msgstr "_Leder:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
-msgid "_Birthday:"
-msgstr "_Fødselsdag:"
+msgid "_Assistant:"
+msgstr "_Assistent:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
-msgid "_Blog:"
-msgstr "_Blogg:"
+msgid "Job"
+msgstr "Jobb"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
-#: ../calendar/gui/dialogs/event-page.c:710
-#: ../calendar/gui/dialogs/event-page.ui.h:10
-#: ../plugins/itip-formatter/itip-view.c:1971
-msgid "_Calendar:"
-msgstr "_Kalender:"
+msgid "_Office:"
+msgstr "K_ontor:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
-msgid "_City:"
-msgstr "_By:"
+msgid "_Spouse:"
+msgstr "_Ektefelle:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
-msgid "_Company:"
-msgstr "F_irma:"
+msgid "_Birthday:"
+msgstr "_Fødselsdag:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
-msgid "_Country:"
-msgstr "_Land:"
+msgid "_Anniversary:"
+msgstr "_Bryllupsdag:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
-msgid "_Department:"
-msgstr "Av_deling:"
+#: ../addressbook/gui/widgets/eab-contact-display.c:720
+#: ../calendar/gui/e-calendar-view.c:2068
+msgid "Anniversary"
+msgstr "Bryllupsdag"
 
+#. XXX Allow the category icons to be referenced as named
+#. *     icons, since GtkAction does not support GdkPixbufs.
+#. Get the icon file for some default category.  Doesn't matter
+#. * which, so long as it has an icon.  We're just interested in
+#. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
-msgid "_File under:"
-msgstr "_Lagre under:"
+#: ../addressbook/gui/widgets/eab-contact-display.c:719
+#: ../calendar/gui/e-calendar-view.c:2067 ../capplet/anjal-settings-main.c:78
+#: ../shell/main.c:134
+msgid "Birthday"
+msgstr "Fødselsdag"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
-msgid "_Free/Busy:"
-msgstr "_Ledig/opptatt:"
+#: ../calendar/gui/dialogs/task-details-page.ui.h:22
+msgid "Miscellaneous"
+msgstr "Forskjellig"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
-msgid "_Home Page:"
-msgstr "_Hjemmeside:"
+msgid "Personal Information"
+msgstr "Personlig informasjon"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
-msgid "_Manager:"
-msgstr "_Leder:"
+msgid "_City:"
+msgstr "_By:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
-msgid "_Office:"
-msgstr "K_ontor:"
+msgid "_Zip/Postal Code:"
+msgstr "_Zip/postnummer:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
-msgid "_PO Box:"
-msgstr "_Postboks:"
+msgid "_State/Province:"
+msgstr "_Stat/Provins:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
-msgid "_Profession:"
-msgstr "_Yrke:"
+msgid "_Country:"
+msgstr "_Land:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
-msgid "_Spouse:"
-msgstr "_Ektefelle:"
+msgid "_PO Box:"
+msgstr "_Postboks:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
-msgid "_State/Province:"
-msgstr "_Stat/Provins:"
+msgid "_Address:"
+msgstr "_Adresse:"
 
 #: ../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/e-contact-editor.c:198
+#: ../addressbook/gui/widgets/eab-contact-display.c:78
+#: ../addressbook/gui/widgets/eab-contact-display.c:1351
+#: ../widgets/misc/e-contact-map.c:297
+msgid "Home"
+msgstr "Hjemme"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
-msgid "_Video Chat:"
-msgstr "_Videoprat:"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:197
+#: ../addressbook/gui/widgets/eab-contact-display.c:77
+#: ../addressbook/gui/widgets/eab-contact-display.c:699
+#: ../addressbook/gui/widgets/eab-contact-display.c:1348
+#: ../widgets/misc/e-contact-map.c:305
+msgid "Work"
+msgstr "Arbeid"
 
 #: ../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/e-contact-editor.c:199
+#: ../addressbook/gui/widgets/eab-contact-display.c:79
+#: ../addressbook/gui/widgets/eab-contact-display.c:412
+#: ../calendar/gui/e-cal-model.c:3445
+msgid "Other"
+msgstr "Andre"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:50
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
-msgid "_Where:"
-msgstr "_Hvor:"
+msgid "Mailing Address"
+msgstr "Postadresse"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:51
-msgid "_Zip/Postal Code:"
-msgstr "_Zip/postnummer:"
+msgid "Notes"
+msgstr "Notater"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:657
+#: ../addressbook/gui/widgets/eab-contact-display.c:660
 msgid "AIM"
 msgstr "AIM"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-display.c:660
+#: ../addressbook/gui/widgets/eab-contact-display.c:663
 msgid "Jabber"
 msgstr "Jabber"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:180
-#: ../addressbook/gui/widgets/eab-contact-display.c:662
+#: ../addressbook/gui/widgets/eab-contact-display.c:665
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:181
-#: ../addressbook/gui/widgets/eab-contact-display.c:663
+#: ../addressbook/gui/widgets/eab-contact-display.c:666
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:182
-#: ../addressbook/gui/widgets/eab-contact-display.c:661
+#: ../addressbook/gui/widgets/eab-contact-display.c:664
 msgid "MSN"
 msgstr "MSN"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:183
-#: ../addressbook/gui/widgets/eab-contact-display.c:659
+#: ../addressbook/gui/widgets/eab-contact-display.c:662
 msgid "ICQ"
 msgstr "ICQ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:184
-#: ../addressbook/gui/widgets/eab-contact-display.c:658
+#: ../addressbook/gui/widgets/eab-contact-display.c:661
 msgid "GroupWise"
 msgstr "GroupWise"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:185
-#: ../addressbook/gui/widgets/eab-contact-display.c:664
+#: ../addressbook/gui/widgets/eab-contact-display.c:667
 msgid "Skype"
 msgstr "Skype"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:220
-#: ../addressbook/gui/widgets/eab-gui-util.c:473
+#: ../addressbook/gui/widgets/eab-gui-util.c:481
 msgid "Error adding contact"
 msgstr "Feil under innlegging av kontakt"
 
@@ -559,20 +559,20 @@ msgid "Error removing contact"
 msgstr "Feil under fjerning av kontakt"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:670
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2927
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2931
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Kontaktredigering - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3407
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3411
 msgid "Please select an image for this contact"
 msgstr "Vennligst velg et bilde for denne kontakten"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3408
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3412
 msgid "_No image"
 msgstr "_Uten bilde"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3735
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3739
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -580,28 +580,28 @@ msgstr ""
 "Kontaktdata er ugyldig:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3741
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3745
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "«%s» har ugyldig format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3748
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3752
 #, c-format
 msgid "'%s' cannot be a future date"
 msgstr "«%s» kan ikke være en dato i fremtiden"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3756
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3760
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s«%s» har ugyldig format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3769
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3783
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3773
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3787
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s«%s» er tom"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3798
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3802
 msgid "Invalid contact."
 msgstr "Ugyldig kontakt."
 
@@ -626,67 +626,67 @@ msgid "_Select Address Book"
 msgstr "_Velg adressebok"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:1
-msgid "Dr."
-msgstr "Dr."
+msgid "Mr."
+msgstr "Hr."
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:2
-msgid "Esq."
-msgstr "Esq."
+msgid "Mrs."
+msgstr "Fru"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Full Name"
-msgstr "Fullt navn"
+msgid "Ms."
+msgstr "Frk"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:4
-msgid "I"
-msgstr "I"
+msgid "Miss"
+msgstr "Frk"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:5
-msgid "II"
-msgstr "II"
+msgid "Dr."
+msgstr "Dr."
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:6
-msgid "III"
-msgstr "III"
+msgid "Sr."
+msgstr "Hr."
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:7
 msgid "Jr."
 msgstr "Jr."
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:8
-msgid "Miss"
-msgstr "Frk"
+msgid "I"
+msgstr "I"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:9
-msgid "Mr."
-msgstr "Hr."
+msgid "II"
+msgstr "II"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:10
-msgid "Mrs."
-msgstr "Fru"
+msgid "III"
+msgstr "III"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:11
-msgid "Ms."
-msgstr "Frk"
+msgid "Esq."
+msgstr "Esq."
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:12
-msgid "Sr."
-msgstr "Hr."
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+msgid "Full Name"
+msgstr "Fullt navn"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:13
 msgid "_First:"
 msgstr "_Fornavn:"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:14
-msgid "_Last:"
-msgstr "_Etternavn:"
-
 #: ../addressbook/gui/contact-editor/fullname.ui.h:15
 msgid "_Middle:"
 msgstr "_Mellomnavn:"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:16
+msgid "_Last:"
+msgstr "_Etternavn:"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:17
 msgid "_Suffix:"
 msgstr "_Suffiks:"
 
@@ -696,26 +696,26 @@ msgid "Contact List Editor"
 msgstr "Kontaktlisteredigering"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:2
+msgid "_List name:"
+msgstr "_Listenavn:"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:4
 msgid "Members"
 msgstr "Medlemmer"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
+msgid "_Type an email address or drag a contact into the list below:"
+msgstr "_Skriv en e-post adresse eller dra en kontakt inn i feltet under:"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:6
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Skjul adresser når du sender e-post til listen"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:4
-msgid "_List name:"
-msgstr "_Listenavn:"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:175
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
+#: ../mail/mail-config.ui.h:156
 msgid "_Select..."
 msgstr "_Velg …"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:6
-msgid "_Type an email address or drag a contact into the list below:"
-msgstr "_Skriv en e-post adresse eller dra en kontakt inn i feltet under:"
-
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:885
 msgid "Contact List Members"
 msgstr "Kontaktlistemedlemmer"
@@ -737,20 +737,11 @@ msgid "Error removing list"
 msgstr "Feil under fjerning av liste"
 
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
-msgid "Changed Contact:"
-msgstr "Endret kontakt:"
-
-#. Translators: Heading of the contact which has same name or email address in this folder already.
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:3
-msgid "Conflicting Contact:"
-msgstr "Kontakt i konflikt:"
-
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:4
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:1
 msgid "Duplicate Contact Detected"
 msgstr "Duplisert kontakt funnet"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:5
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:2
 msgid ""
 "The name or email of this contact already exists in this folder. Would you "
 "like to save the changes anyway?"
@@ -758,15 +749,21 @@ msgstr ""
 "Navnet eller e-postadressen for denne kontakten eksisterer allerede i denne "
 "mappen. Vil du lagre endringene likevel?"
 
+#. Translators: Heading of the contact which has same name or email address in this folder already.
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:4
+msgid "Conflicting Contact:"
+msgstr "Kontakt i konflikt:"
+
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:5
+msgid "Changed Contact:"
+msgstr "Endret kontakt:"
+
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
-msgid "New Contact:"
-msgstr "Ny kontakt:"
+#: ../addressbook/gui/merging/eab-contact-merging.c:338
+msgid "_Merge"
+msgstr "_Flett"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:3
-msgid "Original Contact:"
-msgstr "Opprinnelig kontakt:"
-
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:4
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder.  Would you like to add it anyway?"
@@ -774,24 +771,22 @@ msgstr ""
 "Navnet eller e-post adressen for denne kontakten eksisterer allerede\n"
 "i denne mappen. Vil du legge den til likevel?"
 
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:5
+msgid "Original Contact:"
+msgstr "Opprinnelig kontakt:"
+
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:336
-msgid "_Merge"
-msgstr "_Flett"
+msgid "New Contact:"
+msgstr "Ny kontakt:"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:319
+#: ../addressbook/gui/merging/eab-contact-merging.c:320
 msgid "Merge Contact"
 msgstr "Flett kontakt"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../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:1063
-#: ../modules/calendar/e-cal-shell-view-actions.c:1734
-#: ../modules/calendar/e-memo-shell-view-actions.c:788
-#: ../modules/calendar/e-task-shell-view-actions.c:987
-msgid "Any field contains"
-msgstr "Et felt inneholder"
+#: ../modules/addressbook/e-book-shell-view-actions.c:1077
+msgid "Name contains"
+msgstr "Navn inneholder"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
 #: ../modules/addressbook/e-book-shell-view-actions.c:1070
@@ -799,9 +794,14 @@ msgid "Email begins with"
 msgstr "E-post begynner med"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../modules/addressbook/e-book-shell-view-actions.c:1077
-msgid "Name contains"
-msgstr "Navn inneholder"
+#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:30
+#: ../modules/addressbook/e-book-shell-view-actions.c:1063
+#: ../modules/calendar/e-cal-shell-view-actions.c:1734
+#: ../modules/calendar/e-memo-shell-view-actions.c:788
+#: ../modules/calendar/e-task-shell-view-actions.c:987
+msgid "Any field contains"
+msgstr "Et felt inneholder"
 
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:97
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:106
@@ -828,98 +828,98 @@ msgstr "_Send ny melding til …"
 msgid "Send a mail message to this address"
 msgstr "Send en e-postmelding til denne adressen"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:215
+#: ../addressbook/gui/widgets/eab-contact-display.c:218
 msgid "Open map"
 msgstr "Åpne kart"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:530
-#: ../addressbook/gui/widgets/eab-contact-display.c:558
+#: ../addressbook/gui/widgets/eab-contact-display.c:533
+#: ../addressbook/gui/widgets/eab-contact-display.c:561
 msgid "List Members:"
 msgstr "Listemedlemmer:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:650
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: ../addressbook/gui/widgets/eab-contact-display.c:653
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Nickname"
 msgstr "Kallenavn"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:682
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: ../addressbook/gui/widgets/eab-contact-display.c:685
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Company"
 msgstr "Firma"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:683
+#: ../addressbook/gui/widgets/eab-contact-display.c:686
 msgid "Department"
 msgstr "Avdeling"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:684
+#: ../addressbook/gui/widgets/eab-contact-display.c:687
 msgid "Profession"
 msgstr "Yrke"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:685
+#: ../addressbook/gui/widgets/eab-contact-display.c:688
 msgid "Position"
 msgstr "Stilling"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:686
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: ../addressbook/gui/widgets/eab-contact-display.c:689
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Manager"
 msgstr "Leder"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:687
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+#: ../addressbook/gui/widgets/eab-contact-display.c:690
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Assistant"
 msgstr "Assistent"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:688
+#: ../addressbook/gui/widgets/eab-contact-display.c:691
 msgid "Video Chat"
 msgstr "Videosamtale"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:689
+#: ../addressbook/gui/widgets/eab-contact-display.c:692
 #: ../calendar/gui/dialogs/calendar-setup.c:463
 #: ../modules/calendar/e-cal-shell-view-actions.c:232
 #: ../modules/calendar/e-cal-shell-view-actions.c:261
 #: ../modules/calendar/e-cal-shell-view.c:528
 #: ../modules/online-accounts/e-online-accounts-google.c:302
-#: ../plugins/publish-calendar/publish-calendar.ui.h:1
+#: ../plugins/publish-calendar/publish-calendar.ui.h:21
 #: ../widgets/misc/e-send-options.c:528
 msgid "Calendar"
 msgstr "Kalender"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:690
+#: ../addressbook/gui/widgets/eab-contact-display.c:693
 #: ../calendar/gui/dialogs/event-editor.c:123
 #: ../calendar/gui/dialogs/event-editor.c:350
-#: ../plugins/publish-calendar/publish-calendar.ui.h:6
+#: ../plugins/publish-calendar/publish-calendar.ui.h:2
 msgid "Free/Busy"
 msgstr "Ledig/opptatt"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:691
-#: ../addressbook/gui/widgets/eab-contact-display.c:713
+#: ../addressbook/gui/widgets/eab-contact-display.c:694
+#: ../addressbook/gui/widgets/eab-contact-display.c:716
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:692
+#: ../addressbook/gui/widgets/eab-contact-display.c:695
 msgid "Fax"
 msgstr "Faks"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:693
-#: ../addressbook/gui/widgets/eab-contact-display.c:715
+#: ../addressbook/gui/widgets/eab-contact-display.c:696
+#: ../addressbook/gui/widgets/eab-contact-display.c:718
 msgid "Address"
 msgstr "Adresse"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:710
+#: ../addressbook/gui/widgets/eab-contact-display.c:713
 msgid "Home Page"
 msgstr "Hjemmeside"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:711
+#: ../addressbook/gui/widgets/eab-contact-display.c:714
 msgid "Web Log"
 msgstr "Nettdagbok"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:714
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: ../addressbook/gui/widgets/eab-contact-display.c:717
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:718
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+#: ../addressbook/gui/widgets/eab-contact-display.c:721
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
 msgid "Spouse"
 msgstr "Ektefelle"
 
@@ -927,7 +927,7 @@ msgstr "Ektefelle"
 #. Create the default Person calendar
 #. Create the default Person memo list
 #. Create the default Person task list
-#: ../addressbook/gui/widgets/eab-contact-display.c:720
+#: ../addressbook/gui/widgets/eab-contact-display.c:723
 #: ../capplet/settings/mail-capplet-shell.c:379
 #: ../modules/addressbook/e-book-shell-backend.c:126
 #: ../modules/addressbook/e-book-shell-migrate.c:144
@@ -940,28 +940,28 @@ msgstr "Ektefelle"
 msgid "Personal"
 msgstr "Personlig"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:741
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: ../addressbook/gui/widgets/eab-contact-display.c:744
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
 msgid "Note"
 msgstr "Kommentar"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1010
+#: ../addressbook/gui/widgets/eab-contact-display.c:1013
 msgid "List Members"
 msgstr "Listemedlemmer"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1028
+#: ../addressbook/gui/widgets/eab-contact-display.c:1031
 msgid "Job Title"
 msgstr "Jobbtittel"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1065
+#: ../addressbook/gui/widgets/eab-contact-display.c:1068
 msgid "Home page"
 msgstr "Hjemmeside"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1074
+#: ../addressbook/gui/widgets/eab-contact-display.c:1077
 msgid "Blog"
 msgstr "Weblogg"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1273
+#: ../addressbook/gui/widgets/eab-contact-display.c:1276
 #: ../widgets/misc/e-web-view.c:980
 #, c-format
 msgid "Click to mail %s"
@@ -1055,27 +1055,27 @@ msgstr "Denne spørringen ble ikke fullført. %s"
 msgid "card.vcf"
 msgstr "kort.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:308
+#: ../addressbook/gui/widgets/eab-gui-util.c:309
 msgid "Select Address Book"
 msgstr "Velg adressebok"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:375
+#: ../addressbook/gui/widgets/eab-gui-util.c:383
 msgid "list"
 msgstr "liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:560
+#: ../addressbook/gui/widgets/eab-gui-util.c:568
 msgid "Move contact to"
 msgstr "Flytt kontakt til"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:562
+#: ../addressbook/gui/widgets/eab-gui-util.c:570
 msgid "Copy contact to"
 msgstr "Kopier kontakt til"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:565
+#: ../addressbook/gui/widgets/eab-gui-util.c:573
 msgid "Move contacts to"
 msgstr "Flytt kontakter til"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:567
+#: ../addressbook/gui/widgets/eab-gui-util.c:575
 msgid "Copy contacts to"
 msgstr "Kopier kontakter til"
 
@@ -1173,111 +1173,93 @@ msgstr "Ikke _vis"
 msgid "Display _All Contacts"
 msgstr "Vis _alle kontakter"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:2
-msgid "Assistant Phone"
-msgstr "Assistents telefon"
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "File As"
+msgstr "Lagre som"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:3
-msgid "Business Fax"
-msgstr "Faks på arbeid"
+msgid "Given Name"
+msgstr "Gitt navn"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Family Name"
+msgstr "Etternavn"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Email 2"
+msgstr "E-post 2"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+msgid "Email 3"
+msgstr "E-post 3"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Assistant Phone"
+msgstr "Assistents telefon"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 msgid "Business Phone"
 msgstr "Arbeidstelefon"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 msgid "Business Phone 2"
 msgstr "Arbeidstelefon 2"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+msgid "Business Fax"
+msgstr "Faks på arbeid"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Callback Phone"
 msgstr "Telefon for tilbakeringing"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Car Phone"
 msgstr "Biltelefon"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.ui.h:4
-#: ../calendar/gui/e-calendar-table.etspec.h:3
-#: ../calendar/gui/e-cal-list-view.etspec.h:1
-#: ../calendar/gui/e-memo-table.etspec.h:1
-msgid "Categories"
-msgstr "Kategorier"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Company Phone"
 msgstr "Firmatelefon"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-msgid "Email 2"
-msgstr "E-post 2"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
-msgid "Email 3"
-msgstr "E-post 3"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
-msgid "Family Name"
-msgstr "Etternavn"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
-msgid "File As"
-msgstr "Lagre som"
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
+msgid "Home Phone"
+msgstr "Hjemmetelefon"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Given Name"
-msgstr "Gitt navn"
+msgid "Home Phone 2"
+msgstr "Hjemmetelefon 2"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Fax"
 msgstr "Faks hjemme"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:19
-msgid "Home Phone"
-msgstr "Hjemmetelefon"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
-msgid "Home Phone 2"
-msgstr "Hjemmetelefon 2"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
 msgid "ISDN Phone"
 msgstr "ISDN-telefon"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "Journal"
-msgstr "Journal"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Office"
-msgstr "Kontor"
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Other Phone"
+msgstr "Annen telefon"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Other Fax"
 msgstr "Annen faks"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-msgid "Other Phone"
-msgstr "Annen telefon"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Pager"
 msgstr "Personsøker"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Primary Phone"
 msgstr "Primær telefon"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Radio"
 msgstr "Radio"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:610
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Rolle"
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+msgid "Telex"
+msgstr "Teleks"
 
 #. Translators: This is a vcard standard and stands for the type of
 #. phone used by the hearing impaired. TTY stands for "teletype"
@@ -1285,26 +1267,44 @@ msgstr "Rolle"
 #. Device for Deaf". However, you probably want to leave this
 #. abbreviation unchanged unless you know that there is actually a
 #. different and established translation for this in your language.
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:41
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 msgid "TTYTDD"
 msgstr "TTYTDD"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:42
-msgid "Telex"
-msgstr "Teleks"
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+msgid "Unit"
+msgstr "Enhet"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Office"
+msgstr "Kontor"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
 msgstr "Tittel"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
-msgid "Unit"
-msgstr "Enhet"
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#: ../calendar/gui/e-meeting-list-view.c:610
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
+msgid "Role"
+msgstr "Rolle"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:41
 msgid "Web Site"
 msgstr "Nettside"
 
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:42
+msgid "Journal"
+msgstr "Journal"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
+#: ../calendar/gui/dialogs/event-page.ui.h:20
+#: ../calendar/gui/e-calendar-table.etspec.h:12
+#: ../calendar/gui/e-cal-list-view.etspec.h:6
+#: ../calendar/gui/e-memo-table.etspec.h:4
+msgid "Categories"
+msgstr "Kategorier"
+
 #: ../addressbook/gui/widgets/ea-minicard.c:34
 msgid "Open"
 msgstr "Åpne"
@@ -1416,7 +1416,7 @@ msgstr "Kortvisning"
 #: ../addressbook/importers/evolution-vcard-importer.c:280
 #: ../calendar/importers/icalendar-importer.c:413
 #: ../calendar/importers/icalendar-importer.c:903
-#: ../calendar/importers/icalendar-importer.c:942 ../shell/shell.error.xml.h:6
+#: ../calendar/importers/icalendar-importer.c:942 ../shell/shell.error.xml.h:1
 msgid "Importing..."
 msgstr "Importerer …"
 
@@ -1462,7 +1462,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:719
+#: ../addressbook/printing/e-contact-print.c:721
 #, c-format
 msgid "Page %d"
 msgstr "Side %d"
@@ -1537,8 +1537,8 @@ msgstr "Kunne ikke hente liste med adressebøker: %s"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
-#: ../calendar/gui/dialogs/memo-page.c:938 ../em-format/em-format.c:2321
-#: ../mail/em-folder-tree.c:675 ../mail/mail-ops.c:670
+#: ../calendar/gui/dialogs/memo-page.c:946 ../em-format/em-format.c:2321
+#: ../mail/em-folder-tree.c:673 ../mail/mail-ops.c:636
 #: ../plugins/caldav/caldav-browse-server.c:220
 #: ../plugins/caldav/caldav-browse-server.c:1469 ../plugins/face/face.c:174
 #: ../plugins/itip-formatter/itip-formatter.c:1474
@@ -1552,604 +1552,604 @@ msgstr "Ukjent feil"
 msgid "Failed to open client '%s': %s"
 msgstr "Klarte ikke å åpne klient «%s»: %s"
 
-#. For Translators: {0} is the name of the calendar source
-#: ../calendar/calendar.error.xml.h:2
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:109
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "minutt"
+msgstr[1] "minutter"
+
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:122
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] "time"
+msgstr[1] "timer"
+
+#. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
+#. * (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:135
+#: ../calendar/gui/dialogs/recurrence-page.c:1188
+msgid "day"
+msgid_plural "days"
+msgstr[0] "dag"
+msgstr[1] "dager"
+
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:331
+msgid "Start time"
+msgstr "Starttid"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:1
+msgid "Appointments"
+msgstr "Avtaler"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:2
+msgid "_Snooze"
+msgstr "_Utsett"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:3 ../e-util/e-alert-dialog.c:160
+msgid "_Dismiss"
+msgstr "_Lukk"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:4
+msgid "Snooze _time:"
+msgstr "_Tid for utsettelse av alarm:"
+
+#. Translators: This is the last part of the sentence:
+#. * "Purge events older than <<spin-button>> days"
+#: ../calendar/alarm-notify/alarm-notify.ui.h:5
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10 ../e-util/e-plugin-util.c:454
+#: ../filter/filter.ui.h:8 ../modules/calendar/e-cal-shell-view-actions.c:350
+#: ../plugins/google-account-setup/google-contacts-source.c:387
+#: ../plugins/publish-calendar/publish-calendar.ui.h:6
+msgid "days"
+msgstr "dager"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:6
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
+#: ../calendar/gui/dialogs/event-page.ui.h:18 ../e-util/e-plugin-util.c:453
+#: ../filter/filter.ui.h:7
+#: ../plugins/google-account-setup/google-contacts-source.c:386
+msgid "hours"
+msgstr "timer"
+
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
+#: ../calendar/alarm-notify/alarm-notify.ui.h:7
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
+#: ../calendar/gui/dialogs/event-page.ui.h:19 ../e-util/e-plugin-util.c:452
+#: ../filter/filter.ui.h:6 ../modules/addressbook/ldap-config.ui.h:29
+#: ../plugins/google-account-setup/google-contacts-source.c:385
+msgid "minutes"
+msgstr "minutter"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:8
+msgid "location of appointment"
+msgstr "sted for avtalen"
+
+#. Location
+#: ../calendar/alarm-notify/alarm-notify.ui.h:9
+#: ../calendar/alarm-notify/alarm-queue.c:1756
+#: ../calendar/alarm-notify/alarm-queue.c:1766
+#: ../plugins/itip-formatter/itip-view.c:1052
+msgid "Location:"
+msgstr "Sted:"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:10
+msgid "Dismiss _All"
+msgstr "Lukk _alle"
+
+#: ../calendar/alarm-notify/alarm-queue.c:1605
+#: ../calendar/alarm-notify/alarm-queue.c:1737
+msgid "No summary available."
+msgstr "Sammendrag er ikke tilgjengelig."
+
+#: ../calendar/alarm-notify/alarm-queue.c:1614
+#: ../calendar/alarm-notify/alarm-queue.c:1616
+msgid "No description available."
+msgstr "Ingen beskrivelse tilgjengelig."
+
+#: ../calendar/alarm-notify/alarm-queue.c:1624
+msgid "No location information available."
+msgstr "Stedsinformasjon er ikke tilgjengelig."
+
+#: ../calendar/alarm-notify/alarm-queue.c:1670
+#, c-format
+msgid "You have %d reminder"
+msgid_plural "You have %d reminders"
+msgstr[0] "Du har %d påminnelse"
+msgstr[1] "Du har %d påminnelser"
+
+#: ../calendar/alarm-notify/alarm-queue.c:1870
+#: ../calendar/alarm-notify/alarm-queue.c:1905
+msgid "Warning"
+msgstr "Advarsel"
+
+#: ../calendar/alarm-notify/alarm-queue.c:1874
 msgid ""
-"'{0}' does not support assigned tasks, please select a different task list."
+"Evolution does not support calendar reminders with\n"
+"email notifications yet, but this reminder was\n"
+"configured to send an email.  Evolution will display\n"
+"a normal reminder dialog box instead."
 msgstr ""
-"«{0}» støtter ikke tildelte oppgaver. Vennligst velg en annen oppgaveliste."
+"Evolution støtter ikke kalenderpåminnelser med\n"
+"varsling via e-post ennå, men denne påminnelsen\n"
+"er konfigurert til å sende e-post. Evolution vil vise\n"
+"en vanlig dialog med påminnelsen i stedet."
 
-#. For Translators: {0} is the name of the calendar source
-#: ../calendar/calendar.error.xml.h:4
+#: ../calendar/alarm-notify/alarm-queue.c:1911
+#, c-format
 msgid ""
-"'{0}' is a read-only calendar and cannot be modified. Please select a "
-"different calendar from the side bar in the Calendar view."
+"An Evolution Calendar reminder is about to trigger. This reminder is "
+"configured to run the following program:\n"
+"\n"
+"        %s\n"
+"\n"
+"Are you sure you want to run this program?"
 msgstr ""
-"«{0}» er en skrivebeskyttet kalender og kan ikke endres. Velg en annen "
-"kalender fra sidelinjen i kalendervisning."
+"En kalenderpåminnelse i Evolution er i ferd med å startes. Denne påminnelsen "
+"er satt til å kjøre følgende program:\n"
+"        %s\n"
+"\n"
+"Er du sikker på at du vil kjøre dette programmet?"
 
-#. For Translators: {0} is the name of the calendar source
-#: ../calendar/calendar.error.xml.h:6
+#: ../calendar/alarm-notify/alarm-queue.c:1926
+msgid "Do not ask me about this program again."
+msgstr "Ikke spør meg om dette programmet igjen."
+
+#: ../calendar/alarm-notify/util.c:45
+msgid "invalid time"
+msgstr "ugyldig tid"
+
+#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
+#: ../calendar/alarm-notify/util.c:71 ../calendar/gui/e-alarm-list.c:405
+#: ../calendar/gui/misc.c:116
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d time"
+msgstr[1] "%d timer"
+
+#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
+#: ../calendar/alarm-notify/util.c:77 ../calendar/gui/e-alarm-list.c:411
+#: ../calendar/gui/misc.c:122
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minutt"
+msgstr[1] "%d minutter"
+
+#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
+#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
+#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
+#: ../calendar/alarm-notify/util.c:81 ../calendar/gui/e-alarm-list.c:417
+#: ../calendar/gui/misc.c:126
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d sekund"
+msgstr[1] "%d sekunder"
+
+#: ../calendar/calendar.error.xml.h:1
+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:2
 msgid ""
-"'{0}' is a read-only calendar and cannot be modified. Please select a "
-"different calendar that can accept appointments."
+"If you do not send a cancelation notice, the other participants may not know "
+"the meeting is canceled."
 msgstr ""
-"«{0}» er en skrivebeskyttet kalender og kan ikke endres. Velg en annen "
-"kalender som kan motta avtaler."
+"Hvis du ikke sender en avlysningsmelding vil ikke deltakerene vite at møtet "
+"er avlyst."
+
+#: ../calendar/calendar.error.xml.h:3
+msgid "Do _not Send"
+msgstr "Ikke se_nd"
 
-#: ../calendar/calendar.error.xml.h:7
+#: ../calendar/calendar.error.xml.h:4
+msgid "_Send Notice"
+msgstr "_Send melding"
+
+#: ../calendar/calendar.error.xml.h:5
+#: ../calendar/gui/dialogs/delete-comp.c:189
+#, c-format
+msgid "Are you sure you want to delete this meeting?"
+msgstr "Er du sikker på at du vil slette dette møtet?"
+
+#: ../calendar/calendar.error.xml.h:6
 msgid ""
-"Adding a meaningful summary to your appointment will give you an idea of "
-"what your appointment is about."
+"All information on this meeting will be deleted and can not be restored."
 msgstr ""
-"Hvis du gir dine avtaler et meningsfylt sammendrag vil gjøre det lettere "
-"forstå hva avtalen gjelder."
+"All informasjon om dette møtet vil bli slettet og kan ikke gjenopprettes."
 
 #: ../calendar/calendar.error.xml.h:8
 msgid ""
-"Adding a meaningful summary to your task will give you an idea of what your "
-"task is about."
+"If you do not send a cancelation notice, the other participants may not know "
+"the task has been deleted."
 msgstr ""
-"Hvis du gir oppgaver et meningsfylt sammendrag vil det gjøre det lettere å "
-"forstå hva oppgaven gjelder."
+"Hvis du ikke sender en avlysningsmelding vil ikke de andre deltakerene vite "
+"at oppgaven er slettet."
 
 #: ../calendar/calendar.error.xml.h:9
-msgid "All information in these memos will be deleted and can not be restored."
-msgstr ""
-"All informasjon i disse notatene vil bli slettet og kan ikke gjenopprettes."
+#: ../calendar/gui/dialogs/delete-comp.c:192
+#, c-format
+msgid "Are you sure you want to delete this task?"
+msgstr "Er du sikker på at du vil slette denne oppgaven?"
 
 #: ../calendar/calendar.error.xml.h:10
-msgid "All information in this memo will be deleted and can not be restored."
+msgid "All information on this task will be deleted and can not be restored."
 msgstr ""
-"All informasjon i dette notatet vil bli slettet og kan ikke gjenopprettes."
+"All informasjon om denne oppgaven vil bli slettet og kan ikke gjenopprettes."
 
 #: ../calendar/calendar.error.xml.h:11
-msgid ""
-"All information on these appointments will be deleted and can not be "
-"restored."
-msgstr ""
-"All informasjon i disse avtalene vil bli slettet og kan ikke gjenopprettes."
+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:12
-msgid "All information on these tasks will be deleted and can not be restored."
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the memo has been deleted."
 msgstr ""
-"All informasjon om disse oppgavene vil bli slettet og kan ikke gjenopprettes."
+"Hvis du ikke sender en avlysningsmelding vil ikke de andre deltakerene vite "
+"at notatet er slettet."
 
 #: ../calendar/calendar.error.xml.h:13
-msgid ""
-"All information on this appointment will be deleted and can not be restored."
-msgstr ""
-"All informasjon i denne avtalen vil bli slettet og kan ikke gjenopprettes."
+#: ../calendar/gui/dialogs/delete-comp.c:195
+#, c-format
+msgid "Are you sure you want to delete this memo?"
+msgstr "Er du sikker på at du vil slette dette notatet?"
 
 #: ../calendar/calendar.error.xml.h:14
-msgid ""
-"All information on this meeting will be deleted and can not be restored."
-msgstr ""
-"All informasjon om dette møtet vil bli slettet og kan ikke gjenopprettes."
-
-#: ../calendar/calendar.error.xml.h:15
 msgid "All information on this memo will be deleted and can not be restored."
 msgstr ""
 "All informasjon om dette notatet vil bli slettet og kan ikke gjenopprettes."
 
+#: ../calendar/calendar.error.xml.h:15
+msgid "Are you sure you want to delete the meeting titled '{0}'?"
+msgstr "Er du sikker på at du vil slette møtet med navn «{0}»?"
+
 #: ../calendar/calendar.error.xml.h:16
-msgid "All information on this task will be deleted and can not be restored."
-msgstr ""
-"All informasjon om denne oppgaven vil bli slettet og kan ikke gjenopprettes."
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr "Er du sikker på at du vil slette avtalen med navn «{0}»?"
 
 #: ../calendar/calendar.error.xml.h:17
-msgid "Are you sure you want to delete the '{0}' task?"
-msgstr "Er du sikker på at du vil slette oppgaven «{0}»?"
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+"All informasjon i denne avtalen vil bli slettet og kan ikke gjenopprettes."
 
 #: ../calendar/calendar.error.xml.h:18
-msgid "Are you sure you want to delete the appointment titled '{0}'?"
-msgstr "Er du sikker på at du vil slette avtalen med navn «{0}»?"
+msgid "Are you sure you want to delete this appointment?"
+msgstr "Er du sikker på at du vil slette denne avtalen?"
 
 #: ../calendar/calendar.error.xml.h:19
-msgid "Are you sure you want to delete the meeting titled '{0}'?"
-msgstr "Er du sikker på at du vil slette møtet med navn «{0}»?"
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr "Er du sikker på at du vil slette oppgaven «{0}»?"
 
 #: ../calendar/calendar.error.xml.h:20
 msgid "Are you sure you want to delete the memo '{0}'?"
 msgstr "Er du sikker på at du vil slette notatet «{0}»?"
 
 #: ../calendar/calendar.error.xml.h:21
-msgid "Are you sure you want to delete these {0} appointments?"
-msgstr "Er du sikker på at du vil slette disse {0} avtalene?"
+msgid "All information in this memo will be deleted and can not be restored."
+msgstr ""
+"All informasjon i dette notatet vil bli slettet og kan ikke gjenopprettes."
 
 #: ../calendar/calendar.error.xml.h:22
-msgid "Are you sure you want to delete these {0} memos?"
-msgstr "Er du sikker på at du vil slette disse {0} notatene?"
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr "Er du sikker på at du vil slette disse {0} avtalene?"
 
 #: ../calendar/calendar.error.xml.h:23
-msgid "Are you sure you want to delete these {0} tasks?"
-msgstr "Er du sikker på at du vil slette disse {0} oppgavene?"
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+"All informasjon i disse avtalene vil bli slettet og kan ikke gjenopprettes."
 
 #: ../calendar/calendar.error.xml.h:24
-msgid "Are you sure you want to delete this appointment?"
-msgstr "Er du sikker på at du vil slette denne avtalen?"
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr "Er du sikker på at du vil slette disse {0} oppgavene?"
 
 #: ../calendar/calendar.error.xml.h:25
-#: ../calendar/gui/dialogs/delete-comp.c:189
-#, c-format
-msgid "Are you sure you want to delete this meeting?"
-msgstr "Er du sikker på at du vil slette dette møtet?"
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr ""
+"All informasjon om disse oppgavene vil bli slettet og kan ikke gjenopprettes."
 
 #: ../calendar/calendar.error.xml.h:26
-#: ../calendar/gui/dialogs/delete-comp.c:195
-#, c-format
-msgid "Are you sure you want to delete this memo?"
-msgstr "Er du sikker på at du vil slette dette notatet?"
+msgid "Are you sure you want to delete these {0} memos?"
+msgstr "Er du sikker på at du vil slette disse {0} notatene?"
 
 #: ../calendar/calendar.error.xml.h:27
-#: ../calendar/gui/dialogs/delete-comp.c:192
-#, c-format
-msgid "Are you sure you want to delete this task?"
-msgstr "Er du sikker på at du vil slette denne oppgaven?"
+msgid "All information in these memos will be deleted and can not be restored."
+msgstr ""
+"All informasjon i disse notatene vil bli slettet og kan ikke gjenopprettes."
 
 #: ../calendar/calendar.error.xml.h:28
-msgid "Are you sure you want to save the appointment without a summary?"
-msgstr "Er du sikker på at du vil lagre avtalen uten et sammendrag?"
+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:29
-msgid "Are you sure you want to save the memo without a summary?"
-msgstr "Er du sikker på at du vil lagre notatet uten sammendrag?"
+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:30
-msgid "Are you sure you want to save the task without a summary?"
-msgstr "Er du sikker på at du vil lagre oppgaven uten et sammendrag?"
+#: ../composer/mail-composer.error.xml.h:16
+msgid "_Discard Changes"
+msgstr "_Forkast endringer"
 
 #: ../calendar/calendar.error.xml.h:31
-msgid "Cannot create a new event"
-msgstr "Kan ikke opprette en ny hendelse"
+msgid "_Save Changes"
+msgstr "_Lagre endringer"
 
 #: ../calendar/calendar.error.xml.h:32
-msgid "Cannot save event"
-msgstr "Kan ikke lagre hendelse"
+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:33
-msgid "Cannot save task"
-msgstr "Kan ikke lagre oppgave"
+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:34
-msgid "Delete calendar '{0}'?"
-msgstr "Slett kalender «{0}»?"
+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:35
-msgid "Delete memo list '{0}'?"
-msgstr "Slett notatliste «{0}»?"
+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:36
-msgid "Delete task list '{0}'?"
-msgstr "Slett oppgaveliste «{0}»?"
+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:37
+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:38
-msgid "Do _not Send"
-msgstr "Ikke se_nd"
+msgid "Would you like to send meeting invitations to participants?"
+msgstr "Vil du sende møteinvitasjoner til deltakerene?"
 
 #: ../calendar/calendar.error.xml.h:39
-msgid "Download in progress. Do you want to save the appointment?"
-msgstr "Nedlasting pågår. Vil du lagre avtalen?"
+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
-msgid "Download in progress. Do you want to save the task?"
-msgstr "Nedlasting pågår. Vil du lagre oppgaven?"
+#: ../composer/mail-composer.error.xml.h:13 ../mail/mail.error.xml.h:8
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+msgid "_Send"
+msgstr "_Send"
 
 #: ../calendar/calendar.error.xml.h:41
-msgid "Editor could not be loaded."
-msgstr "Redigeringskomponenten kunne ikke lastes."
+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:42
 msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+"Sending av oppdatert informasjon lar andre deltakere holde sine kalendere "
+"oppdatert."
+
+#: ../calendar/calendar.error.xml.h:43
+msgid "Would you like to send this task to participants?"
+msgstr "Vil du sende denne oppgaven til deltakere?"
+
+#: ../calendar/calendar.error.xml.h:44
+msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
 msgstr ""
 "Invitasjoner vil sendes til alle deltakere via e-post slik at de kan godta "
 "denne oppgaven."
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:45
+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:46
 msgid ""
-"Email invitations will be sent to all participants and allow them to reply."
+"Some attachments are being downloaded. Saving the task would result in the "
+"loss of these attachments."
 msgstr ""
-"Invitasjoner vil sendes til alle deltakere via e-post slik at de kan gi svar."
-
-#: ../calendar/calendar.error.xml.h:44
-msgid "Error loading calendar"
-msgstr "Feil under lasting av kalender"
+"Noen vedlegg blir lastet ned. Oppgaven vil bli lagret uten disse vedleggene "
+"hvis den blir lagret nå."
 
-#: ../calendar/calendar.error.xml.h:45
-msgid "Error loading memo list"
-msgstr "Feil under lasting av notatliste"
+#: ../calendar/calendar.error.xml.h:47 ../composer/e-composer-actions.c:316
+msgid "_Save"
+msgstr "_Lagre"
 
-#: ../calendar/calendar.error.xml.h:46
-msgid "Error loading task list"
-msgstr "Feil under lasting av oppgaveliste"
+#: ../calendar/calendar.error.xml.h:48
+msgid "Download in progress. Do you want to save the appointment?"
+msgstr "Nedlasting pågår. Vil du lagre avtalen?"
 
-#. Translators: {0} is replaced with a group name, like CalDAV, Google, or such;
-#. {1} is replaced with a calendar/task/memo list name, where the error happened
 #: ../calendar/calendar.error.xml.h:49
-msgid "Error on {0}: {1}"
-msgstr "Feil på {0}: {1}"
-
-#: ../calendar/calendar.error.xml.h:50
 msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the meeting is canceled."
+"Some attachments are being downloaded. Saving the appointment would result "
+"in the loss of these attachments."
 msgstr ""
-"Hvis du ikke sender en avlysningsmelding vil ikke deltakerene vite at møtet "
-"er avlyst."
+"Noen vedlegg blir lastet ned. Avtalen vil bli lagret uten disse vedleggene "
+"hvis den blir lagret nå."
+
+#: ../calendar/calendar.error.xml.h:50
+msgid "Would you like to send updated task information to participants?"
+msgstr "Vil du sende oppdatert oppgaveinformasjon til deltakere?"
 
 #: ../calendar/calendar.error.xml.h:51
 msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the memo has been deleted."
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
 msgstr ""
-"Hvis du ikke sender en avlysningsmelding vil ikke de andre deltakerene vite "
-"at notatet er slettet."
+"Sending av oppdatert informasjon lar andre deltakere holde sine "
+"oppgavelister oppdatert."
 
 #: ../calendar/calendar.error.xml.h:52
-msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the task has been deleted."
-msgstr ""
-"Hvis du ikke sender en avlysningsmelding vil ikke de andre deltakerene vite "
-"at oppgaven er slettet."
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr "Evolution-oppgaver har avsluttet uventet."
 
 #: ../calendar/calendar.error.xml.h:53
-msgid ""
-"Sending updated information allows other participants to keep their "
-"calendars up to date."
+msgid "Your tasks will not be available until Evolution is restarted."
 msgstr ""
-"Sending av oppdatert informasjon lar andre deltakere holde sine kalendere "
-"oppdatert."
+"Oppgavene dine vil ikke være tilgjengelige før Evolution startes på nytt."
 
 #: ../calendar/calendar.error.xml.h:54
-msgid ""
-"Sending updated information allows other participants to keep their task "
-"lists up to date."
-msgstr ""
-"Sending av oppdatert informasjon lar andre deltakere holde sine "
-"oppgavelister oppdatert."
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr "Evolution-kalender har avsluttet uventet."
 
 #: ../calendar/calendar.error.xml.h:55
-msgid ""
-"Some attachments are being downloaded. Saving the appointment would result "
-"in the loss of these attachments."
+msgid "Your calendars will not be available until Evolution is restarted."
 msgstr ""
-"Noen vedlegg blir lastet ned. Avtalen vil bli lagret uten disse vedleggene "
-"hvis den blir lagret nå."
+"Kalenderene dine vil ikke være tilgjengelige før Evolution startes på nytt."
 
 #: ../calendar/calendar.error.xml.h:56
-msgid ""
-"Some attachments are being downloaded. Saving the task would result in the "
-"loss of these attachments."
-msgstr ""
-"Noen vedlegg blir lastet ned. Oppgaven vil bli lagret uten disse vedleggene "
-"hvis den blir lagret nå."
+msgid "The Evolution memo has quit unexpectedly."
+msgstr "Evolution-notater har avsluttet uventet."
 
 #: ../calendar/calendar.error.xml.h:57
-msgid "Some features may not work properly with your current server."
-msgstr "Noen funksjoner vil kanskje ikke fungere med denne tjeneren."
+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:58
-msgid "The Evolution calendar has quit unexpectedly."
+msgid "The Evolution calendars have quit unexpectedly."
 msgstr "Evolution-kalender har avsluttet uventet."
 
 #: ../calendar/calendar.error.xml.h:59
-msgid "The Evolution calendars have quit unexpectedly."
-msgstr "Evolution-kalender har avsluttet uventet."
+msgid "Editor could not be loaded."
+msgstr "Redigeringskomponenten kunne ikke lastes."
 
 #: ../calendar/calendar.error.xml.h:60
-msgid "The Evolution memo has quit unexpectedly."
-msgstr "Evolution-notater har avsluttet uventet."
+msgid "Delete calendar '{0}'?"
+msgstr "Slett kalender «{0}»?"
 
 #: ../calendar/calendar.error.xml.h:61
-msgid "The Evolution tasks have quit unexpectedly."
-msgstr "Evolution-oppgaver har avsluttet uventet."
+msgid "This calendar will be removed permanently."
+msgstr "Denne kalenderen vil bli fjernet permanent."
 
 #: ../calendar/calendar.error.xml.h:62
-msgid "The calendar is not marked for offline usage."
-msgstr "Kalenderen er ikke merket for frakoblet bruk."
+msgid "Delete task list '{0}'?"
+msgstr "Slett oppgaveliste «{0}»?"
 
 #: ../calendar/calendar.error.xml.h:63
-msgid "The memo list is not marked for offline usage."
-msgstr "Notatlisten er ikke merket for frakoblet bruk."
+msgid "This task list will be removed permanently."
+msgstr "Denne oppgavelisten vil bli fjernet permanent."
 
 #: ../calendar/calendar.error.xml.h:64
-msgid "The task list is not marked for offline usage."
-msgstr "Oppgavelisten er ikke merket for frakoblet bruk."
+msgid "Delete memo list '{0}'?"
+msgstr "Slett notatliste «{0}»?"
 
 #: ../calendar/calendar.error.xml.h:65
-msgid "This calendar will be removed permanently."
-msgstr "Denne kalenderen vil bli fjernet permanent."
-
-#: ../calendar/calendar.error.xml.h:66
 msgid "This memo list will be removed permanently."
 msgstr "Denne notatlisten vil bli fjernet permanent."
 
+#: ../calendar/calendar.error.xml.h:66
+msgid "Are you sure you want to save the appointment without a summary?"
+msgstr "Er du sikker på at du vil lagre avtalen uten et sammendrag?"
+
 #: ../calendar/calendar.error.xml.h:67
-msgid "This task list will be removed permanently."
-msgstr "Denne oppgavelisten vil bli fjernet permanent."
+msgid ""
+"Adding a meaningful summary to your appointment will give you an idea of "
+"what your appointment is about."
+msgstr ""
+"Hvis du gir dine avtaler et meningsfylt sammendrag vil gjøre det lettere "
+"forstå hva avtalen gjelder."
 
 #: ../calendar/calendar.error.xml.h:68
-msgid "Would you like to save your changes to this appointment?"
-msgstr "Vil du lagre dine endringer i denne avtalen?"
+msgid "Are you sure you want to save the task without a summary?"
+msgstr "Er du sikker på at du vil lagre oppgaven uten et sammendrag?"
 
 #: ../calendar/calendar.error.xml.h:69
-msgid "Would you like to save your changes to this meeting?"
-msgstr "Vil du lagre dine endringer i dette møtet?"
+msgid ""
+"Adding a meaningful summary to your task will give you an idea of what your "
+"task is about."
+msgstr ""
+"Hvis du gir oppgaver et meningsfylt sammendrag vil det gjøre det lettere å "
+"forstå hva oppgaven gjelder."
 
 #: ../calendar/calendar.error.xml.h:70
-msgid "Would you like to save your changes to this memo?"
-msgstr "Vil du lagre dine endringer i dette notatet?"
+msgid "Are you sure you want to save the memo without a summary?"
+msgstr "Er du sikker på at du vil lagre notatet uten sammendrag?"
 
 #: ../calendar/calendar.error.xml.h:71
-msgid "Would you like to save your changes to this task?"
-msgstr "Vil du lagre dine endringer i denne oppgaven?"
+msgid "Error loading calendar"
+msgstr "Feil under lasting av kalender"
 
 #: ../calendar/calendar.error.xml.h:72
-msgid "Would you like to send a cancelation notice for this memo?"
-msgstr "Vil du sende en avlysingsmelding for dette notatet?"
+msgid "The calendar is not marked for offline usage."
+msgstr "Kalenderen er ikke merket for frakoblet bruk."
 
 #: ../calendar/calendar.error.xml.h:73
-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:74
-msgid "Would you like to send meeting invitations to participants?"
-msgstr "Vil du sende møteinvitasjoner til deltakerene?"
+msgid "Cannot create a new event"
+msgstr "Kan ikke opprette en ny hendelse"
 
+#. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:75
-msgid "Would you like to send this task to participants?"
-msgstr "Vil du sende denne oppgaven til deltakere?"
+msgid ""
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar from the side bar in the Calendar view."
+msgstr ""
+"«{0}» er en skrivebeskyttet kalender og kan ikke endres. Velg en annen "
+"kalender fra sidelinjen i kalendervisning."
 
 #: ../calendar/calendar.error.xml.h:76
-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:77
-msgid "Would you like to send updated task information to participants?"
-msgstr "Vil du sende oppdatert oppgaveinformasjon til deltakere?"
+msgid "Cannot save event"
+msgstr "Kan ikke lagre hendelse"
 
+#. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:78
 msgid ""
-"You are connecting to an unsupported GroupWise server and may encounter "
-"problems using Evolution. For best results, the server should be upgraded to "
-"a supported version."
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar that can accept appointments."
 msgstr ""
-"Du prøver å koble til en GroupWise-tjener som ikke er støttet og kan "
-"muligens støte på problemer. Tjeneren bør oppgraderes til en støttet versjon "
-"for å unngå problemer."
+"«{0}» er en skrivebeskyttet kalender og kan ikke endres. Velg en annen "
+"kalender som kan motta avtaler."
 
 #: ../calendar/calendar.error.xml.h:79
-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:80
-msgid "You have changed this meeting, but not yet saved it."
-msgstr "Du har endret dette møtet, men ikke lagret det."
+msgid "Cannot save task"
+msgstr "Kan ikke lagre oppgave"
 
+#. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:81
-msgid "You have changed this task, but not yet saved it."
-msgstr "Du har endret denne oppgaven, men ikke lagret den."
+msgid ""
+"'{0}' does not support assigned tasks, please select a different task list."
+msgstr ""
+"«{0}» støtter ikke tildelte oppgaver. Vennligst velg en annen oppgaveliste."
 
 #: ../calendar/calendar.error.xml.h:82
-msgid "You have made changes to this memo, but not yet saved them."
-msgstr "Du har endret dette notatet, men ikke lagret den."
+msgid "Error loading task list"
+msgstr "Feil under lasting av oppgaveliste"
 
 #: ../calendar/calendar.error.xml.h:83
-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."
+msgid "The task list is not marked for offline usage."
+msgstr "Oppgavelisten er ikke merket for frakoblet bruk."
 
 #: ../calendar/calendar.error.xml.h:84
-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."
+msgid "Error loading memo list"
+msgstr "Feil under lasting av notatliste"
 
 #: ../calendar/calendar.error.xml.h:85
-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:86
-#: ../composer/mail-composer.error.xml.h:29
-msgid "_Discard Changes"
-msgstr "_Forkast endringer"
-
-#: ../calendar/calendar.error.xml.h:87 ../composer/e-composer-actions.c:316
-msgid "_Save"
-msgstr "_Lagre"
+msgid "The memo list is not marked for offline usage."
+msgstr "Notatlisten er ikke merket for frakoblet bruk."
 
+#. Translators: {0} is replaced with a group name, like CalDAV, Google, or such;
+#. {1} is replaced with a calendar/task/memo list name, where the error happened
 #: ../calendar/calendar.error.xml.h:88
-msgid "_Save Changes"
-msgstr "_Lagre endringer"
+msgid "Error on {0}: {1}"
+msgstr "Feil på {0}: {1}"
 
 #: ../calendar/calendar.error.xml.h:89
-#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:164
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
-msgid "_Send"
-msgstr "_Send"
+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:90
-msgid "_Send Notice"
-msgstr "_Send melding"
-
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:107
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "minutt"
-msgstr[1] "minutter"
-
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:120
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "time"
-msgstr[1] "timer"
-
-#. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
-#. * (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' or
-#. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:133
-#: ../calendar/gui/dialogs/recurrence-page.c:1188
-msgid "day"
-msgid_plural "days"
-msgstr[0] "dag"
-msgstr[1] "dager"
-
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:313
-msgid "Start time"
-msgstr "Starttid"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:1
-msgid "Appointments"
-msgstr "Avtaler"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:2
-msgid "Dismiss _All"
-msgstr "Lukk _alle"
-
-#. Location
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1738
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1748
-#: ../plugins/itip-formatter/itip-view.c:1052
-msgid "Location:"
-msgstr "Sted:"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:4
-msgid "Snooze _time:"
-msgstr "_Tid for utsettelse av alarm:"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5
-msgid "_Dismiss"
-msgstr "_Lukk"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:6
-msgid "_Snooze"
-msgstr "_Utsett"
-
-#. Translators: This is the last part of the sentence:
-#. * "Purge events older than <<spin-button>> days"
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:454
-#: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:350
-#: ../plugins/google-account-setup/google-contacts-source.c:387
-#: ../plugins/publish-calendar/publish-calendar.ui.h:30
-msgid "days"
-msgstr "dager"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
-#: ../calendar/gui/dialogs/event-page.ui.h:26 ../e-util/e-plugin-util.c:453
-#: ../filter/filter.ui.h:15
-#: ../plugins/google-account-setup/google-contacts-source.c:386
-msgid "hours"
-msgstr "timer"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:9
-msgid "location of appointment"
-msgstr "sted for avtalen"
-
-#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
-#: ../calendar/gui/dialogs/event-page.ui.h:27 ../e-util/e-plugin-util.c:452
-#: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
-#: ../plugins/google-account-setup/google-contacts-source.c:385
-msgid "minutes"
-msgstr "minutter"
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1587
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1719
-msgid "No summary available."
-msgstr "Sammendrag er ikke tilgjengelig."
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1596
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1598
-msgid "No description available."
-msgstr "Ingen beskrivelse tilgjengelig."
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1606
-msgid "No location information available."
-msgstr "Stedsinformasjon er ikke tilgjengelig."
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1652
-#, c-format
-msgid "You have %d reminder"
-msgid_plural "You have %d reminders"
-msgstr[0] "Du har %d påminnelse"
-msgstr[1] "Du har %d påminnelser"
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1852
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1887
-msgid "Warning"
-msgstr "Advarsel"
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1856
-msgid ""
-"Evolution does not support calendar reminders with\n"
-"email notifications yet, but this reminder was\n"
-"configured to send an email.  Evolution will display\n"
-"a normal reminder dialog box instead."
-msgstr ""
-"Evolution støtter ikke kalenderpåminnelser med\n"
-"varsling via e-post ennå, men denne påminnelsen\n"
-"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:1893
-#, c-format
 msgid ""
-"An Evolution Calendar reminder is about to trigger. This reminder is "
-"configured to run the following program:\n"
-"\n"
-"        %s\n"
-"\n"
-"Are you sure you want to run this program?"
+"You are connecting to an unsupported GroupWise server and may encounter "
+"problems using Evolution. For best results, the server should be upgraded to "
+"a supported version."
 msgstr ""
-"En kalenderpåminnelse i Evolution er i ferd med å startes. Denne påminnelsen "
-"er satt til å kjøre følgende program:\n"
-"        %s\n"
-"\n"
-"Er du sikker på at du vil kjøre dette programmet?"
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1908
-msgid "Do not ask me about this program again."
-msgstr "Ikke spør meg om dette programmet igjen."
-
-#: ../calendar/gui/alarm-notify/util.c:45
-msgid "invalid time"
-msgstr "ugyldig tid"
-
-#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:71 ../calendar/gui/e-alarm-list.c:405
-#: ../calendar/gui/misc.c:116
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d time"
-msgstr[1] "%d timer"
-
-#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:77 ../calendar/gui/e-alarm-list.c:411
-#: ../calendar/gui/misc.c:122
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d minutt"
-msgstr[1] "%d minutter"
-
-#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
-#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:81 ../calendar/gui/e-alarm-list.c:417
-#: ../calendar/gui/misc.c:126
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d sekund"
-msgstr[1] "%d sekunder"
+"Du prøver å koble til en GroupWise-tjener som ikke er støttet og kan "
+"muligens støte på problemer. Tjeneren bør oppgraderes til en støttet versjon "
+"for å unngå problemer."
 
 #: ../calendar/gui/calendar-view-factory.c:110
 msgid "Day View"
@@ -2167,266 +2167,265 @@ msgstr "Ukevisning"
 msgid "Month View"
 msgstr "Månedsvisning"
 
-#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/memotypes.xml.h:1
-#: ../calendar/gui/tasktypes.xml.h:3
-msgid "Any Field"
-msgstr "Ethvert felt"
+#: ../calendar/gui/caltypes.xml.h:1
+#: ../calendar/gui/e-calendar-table.etspec.h:4
+#: ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../calendar/gui/e-memo-table.etspec.h:2 ../calendar/gui/memotypes.xml.h:1
+#: ../calendar/gui/tasktypes.xml.h:1 ../plugins/save-calendar/csv-format.c:383
+msgid "Summary"
+msgstr "Sammendrag"
+
+#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:2 ../mail/em-filter-i18n.h:10
+msgid "contains"
+msgstr "inneholder"
 
 #: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:5 ../mail/em-filter-i18n.h:5
-msgid "Attachments"
-msgstr "Vedlegg"
+#: ../calendar/gui/tasktypes.xml.h:3 ../mail/em-filter-i18n.h:16
+msgid "does not contain"
+msgstr "inneholder ikke"
 
-#: ../calendar/gui/caltypes.xml.h:4
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-#: ../calendar/gui/tasktypes.xml.h:6
-msgid "Attendee"
-msgstr "Deltaker"
+#: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/e-cal-list-view.etspec.h:4
+#: ../calendar/gui/memotypes.xml.h:4 ../calendar/gui/tasktypes.xml.h:4
+#: ../modules/plugin-manager/evolution-plugin-manager.c:70
+#: ../widgets/misc/e-attachment-tree-view.c:526
+#: ../widgets/table/e-table-config.ui.h:24
+msgid "Description"
+msgstr "Beskrivelse"
 
-#: ../calendar/gui/caltypes.xml.h:5 ../calendar/gui/memotypes.xml.h:4
-#: ../calendar/gui/tasktypes.xml.h:8
-msgid "Category"
-msgstr "Kategori"
+#: ../calendar/gui/caltypes.xml.h:5 ../calendar/gui/memotypes.xml.h:5
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Any Field"
+msgstr "Ethvert felt"
 
-#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/memotypes.xml.h:5
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/memotypes.xml.h:7
 msgid "Classification"
 msgstr "Klassifisering"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:243
-#: ../calendar/gui/e-cal-model.c:795 ../calendar/gui/e-task-table.c:544
-#: ../calendar/gui/memotypes.xml.h:6 ../widgets/misc/e-send-options.ui.h:2
-msgid "Confidential"
-msgstr "Konfidensiell"
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:8
+#: ../calendar/gui/tasktypes.xml.h:9 ../mail/em-filter-i18n.h:31
+msgid "is"
+msgstr "er"
 
-#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/e-cal-list-view.etspec.h:3
-#: ../calendar/gui/memotypes.xml.h:7 ../calendar/gui/tasktypes.xml.h:10
-#: ../modules/plugin-manager/evolution-plugin-manager.c:70
-#: ../widgets/misc/e-attachment-tree-view.c:526
-#: ../widgets/table/e-table-config.ui.h:6
-msgid "Description"
-msgstr "Beskrivelse"
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:10 ../mail/em-filter-i18n.h:37
+msgid "is not"
+msgstr "er ikke"
 
-#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
-#: ../calendar/gui/tasktypes.xml.h:11
-msgid "Description Contains"
-msgstr "Beskrivelse inneholder"
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/e-cal-list-view.c:241
+#: ../calendar/gui/e-cal-model.c:784 ../calendar/gui/e-cal-model.c:791
+#: ../calendar/gui/e-task-table.c:542 ../calendar/gui/memotypes.xml.h:10
+msgid "Public"
+msgstr "Offentlig"
 
-#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
-#: ../calendar/gui/tasktypes.xml.h:12 ../mail/em-filter-i18n.h:22
-msgid "Do Not Exist"
-msgstr "Eksisterer ikke"
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/e-cal-list-view.c:242
+#: ../calendar/gui/e-cal-model.c:793 ../calendar/gui/e-task-table.c:543
+#: ../calendar/gui/memotypes.xml.h:11
+msgid "Private"
+msgstr "Privat"
 
-#: ../calendar/gui/caltypes.xml.h:11
-msgid "Exactly"
-msgstr "Eksakt"
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:243
+#: ../calendar/gui/e-cal-model.c:795 ../calendar/gui/e-task-table.c:544
+#: ../calendar/gui/memotypes.xml.h:12 ../widgets/misc/e-send-options.ui.h:7
+msgid "Confidential"
+msgstr "Konfidensiell"
 
-#: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/memotypes.xml.h:10
-#: ../calendar/gui/tasktypes.xml.h:13 ../mail/em-filter-i18n.h:25
-msgid "Exist"
-msgstr "Eksisterer"
+#: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/memotypes.xml.h:6
+#: ../calendar/gui/tasktypes.xml.h:5
+msgid "Organizer"
+msgstr "Organisator"
 
 #: ../calendar/gui/caltypes.xml.h:13
-msgid "Less Than"
-msgstr "Mindre enn"
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
+#: ../calendar/gui/tasktypes.xml.h:6
+msgid "Attendee"
+msgstr "Deltaker"
 
 #: ../calendar/gui/caltypes.xml.h:14
-#: ../calendar/gui/e-cal-list-view.etspec.h:6 ../mail/message-list.etspec.h:9
+#: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:14
 #: ../plugins/publish-calendar/publish-calendar.c:855
-#: ../plugins/publish-calendar/publish-calendar.ui.h:8
+#: ../plugins/publish-calendar/publish-calendar.ui.h:22
 #: ../plugins/save-calendar/csv-format.c:397
 msgid "Location"
 msgstr "Lokasjon"
 
-#: ../calendar/gui/caltypes.xml.h:15
-msgid "More Than"
-msgstr "Mer enn"
-
-#: ../calendar/gui/caltypes.xml.h:16
-msgid "Occurs"
-msgstr "Hender"
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/tasktypes.xml.h:23
+msgid "Category"
+msgstr "Kategori"
 
-#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:11
-#: ../calendar/gui/tasktypes.xml.h:19
-msgid "Organizer"
-msgstr "Organisator"
+#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/tasktypes.xml.h:15 ../mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "Vedlegg"
 
-#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/e-cal-list-view.c:242
-#: ../calendar/gui/e-cal-model.c:793 ../calendar/gui/e-task-table.c:543
-#: ../calendar/gui/memotypes.xml.h:12
-msgid "Private"
-msgstr "Privat"
+#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:25
+msgid "Exist"
+msgstr "Eksisterer"
 
-#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/e-cal-list-view.c:241
-#: ../calendar/gui/e-cal-model.c:784 ../calendar/gui/e-cal-model.c:791
-#: ../calendar/gui/e-task-table.c:542 ../calendar/gui/memotypes.xml.h:13
-msgid "Public"
-msgstr "Offentlig"
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:22
+msgid "Do Not Exist"
+msgstr "Eksisterer ikke"
 
-#: ../calendar/gui/caltypes.xml.h:20
+#: ../calendar/gui/caltypes.xml.h:19
 #: ../calendar/gui/dialogs/event-editor.c:317
 #: ../calendar/gui/dialogs/event-editor.c:338
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:4
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:15
 msgid "Recurrence"
 msgstr "Gjeninntreffelse"
 
+#: ../calendar/gui/caltypes.xml.h:20
+msgid "Occurs"
+msgstr "Hender"
+
 #: ../calendar/gui/caltypes.xml.h:21
-#: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-cal-list-view.etspec.h:8
-#: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
-#: ../calendar/gui/tasktypes.xml.h:22
-#: ../plugins/save-calendar/csv-format.c:383
-msgid "Summary"
-msgstr "Sammendrag"
+msgid "Less Than"
+msgstr "Mindre enn"
 
-#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:15
-#: ../calendar/gui/tasktypes.xml.h:23
-msgid "Summary Contains"
-msgstr "Sammendrag inneholder"
+#: ../calendar/gui/caltypes.xml.h:22
+msgid "Exactly"
+msgstr "Eksakt"
 
-#: ../calendar/gui/caltypes.xml.h:23 ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:25 ../mail/em-filter-i18n.h:10
-msgid "contains"
-msgstr "inneholder"
+#: ../calendar/gui/caltypes.xml.h:23
+msgid "More Than"
+msgstr "Mer enn"
 
 #: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:17
-#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:16
-msgid "does not contain"
-msgstr "inneholder ikke"
+#: ../calendar/gui/tasktypes.xml.h:28
+msgid "Summary Contains"
+msgstr "Sammendrag inneholder"
 
 #: ../calendar/gui/caltypes.xml.h:25 ../calendar/gui/memotypes.xml.h:18
-#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:31
-msgid "is"
-msgstr "er"
-
-#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:19
-#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:37
-msgid "is not"
-msgstr "er ikke"
+#: ../calendar/gui/tasktypes.xml.h:29
+msgid "Description Contains"
+msgstr "Beskrivelse inneholder"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:634
+#: ../calendar/gui/dialogs/alarm-dialog.c:632
 msgid "Edit Reminder"
 msgstr "Rediger påminnelse"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:825
+#: ../calendar/gui/dialogs/alarm-dialog.c:823
 #: ../calendar/gui/e-alarm-list.c:447
 msgid "Pop up an alert"
 msgstr "Vis varsling"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:826
+#: ../calendar/gui/dialogs/alarm-dialog.c:824
 #: ../calendar/gui/e-alarm-list.c:443
 msgid "Play a sound"
 msgstr "Spill en lyd"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:827
+#: ../calendar/gui/dialogs/alarm-dialog.c:825
 #: ../calendar/gui/e-alarm-list.c:455
 msgid "Run a program"
 msgstr "Kjør et program"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:828
+#: ../calendar/gui/dialogs/alarm-dialog.c:826
 #: ../calendar/gui/e-alarm-list.c:451
 msgid "Send an email"
 msgstr "Send en melding"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:1
-msgid "Add Reminder"
-msgstr "Legg til påminnelse"
+msgid "minute(s)"
+msgstr "minutt(er)"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
-msgid "Custom _message"
-msgstr "Tilpasset _beskjed"
+msgid "hour(s)"
+msgstr "time(r)"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
-msgid "Custom reminder sound"
-msgstr "Egendefinert lyd for påminnelse"
+msgid "day(s)"
+msgstr "dag(er)"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
-msgid "Mes_sage:"
-msgstr "Be_skjed:"
+msgid "before"
+msgstr "før"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5 ../mail/mail-config.ui.h:80
-msgid "Options"
-msgstr "Alternativer"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
+msgid "after"
+msgstr "etter"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:6
-#: ../calendar/gui/dialogs/event-editor.c:360
-msgid "Reminder"
-msgstr "Påminnelse"
+msgid "start of appointment"
+msgstr "ved avtalens start"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
-msgid "Repeat"
-msgstr "Gjenta"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
-msgid "Select A File"
-msgstr "Velg en fil"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
-msgid "Send To:"
-msgstr "Send til:"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10
-msgid "_Arguments:"
-msgstr "_Argumenter:"
+msgid "end of appointment"
+msgstr "slutt på avtalen"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:11
-msgid "_Program:"
-msgstr "_Program:"
+msgid "Add Reminder"
+msgstr "Legg til påminnelse"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
-msgid "_Repeat the reminder"
-msgstr "_Gjenta påminnelse"
+#: ../calendar/gui/dialogs/event-editor.c:360
+msgid "Reminder"
+msgstr "Påminnelse"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:13
-msgid "_Sound:"
-msgstr "_Lyd:"
+msgid "Repeat"
+msgstr "Gjenta"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
-msgid "after"
-msgstr "etter"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15
-msgid "before"
-msgstr "før"
+msgid "_Repeat the reminder"
+msgstr "_Gjenta påminnelse"
 
+#. This is part of the sentence: 'Repeat the reminder %d extra times every %d minutes'. Where %d are numbers.
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
-msgid "day(s)"
-msgstr "dag(er)"
+msgid "extra times every"
+msgstr "ekstra ganger hver"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../mail/mail-config.ui.h:32
+msgid "Options"
+msgstr "Alternativer"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
-msgid "end of appointment"
-msgstr "slutt på avtalen"
+msgid "Custom _message"
+msgstr "Tilpasset _beskjed"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
+msgid "Mes_sage:"
+msgstr "Be_skjed:"
 
-#. This is part of the sentence: 'Repeat the reminder %d extra times every %d minutes'. Where %d are numbers.
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
-msgid "extra times every"
-msgstr "ekstra ganger hver"
+msgid "Custom reminder sound"
+msgstr "Egendefinert lyd for påminnelse"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
-msgid "hour(s)"
-msgstr "time(r)"
+msgid "_Sound:"
+msgstr "_Lyd:"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+msgid "Select A File"
+msgstr "Velg en fil"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
-msgid "minute(s)"
-msgstr "minutt(er)"
+msgid "_Program:"
+msgstr "_Program:"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+msgid "_Arguments:"
+msgstr "_Argumenter:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:25
-msgid "start of appointment"
-msgstr "ved avtalens start"
+msgid "Send To:"
+msgstr "Send til:"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:243
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:242
 msgid "Action/Trigger"
 msgstr "Handling/utløser"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:1
-msgid "A_dd"
-msgstr "Le_gg til"
-
-#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
-#: ../calendar/gui/dialogs/event-page.ui.h:8
-#: ../modules/calendar/e-calendar-preferences.ui.h:25
+#: ../calendar/gui/dialogs/event-page.ui.h:25
+#: ../modules/calendar/e-calendar-preferences.ui.h:62
 msgid "Reminders"
 msgstr "Påminnelser"
 
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
+msgid "A_dd"
+msgstr "Le_gg til"
+
 #: ../calendar/gui/dialogs/calendar-setup.c:169
 msgid "Type:"
 msgstr "Type:"
@@ -2436,8 +2435,8 @@ msgstr "Type:"
 msgid "_Type:"
 msgstr "_Type:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:262 ../mail/mail-config.ui.h:167
-#: ../modules/addressbook/ldap-config.ui.h:28
+#: ../calendar/gui/dialogs/calendar-setup.c:262 ../mail/mail-config.ui.h:9
+#: ../modules/addressbook/ldap-config.ui.h:12
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
 #: ../widgets/misc/e-signature-script-dialog.c:284
 msgid "_Name:"
@@ -2466,18 +2465,18 @@ msgstr "Fa_rge:"
 #: ../calendar/gui/dialogs/calendar-setup.c:462
 #: ../calendar/gui/dialogs/calendar-setup.c:474
 #: ../calendar/gui/dialogs/calendar-setup.c:485
-#: ../mail/em-folder-properties.c:232 ../mail/mail-config.ui.h:56
+#: ../mail/em-folder-properties.c:232 ../mail/mail-config.ui.h:25
 #: ../modules/addressbook/addressbook-config.c:1082
 #: ../modules/addressbook/autocompletion-config.c:240
-#: ../modules/calendar/e-calendar-preferences.ui.h:17
+#: ../modules/calendar/e-calendar-preferences.ui.h:47
 #: ../plugins/itip-formatter/itip-formatter.c:3225
-#: ../plugins/publish-calendar/publish-calendar.ui.h:7
+#: ../plugins/publish-calendar/publish-calendar.ui.h:16
 #: ../smime/gui/smime-ui.ui.h:21
 msgid "General"
 msgstr "Generelt"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:475
-#: ../modules/calendar/e-calendar-preferences.ui.h:41
+#: ../modules/calendar/e-calendar-preferences.ui.h:56
 msgid "Task List"
 msgstr "Oppgaveliste"
 
@@ -2650,9 +2649,9 @@ msgid "_Classification"
 msgstr "K_lassifisering"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1199
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:19 ../filter/filter.ui.h:16
 #: ../mail/e-mail-browser.c:172
-#: ../plugins/publish-calendar/publish-calendar.ui.h:23
+#: ../plugins/publish-calendar/publish-calendar.ui.h:32
 #: ../shell/e-shell-window-actions.c:1614
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
@@ -2679,7 +2678,7 @@ msgid "_Options"
 msgstr "_Alternativer"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1234 ../mail/e-mail-browser.c:179
-#: ../shell/e-shell-window-actions.c:1663 ../smime/gui/smime-ui.ui.h:46
+#: ../shell/e-shell-window-actions.c:1663 ../smime/gui/smime-ui.ui.h:28
 msgid "_View"
 msgstr "_Vis"
 
@@ -2887,16 +2886,16 @@ msgid "The item could not be deleted due to an error: %s"
 msgstr "Oppføringen kunne ikke slettes pga en feil: %s"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:1
-msgid "Contacts..."
-msgstr "Kontakter …"
+msgid "Enter Delegate"
+msgstr "Skriv inn delegat"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:2
 msgid "Delegate To:"
 msgstr "Deleger til:"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:3
-msgid "Enter Delegate"
-msgstr "Skriv inn delegat"
+msgid "Contacts..."
+msgstr "Kontakter …"
 
 #: ../calendar/gui/dialogs/event-editor.c:212
 msgid "_Reminders"
@@ -2923,7 +2922,7 @@ msgid "Make this a recurring event"
 msgstr "Gjør denne hendelsen til repeterende"
 
 #: ../calendar/gui/dialogs/event-editor.c:240
-#: ../widgets/misc/e-send-options.ui.h:22
+#: ../widgets/misc/e-send-options.ui.h:14
 msgid "Send Options"
 msgstr "Alternativer for sending"
 
@@ -2948,12 +2947,12 @@ msgstr "_Ledig/opptatt"
 msgid "Query free / busy information for the attendees"
 msgstr "Slå opp ledig/opptatt informasjon for deltakerene"
 
-#: ../calendar/gui/dialogs/event-editor.c:314 ../calendar/gui/print.c:3308
+#: ../calendar/gui/dialogs/event-editor.c:314 ../calendar/gui/print.c:3327
 msgid "Appointment"
 msgstr "Avtale"
 
 #: ../calendar/gui/dialogs/event-editor.c:384
-#: ../calendar/gui/dialogs/event-page.ui.h:2
+#: ../calendar/gui/dialogs/event-page.ui.h:24
 #: ../calendar/gui/e-meeting-list-view.c:161
 msgid "Attendees"
 msgstr "Deltakere"
@@ -2975,62 +2974,62 @@ 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:651
-#: ../calendar/gui/dialogs/event-page.c:3082
+#: ../calendar/gui/dialogs/event-page.c:3093
 msgid "This event has reminders"
 msgstr "Denne hendelsen har påminnelser"
 
 #: ../calendar/gui/dialogs/event-page.c:718
-#: ../calendar/gui/dialogs/event-page.ui.h:7
-#: ../calendar/gui/dialogs/memo-page.ui.h:2
+#: ../calendar/gui/dialogs/event-page.ui.h:13
+#: ../calendar/gui/dialogs/memo-page.ui.h:4
 msgid "Or_ganizer:"
 msgstr "Or_ganisator:"
 
-#: ../calendar/gui/dialogs/event-page.c:1263
+#: ../calendar/gui/dialogs/event-page.c:1277
 msgid "Event with no start date"
 msgstr "Hendelse uten startdato"
 
-#: ../calendar/gui/dialogs/event-page.c:1266
+#: ../calendar/gui/dialogs/event-page.c:1280
 msgid "Event with no end date"
 msgstr "Hendelse uten sluttdato"
 
-#: ../calendar/gui/dialogs/event-page.c:1439
-#: ../calendar/gui/dialogs/memo-page.c:708
-#: ../calendar/gui/dialogs/task-page.c:825
+#: ../calendar/gui/dialogs/event-page.c:1453
+#: ../calendar/gui/dialogs/memo-page.c:718
+#: ../calendar/gui/dialogs/task-page.c:836
 msgid "Start date is wrong"
 msgstr "Startdato er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:1449
+#: ../calendar/gui/dialogs/event-page.c:1463
 msgid "End date is wrong"
 msgstr "Sluttdato er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:1472
+#: ../calendar/gui/dialogs/event-page.c:1486
 msgid "Start time is wrong"
 msgstr "Tid for start er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:1479
+#: ../calendar/gui/dialogs/event-page.c:1493
 msgid "End time is wrong"
 msgstr "Tid for slutt er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:1644
-#: ../calendar/gui/dialogs/memo-page.c:749
-#: ../calendar/gui/dialogs/task-page.c:879
+#: ../calendar/gui/dialogs/event-page.c:1656
+#: ../calendar/gui/dialogs/memo-page.c:757
+#: ../calendar/gui/dialogs/task-page.c:889
 msgid "An organizer is required."
 msgstr "En organisator kreves."
 
-#: ../calendar/gui/dialogs/event-page.c:1678
-#: ../calendar/gui/dialogs/task-page.c:913
+#: ../calendar/gui/dialogs/event-page.c:1690
+#: ../calendar/gui/dialogs/task-page.c:923
 msgid "At least one attendee is required."
 msgstr "Minst en deltaker kreves."
 
-#: ../calendar/gui/dialogs/event-page.c:1885
+#: ../calendar/gui/dialogs/event-page.c:1897
 msgid "_Delegatees"
 msgstr "_Delegater"
 
-#: ../calendar/gui/dialogs/event-page.c:1887
+#: ../calendar/gui/dialogs/event-page.c:1899
 msgid "Atte_ndees"
 msgstr "De_ltakere"
 
-#: ../calendar/gui/dialogs/event-page.c:2922
+#: ../calendar/gui/dialogs/event-page.c:2933
 #, c-format
 msgid "Unable to open the calendar '%s': %s"
 msgstr "Kan ikke åpne kalenderen «%s»: %s"
@@ -3041,175 +3040,175 @@ msgstr "Kan ikke åpne kalenderen «%s»: %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:3000
-#: ../calendar/gui/dialogs/memo-page.c:1012
-#: ../calendar/gui/dialogs/task-page.c:1845
+#: ../calendar/gui/dialogs/event-page.c:3011
+#: ../calendar/gui/dialogs/memo-page.c:1020
+#: ../calendar/gui/dialogs/task-page.c:1854
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Du opptrer på vegne av %s"
 
-#: ../calendar/gui/dialogs/event-page.c:3327
+#: ../calendar/gui/dialogs/event-page.c:3338
 #, 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:3333
+#: ../calendar/gui/dialogs/event-page.c:3344
 #, 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:3339
+#: ../calendar/gui/dialogs/event-page.c:3350
 #, 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:3358
+#: ../calendar/gui/dialogs/event-page.c:3369
 msgid "Customize"
 msgstr "Tilpass"
 
 #. Translators: "None" for "No reminder set"
-#: ../calendar/gui/dialogs/event-page.c:3364
+#: ../calendar/gui/dialogs/event-page.c:3375
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "Ingen"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:1
-#: ../calendar/gui/dialogs/task-page.ui.h:1
-#: ../calendar/gui/e-meeting-time-sel.c:565
-msgid "Atte_ndees..."
-msgstr "De_ltakere …"
+#. TRANSLATORS: 'for' in a sense of 'duration'; example string: Time: [date] [time] for [ H ] hours [ M ] minutes
+#: ../calendar/gui/dialogs/event-page.ui.h:2
+msgctxt "eventpage"
+msgid "for"
+msgstr "i"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:5
-msgid "Custom Reminder:"
-msgstr "Egendefinert påminnelse:"
+#. TRANSLATORS: 'until' in a sense of 'duration'; example string: Time: [date] [time] until [ date ] [ time ]
+#: ../calendar/gui/dialogs/event-page.ui.h:4
+msgctxt "eventpage"
+msgid "until"
+msgstr "til"
 
+#. TRANSLATORS: Predefined reminder's description
 #: ../calendar/gui/dialogs/event-page.ui.h:6
-msgid "Event Description"
-msgstr "Beskrivelse av hendelse"
+msgctxt "eventpage"
+msgid "15 minutes before appointment"
+msgstr "15 minutter før avtalen"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:9
-#: ../modules/calendar/e-calendar-preferences.ui.h:46
-msgid "Time _zone:"
-msgstr "Tids_sone:"
+#. TRANSLATORS: Predefined reminder's description
+#: ../calendar/gui/dialogs/event-page.ui.h:8
+msgctxt "eventpage"
+msgid "1 hour before appointment"
+msgstr "1 time før avtalen"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:11
-#: ../calendar/gui/dialogs/memo-page.ui.h:6
-#: ../calendar/gui/dialogs/task-page.ui.h:8
-#: ../widgets/misc/e-attachment-dialog.c:347
-msgid "_Description:"
-msgstr "_Beskrivelse:"
+#. TRANSLATORS: Predefined reminder's description
+#: ../calendar/gui/dialogs/event-page.ui.h:10
+msgctxt "eventpage"
+msgid "1 day before appointment"
+msgstr "1 dag før avtalen"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:12
+#: ../calendar/gui/dialogs/event-page.ui.h:11
 #: ../plugins/calendar-weather/calendar-weather.c:381
 msgid "_Location:"
 msgstr "_Sted:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:13
-msgid "_Reminder"
-msgstr "_Påminnelse"
+#: ../calendar/gui/dialogs/event-page.ui.h:12
+#: ../calendar/gui/dialogs/memo-page.ui.h:2
+#: ../calendar/gui/dialogs/task-page.ui.h:7
+#: ../widgets/misc/e-attachment-dialog.c:347
+msgid "_Description:"
+msgstr "_Beskrivelse:"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:14
-msgid "_Summary:"
-msgstr "_Sammendrag:"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:15
 msgid "_Time:"
 msgstr "_Tid:"
 
-#. TRANSLATORS: Predefined reminder's description
-#: ../calendar/gui/dialogs/event-page.ui.h:17
-msgctxt "eventpage"
-msgid "1 day before appointment"
-msgstr "1 dag før avtalen"
+#: ../calendar/gui/dialogs/event-page.ui.h:15
+#: ../modules/calendar/e-calendar-preferences.ui.h:20
+msgid "Time _zone:"
+msgstr "Tids_sone:"
 
-#. TRANSLATORS: Predefined reminder's description
-#: ../calendar/gui/dialogs/event-page.ui.h:19
-msgctxt "eventpage"
-msgid "1 hour before appointment"
-msgstr "1 time før avtalen"
+#: ../calendar/gui/dialogs/event-page.ui.h:17
+msgid "_Summary:"
+msgstr "_Sammendrag:"
 
-#. TRANSLATORS: Predefined reminder's description
 #: ../calendar/gui/dialogs/event-page.ui.h:21
-msgctxt "eventpage"
-msgid "15 minutes before appointment"
-msgstr "15 minutter før avtalen"
+msgid "Event Description"
+msgstr "Beskrivelse av hendelse"
 
-#. TRANSLATORS: 'for' in a sense of 'duration'; example string: Time: [date] [time] for [ H ] hours [ M ] minutes
 #: ../calendar/gui/dialogs/event-page.ui.h:23
-msgctxt "eventpage"
-msgid "for"
-msgstr "i"
+#: ../calendar/gui/dialogs/task-page.ui.h:8
+#: ../calendar/gui/e-meeting-time-sel.c:565
+msgid "Atte_ndees..."
+msgstr "De_ltakere …"
 
-#. TRANSLATORS: 'until' in a sense of 'duration'; example string: Time: [date] [time] until [ date ] [ time ]
-#: ../calendar/gui/dialogs/event-page.ui.h:25
-msgctxt "eventpage"
-msgid "until"
-msgstr "til"
+#: ../calendar/gui/dialogs/event-page.ui.h:26
+msgid "_Reminder"
+msgstr "_Påminnelse"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:27
+msgid "Custom Reminder:"
+msgstr "Egendefinert påminnelse:"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:1
-msgid "April"
-msgstr "April"
+msgid "January"
+msgstr "Januar"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:2
-msgid "August"
-msgstr "August"
+msgid "February"
+msgstr "Februar"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:3
-msgid "December"
-msgstr "Desember"
+msgid "March"
+msgstr "Mars"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:4
-msgid "February"
-msgstr "Februar"
+msgid "April"
+msgstr "April"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:5
-msgid "January"
-msgstr "Januar"
+msgid "May"
+msgstr "Mai"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:6
-msgid "July"
-msgstr "Juli"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:7
 msgid "June"
 msgstr "Juni"
 
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:7
+msgid "July"
+msgstr "Juli"
+
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:8
-msgid "March"
-msgstr "Mars"
+msgid "August"
+msgstr "August"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:9
-msgid "May"
-msgstr "Mai"
+msgid "September"
+msgstr "September"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:10
-msgid "November"
-msgstr "November"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:11
 msgid "October"
 msgstr "Oktober"
 
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:11
+msgid "November"
+msgstr "November"
+
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:12
+msgid "December"
+msgstr "Desember"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:13
 msgid "Select Date"
 msgstr "Velg dato"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:13
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:14
 #: ../modules/calendar/e-cal-shell-view-actions.c:1363
 msgid "Select _Today"
 msgstr "Velg i _dag"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:14
-msgid "September"
-msgstr "September"
-
-#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3312
+#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3331
 msgid "Memo"
 msgstr "Notat"
 
@@ -3217,49 +3216,49 @@ msgstr "Notat"
 msgid "Print this memo"
 msgstr "Skriv ut dette notatet"
 
-#: ../calendar/gui/dialogs/memo-page.c:405
+#: ../calendar/gui/dialogs/memo-page.c:418
 msgid "Memo's start date is in the past"
 msgstr "Startdato for notatet er passert"
 
-#: ../calendar/gui/dialogs/memo-page.c:442
+#: ../calendar/gui/dialogs/memo-page.c:455
 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:446
+#: ../calendar/gui/dialogs/memo-page.c:459
 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:936
+#: ../calendar/gui/dialogs/memo-page.c:944
 #, c-format
 msgid "Unable to open memos in '%s': %s"
 msgstr "Kan ikke åpne notater i «%s»: %s"
 
-#: ../calendar/gui/dialogs/memo-page.c:1144 ../em-format/em-format.c:1062
-#: ../em-format/em-format-quote.c:318 ../mail/em-format-html.c:2629
-#: ../mail/em-format-html.c:2694 ../mail/em-format-html.c:2718
-#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:72
+#: ../calendar/gui/dialogs/memo-page.c:1151 ../em-format/em-format.c:1062
+#: ../em-format/em-format-quote.c:318 ../mail/em-format-html.c:2663
+#: ../mail/em-format-html.c:2728 ../mail/em-format-html.c:2752
+#: ../mail/message-list.etspec.h:9 ../modules/mail/em-mailer-prefs.c:72
 msgid "To"
 msgstr "Til"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:3
-#: ../calendar/gui/dialogs/task-page.ui.h:5
-msgid "Sta_rt date:"
-msgstr "Sta_rtdato:"
-
-#: ../calendar/gui/dialogs/memo-page.ui.h:4
-#: ../calendar/gui/dialogs/task-page.ui.h:6
-msgid "Su_mmary:"
-msgstr "Sa_mmendrag:"
+#: ../calendar/gui/dialogs/task-page.c:338
+#: ../calendar/gui/dialogs/task-page.ui.h:9
+msgid "_List:"
+msgstr "_Liste:"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:5
 msgid "T_o:"
 msgstr "T_il:"
 
+#: ../calendar/gui/dialogs/memo-page.ui.h:6
+#: ../calendar/gui/dialogs/task-page.ui.h:4
+msgid "Sta_rt date:"
+msgstr "Sta_rtdato:"
+
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.c:339
-#: ../calendar/gui/dialogs/task-page.ui.h:9
-msgid "_List:"
-msgstr "_Liste:"
+#: ../calendar/gui/dialogs/task-page.ui.h:1
+msgid "Su_mmary:"
+msgstr "Sa_mmendrag:"
 
 #: ../calendar/gui/dialogs/recur-comp.c:53
 #, c-format
@@ -3396,37 +3395,37 @@ msgid "21st to 31st"
 msgstr "tjueførste til trettiførste"
 
 #: ../calendar/gui/dialogs/recurrence-page.c:1189
-#: ../modules/calendar/e-calendar-preferences.ui.h:22
+#: ../modules/calendar/e-calendar-preferences.ui.h:1
 msgid "Monday"
 msgstr "Mandag"
 
 #: ../calendar/gui/dialogs/recurrence-page.c:1190
-#: ../modules/calendar/e-calendar-preferences.ui.h:48
+#: ../modules/calendar/e-calendar-preferences.ui.h:2
 msgid "Tuesday"
 msgstr "Tirsdag"
 
 #: ../calendar/gui/dialogs/recurrence-page.c:1191
-#: ../modules/calendar/e-calendar-preferences.ui.h:50
+#: ../modules/calendar/e-calendar-preferences.ui.h:3
 msgid "Wednesday"
 msgstr "Onsdag"
 
 #: ../calendar/gui/dialogs/recurrence-page.c:1192
-#: ../modules/calendar/e-calendar-preferences.ui.h:44
+#: ../modules/calendar/e-calendar-preferences.ui.h:4
 msgid "Thursday"
 msgstr "Torsdag"
 
 #: ../calendar/gui/dialogs/recurrence-page.c:1193
-#: ../modules/calendar/e-calendar-preferences.ui.h:16
+#: ../modules/calendar/e-calendar-preferences.ui.h:5
 msgid "Friday"
 msgstr "Fredag"
 
 #: ../calendar/gui/dialogs/recurrence-page.c:1194
-#: ../modules/calendar/e-calendar-preferences.ui.h:28
+#: ../modules/calendar/e-calendar-preferences.ui.h:6
 msgid "Saturday"
 msgstr "Lørdag"
 
 #: ../calendar/gui/dialogs/recurrence-page.c:1195
-#: ../modules/calendar/e-calendar-preferences.ui.h:38
+#: ../modules/calendar/e-calendar-preferences.ui.h:7
 msgid "Sunday"
 msgstr "Søndag"
 
@@ -3461,27 +3460,29 @@ msgstr "Fant ikke et utvalg å slette."
 msgid "Date/Time"
 msgstr "Dato/klokkeslett"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:1
-msgid "Every"
-msgstr "Hver"
-
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:2
-msgid "Exceptions"
-msgstr "Unntak"
+msgctxt "recurrpage"
+msgid "day(s)"
+msgstr "dag(er)"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:88
-msgid "Preview"
-msgstr "Forhåndsvis"
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:4
+msgctxt "recurrpage"
+msgid "week(s)"
+msgstr "uke(r)"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:5
-msgid "This appointment rec_urs"
-msgstr "Denne avtalen _gjeninntreffer"
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:6
+msgctxt "recurrpage"
+msgid "month(s)"
+msgstr "måned(er)"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:8
 msgctxt "recurrpage"
-msgid "day(s)"
-msgstr "dag(er)"
+msgid "year(s)"
+msgstr "år"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:10
@@ -3492,32 +3493,30 @@ msgstr "med"
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:12
 msgctxt "recurrpage"
-msgid "forever"
-msgstr "alltid"
+msgid "until"
+msgstr "til"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:14
 msgctxt "recurrpage"
-msgid "month(s)"
-msgstr "måned(er)"
+msgid "forever"
+msgstr "alltid"
 
-#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:16
-msgctxt "recurrpage"
-msgid "until"
-msgstr "til"
+msgid "This appointment rec_urs"
+msgstr "Denne avtalen _gjeninntreffer"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:17
+msgid "Every"
+msgstr "Hver"
 
-#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:18
-msgctxt "recurrpage"
-msgid "week(s)"
-msgstr "uke(r)"
+msgid "Exceptions"
+msgstr "Unntak"
 
-#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:20
-msgctxt "recurrpage"
-msgid "year(s)"
-msgstr "år"
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:20 ../mail/mail-config.ui.h:27
+msgid "Preview"
+msgstr "Forhåndsvis"
 
 #: ../calendar/gui/dialogs/send-comp.c:196
 msgid "Send my reminders with this event"
@@ -3532,116 +3531,117 @@ msgstr "Varsle _kun nye deltakere"
 msgid "Completed date is wrong"
 msgstr "Dato for ferdigstilling er feil"
 
-#: ../calendar/gui/dialogs/task-details-page.c:488
+#: ../calendar/gui/dialogs/task-details-page.c:486
 msgid "Web Page"
 msgstr "Nettside"
 
-#. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:300
-#: ../calendar/gui/e-cal-model-tasks.c:493
-#: ../calendar/gui/e-cal-model-tasks.c:778 ../calendar/gui/e-task-table.c:220
-#: ../calendar/gui/e-task-table.c:235 ../calendar/gui/e-task-table.c:646
-#: ../calendar/gui/print.c:3398 ../mail/em-sync-stream.c:152
-#: ../mail/em-sync-stream.c:180 ../mail/em-sync-stream.c:202
-#, c-format
-msgid "Canceled"
-msgstr "Avbrutt"
-
-#. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-details-page.ui.h:4
-#: ../calendar/gui/e-cal-component-preview.c:297
-#: ../calendar/gui/e-cal-model-tasks.c:491
-#: ../calendar/gui/e-cal-model-tasks.c:776
-#: ../calendar/gui/e-meeting-store.c:206 ../calendar/gui/e-meeting-store.c:229
-#: ../calendar/gui/e-task-table.c:218 ../calendar/gui/e-task-table.c:233
-#: ../calendar/gui/e-task-table.c:645 ../calendar/gui/print.c:3395
-#: ../calendar/gui/tasktypes.xml.h:9 ../plugins/save-calendar/csv-format.c:387
-msgid "Completed"
-msgstr "Fullført"
-
 #. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-details-page.ui.h:6
+#: ../calendar/gui/dialogs/task-details-page.ui.h:2
 #: ../calendar/gui/e-cal-component-preview.c:319
-#: ../calendar/gui/e-task-table.c:566 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1286 ../widgets/misc/e-send-options.ui.h:13
+#: ../calendar/gui/e-task-table.c:566 ../calendar/gui/tasktypes.xml.h:19
+#: ../mail/message-list.c:1282 ../widgets/misc/e-send-options.ui.h:2
 msgid "High"
 msgstr "Høy"
 
-#. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-details-page.ui.h:8
-#: ../calendar/gui/e-cal-component-preview.c:294
-#: ../calendar/gui/e-cal-model-tasks.c:489
-#: ../calendar/gui/e-cal-model-tasks.c:774
-#: ../calendar/gui/e-cal-model-tasks.c:852 ../calendar/gui/e-task-table.c:216
-#: ../calendar/gui/e-task-table.c:231 ../calendar/gui/e-task-table.c:644
-#: ../calendar/gui/print.c:3392
-msgid "In Progress"
-msgstr "Under arbeid"
+#. To Translators: This is task priority
+#: ../calendar/gui/dialogs/task-details-page.ui.h:4
+#: ../calendar/gui/e-cal-component-preview.c:321
+#: ../calendar/gui/e-cal-model.c:1607 ../calendar/gui/e-task-table.c:567
+#: ../calendar/gui/tasktypes.xml.h:20 ../mail/message-list.c:1281
+#: ../widgets/misc/e-send-options.ui.h:5
+msgid "Normal"
+msgstr "Normal"
 
 #. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-details-page.ui.h:10
+#: ../calendar/gui/dialogs/task-details-page.ui.h:6
 #: ../calendar/gui/e-cal-component-preview.c:323
-#: ../calendar/gui/e-task-table.c:568 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1284 ../widgets/misc/e-send-options.ui.h:14
+#: ../calendar/gui/e-task-table.c:568 ../calendar/gui/tasktypes.xml.h:21
+#: ../mail/message-list.c:1280 ../widgets/misc/e-send-options.ui.h:4
 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:321
-#: ../calendar/gui/e-cal-model.c:1607 ../calendar/gui/e-task-table.c:567
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1285
-#: ../widgets/misc/e-send-options.ui.h:16
-msgid "Normal"
-msgstr "Normal"
+#: ../calendar/gui/dialogs/task-details-page.ui.h:8
+#: ../calendar/gui/e-task-table.c:569 ../calendar/gui/tasktypes.xml.h:22
+#: ../widgets/misc/e-send-options.ui.h:1
+msgid "Undefined"
+msgstr "Udefinert"
 
 #. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-details-page.ui.h:15
+#: ../calendar/gui/dialogs/task-details-page.ui.h:10
 #: ../calendar/gui/e-cal-component-preview.c:304
 #: ../calendar/gui/e-cal-model-tasks.c:487
 #: ../calendar/gui/e-cal-model-tasks.c:772 ../calendar/gui/e-task-table.c:214
 #: ../calendar/gui/e-task-table.c:229 ../calendar/gui/e-task-table.c:643
-#: ../calendar/gui/print.c:3389 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/print.c:3408 ../calendar/gui/tasktypes.xml.h:11
 msgid "Not Started"
 msgstr "Ikke startet"
 
-#: ../calendar/gui/dialogs/task-details-page.ui.h:16
-msgid "P_ercent complete:"
-msgstr "Pros_ent fullført:"
+#. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-details-page.ui.h:12
+#: ../calendar/gui/e-cal-component-preview.c:294
+#: ../calendar/gui/e-cal-model-tasks.c:489
+#: ../calendar/gui/e-cal-model-tasks.c:774
+#: ../calendar/gui/e-cal-model-tasks.c:852 ../calendar/gui/e-task-table.c:216
+#: ../calendar/gui/e-task-table.c:231 ../calendar/gui/e-task-table.c:644
+#: ../calendar/gui/print.c:3411
+msgid "In Progress"
+msgstr "Under arbeid"
 
-#: ../calendar/gui/dialogs/task-details-page.ui.h:17
-msgid "Stat_us:"
-msgstr "Stat_us:"
+#. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-details-page.ui.h:14
+#: ../calendar/gui/e-cal-component-preview.c:297
+#: ../calendar/gui/e-cal-model-tasks.c:491
+#: ../calendar/gui/e-cal-model-tasks.c:776
+#: ../calendar/gui/e-meeting-store.c:206 ../calendar/gui/e-meeting-store.c:229
+#: ../calendar/gui/e-task-table.c:218 ../calendar/gui/e-task-table.c:233
+#: ../calendar/gui/e-task-table.c:645 ../calendar/gui/print.c:3414
+#: ../calendar/gui/tasktypes.xml.h:13
+#: ../plugins/save-calendar/csv-format.c:387
+msgid "Completed"
+msgstr "Fullført"
+
+#. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-details-page.ui.h:16
+#: ../calendar/gui/e-cal-component-preview.c:300
+#: ../calendar/gui/e-cal-model-tasks.c:493
+#: ../calendar/gui/e-cal-model-tasks.c:778 ../calendar/gui/e-task-table.c:220
+#: ../calendar/gui/e-task-table.c:235 ../calendar/gui/e-task-table.c:646
+#: ../calendar/gui/print.c:3417 ../mail/em-sync-stream.c:152
+#: ../mail/em-sync-stream.c:180 ../mail/em-sync-stream.c:202
+#, c-format
+msgid "Canceled"
+msgstr "Avbrutt"
 
 #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
 #. * Status: Accepted: X   Declined: Y   ...
-#: ../calendar/gui/dialogs/task-details-page.ui.h:18
-#: ../calendar/gui/e-calendar-table.etspec.h:12
+#: ../calendar/gui/dialogs/task-details-page.ui.h:17
+#: ../calendar/gui/e-calendar-table.etspec.h:11
 #: ../calendar/gui/e-cal-model.c:3496
 #: ../calendar/gui/e-meeting-list-view.c:635
-#: ../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
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
+#: ../calendar/gui/tasktypes.xml.h:8 ../mail/em-filter-i18n.h:72
+#: ../mail/message-list.etspec.h:1
 msgid "Status"
 msgstr "Status"
 
-#. To Translators: This is task priority
+#: ../calendar/gui/dialogs/task-details-page.ui.h:18
+msgid "Stat_us:"
+msgstr "Stat_us:"
+
+#: ../calendar/gui/dialogs/task-details-page.ui.h:19
+msgid "P_ercent complete:"
+msgstr "Pros_ent fullført:"
+
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:569 ../calendar/gui/tasktypes.xml.h:24
-#: ../widgets/misc/e-send-options.ui.h:27
-msgid "Undefined"
-msgstr "Udefinert"
+#: ../widgets/misc/e-send-options.ui.h:26
+msgid "_Priority:"
+msgstr "_Prioritet:"
 
 #: ../calendar/gui/dialogs/task-details-page.ui.h:21
 msgid "_Date completed:"
 msgstr "Fullført _dato:"
 
-#: ../calendar/gui/dialogs/task-details-page.ui.h:22
-#: ../widgets/misc/e-send-options.ui.h:35
-msgid "_Priority:"
-msgstr "_Prioritet:"
-
 #: ../calendar/gui/dialogs/task-details-page.ui.h:23
 msgid "_Web Page:"
 msgstr "_Nettside:"
@@ -3658,7 +3658,7 @@ msgstr "Klikk for å endre/vise detaljer om status for oppgaven"
 msgid "_Send Options"
 msgstr "Alternativer for _sending"
 
-#: ../calendar/gui/dialogs/task-editor.c:321 ../calendar/gui/print.c:3310
+#: ../calendar/gui/dialogs/task-editor.c:321 ../calendar/gui/print.c:3329
 #: ../widgets/misc/e-send-options.c:535
 msgid "Task"
 msgstr "Oppgave"
@@ -3671,24 +3671,24 @@ msgstr "Oppgavedetaljer"
 msgid "Print this task"
 msgstr "Skriv ut denne oppgaven"
 
-#: ../calendar/gui/dialogs/task-page.c:251
+#: ../calendar/gui/dialogs/task-page.c:250
 msgid "Task's start date is in the past"
 msgstr "Startdato for oppgaven er passert"
 
-#: ../calendar/gui/dialogs/task-page.c:252
+#: ../calendar/gui/dialogs/task-page.c:251
 msgid "Task's due date is in the past"
 msgstr "Ferdigdato for oppgaven er passert"
 
-#: ../calendar/gui/dialogs/task-page.c:286
+#: ../calendar/gui/dialogs/task-page.c:285
 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:290
+#: ../calendar/gui/dialogs/task-page.c:289
 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:294
+#: ../calendar/gui/dialogs/task-page.c:293
 msgid ""
 "Task cannot be edited, because the selected task list does not support "
 "assigned tasks"
@@ -3696,29 +3696,29 @@ msgstr ""
 "Oppgaven kan ikke redigeres fordi valgt oppgaveliste ikke støtter tildelte "
 "oppgaver"
 
-#: ../calendar/gui/dialogs/task-page.c:347
-#: ../calendar/gui/dialogs/task-page.ui.h:4
+#: ../calendar/gui/dialogs/task-page.c:346
+#: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Organi_zer:"
 msgstr "Organi_sator:"
 
-#: ../calendar/gui/dialogs/task-page.c:807
+#: ../calendar/gui/dialogs/task-page.c:818
 msgid "Due date is wrong"
 msgstr "Ferdigdato er feil"
 
-#: ../calendar/gui/dialogs/task-page.c:1764
+#: ../calendar/gui/dialogs/task-page.c:1773
 #, c-format
 msgid "Unable to open tasks in '%s': %s"
 msgstr "Kan ikke åpne oppgaver i «%s»: %s"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:2
-msgid "Categor_ies..."
-msgstr "Kategor_ier …"
-
 #: ../calendar/gui/dialogs/task-page.ui.h:3
 msgid "D_ue date:"
 msgstr "Fer_dig-dato:"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:7
+#: ../calendar/gui/dialogs/task-page.ui.h:5
+msgid "Categor_ies..."
+msgstr "Kategor_ier …"
+
+#: ../calendar/gui/dialogs/task-page.ui.h:6
 msgid "Time zone:"
 msgstr "Tids_sone:"
 
@@ -3971,7 +3971,7 @@ msgstr "kalendervisning for en måned"
 msgid "calendar view for one or more weeks"
 msgstr "kalendervisning for en eller flere uker"
 
-#: ../calendar/gui/e-cal-component-preview.c:194 ../filter/e-filter-rule.c:671
+#: ../calendar/gui/e-cal-component-preview.c:194 ../filter/e-filter-rule.c:680
 msgid "Untitled"
 msgstr "Uten navn"
 
@@ -4002,7 +4002,7 @@ msgstr "Status:"
 msgid "Priority:"
 msgstr "Prioritet:"
 
-#: ../calendar/gui/e-cal-component-preview.c:342 ../mail/mail-config.ui.h:37
+#: ../calendar/gui/e-cal-component-preview.c:342 ../mail/mail-config.ui.h:159
 msgid "Description:"
 msgstr "Beskrivelse:"
 
@@ -4010,58 +4010,58 @@ msgstr "Beskrivelse:"
 msgid "Web Page:"
 msgstr "Nettside:"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:2
-#, no-c-format
-msgid "% Complete"
-msgstr "% ferdig"
-
-#: ../calendar/gui/e-calendar-table.etspec.h:4
+#: ../calendar/gui/e-calendar-table.etspec.h:1
 msgid "Click to add a task"
 msgstr "Klikk for å legge til en oppgave"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:5
-msgid "Complete"
-msgstr "Fullført"
+#: ../calendar/gui/e-calendar-table.etspec.h:2
+msgid "Start date"
+msgstr "Startdato"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:6
+#: ../calendar/gui/e-calendar-table.etspec.h:3
+#: ../calendar/gui/e-meeting-list-view.c:598
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
+#: ../calendar/gui/e-memo-table.etspec.h:3
+#: ../mail/e-mail-account-tree-view.c:139
+#: ../widgets/misc/e-attachment-tree-view.c:584
+msgid "Type"
+msgstr "Type"
+
+#: ../calendar/gui/e-calendar-table.etspec.h:5
 msgid "Completion date"
 msgstr "Ferdigstillingsdato"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:7
-#: ../calendar/gui/e-cal-list-view.etspec.h:2
-#: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../plugins/save-calendar/csv-format.c:388
-msgid "Created"
-msgstr "Opprettet"
+#: ../calendar/gui/e-calendar-table.etspec.h:6
+msgid "Complete"
+msgstr "Fullført"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:8
+#: ../calendar/gui/e-calendar-table.etspec.h:7
 msgid "Due date"
 msgstr "Ferdigdato"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:9
-#: ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../calendar/gui/e-memo-table.etspec.h:4
-msgid "Last modified"
-msgstr "Sist endret"
+#, no-c-format
+msgid "% Complete"
+msgstr "% ferdig"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:20
+#: ../calendar/gui/tasktypes.xml.h:18
 #: ../plugins/save-calendar/csv-format.c:394
 msgid "Priority"
 msgstr "Prioritet"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-msgid "Start date"
-msgstr "Startdato"
+#: ../calendar/gui/e-calendar-table.etspec.h:13
+#: ../calendar/gui/e-cal-list-view.etspec.h:7
+#: ../calendar/gui/e-memo-table.etspec.h:6
+#: ../plugins/save-calendar/csv-format.c:388
+msgid "Created"
+msgstr "Opprettet"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-meeting-list-view.c:598
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
+#: ../calendar/gui/e-cal-list-view.etspec.h:8
 #: ../calendar/gui/e-memo-table.etspec.h:7
-#: ../mail/e-mail-account-tree-view.c:139
-#: ../widgets/misc/e-attachment-tree-view.c:584
-msgid "Type"
-msgstr "Type"
+msgid "Last modified"
+msgstr "Sist endret"
 
 #: ../calendar/gui/e-calendar-view.c:423
 msgid "Cut selected events to the clipboard"
@@ -4108,7 +4108,7 @@ msgid "Organizer: %s"
 msgstr "Organisator: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1932 ../calendar/gui/print.c:3344
+#: ../calendar/gui/e-calendar-view.c:1932 ../calendar/gui/print.c:3363
 #, c-format
 msgid "Location: %s"
 msgstr "Sted: %s"
@@ -4119,20 +4119,20 @@ msgstr "Sted: %s"
 msgid "Time: %s %s"
 msgstr "Tidspunkt: %s %s"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:4
-msgid "End Date"
-msgstr "Sluttdato"
-
-#: ../calendar/gui/e-cal-list-view.etspec.h:7
+#: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Start Date"
 msgstr "Startdato"
 
+#: ../calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr "Sluttdato"
+
 #: ../calendar/gui/e-cal-model.c:797 ../calendar/gui/e-meeting-list-view.c:178
 #: ../calendar/gui/e-meeting-list-view.c:192
 #: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:171
-#: ../calendar/gui/e-meeting-store.c:234 ../calendar/gui/print.c:1149
-#: ../calendar/gui/print.c:1166 ../e-util/e-charset.c:52
+#: ../calendar/gui/e-meeting-store.c:234 ../calendar/gui/print.c:1162
+#: ../calendar/gui/print.c:1179 ../e-util/e-charset.c:52
 #: ../modules/plugin-manager/evolution-plugin-manager.c:101
 #: ../plugins/itip-formatter/itip-formatter.c:466
 #: ../plugins/itip-formatter/itip-formatter.c:2872
@@ -4244,15 +4244,15 @@ msgstr ""
 
 #. String to use in 12-hour time format for times in the morning.
 #: ../calendar/gui/e-day-view.c:1021 ../calendar/gui/e-week-view.c:773
-#: ../calendar/gui/print.c:975 ../calendar/gui/print.c:994
-#: ../calendar/gui/print.c:2482 ../calendar/gui/print.c:2502
+#: ../calendar/gui/print.c:988 ../calendar/gui/print.c:1007
+#: ../calendar/gui/print.c:2498 ../calendar/gui/print.c:2518
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: ../calendar/gui/e-day-view.c:1024 ../calendar/gui/e-week-view.c:776
-#: ../calendar/gui/print.c:980 ../calendar/gui/print.c:996
-#: ../calendar/gui/print.c:2487 ../calendar/gui/print.c:2504
+#: ../calendar/gui/print.c:993 ../calendar/gui/print.c:1009
+#: ../calendar/gui/print.c:2503 ../calendar/gui/print.c:2520
 msgid "pm"
 msgstr "pm"
 
@@ -4263,7 +4263,7 @@ msgstr "pm"
 #. * order but don't change the specifiers or add
 #. * anything.
 #: ../calendar/gui/e-day-view.c:1821 ../calendar/gui/e-day-view-top-item.c:848
-#: ../calendar/gui/e-week-view-main-item.c:215 ../calendar/gui/print.c:1966
+#: ../calendar/gui/e-week-view-main-item.c:215 ../calendar/gui/print.c:1982
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -4290,7 +4290,7 @@ msgstr "Vis den andre tidssonen"
 #: ../calendar/gui/e-day-view-time-item.c:842
 #: ../modules/calendar/e-calendar-preferences.c:179
 #: ../modules/calendar/e-calendar-preferences.c:231
-#: ../modules/calendar/e-calendar-preferences.ui.h:77
+#: ../modules/calendar/e-calendar-preferences.ui.h:18
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "Ingen"
@@ -4319,49 +4319,49 @@ msgstr "Ressurser"
 
 #: ../calendar/gui/e-meeting-list-view.c:174
 #: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:128
-#: ../calendar/gui/e-meeting-store.c:1047 ../calendar/gui/print.c:1145
+#: ../calendar/gui/e-meeting-store.c:1047 ../calendar/gui/print.c:1158
 msgid "Individual"
 msgstr "Individuell"
 
 #: ../calendar/gui/e-meeting-list-view.c:175
 #: ../calendar/gui/e-meeting-store.c:113 ../calendar/gui/e-meeting-store.c:130
-#: ../calendar/gui/print.c:1146 ../widgets/table/e-table-config.ui.h:7
+#: ../calendar/gui/print.c:1159 ../widgets/table/e-table-config.ui.h:8
 msgid "Group"
 msgstr "Gruppe"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
 #: ../calendar/gui/e-meeting-store.c:115 ../calendar/gui/e-meeting-store.c:132
-#: ../calendar/gui/print.c:1147
+#: ../calendar/gui/print.c:1160
 msgid "Resource"
 msgstr "Ressurs"
 
 #: ../calendar/gui/e-meeting-list-view.c:177
 #: ../calendar/gui/e-meeting-store.c:117 ../calendar/gui/e-meeting-store.c:134
-#: ../calendar/gui/print.c:1148
+#: ../calendar/gui/print.c:1161
 msgid "Room"
 msgstr "Rom"
 
 #: ../calendar/gui/e-meeting-list-view.c:188
 #: ../calendar/gui/e-meeting-store.c:146 ../calendar/gui/e-meeting-store.c:163
-#: ../calendar/gui/print.c:1162
+#: ../calendar/gui/print.c:1175
 msgid "Chair"
 msgstr "Styremedlem"
 
 #: ../calendar/gui/e-meeting-list-view.c:189
 #: ../calendar/gui/e-meeting-store.c:148 ../calendar/gui/e-meeting-store.c:165
-#: ../calendar/gui/e-meeting-store.c:1050 ../calendar/gui/print.c:1163
+#: ../calendar/gui/e-meeting-store.c:1050 ../calendar/gui/print.c:1176
 msgid "Required Participant"
 msgstr "Obligatorisk deltaker"
 
 #: ../calendar/gui/e-meeting-list-view.c:190
 #: ../calendar/gui/e-meeting-store.c:150 ../calendar/gui/e-meeting-store.c:167
-#: ../calendar/gui/print.c:1164
+#: ../calendar/gui/print.c:1177
 msgid "Optional Participant"
 msgstr "Valgfri deltaker"
 
 #: ../calendar/gui/e-meeting-list-view.c:191
 #: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:169
-#: ../calendar/gui/print.c:1165
+#: ../calendar/gui/print.c:1178
 msgid "Non-Participant"
 msgstr "Ikke-deltaker"
 
@@ -4378,7 +4378,7 @@ msgstr "Deltaker                          "
 
 #. To translators: RSVP means "please reply"
 #: ../calendar/gui/e-meeting-list-view.c:623
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "RSVP"
 msgstr "RSVP"
 
@@ -4466,30 +4466,30 @@ msgstr "_Start-tid:"
 msgid "_End time:"
 msgstr "S_lutt-tid:"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Click here to add an attendee"
 msgstr "Klikk her for å legge til en deltaker"
 
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Common Name"
-msgstr "Vanlig navn"
+msgid "Member"
+msgstr "Medlem"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
+msgid "Delegated To"
+msgstr "Delegert til"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "Delegated From"
 msgstr "Delegert fra"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Delegated To"
-msgstr "Delegert til"
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+msgid "Common Name"
+msgstr "Vanlig navn"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Language"
 msgstr "Språk"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "Member"
-msgstr "Medlem"
-
 #: ../calendar/gui/e-memo-table.c:420
 #: ../modules/calendar/e-cal-shell-content.c:474
 #: ../modules/calendar/e-memo-shell-view-actions.c:231
@@ -4534,7 +4534,7 @@ msgstr "Slett valgt notat"
 msgid "Select all visible memos"
 msgstr "Velg alle synlige notater"
 
-#: ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.etspec.h:1
 msgid "Click to add a memo"
 msgstr "Klikk for å legge til et notat"
 
@@ -4547,10 +4547,10 @@ msgstr "Klikk for å legge til et notat"
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:692 ../calendar/gui/print.c:2271
+#: ../calendar/gui/e-task-table.c:692 ../calendar/gui/print.c:2287
 #: ../calendar/importers/icalendar-importer.c:85
 #: ../calendar/importers/icalendar-importer.c:1044
-#: ../modules/calendar/e-calendar-preferences.ui.h:42
+#: ../modules/calendar/e-calendar-preferences.ui.h:61
 #: ../modules/calendar/e-cal-shell-content.c:435
 #: ../modules/calendar/e-task-shell-view-actions.c:254
 #: ../modules/calendar/e-task-shell-view-actions.c:269
@@ -4587,7 +4587,7 @@ msgstr "Velg tidssone"
 #. strftime format %d = day of month, %B = full
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:232 ../calendar/gui/print.c:1947
+#: ../calendar/gui/e-week-view-main-item.c:232 ../calendar/gui/print.c:1963
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -4717,247 +4717,247 @@ msgstr "Kan ikke booke en ressurs. Feil: "
 msgid "You must be an attendee of the event."
 msgstr "Du må være en deltager i hendelsen."
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:592
 msgid "1st"
 msgstr "1"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:592
 msgid "2nd"
 msgstr "2"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:592
 msgid "3rd"
 msgstr "3"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:592
 msgid "4th"
 msgstr "4"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:592
 msgid "5th"
 msgstr "5"
 
-#: ../calendar/gui/print.c:580
+#: ../calendar/gui/print.c:593
 msgid "6th"
 msgstr "6"
 
-#: ../calendar/gui/print.c:580
+#: ../calendar/gui/print.c:593
 msgid "7th"
 msgstr "7"
 
-#: ../calendar/gui/print.c:580
+#: ../calendar/gui/print.c:593
 msgid "8th"
 msgstr "8"
 
-#: ../calendar/gui/print.c:580
+#: ../calendar/gui/print.c:593
 msgid "9th"
 msgstr "9"
 
-#: ../calendar/gui/print.c:580
+#: ../calendar/gui/print.c:593
 msgid "10th"
 msgstr "10"
 
-#: ../calendar/gui/print.c:581
+#: ../calendar/gui/print.c:594
 msgid "11th"
 msgstr "11"
 
-#: ../calendar/gui/print.c:581
+#: ../calendar/gui/print.c:594
 msgid "12th"
 msgstr "12"
 
-#: ../calendar/gui/print.c:581
+#: ../calendar/gui/print.c:594
 msgid "13th"
 msgstr "13"
 
-#: ../calendar/gui/print.c:581
+#: ../calendar/gui/print.c:594
 msgid "14th"
 msgstr "14"
 
-#: ../calendar/gui/print.c:581
+#: ../calendar/gui/print.c:594
 msgid "15th"
 msgstr "15"
 
-#: ../calendar/gui/print.c:582
+#: ../calendar/gui/print.c:595
 msgid "16th"
 msgstr "16"
 
-#: ../calendar/gui/print.c:582
+#: ../calendar/gui/print.c:595
 msgid "17th"
 msgstr "17"
 
-#: ../calendar/gui/print.c:582
+#: ../calendar/gui/print.c:595
 msgid "18th"
 msgstr "18"
 
-#: ../calendar/gui/print.c:582
+#: ../calendar/gui/print.c:595
 msgid "19th"
 msgstr "19"
 
-#: ../calendar/gui/print.c:582
+#: ../calendar/gui/print.c:595
 msgid "20th"
 msgstr "20"
 
-#: ../calendar/gui/print.c:583
+#: ../calendar/gui/print.c:596
 msgid "21st"
 msgstr "21"
 
-#: ../calendar/gui/print.c:583
+#: ../calendar/gui/print.c:596
 msgid "22nd"
 msgstr "22"
 
-#: ../calendar/gui/print.c:583
+#: ../calendar/gui/print.c:596
 msgid "23rd"
 msgstr "23"
 
-#: ../calendar/gui/print.c:583
+#: ../calendar/gui/print.c:596
 msgid "24th"
 msgstr "24"
 
-#: ../calendar/gui/print.c:583
+#: ../calendar/gui/print.c:596
 msgid "25th"
 msgstr "25"
 
-#: ../calendar/gui/print.c:584
+#: ../calendar/gui/print.c:597
 msgid "26th"
 msgstr "26"
 
-#: ../calendar/gui/print.c:584
+#: ../calendar/gui/print.c:597
 msgid "27th"
 msgstr "27"
 
-#: ../calendar/gui/print.c:584
+#: ../calendar/gui/print.c:597
 msgid "28th"
 msgstr "28"
 
-#: ../calendar/gui/print.c:584
+#: ../calendar/gui/print.c:597
 msgid "29th"
 msgstr "29"
 
-#: ../calendar/gui/print.c:584
+#: ../calendar/gui/print.c:597
 msgid "30th"
 msgstr "30"
 
-#: ../calendar/gui/print.c:585
+#: ../calendar/gui/print.c:598
 msgid "31st"
 msgstr "31"
 
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:642
+#: ../calendar/gui/print.c:655
 msgid "Su"
 msgstr "Sø."
 
-#: ../calendar/gui/print.c:642
+#: ../calendar/gui/print.c:655
 msgid "Mo"
 msgstr "Ma."
 
-#: ../calendar/gui/print.c:642
+#: ../calendar/gui/print.c:655
 msgid "Tu"
 msgstr "Ti."
 
-#: ../calendar/gui/print.c:642
+#: ../calendar/gui/print.c:655
 msgid "We"
 msgstr "On."
 
-#: ../calendar/gui/print.c:643
+#: ../calendar/gui/print.c:656
 msgid "Th"
 msgstr "To."
 
-#: ../calendar/gui/print.c:643
+#: ../calendar/gui/print.c:656
 msgid "Fr"
 msgstr "Fr."
 
-#: ../calendar/gui/print.c:643
+#: ../calendar/gui/print.c:656
 msgid "Sa"
 msgstr "Lø."
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:3137
+#: ../calendar/gui/print.c:3156
 msgid " to "
 msgstr " til "
 
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../calendar/gui/print.c:3147
+#: ../calendar/gui/print.c:3166
 msgid " (Completed "
 msgstr " (Fullført "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3153
+#: ../calendar/gui/print.c:3172
 msgid "Completed "
 msgstr "Fullført "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3163
+#: ../calendar/gui/print.c:3182
 msgid " (Due "
 msgstr " (Ferdig "
 
 #. Translators: This is part of "Due DUE",
 #. * where DUE is a date/time due the event
 #. * should be finished.
-#: ../calendar/gui/print.c:3170
+#: ../calendar/gui/print.c:3189
 msgid "Due "
 msgstr "Ferdig "
 
-#: ../calendar/gui/print.c:3335
+#: ../calendar/gui/print.c:3354
 #, c-format
 msgid "Summary: %s"
 msgstr "Sammendrag: %s"
 
-#: ../calendar/gui/print.c:3362
+#: ../calendar/gui/print.c:3381
 msgid "Attendees: "
 msgstr "Deltakere: "
 
-#: ../calendar/gui/print.c:3405
+#: ../calendar/gui/print.c:3424
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: ../calendar/gui/print.c:3420
+#: ../calendar/gui/print.c:3439
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioritet: %s"
 
-#: ../calendar/gui/print.c:3438
+#: ../calendar/gui/print.c:3457
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Prosent fullført: %i"
 
-#: ../calendar/gui/print.c:3449
+#: ../calendar/gui/print.c:3468
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:3462
+#: ../calendar/gui/print.c:3481
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorier: %s"
 
-#: ../calendar/gui/print.c:3473
+#: ../calendar/gui/print.c:3492
 msgid "Contacts: "
 msgstr "Kontakter: "
 
-#: ../calendar/gui/tasktypes.xml.h:2
-#, no-c-format
-msgid "% Completed"
-msgstr "% ferdig"
+#: ../calendar/gui/tasktypes.xml.h:12
+msgid "In progress"
+msgstr "Under arbeid"
 
-#: ../calendar/gui/tasktypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:14
 msgid "Cancelled"
 msgstr "Avbrutt"
 
-#: ../calendar/gui/tasktypes.xml.h:15
-msgid "In progress"
-msgstr "Under arbeid"
+#: ../calendar/gui/tasktypes.xml.h:25
+#, no-c-format
+msgid "% Completed"
+msgstr "% ferdig"
 
-#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:35
+#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:35
 msgid "is greater than"
 msgstr "er større enn"
 
-#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:36
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:36
 msgid "is less than"
 msgstr "er mindre enn"
 
@@ -6718,13 +6718,13 @@ msgid "Please enter your password."
 msgstr "Vennligst oppgi ditt passord."
 
 #: ../capplet/settings/mail-account-view.c:280
-#: ../mail/em-account-editor.c:5065 ../plugins/caldav/caldav-source.c:67
+#: ../mail/em-account-editor.c:5085 ../plugins/caldav/caldav-source.c:67
 msgid "CalDAV"
 msgstr "CalDAV"
 
 #: ../capplet/settings/mail-account-view.c:374
 #: ../capplet/settings/mail-account-view.c:419
-#: ../mail/em-account-editor.c:4936 ../mail/em-account-editor.c:4993
+#: ../mail/em-account-editor.c:4956 ../mail/em-account-editor.c:5013
 #: ../modules/online-accounts/e-online-accounts-google.c:295
 #: ../modules/online-accounts/e-online-accounts-google.c:369
 #: ../plugins/google-account-setup/google-contacts-source.c:55
@@ -6736,31 +6736,31 @@ msgstr "Google"
 msgid "Personal details:"
 msgstr "Personlige detaljer:"
 
-#: ../capplet/settings/mail-account-view.c:493 ../mail/mail-config.ui.h:75
+#: ../capplet/settings/mail-account-view.c:493 ../mail/mail-config.ui.h:179
 msgid "Name:"
 msgstr "Navn:"
 
-#: ../capplet/settings/mail-account-view.c:502 ../mail/mail-config.ui.h:46
+#: ../capplet/settings/mail-account-view.c:502 ../mail/mail-config.ui.h:180
 msgid "Email address:"
 msgstr "E-postadresse:"
 
-#: ../capplet/settings/mail-account-view.c:512 ../mail/mail-config.ui.h:38
+#: ../capplet/settings/mail-account-view.c:512 ../mail/mail-config.ui.h:181
 msgid "Details:"
 msgstr "Detaljer:"
 
-#: ../capplet/settings/mail-account-view.c:520 ../mail/mail-config.ui.h:93
+#: ../capplet/settings/mail-account-view.c:520 ../mail/mail-config.ui.h:182
 msgid "Receiving"
 msgstr "Mottar"
 
-#: ../capplet/settings/mail-account-view.c:527 ../mail/mail-config.ui.h:129
+#: ../capplet/settings/mail-account-view.c:527 ../mail/mail-config.ui.h:184
 msgid "Server type:"
 msgstr "Tjenertype:"
 
-#: ../capplet/settings/mail-account-view.c:536 ../mail/mail-config.ui.h:128
+#: ../capplet/settings/mail-account-view.c:536 ../mail/mail-config.ui.h:185
 msgid "Server address:"
 msgstr "Tjeneradresse:"
 
-#: ../capplet/settings/mail-account-view.c:545 ../mail/mail-config.ui.h:153
+#: ../capplet/settings/mail-account-view.c:545 ../mail/mail-config.ui.h:186
 msgid "Username:"
 msgstr "Brukernavn:"
 
@@ -6773,7 +6773,7 @@ msgstr "Bruk kryptering:"
 msgid "never"
 msgstr "aldri"
 
-#: ../capplet/settings/mail-account-view.c:571 ../mail/mail-config.ui.h:113
+#: ../capplet/settings/mail-account-view.c:571 ../mail/mail-config.ui.h:183
 msgid "Sending"
 msgstr "Sender"
 
@@ -6822,7 +6822,7 @@ msgstr ""
 "posten din."
 
 #: ../capplet/settings/mail-account-view.c:636
-#: ../mail/em-account-editor.c:2852 ../mail/em-account-editor.c:2988
+#: ../mail/em-account-editor.c:2878 ../mail/em-account-editor.c:3014
 msgid "Identity"
 msgstr "Identitet"
 
@@ -6874,7 +6874,7 @@ msgid "Back - Receiving options"
 msgstr "Tilbake - Alternativer for mottak"
 
 #: ../capplet/settings/mail-account-view.c:641
-#: ../mail/em-account-editor.c:3975
+#: ../mail/em-account-editor.c:4001
 msgid "Defaults"
 msgstr "Forvalg"
 
@@ -6903,12 +6903,12 @@ msgid "Setup Google calendar with Evolution"
 msgstr "Sett opp Google-kalender i Evolution."
 
 #: ../capplet/settings/mail-account-view.c:772
-#: ../mail/em-account-editor.c:4730
+#: ../mail/em-account-editor.c:4752
 msgid "You may need to enable IMAP access."
 msgstr "Du må kanskje slå på IMAP-tilgang."
 
 #: ../capplet/settings/mail-account-view.c:780
-#: ../mail/em-account-editor.c:4721
+#: ../mail/em-account-editor.c:4743
 msgid "Google account settings:"
 msgstr "Innstillinger for Google-konto:"
 
@@ -6917,7 +6917,7 @@ msgid "Setup Yahoo calendar with Evolution"
 msgstr "Sett opp Yahoo-kalender i Evolution"
 
 #: ../capplet/settings/mail-account-view.c:810
-#: ../mail/em-account-editor.c:4749
+#: ../mail/em-account-editor.c:4770
 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 "
@@ -6928,7 +6928,7 @@ msgstr ""
 "ikke er korrekt."
 
 #: ../capplet/settings/mail-account-view.c:819
-#: ../mail/em-account-editor.c:4758
+#: ../mail/em-account-editor.c:4779
 msgid "Yahoo account settings:"
 msgstr "Innstillinger for Yahoo-konto:"
 
@@ -6954,7 +6954,7 @@ msgid "Evolution account assistant"
 msgstr "Evolution kontoassistent"
 
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:371 ../mail/e-mail-session.c:781
+#: ../capplet/settings/mail-capplet-shell.c:371 ../mail/e-mail-session.c:839
 #: ../modules/addressbook/e-book-shell-backend.c:106
 #: ../modules/addressbook/e-book-shell-migrate.c:136
 #: ../modules/calendar/e-cal-shell-backend.c:119
@@ -7040,7 +7040,7 @@ msgstr "Lagre som ut_kast"
 msgid "Save as draft"
 msgstr "Lagre som utkast"
 
-#: ../composer/e-composer-actions.c:370 ../composer/e-composer-private.c:350
+#: ../composer/e-composer-actions.c:370 ../composer/e-composer-private.c:349
 msgid "S_end"
 msgstr "S_end"
 
@@ -7148,43 +7148,43 @@ msgstr ""
 "Skriv inn adressene som skal motta en kopi av meldingen uten å vises i "
 "mottakerlisten for meldingen."
 
-#: ../composer/e-composer-header-table.c:1006
+#: ../composer/e-composer-header-table.c:775
 msgid "Fr_om:"
 msgstr "Fr_a:"
 
-#: ../composer/e-composer-header-table.c:1015
+#: ../composer/e-composer-header-table.c:784
 msgid "_Reply-To:"
 msgstr "Sva_r-til:"
 
-#: ../composer/e-composer-header-table.c:1019
+#: ../composer/e-composer-header-table.c:788
 msgid "_To:"
 msgstr "_Til:"
 
-#: ../composer/e-composer-header-table.c:1024
+#: ../composer/e-composer-header-table.c:793
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:1029
+#: ../composer/e-composer-header-table.c:798
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-composer-header-table.c:1034
+#: ../composer/e-composer-header-table.c:803
 msgid "_Post To:"
 msgstr "_Post til:"
 
-#: ../composer/e-composer-header-table.c:1038
+#: ../composer/e-composer-header-table.c:807
 msgid "S_ubject:"
 msgstr "Em_ne:"
 
-#: ../composer/e-composer-header-table.c:1047
+#: ../composer/e-composer-header-table.c:816
 msgid "Si_gnature:"
 msgstr "Si_gnatur:"
 
-#: ../composer/e-composer-name-header.c:141
+#: ../composer/e-composer-name-header.c:145
 msgid "Click here for the address book"
 msgstr "Klikk her for å få opp adresseboken"
 
-#: ../composer/e-composer-post-header.c:131
+#: ../composer/e-composer-post-header.c:135
 msgid "Click here to select folders to post to"
 msgstr "Klikk her for å velge mapper å poste til"
 
@@ -7204,7 +7204,7 @@ msgstr "Søk etter tekst"
 msgid "Search for and replace text"
 msgstr "Søk etter / erstatt tekst"
 
-#: ../composer/e-composer-private.c:370
+#: ../composer/e-composer-private.c:369
 msgid "Save draft"
 msgstr "Lagre utkast"
 
@@ -7225,71 +7225,84 @@ msgstr ""
 "Kan ikke kryptere utgående melding: Sertifikat for kryptering ikke satt for "
 "denne kontoen"
 
-#: ../composer/e-msg-composer.c:1700 ../composer/e-msg-composer.c:2087
+#: ../composer/e-msg-composer.c:1609 ../composer/e-msg-composer.c:1996
 msgid "Compose Message"
 msgstr "Skriv melding"
 
-#: ../composer/e-msg-composer.c:4257
+#: ../composer/e-msg-composer.c:4166
 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 "
 "redigeres."
 
-#: ../composer/e-msg-composer.c:4961
+#: ../composer/e-msg-composer.c:4870
 msgid "Untitled Message"
 msgstr "Melding uten navn"
 
 #: ../composer/mail-composer.error.xml.h:1
-msgid ""
-" There are few attachments getting downloaded. Sending the mail will cause "
-"the mail to be sent without those pending attachments "
-msgstr ""
-"Noen vedlegg blir lastet ned. E-posten vil ikke inneholde disse vedleggene "
-"hvis den blir sendt nå."
+msgid "You cannot attach the file &quot;{0}&quot; to this message."
+msgstr "Du kan ikke legge ved filen &quot;{0}&quot; i denne meldingen."
 
 #: ../composer/mail-composer.error.xml.h:2
-msgid "All accounts have been removed."
-msgstr "Alle kontoer er fjernet."
+msgid "The file '{0}' is not a regular file and cannot be sent in a message."
+msgstr "Filen «{0}» er ikke en vanlig fil og kan ikke sendes i en melding."
 
 #: ../composer/mail-composer.error.xml.h:3
-msgid "An error occurred while saving to your Drafts folder."
-msgstr "En feil oppsto under lagring til mappen Skisser."
+msgid "Could not retrieve messages to attach from {0}."
+msgstr "Kunne ikke hente meldinger som skal legges ved fra {0}."
 
 #: ../composer/mail-composer.error.xml.h:4
-msgid "An error occurred while saving to your Outbox folder."
-msgstr "En feil oppsto under lagring til mappen Utboks."
+msgid "Because &quot;{1}&quot;."
+msgstr "Pga &quot;{1}&quot;."
 
 #: ../composer/mail-composer.error.xml.h:5
-msgid "An error occurred while sending. How do you want to proceed?"
-msgstr "En feil oppsto under sending. Hvordan vil du fortsette?"
+msgid "Do you want to recover unfinished messages?"
+msgstr "Vil du gjenopprette uferdige meldinger?"
 
 #: ../composer/mail-composer.error.xml.h:6
 msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
 msgstr ""
-"Er du sikker på at du vil forkaste meldingen du skriver med tittel «{0}?"
+"Evolution avsluttet uventet mens du skrev en ny melding. Gjenoppretting av "
+"meldingen vil la deg fortsette der du slapp."
 
 #: ../composer/mail-composer.error.xml.h:7
-msgid "Because &quot;{0}&quot;, you may need to select different mail options."
-msgstr ""
-"Du vil kanskje måtte velge andre alternativer for e-post pga &quot;{0}&quot;."
+msgid "_Do not Recover"
+msgstr "Ikke _gjenopprett"
 
 #: ../composer/mail-composer.error.xml.h:8
-msgid "Because &quot;{1}&quot;."
-msgstr "Pga &quot;{1}&quot;."
+msgid "_Recover"
+msgstr "Gjenopp_rett"
 
 #: ../composer/mail-composer.error.xml.h:9
+msgid "Could not save to autosave file &quot;{0}&quot;."
+msgstr "Kunne ikke lagre til fil for automatisk lagring: &quot;{0}&quot;."
+
+#: ../composer/mail-composer.error.xml.h:10
+msgid "Error saving to autosave because &quot;{1}&quot;."
+msgstr "Feil under automatisk lagring pga &quot;{1}&quot;."
+
+#: ../composer/mail-composer.error.xml.h:11
+msgid "Download in progress. Do you want to send the mail?"
+msgstr "Nedlasting pågår. Vil du sende meldingen?"
+
+#: ../composer/mail-composer.error.xml.h:12
 msgid ""
-"Because you are working offline, the message will be saved to your local "
-"Outbox folder. When you are back online you can send the message by clicking "
-"the Send/Receive button in Evolution's toolbar."
+" There are few attachments getting downloaded. Sending the mail will cause "
+"the mail to be sent without those pending attachments "
 msgstr ""
-"Meldingen vil bli lagret til din lokale utboks fordi du arbeider frakoblet. "
-"Du kan sende meldingen ved å klikke på Send/Motta-knappen på verktøylinjen i "
-"Evolution når du kobler til igjen."
+"Noen vedlegg blir lastet ned. E-posten vil ikke inneholde disse vedleggene "
+"hvis den blir sendt nå."
 
-#: ../composer/mail-composer.error.xml.h:10
+#: ../composer/mail-composer.error.xml.h:14
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
+msgstr ""
+"Er du sikker på at du vil forkaste meldingen du skriver med tittel «{0}?"
+
+#: ../composer/mail-composer.error.xml.h:15
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
@@ -7299,253 +7312,240 @@ msgstr ""
 "velger å lagre meldingen i mappen Skisser. Dette vil la deg fortsette å "
 "skrive på meldingen på et senere tidspunkt."
 
-#: ../composer/mail-composer.error.xml.h:11
-msgid "Could not create message."
-msgstr "Kunne ikke opprette melding."
-
-#: ../composer/mail-composer.error.xml.h:12
-msgid "Could not read signature file &quot;{0}&quot;."
-msgstr "Kunne ikke lese signaturfil &quot;{0}&quot;."
-
-#: ../composer/mail-composer.error.xml.h:13
-msgid "Could not retrieve messages to attach from {0}."
-msgstr "Kunne ikke hente meldinger som skal legges ved fra {0}."
-
-#: ../composer/mail-composer.error.xml.h:14
-msgid "Could not save to autosave file &quot;{0}&quot;."
-msgstr "Kunne ikke lagre til fil for automatisk lagring: &quot;{0}&quot;."
-
-#: ../composer/mail-composer.error.xml.h:15
-msgid "Do you want to recover unfinished messages?"
-msgstr "Vil du gjenopprette uferdige meldinger?"
-
-#: ../composer/mail-composer.error.xml.h:16
-msgid "Download in progress. Do you want to send the mail?"
-msgstr "Nedlasting pågår. Vil du sende meldingen?"
-
-#: ../composer/mail-composer.error.xml.h:17
-msgid "Error saving to autosave because &quot;{1}&quot;."
-msgstr "Feil under automatisk lagring pga &quot;{1}&quot;."
-
+#. Response codes were chosen somewhat arbitrarily.
 #: ../composer/mail-composer.error.xml.h:18
-msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
-msgstr ""
-"Evolution avsluttet uventet mens du skrev en ny melding. Gjenoppretting av "
-"meldingen vil la deg fortsette der du slapp."
+msgid "_Continue Editing"
+msgstr "_Fortsett redigering"
 
 #: ../composer/mail-composer.error.xml.h:19
-msgid "Saving message to Outbox."
-msgstr "Lagrer melding til Utboks."
+msgid "_Save Draft"
+msgstr "L_agre skisse"
 
 #: ../composer/mail-composer.error.xml.h:20
-msgid "The file '{0}' is not a regular file and cannot be sent in a message."
-msgstr "Filen «{0}» er ikke en vanlig fil og kan ikke sendes i en melding."
+msgid "Could not create message."
+msgstr "Kunne ikke opprette melding."
 
-#: ../composer/mail-composer.error.xml.h:21 ../mail/mail.error.xml.h:123
-msgid "The reported error was &quot;{0}&quot;."
-msgstr "Feilen som ble rapportert var &quot;{0}&quot;."
+#: ../composer/mail-composer.error.xml.h:21
+msgid "Because &quot;{0}&quot;, you may need to select different mail options."
+msgstr ""
+"Du vil kanskje måtte velge andre alternativer for e-post pga &quot;{0}&quot;."
 
 #: ../composer/mail-composer.error.xml.h:22
-msgid ""
-"The reported error was &quot;{0}&quot;. The message has most likely not been "
-"saved."
-msgstr ""
-"Rapportert feil var &quot;{0}&quot;. Meldingen har sannsynligvis ikke blitt "
-"lagret."
+msgid "Could not read signature file &quot;{0}&quot;."
+msgstr "Kunne ikke lese signaturfil &quot;{0}&quot;."
 
 #: ../composer/mail-composer.error.xml.h:23
-msgid "The reported error was &quot;{0}&quot;. The message has not been sent."
-msgstr "Rapportert feil var &quot;{0}&quot;. Meldingen ble ikke sendt."
+msgid "All accounts have been removed."
+msgstr "Alle kontoer er fjernet."
 
 #: ../composer/mail-composer.error.xml.h:24
-msgid "You cannot attach the file &quot;{0}&quot; to this message."
-msgstr "Du kan ikke legge ved filen &quot;{0}&quot; i denne meldingen."
-
-#: ../composer/mail-composer.error.xml.h:25
 msgid "You need to configure an account before you can compose mail."
 msgstr "Du må konfigurere en konto før du kan skrive meldinger."
 
+#: ../composer/mail-composer.error.xml.h:25
+msgid "An error occurred while saving to your Outbox folder."
+msgstr "En feil oppsto under lagring til mappen Utboks."
+
 #: ../composer/mail-composer.error.xml.h:26
-msgid "Your message was sent, but an error occurred during post-processing."
-msgstr "Meldingen ble sendt, men det oppsto en feil under etterbehandling."
+msgid "The reported error was &quot;{0}&quot;. The message has not been sent."
+msgstr "Rapportert feil var &quot;{0}&quot;. Meldingen ble ikke sendt."
+
+#: ../composer/mail-composer.error.xml.h:27
+msgid "An error occurred while saving to your Drafts folder."
+msgstr "En feil oppsto under lagring til mappen Skisser."
 
-#. Response codes were chosen somewhat arbitrarily.
 #: ../composer/mail-composer.error.xml.h:28
-msgid "_Continue Editing"
-msgstr "_Fortsett redigering"
+msgid ""
+"The reported error was &quot;{0}&quot;. The message has most likely not been "
+"saved."
+msgstr ""
+"Rapportert feil var &quot;{0}&quot;. Meldingen har sannsynligvis ikke blitt "
+"lagret."
 
-#: ../composer/mail-composer.error.xml.h:30
-msgid "_Do not Recover"
-msgstr "Ikke _gjenopprett"
+#: ../composer/mail-composer.error.xml.h:29
+msgid "An error occurred while sending. How do you want to proceed?"
+msgstr "En feil oppsto under sending. Hvordan vil du fortsette?"
+
+#: ../composer/mail-composer.error.xml.h:30 ../mail/mail.error.xml.h:157
+msgid "The reported error was &quot;{0}&quot;."
+msgstr "Feilen som ble rapportert var &quot;{0}&quot;."
 
 #: ../composer/mail-composer.error.xml.h:31
-msgid "_Recover"
-msgstr "Gjenopp_rett"
+msgid "_Save to Outbox"
+msgstr "_Lagre til Utboks"
 
 #: ../composer/mail-composer.error.xml.h:32
-msgid "_Save Draft"
-msgstr "L_agre skisse"
+msgid "_Try Again"
+msgstr "_Prøv igjen"
 
 #: ../composer/mail-composer.error.xml.h:33
-msgid "_Save to Outbox"
-msgstr "_Lagre til Utboks"
+msgid "Your message was sent, but an error occurred during post-processing."
+msgstr "Meldingen ble sendt, men det oppsto en feil under etterbehandling."
+
+#: ../composer/mail-composer.error.xml.h:34
+msgid "Saving message to Outbox."
+msgstr "Lagrer melding til Utboks."
 
 #: ../composer/mail-composer.error.xml.h:35
-msgid "_Try Again"
-msgstr "_Prøv igjen"
+msgid ""
+"Because you are working offline, the message will be saved to your local "
+"Outbox folder. When you are back online you can send the message by clicking "
+"the Send/Receive button in Evolution's toolbar."
+msgstr ""
+"Meldingen vil bli lagret til din lokale utboks fordi du arbeider frakoblet. "
+"Du kan sende meldingen ved å klikke på Send/Motta-knappen på verktøylinjen i "
+"Evolution når du kobler til igjen."
 
 #: ../data/evolution-alarm-notify.desktop.in.in.h:1
-msgid "Calendar event notifications"
-msgstr "Varsling om kalenderhendelser"
-
-#: ../data/evolution-alarm-notify.desktop.in.in.h:2
 msgid "Evolution Alarm Notify"
 msgstr "Evolution varslingstjeneste"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:936
+#: ../data/evolution-alarm-notify.desktop.in.in.h:2
+msgid "Calendar event notifications"
+msgstr "Varsling om kalenderhendelser"
+
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:938
 #: ../modules/mailto-handler/evolution-mailto-handler.c:215
 #: ../shell/e-shell-window-private.c:243
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2
-msgid "Evolution Mail and Calendar"
-msgstr "Evolution e-post og kalender"
-
-#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:654
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:654
 msgid "Groupware Suite"
 msgstr "Gruppevareløsning"
 
+#: ../data/evolution.desktop.in.in.h:3
+msgid "Evolution Mail and Calendar"
+msgstr "Evolution e-post og kalender"
+
 #: ../data/evolution.desktop.in.in.h:4
 msgid "Manage your email, contacts and schedule"
 msgstr "Håndter e-post, kontakter og kalender"
 
 #: ../data/evolution-settings.desktop.in.in.h:1
-msgid "Configure email accounts"
-msgstr "Konfigurer e-postkonti"
-
-#: ../data/evolution-settings.desktop.in.in.h:2
 msgid "Email Settings"
 msgstr "Innstillinger for e-post"
 
+#: ../data/evolution-settings.desktop.in.in.h:2
+msgid "Configure email accounts"
+msgstr "Konfigurer e-postkonti"
+
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:1
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:1
-msgid "Autocomplete length"
-msgstr "Lengde for autofullføring"
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:21
+msgid "Enable address formatting"
+msgstr "Slå på formattering av adresser"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:2
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:2
-msgid "Contact layout style"
-msgstr "Stil for utforming av kontakt"
+msgid ""
+"Whether addresses should be formatted according to standard in their "
+"destination country"
+msgstr ""
+"Om Adresser skal formatteres i henhold til standard for landet meldingen "
+"sendes til"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:3
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:3
-msgid "Contact preview pane position (horizontal)"
-msgstr "Plassering av horisontalt felt for forhåndsvisning av kontakter"
+msgid "Autocomplete length"
+msgstr "Lengde for autofullføring"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:4
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:4
-msgid "Contact preview pane position (vertical)"
-msgstr "Plassering av vertikalt felt for forhåndsvisning av kontakter"
+msgid ""
+"The number of characters that must be typed before Evolution will attempt to "
+"autocomplete."
+msgstr ""
+"Antall tegn som må skrives før Evolution forsøker automatisk fullføring."
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:5
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:7
-msgid "Enable address formatting"
-msgstr "Slå på formattering av adresser"
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:5
+msgid "Show autocompleted name with an address"
+msgstr "Vis automatisk fullført navn med adresse"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:6
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:8
-msgid "Position of the contact preview pane when oriented horizontally."
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:6
+msgid ""
+"Whether force showing the mail address with the name of the autocompleted "
+"contact in the entry."
 msgstr ""
-"Posisjon for forhåndsvisningsområdet for kontakter med horisontal "
-"orientering."
+"Om tvungen visning av e-postadresse sammen med navn for automatisk fullført "
+"kontakt skal brukes i oppføringen."
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:7
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
-msgid "Position of the contact preview pane when oriented vertically."
-msgstr ""
-"Posisjon for forhåndsvisningsområdet for kontakter med vertikal orientering."
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:7
+msgid "URI for the folder last used in the select names dialog"
+msgstr "URI for sist brukt mappe i dialogen for å velge navn"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:8
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
-msgid "Primary address book"
-msgstr "Hovedadressebok"
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:8
+msgid "URI for the folder last used in the select names dialog."
+msgstr "URI for sist brukt mappe i dialogen for å velge navn."
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:9
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
-msgid "Show autocompleted name with an address"
-msgstr "Vis automatisk fullført navn med adresse"
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
+msgid "Contact layout style"
+msgstr "Stil for utforming av kontakt"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:10
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
-msgid "Show maps"
-msgstr "Vis kart"
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the contact list. \"0\" (Classic View) places the preview pane below the "
+"contact list. \"1\" (Vertical View) places the preview pane next to the "
+"contact list."
+msgstr ""
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:11
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
-msgid "Show preview pane"
-msgstr "Vis forhåndsvisningsområdet"
+msgid "Contact preview pane position (horizontal)"
+msgstr "Plassering av horisontalt felt for forhåndsvisning av kontakter"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:12
-msgid ""
-"The UID of the selected (or \"primary\") address book in the sidebar of the "
-"\"Contacts\" view"
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
+msgid "Position of the contact preview pane when oriented horizontally."
 msgstr ""
-"UID for valgt (eller «primær») adressebok i sidelinjen av «Kontakter»-"
-"visningen."
+"Posisjon for forhåndsvisningsområdet for kontakter med horisontal "
+"orientering."
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:13
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
-msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the contact list. \"0\" (Classic View) places the preview pane below the "
-"contact list. \"1\" (Vertical View) places the preview pane next to the "
-"contact list."
-msgstr ""
+msgid "Contact preview pane position (vertical)"
+msgstr "Plassering av vertikalt felt for forhåndsvisning av kontakter"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:14
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
-msgid ""
-"The number of characters that must be typed before Evolution will attempt to "
-"autocomplete."
+msgid "Position of the contact preview pane when oriented vertically."
 msgstr ""
-"Antall tegn som må skrives før Evolution forsøker automatisk fullføring."
+"Posisjon for forhåndsvisningsområdet for kontakter med vertikal orientering."
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:15
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:17
-msgid "URI for the folder last used in the select names dialog"
-msgstr "URI for sist brukt mappe i dialogen for å velge navn"
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:19
+msgid "Show maps"
+msgstr "Vis kart"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:16
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:18
-msgid "URI for the folder last used in the select names dialog."
-msgstr "URI for sist brukt mappe i dialogen for å velge navn."
+msgid "Whether to show maps in preview pane"
+msgstr "Om kart skal vises i forhåndsvisningsområdet"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:17
-msgid ""
-"Whether addresses should be formatted according to standard in their "
-"destination country"
-msgstr ""
-"Om Adresser skal formatteres i henhold til standard for landet meldingen "
-"sendes til"
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
+msgid "Primary address book"
+msgstr "Hovedadressebok"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:18
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:20
 msgid ""
-"Whether force showing the mail address with the name of the autocompleted "
-"contact in the entry."
+"The UID of the selected (or \"primary\") address book in the sidebar of the "
+"\"Contacts\" view"
 msgstr ""
-"Om tvungen visning av e-postadresse sammen med navn for automatisk fullført "
-"kontakt skal brukes i oppføringen."
+"UID for valgt (eller «primær») adressebok i sidelinjen av «Kontakter»-"
+"visningen."
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:19
-msgid "Whether to show maps in preview pane"
-msgstr "Om kart skal vises i forhåndsvisningsområdet"
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:17
+msgid "Show preview pane"
+msgstr "Vis forhåndsvisningsområdet"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:20
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:22
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:18
 msgid "Whether to show the preview pane."
 msgstr "Om forhåndsvisningsområdet skal vises."
 
@@ -7564,245 +7564,267 @@ msgstr ""
 "egenskaper for uønskede meldinger mer enhetlig."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:1
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:2
-msgid "Ask for confirmation when deleting items"
-msgstr "Spør etter bekreftelse ved sletting av oppføringer"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:123
+msgid "Save directory for reminder audio"
+msgstr "Lagre katalog for påminnelseslyd"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:2
-msgid ""
-"Background color of tasks that are due today, in \"#rrggbb\" format. Used "
-"together with task-due-today-highlight"
-msgstr "Bakgrunnsfarge for oppgaver som går ut i dag i «#rrggbb»-format. Brukes sammen med task-due-today-highlight"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:124
+msgid "Directory for saving reminder audio files"
+msgstr "Katalog for lagring av lydfiler for påminnelser"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:3
-msgid ""
-"Background color of tasks that are overdue, in \"#rrggbb\" format. Used "
-"together with task-overdue-highlight."
-msgstr "Bakgrunnsfarge for oppgaver som har gått ut i «#rrggbb»-format. Brukes sammen med task-overdue-highlight."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:103
+msgid "Birthday and anniversary reminder value"
+msgstr "Verdi for påminnelse om fødselsdager og jubileum"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:4
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
-msgid "Birthday and anniversary reminder"
-msgstr "Påminnelse om fødselsdager og jubileum"
+msgid "Number of units for determining a birthday or anniversary reminder"
+msgstr ""
+"Antall enheter for å bestemme en påminnelse om fødselsdag eller bryllupsdag"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:5
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:105
 msgid "Birthday and anniversary reminder units"
 msgstr "Enhet for påminnelse om fødselsdager og jubileum"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:6
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:7
-msgid "Birthday and anniversary reminder value"
-msgstr "Verdi for påminnelse om fødselsdager og jubileum"
+msgid ""
+"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
+"\"days\""
+msgstr ""
+"Enhet for en påminnelse for fødselsdag eller bryllupsdag i «minutes», "
+"«hours», eller «days»"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:7
-msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)"
-msgstr "Farge på Marcus Bains-linjen i tidslinjen (tom for forvalg)."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:63
+msgid "Compress weekends in month view"
+msgstr "Komprimer helger i månedsvisning"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:8
-msgid "Color to draw the Marcus Bains line in the Day View"
-msgstr "Farge på Marcus Bains-linjen i dagsvisningen"
+msgid ""
+"Whether to compress weekends in the month view, which puts Saturday and "
+"Sunday in the space of one weekday"
+msgstr ""
+"Komprimere helger i månedsvisningen slik at lørdag og søndag bruker plassen "
+"til en ukedag"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:9
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
-msgid "Compress weekends in month view"
-msgstr "Komprimer helger i månedsvisning"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:91
+msgid "Ask for confirmation when deleting items"
+msgstr "Spør etter bekreftelse ved sletting av oppføringer"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:10
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:12
-msgid "Confirm expunge"
-msgstr "Bekreft tømming av mappe"
+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"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:11
-msgid "Days on which the start and end of work hours should be indicated"
-msgstr "Dager som starten og slutten på arbeidstid skal være indikert"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:93
+msgid "Confirm expunge"
+msgstr "Bekreft tømming av mappe"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:12
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:14
-msgid "Default appointment reminder"
-msgstr "Forvalgt påminnelse for avtale"
+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"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:13
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:15
-msgid "Default reminder units"
-msgstr "Forvalgt enhet for påminnelser"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:45
+msgid "Month view vertical pane position"
+msgstr "Plassering av vertikalt felt for månedsvisning"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:14
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:16
-msgid "Default reminder value"
-msgstr "Forvalgt verdi for påminnelse"
+msgid ""
+"Position of the vertical pane, between the calendar lists and the date "
+"navigator calendar"
+msgstr "Plassering av vertikalt felt mellom kalenderlisten og minikalenderen"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:15
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:17
-msgid "Directory for saving reminder audio files"
-msgstr "Katalog for lagring av lydfiler for påminnelser"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:33
+msgid "Workday end hour"
+msgstr "Hvilken time arbeidsdagen slutter"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:16
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:19
-msgid "Free/busy template URL"
-msgstr "Ledig/opptatt mal-URL"
+msgid "Hour the workday ends on, in twenty four hour format, 0 to 23"
+msgstr "Klokkeslett arbeidsdagen slutter på i 24-timers format, 0 til 23"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:17
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:20
-msgid "Hide completed tasks"
-msgstr "Skjul fullførte oppgaver"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:35
+msgid "Workday end minute"
+msgstr "Hvilket minutt arbeidsdagen slutter"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:18
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:21
-msgid "Hide task units"
-msgstr "Skjul enheter for oppgaver"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:36
+msgid "Minute the workday ends on, 0 to 59."
+msgstr "Minutt arbeidsdagen slutter på fra 0 til 59."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:19
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:22
-msgid "Hide task value"
-msgstr "Skjul oppgaveverdi"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:29
+msgid "Workday start hour"
+msgstr "Hvilken time arbeidsdagen starter"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:20
-msgid "Highlight overdue tasks"
-msgstr "Uthev utgåtte oppgaver"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
+msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
+msgstr "Klokkeslett arbeidsdagen starter i 24-timers format, 0 til 23."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:21
-msgid "Highlight tasks due today"
-msgstr "Uthev oppgaver som går ut i dag"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
+msgid "Workday start minute"
+msgstr "Hvilket minutt arbeidsdagen starter"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:22
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:23
-msgid "Horizontal pane position"
-msgstr "Plassering på horisontalt felt"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:32
+msgid "Minute the workday starts on, 0 to 59."
+msgstr "Minutt arbeidsdagen starter på fra 0 til 59."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:23
-msgid "Hour the workday ends on, in twenty four hour format, 0 to 23"
-msgstr "Klokkeslett arbeidsdagen slutter på i 24-timers format, 0 til 23"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:7
+msgid "The second timezone for a Day View"
+msgstr "Sekundær tidssone for dagvisning"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:24
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:25
-msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
-msgstr "Klokkeslett arbeidsdagen starter i 24-timers format, 0 til 23."
+msgid ""
+"Shows the second time zone in a Day View, if set. Value is similar to one "
+"used in a 'timezone' key"
+msgstr ""
+"Viser sekundærtidssone i en dagvisning hvis den er satt. Verdien er lik den "
+"som brukes i nøkkelen «tidssone»"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:25
-msgid "If \"true\", show the memo preview pane in the main window"
-msgstr "Vis forhåndsvisningsområdet for notater i hovedvinduet hvis «true»"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:9
+msgid "Recently used second time zones in a Day View"
+msgstr "Sist brukte sekundærtidssoner i en dagvisning"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:26
-msgid "If \"true\", show the task preview pane in the main window"
-msgstr "Vis forhåndsvisningsområdet for oppgaver i hovedvinduet hvis «true»"
+msgid "List of recently used second time zones in a Day View"
+msgstr "Liste med nylig brukte sekundærtidssoner i en dagvisning"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:27
-msgid "Intervals shown in Day and Work Week views, in minutes"
-msgstr "Intervaller i minutter som vises i dag- og arbeidsukevisningene."
+msgid "Maximum number of recently used timezones to remember"
+msgstr "Maksimalt antall nylig brukte tidssoner som skal huskes"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:28
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:29
-msgid "Last reminder time"
-msgstr "Siste påminnelsestid"
+msgid ""
+"Maximum number of recently used timezones to remember in a 'day-second-"
+"zones' list"
+msgstr ""
+"Maksimalt antall nylig brukte tidssoner som skal huskes i en liste med «day-"
+"second-zones»"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:29
-msgid "List of calendars to load"
-msgstr "Liste med kalendere som skal lastes"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:97
+msgid "Default reminder value"
+msgstr "Forvalgt verdi for påminnelse"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:30
-msgid "List of memo lists to load"
-msgstr "Liste med notatlister som skal lastes"
+msgid "Number of units for determining a default reminder"
+msgstr "Antall enheter for å bestemme en forvalgt påminnelse"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:31
-msgid "List of recently used second time zones in a Day View"
-msgstr "Liste med nylig brukte sekundærtidssoner i en dagvisning"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:99
+msgid "Default reminder units"
+msgstr "Forvalgt enhet for påminnelser"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:32
-msgid "List of selected calendars"
-msgstr "Liste med valgte kalendere"
+msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\""
+msgstr "Enhet for forvalgt påminnelse. «minutes», «hours», eller «days»"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:33
-msgid "List of selected memo lists"
-msgstr "Liste med valgte notatlister"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:25
+msgid "Show categories field in the event/meeting/task editor"
+msgstr "Vis kategorifelt ved redigering av hendelse/møte/oppgave"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:34
-msgid "List of selected task lists"
-msgstr "Liste med valgte oppgavelister"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:26
+msgid "Whether to show categories field in the event/meeting editor"
+msgstr "Om kategorifeltet skal vises i redigering av hendelse/møte"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:35
-msgid "List of task lists to load"
-msgstr "Liste med oppgavelister som skal lastes"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:15
+msgid "Show Role field in the event/task/meeting editor"
+msgstr "Vis rollefelt i redigering av hendelse/oppgave/møte"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:36
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:33
-msgid "Marcus Bains Line"
-msgstr "Marcus Bains-linje"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:16
+msgid "Whether to show role field in the event/task/meeting editor"
+msgstr "Om rollefeltet skal vises i redigering av hendelse/oppgave/møte"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:37
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:34
-msgid "Marcus Bains Line Color - Day View"
-msgstr "Farge på Marcus Bains-linje - Dagsvisning"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:21
+msgid "Show RSVP field in the event/task/meeting editor"
+msgstr "Vis RSVP-feltet i redigering av hendelser/oppgaver/møter"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:38
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:35
-msgid "Marcus Bains Line Color - Time bar"
-msgstr "Farge på Marcus Bains-linje - tidslinje"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:22
+msgid "Whether to show RSVP field in the event/task/meeting editor"
+msgstr "Om RSVP-feltet skal vises redigering av hendelse/oppgave/møte"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:39
-msgid "Maximum number of recently used timezones to remember"
-msgstr "Maksimalt antall nylig brukte tidssoner som skal huskes"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:17
+msgid "Show status field in the event/task/meeting editor"
+msgstr "Vis statusfelt ved redigering av hendelse/oppgave/møte"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:40
-msgid ""
-"Maximum number of recently used timezones to remember in a 'day-second-"
-"zones' list"
-msgstr ""
-"Maksimalt antall nylig brukte tidssoner som skal huskes i en liste med «day-"
-"second-zones»"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:18
+msgid "Whether to show status field in the event/task/meeting editor"
+msgstr "Om statusfeltet skal vises i redigering av hendelse/oppgave/møte"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:41
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
-msgid "Memo layout style"
-msgstr "Stil for utforming av notat"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:23
+msgid "Show timezone field in the event/meeting editor"
+msgstr "Vis tidssonefelt ved redigering av hendelse/møte"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:42
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:39
-msgid "Memo preview pane position (horizontal)"
-msgstr "Posisjon for forhåndsvisningsområde for notater (horisontal)"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:24
+msgid "Whether to show timezone field in the event/meeting editor"
+msgstr "Om felt for tidssone skal vises i redigering av hendelse/møte"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:43
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:40
-msgid "Memo preview pane position (vertical)"
-msgstr "Plassering av vertikalt felt for forhåndsvisning"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:19
+msgid "Show type field in the event/task/meeting editor"
+msgstr "Vis typefelt ved redigering av hendelse/oppgave/møte"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:44
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:41
-msgid "Minute the workday ends on, 0 to 59."
-msgstr "Minutt arbeidsdagen slutter på fra 0 til 59."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:20
+msgid "Whether to show type field in the event/task/meeting editor"
+msgstr "Om typefelt skal vises i redigering av hendelse/oppgave/møte"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:45
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:42
-msgid "Minute the workday starts on, 0 to 59."
-msgstr "Minutt arbeidsdagen starter på fra 0 til 59."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:81
+msgid "Hide completed tasks"
+msgstr "Skjul fullførte oppgaver"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:46
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:43
-msgid "Month view horizontal pane position"
-msgstr "Plassering på horisontal månedsvisningsfelt"
+msgid "Whether to hide completed tasks in the tasks view"
+msgstr "Om fullførte oppgaver skal skjules i oppgavevisningen"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:47
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:44
-msgid "Month view vertical pane position"
-msgstr "Plassering av vertikalt felt for månedsvisning"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:83
+msgid "Hide task units"
+msgstr "Skjul enheter for oppgaver"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:48
-msgid "Number of units for determining a birthday or anniversary reminder"
+msgid ""
+"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\""
 msgstr ""
-"Antall enheter for å bestemme en påminnelse om fødselsdag eller bryllupsdag"
+"Enheter for å bestemme når oppgaver skal skjules. «minutes», «hours» eller "
+"«days»"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:49
-msgid "Number of units for determining a default reminder"
-msgstr "Antall enheter for å bestemme en forvalgt påminnelse"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:85
+msgid "Hide task value"
+msgstr "Skjul oppgaveverdi"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:50
 msgid "Number of units for determining when to hide tasks"
 msgstr "Antall enheter for å bestemme når oppgaver skal skjules"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:51
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:48
-msgid "Overdue tasks color"
-msgstr "Farge for utgåtte oppgaver"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:39
+msgid "Horizontal pane position"
+msgstr "Plassering på horisontalt felt"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:52
 msgid ""
@@ -7813,181 +7835,144 @@ msgstr ""
 "utenom månedsvisning, i piksler"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:53
-msgid ""
-"Position of the horizontal pane, between the view and the date navigator "
-"calendar and task list in the month view, in pixels"
-msgstr ""
-"Posisjonen til det horisontale feltet mellom visning, minikalender og "
-"oppgavelisten i månedsvisning, i piksler"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:111
+msgid "Last reminder time"
+msgstr "Siste påminnelsestid"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:54
-msgid "Position of the memo preview pane when oriented vertically"
-msgstr ""
-"Posisjon for forhåndsvisningsområdet for notater med vertikal orientering"
+msgid "Time the last reminder ran, in time_t"
+msgstr "Tid for forrige påminnelse, som time_t"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:55
-msgid "Position of the task preview pane when oriented horizontally"
-msgstr ""
-"Posisjon for forhåndsvisningsområdet for oppgaver med horisontal orientering"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:71
+msgid "Marcus Bains Line Color - Day View"
+msgstr "Farge på Marcus Bains-linje - Dagsvisning"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:56
-msgid "Position of the task preview pane when oriented vertically"
-msgstr ""
-"Posisjon for forhåndsvisningsområdet for oppgaver med vertikal orientering"
+msgid "Color to draw the Marcus Bains line in the Day View"
+msgstr "Farge på Marcus Bains-linjen i dagsvisningen"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:57
-msgid ""
-"Position of the vertical pane, between the calendar lists and the date "
-"navigator calendar"
-msgstr "Plassering av vertikalt felt mellom kalenderlisten og minikalenderen"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:73
+msgid "Marcus Bains Line Color - Time bar"
+msgstr "Farge på Marcus Bains-linje - tidslinje"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:58
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
-msgid "Primary calendar"
-msgstr "Primær kalender"
+msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)"
+msgstr "Farge på Marcus Bains-linjen i tidslinjen (tom for forvalg)."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:59
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
-msgid "Primary memo list"
-msgstr "Primær notatliste"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:69
+msgid "Marcus Bains Line"
+msgstr "Marcus Bains-linje"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:60
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:59
-msgid "Primary task list"
-msgstr "Primær oppgaveliste"
+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"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:61
-msgid "Programs that are allowed to be run by reminders"
-msgstr "Programmer som er tillates kjørt av påminnelser"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
+msgid "Memo preview pane position (horizontal)"
+msgstr "Posisjon for forhåndsvisningsområde for notater (horisontal)"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:62
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
-msgid "Recently used second time zones in a Day View"
-msgstr "Sist brukte sekundærtidssoner i en dagvisning"
+msgid "Position of the task preview pane when oriented horizontally"
+msgstr ""
+"Posisjon for forhåndsvisningsområdet for oppgaver med horisontal orientering"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:63
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:62
-msgid "Recurrent Events in Italic"
-msgstr "Repeterende hendelser i kursiv"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:48
+msgid "Memo layout style"
+msgstr "Stil for utforming av notat"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:64
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:63
-msgid "Reminder programs"
-msgstr "Programmer for påminnelse"
+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 ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:65
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:64
-msgid "Save directory for reminder audio"
-msgstr "Lagre katalog for påminnelseslyd"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
+msgid "Memo preview pane position (vertical)"
+msgstr "Plassering av vertikalt felt for forhåndsvisning"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:66
-msgid "Scroll Month View by a week, not by a month"
-msgstr "Om månedsvisning skal rulles per uke, og ikke per måned"
+msgid "Position of the memo preview pane when oriented vertically"
+msgstr ""
+"Posisjon for forhåndsvisningsområdet for notater med vertikal orientering"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:67
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:66
-msgid "Show RSVP field in the event/task/meeting editor"
-msgstr "Vis RSVP-feltet i redigering av hendelser/oppgaver/møter"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:43
+msgid "Month view horizontal pane position"
+msgstr "Plassering på horisontal månedsvisningsfelt"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:68
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:67
-msgid "Show Role field in the event/task/meeting editor"
-msgstr "Vis rollefelt i redigering av hendelse/oppgave/møte"
+msgid ""
+"Position of the horizontal pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels"
+msgstr ""
+"Posisjonen til det horisontale feltet mellom visning, minikalender og "
+"oppgavelisten i månedsvisning, i piksler"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:69
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:68
-msgid "Show appointment end times in week and month views"
-msgstr "Vis tid for avtalers slutt i ukes- og månedsvisning"
+msgid "Scroll Month View by a week, not by a month"
+msgstr "Om månedsvisning skal rulles per uke, og ikke per måned"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:70
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:69
-msgid "Show categories field in the event/meeting/task editor"
-msgstr "Vis kategorifelt ved redigering av hendelse/møte/oppgave"
+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"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:71
-msgid "Show days with recurrent events in italic font in bottom left calendar"
-msgstr ""
-"Vis dager med repeterende hendelser i kursiv skrift i kalenderen nederst til "
-"venstre"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:114
+msgid "Reminder programs"
+msgstr "Programmer for påminnelse"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:72
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:71
-msgid "Show display reminders in notification tray"
-msgstr "Vis påminnelser i varslingsområdet på panelet"
+msgid "Programs that are allowed to be run by reminders"
+msgstr "Programmer som er tillates kjørt av påminnelser"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:73
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:72
-msgid "Show status field in the event/task/meeting editor"
-msgstr "Vis statusfelt ved redigering av hendelse/oppgave/møte"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:116
+msgid "Show display reminders in notification tray"
+msgstr "Vis påminnelser i varslingsområdet på panelet"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:74
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:73
-msgid "Show the memo preview pane"
-msgstr "Vis forhåndsvisningsvinduet for notat"
+msgid "Whether or not to use the notification tray for display reminders"
+msgstr "Hvorvidt varslingsfeltet skal brukes for påminnelser på skjermen"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:75
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:74
-msgid "Show the task preview pane"
-msgstr "Vis forhåndsvisningsområdet for oppgave"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:1
+msgid "Primary calendar"
+msgstr "Primær kalender"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:76
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:75
-msgid "Show timezone field in the event/meeting editor"
-msgstr "Vis tidssonefelt ved redigering av hendelse/møte"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:77
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:76
-msgid "Show type field in the event/task/meeting editor"
-msgstr "Vis typefelt ved redigering av hendelse/oppgave/møte"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:78
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:77
-msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
-msgstr "Vis ukenummer i dagvisning, arbeidsukevisning og datonavigator"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:79
-msgid ""
-"Shows the second time zone in a Day View, if set. Value is similar to one "
-"used in a 'timezone' key"
-msgstr ""
-"Viser sekundærtidssone i en dagvisning hvis den er satt. Verdien er lik den "
-"som brukes i nøkkelen «tidssone»"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:80
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:79
-msgid "Task layout style"
-msgstr "Stil for utforming av oppgaver"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:81
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:80
-msgid "Task preview pane position (horizontal)"
-msgstr "Posisjon for forhåndsvisning av oppgaver (horisontal)"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:82
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:81
-msgid "Task preview pane position (vertical)"
-msgstr "Posisjon for forhåndsvisning av oppgaver (vertikal)"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:83
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:82
-msgid "Tasks due today color"
-msgstr "Farge for oppgaver som går ut i dag"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:84
 msgid ""
 "The UID of the selected (or \"primary\") calendar in the sidebar of the "
 "\"Calendar\" view"
 msgstr ""
 "UID for valgt (eller «primær») kalender i sidelinjen av «Kalender»-visningen"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:85
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:77
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:77
+msgid "Primary memo list"
+msgstr "Primær notatliste"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:78
 msgid ""
 "The UID of the selected (or \"primary\") memo list in the sidebar of the "
 "\"Memos\" view"
 msgstr ""
 "UID for valgt (eller «primær») notatliste i sidelinjen av «Notater»-visningen"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:86
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:79
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:79
+msgid "Primary task list"
+msgstr "Primær oppgaveliste"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:80
 msgid ""
 "The UID of the selected (or \"primary\") task list in the sidebar of the "
 "\"Tasks\" view"
@@ -7995,7 +7980,12 @@ msgstr ""
 "UID for valgt (eller «primær») oppgaveliste i sidelinjen av «Oppgaver»-"
 "visningen"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:81
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:120
+msgid "Free/busy template URL"
+msgstr "Ledig/opptatt mal-URL"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:83
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -8004,233 +7994,238 @@ msgstr ""
 "URL-mal som brukes som reserveløsning for ledig/opptatt, %u erstattes med "
 "brukerdelen av e-postadressen og %d erstattes med domenet"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:89
-msgid ""
-"The default timezone to use for dates and times in the calendar, as an "
-"untranslated Olsen timezone database location like \"America/New York\""
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:84
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:75
+msgid "Recurrent Events in Italic"
+msgstr "Repeterende hendelser i kursiv"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:85
+msgid "Show days with recurrent events in italic font in bottom left calendar"
 msgstr ""
-"Forvalgt tidssone som brukes for datoer og tidspunkt i kalenderen som en "
-"uoversatt Olsen tidssonedatabaseplassering som «America/New York»"
+"Vis dager med repeterende hendelser i kursiv skrift i kalenderen nederst til "
+"venstre"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:86
+msgid "List of selected calendars"
+msgstr "Liste med valgte kalendere"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:87
+msgid "List of calendars to load"
+msgstr "Liste med kalendere som skal lastes"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:88
+msgid "List of selected memo lists"
+msgstr "Liste med valgte notatlister"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:89
+msgid "List of memo lists to load"
+msgstr "Liste med notatlister som skal lastes"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:90
-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 ""
+msgid "List of selected task lists"
+msgstr "Liste med valgte oppgavelister"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:91
-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 ""
+msgid "List of task lists to load"
+msgstr "Liste med oppgavelister som skal lastes"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:91
-msgid "The second timezone for a Day View"
-msgstr "Sekundær tidssone for dagvisning"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:65
+msgid "Show appointment end times in week and month views"
+msgstr "Vis tid for avtalers slutt i ukes- og månedsvisning"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:93
-msgid "Time divisions"
-msgstr "Oppdeling av tid"
+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"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
-msgid "Time the last reminder ran, in time_t"
-msgstr "Tid for forrige påminnelse, som time_t"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
+msgid "Show the memo preview pane"
+msgstr "Vis forhåndsvisningsvinduet for notat"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:95
-msgid "Timezone"
-msgstr "Tidssone"
+msgid "If \"true\", show the memo preview pane in the main window"
+msgstr "Vis forhåndsvisningsområdet for notater i hovedvinduet hvis «true»"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:96
-msgid "Twenty four hour time format"
-msgstr "24-timers tidsformat"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
+msgid "Show the task preview pane"
+msgstr "Vis forhåndsvisningsområdet for oppgave"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
-msgid ""
-"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
-"\"days\""
-msgstr ""
-"Enhet for en påminnelse for fødselsdag eller bryllupsdag i «minutes», "
-"«hours», eller «days»"
+msgid "If \"true\", show the task preview pane in the main window"
+msgstr "Vis forhåndsvisningsområdet for oppgaver i hovedvinduet hvis «true»"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
-msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\""
-msgstr "Enhet for forvalgt påminnelse. «minutes», «hours», eller «days»"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:107
+msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
+msgstr "Vis ukenummer i dagvisning, arbeidsukevisning og datonavigator"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
-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»"
+msgid "Whether to show week numbers in various places in the Calendar"
+msgstr "Om ukenummer skal vises på relevante steder i kalenderen"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:100
-msgid "Use system timezone"
-msgstr "Bruk systemets tidssone"
+msgid "Vertical position for the tag pane"
+msgstr "Vertikal posisjon for merkefelt"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
-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"
+msgid "Highlight tasks due today"
+msgstr "Uthev oppgaver som går ut i dag"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
-msgid "Vertical position for the tag pane"
-msgstr "Vertikal posisjon for merkefelt"
+msgid ""
+"Whether highlight tasks due today with a special color (task-due-today-color)"
+msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:103
-msgid "Week start"
-msgstr "Ukestart"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:87
+msgid "Tasks due today color"
+msgstr "Farge for oppgaver som går ut i dag"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
-msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)"
-msgstr "Ukedag uken starter på. Fra søndag (0) til lørdag (6)"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
 msgid ""
-"Whether highlight overdue tasks with a special color (task-overdue-color)"
+"Background color of tasks that are due today, in \"#rrggbb\" format. Used "
+"together with task-due-today-highlight"
 msgstr ""
+"Bakgrunnsfarge for oppgaver som går ut i dag i «#rrggbb»-format. Brukes "
+"sammen med task-due-today-highlight"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
+msgid "Task preview pane position (horizontal)"
+msgstr "Posisjon for forhåndsvisning av oppgaver (horisontal)"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
-msgid ""
-"Whether highlight tasks due today with a special color (task-due-today-color)"
-msgstr ""
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
+msgid "Task layout style"
+msgstr "Stil for utforming av oppgaver"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:107
-msgid "Whether or not to use the notification tray for display reminders"
-msgstr "Hvorvidt varslingsfeltet skal brukes for påminnelser på skjermen"
+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 ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
-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"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
+msgid "Task preview pane position (vertical)"
+msgstr "Posisjon for forhåndsvisning av oppgaver (vertikal)"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
-msgid "Whether to ask for confirmation when expunging appointments and tasks"
+msgid "Position of the task preview pane when oriented vertically"
 msgstr ""
-"Om det skal spørres etter bekreftelse ved tømming av avtaler eller oppgaver"
+"Posisjon for forhåndsvisningsområdet for oppgaver med vertikal orientering"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
-msgid ""
-"Whether to compress weekends in the month view, which puts Saturday and "
-"Sunday in the space of one weekday"
-msgstr ""
-"Komprimere helger i månedsvisningen slik at lørdag og søndag bruker plassen "
-"til en ukedag"
+msgid "Highlight overdue tasks"
+msgstr "Uthev utgåtte oppgaver"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
-msgid "Whether to display the end time of events in the week and month views"
+msgid ""
+"Whether highlight overdue tasks with a special color (task-overdue-color)"
 msgstr ""
-"Om tidspunktet en hendelse slutter på skal vises i uke- og månedsvisninger"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
-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"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:89
+msgid "Overdue tasks color"
+msgstr "Farge for utgåtte oppgaver"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
-msgid "Whether to hide completed tasks in the tasks view"
-msgstr "Om fullførte oppgaver skal skjules i oppgavevisningen"
+msgid ""
+"Background color of tasks that are overdue, in \"#rrggbb\" format. Used "
+"together with task-overdue-highlight."
+msgstr ""
+"Bakgrunnsfarge for oppgaver som har gått ut i «#rrggbb»-format. Brukes "
+"sammen med task-overdue-highlight."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
-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"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
+msgid "Time divisions"
+msgstr "Oppdeling av tid"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
-msgid "Whether to set a default reminder for appointments"
-msgstr "Om en forvalgt påminnelse skal bli satt for avtaler"
+msgid "Intervals shown in Day and Work Week views, in minutes"
+msgstr "Intervaller i minutter som vises i dag- og arbeidsukevisningene."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
-msgid "Whether to set a reminder for birthdays and anniversaries"
-msgstr ""
-"Om en forvalgt påminnelse skal bli satt for fødselsdager og bryllupsdager"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
+msgid "Timezone"
+msgstr "Tidssone"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:115
-msgid "Whether to show RSVP field in the event/task/meeting editor"
-msgstr "Om RSVP-feltet skal vises redigering av hendelse/oppgave/møte"
+msgid ""
+"The default timezone to use for dates and times in the calendar, as an "
+"untranslated Olsen timezone database location like \"America/New York\""
+msgstr ""
+"Forvalgt tidssone som brukes for datoer og tidspunkt i kalenderen som en "
+"uoversatt Olsen tidssonedatabaseplassering som «America/New York»"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:116
-msgid "Whether to show categories field in the event/meeting editor"
-msgstr "Om kategorifeltet skal vises i redigering av hendelse/møte"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
+msgid "Twenty four hour time format"
+msgstr "24-timers tidsformat"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:117
-msgid "Whether to show role field in the event/task/meeting editor"
-msgstr "Om rollefeltet skal vises i redigering av hendelse/oppgave/møte"
+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"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:118
-msgid "Whether to show status field in the event/task/meeting editor"
-msgstr "Om statusfeltet skal vises i redigering av hendelse/oppgave/møte"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:101
+msgid "Birthday and anniversary reminder"
+msgstr "Påminnelse om fødselsdager og jubileum"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
-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"
+msgid "Whether to set a reminder for birthdays and anniversaries"
+msgstr ""
+"Om en forvalgt påminnelse skal bli satt for fødselsdager og bryllupsdager"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:120
-msgid "Whether to show timezone field in the event/meeting editor"
-msgstr "Om felt for tidssone skal vises i redigering av hendelse/møte"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:95
+msgid "Default appointment reminder"
+msgstr "Forvalgt påminnelse for avtale"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:121
-msgid "Whether to show type field in the event/task/meeting editor"
-msgstr "Om typefelt skal vises i redigering av hendelse/oppgave/møte"
+msgid "Whether to set a default reminder for appointments"
+msgstr "Om en forvalgt påminnelse skal bli satt for avtaler"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
-msgid "Whether to show week numbers in various places in the Calendar"
-msgstr "Om ukenummer skal vises på relevante steder i kalenderen"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
+msgid "Use system timezone"
+msgstr "Bruk systemets tidssone"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:123
-msgid "Work days"
-msgstr "Arbeidsdager"
+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"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:124
-msgid "Workday end hour"
-msgstr "Hvilken time arbeidsdagen slutter"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
+msgid "Week start"
+msgstr "Ukestart"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:125
-msgid "Workday end minute"
-msgstr "Hvilket minutt arbeidsdagen slutter"
+msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)"
+msgstr "Ukedag uken starter på. Fra søndag (0) til lørdag (6)"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:126
-msgid "Workday start hour"
-msgstr "Hvilken time arbeidsdagen starter"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:67
+msgid "Work days"
+msgstr "Arbeidsdager"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:127
-msgid "Workday start minute"
-msgstr "Hvilket minutt arbeidsdagen starter"
+msgid "Days on which the start and end of work hours should be indicated"
+msgstr "Dager som starten og slutten på arbeidstid skal være indikert"
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:1
-#: ../shell/apps_evolution_shell.schemas.in.h:3
+#: ../shell/apps_evolution_shell.schemas.in.h:1
 msgid "Configuration version"
 msgstr "Konfigurasjonsversjon"
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:2
-#: ../shell/apps_evolution_shell.schemas.in.h:21
-msgid "Last upgraded configuration version"
-msgstr "Sist oppgradert konfigurasjonsversjon"
-
-#: ../data/org.gnome.evolution.gschema.xml.in.h:3
-msgid "List of disabled plugins"
-msgstr "Liste med tillegg som er slått av"
-
-#: ../data/org.gnome.evolution.gschema.xml.in.h:4
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../shell/apps_evolution_shell.schemas.in.h:2
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -8238,8 +8233,13 @@ msgstr ""
 "Konfigurasjonsversjon for Evolution med større/mindre/konfigurasjonsnivå "
 "(for eksempel «2.6.0»)."
 
-#: ../data/org.gnome.evolution.gschema.xml.in.h:5
-#: ../shell/apps_evolution_shell.schemas.in.h:41
+#: ../data/org.gnome.evolution.gschema.xml.in.h:3
+#: ../shell/apps_evolution_shell.schemas.in.h:3
+msgid "Last upgraded configuration version"
+msgstr "Sist oppgradert konfigurasjonsversjon"
+
+#: ../data/org.gnome.evolution.gschema.xml.in.h:4
+#: ../shell/apps_evolution_shell.schemas.in.h:4
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -8247,6 +8247,10 @@ msgstr ""
 "Sist oppgradert konfigurasjonsversjon for Evolution, med major/minor/"
 "konfigurasjonsnivå (for eksempel «2.6.0»)."
 
+#: ../data/org.gnome.evolution.gschema.xml.in.h:5
+msgid "List of disabled plugins"
+msgstr "Liste med tillegg som er slått av"
+
 #: ../data/org.gnome.evolution.gschema.xml.in.h:6
 msgid "The list of disabled plugins in Evolution"
 msgstr "Liste med tillegg som er slått av i Evolution"
@@ -8260,13 +8264,13 @@ msgid "The window's Y coordinate"
 msgstr "Y-koordinat for vinduet"
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:9
-msgid "The window's height in pixels"
-msgstr "Vinduets høyde i piksler"
-
-#: ../data/org.gnome.evolution.gschema.xml.in.h:10
 msgid "The window's width in pixels"
 msgstr "Vinduets bredde i piksler"
 
+#: ../data/org.gnome.evolution.gschema.xml.in.h:10
+msgid "The window's height in pixels"
+msgstr "Vinduets høyde i piksler"
+
 #: ../data/org.gnome.evolution.gschema.xml.in.h:11
 msgid "Whether the window is maximized"
 msgstr "Om vinduet er maksimert"
@@ -8276,1052 +8280,1056 @@ msgid "Gnome Calendar's calendar import done"
 msgstr "Kalenderimport til GNOME kalender fullført"
 
 #: ../data/org.gnome.evolution.importer.gschema.xml.in.h:2
-msgid "Gnome Calendar's tasks import done"
-msgstr "Oppgaveimport til GNOME kalender fullført"
-
-#: ../data/org.gnome.evolution.importer.gschema.xml.in.h:3
 msgid "Whether calendar from Gnome Calendar has been imported or not"
 msgstr "Im kalender fra GNOME kalender er importert eller ikke"
 
+#: ../data/org.gnome.evolution.importer.gschema.xml.in.h:3
+msgid "Gnome Calendar's tasks import done"
+msgstr "Oppgaveimport til GNOME kalender fullført"
+
 #: ../data/org.gnome.evolution.importer.gschema.xml.in.h:4
 msgid "Whether tasks from Gnome Calendar have been imported or not"
 msgstr "Om oppgave fra GNOME kalender er importert eller ikke"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:1
-#: ../mail/evolution-mail.schemas.in.h:13
-msgid "Always request read receipt"
-msgstr "Alltid be om lesekvittering"
+#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
+msgid "Check whether Evolution is the default mailer"
+msgstr "Undersøk om Evolution er den forvalgte e-postklienten"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:2
-#: ../mail/evolution-mail.schemas.in.h:14
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:1
-msgid "Amount of time in seconds the error should be shown on the status bar."
-msgstr "Antall sekunder feilen skal vises i statuslinjen."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:3
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
 msgid ""
-"Asks whether to close the message window when the user forwards or replies "
-"to the message shown in the window"
+"Every time Evolution starts, check whether or not it is the default mailer."
 msgstr ""
+"Undersøk om Evolution er den forvalgte e-postklienten ved hver oppstart."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:3
+#: ../mail/evolution-mail.schemas.in.h:1
+msgid "Default charset in which to compose messages"
+msgstr "Forvalgt tegnsett for nye meldinger"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:4
-msgid "Attribute message"
-msgstr "Attributtmelding"
+#: ../mail/evolution-mail.schemas.in.h:2
+msgid "Default charset in which to compose messages."
+msgstr "Forvalgt tegnsett for nye meldinger."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:5
-#: ../mail/evolution-mail.schemas.in.h:17
-msgid "Automatic emoticon recognition"
-msgstr "Automatisk gjenkjenning av smilefjes"
+#: ../mail/evolution-mail.schemas.in.h:51
+msgid "Path where picture gallery should search for its content"
+msgstr "Sti for søk etter innhold til bildegalleri"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:6
-#: ../mail/evolution-mail.schemas.in.h:18
-msgid "Automatic link recognition"
-msgstr "Automatisk gjenkjenning av lenker"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:7
-#: ../mail/evolution-mail.schemas.in.h:19
 msgid ""
-"Automatically enable PGP or S/MIME signatures when replying to a message "
-"which is also PGP or S/MIME signed."
+"This value can be an empty string, which means it'll use the system Picture "
+"folder, usually set to ~/Pictures. This folder will be also used when the "
+"set path is not pointing to the existent folder"
 msgstr ""
-"Slå på PGP- eller S/MIME-signaturer automatisk ved svar på en melding som "
-"også er signert med PGP eller S/MIME."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:3
+msgid "Spell check inline"
+msgstr "Stavekontroll i meldingen"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:8
-#: ../mail/evolution-mail.schemas.in.h:20
-msgid "Check for new messages in all active accounts"
-msgstr "Se etter nye meldinger i alle aktive kontoer"
+#: ../mail/evolution-mail.schemas.in.h:4
+msgid "Draw spelling error indicators on words as you type."
+msgstr "Vis indikatorer for stavefeil mens du skriver."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:9
-#: ../mail/evolution-mail.schemas.in.h:21
-msgid "Check for new messages on start"
-msgstr "Se etter nye meldinger ved oppstart"
+#: ../mail/evolution-mail.schemas.in.h:5
+msgid "Automatic link recognition"
+msgstr "Automatisk gjenkjenning av lenker"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:10
-#: ../mail/evolution-mail.schemas.in.h:22
-msgid "Check incoming mail being junk"
-msgstr "Sjekk om innkommende meldinger er uønsket e-post"
+#: ../mail/evolution-mail.schemas.in.h:6
+msgid "Recognize links in text and replace them."
+msgstr "Gjenkjenn lenker i tekst og erstatt dem."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:11
-#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
-msgid "Check whether Evolution is the default mailer"
-msgstr "Undersøk om Evolution er den forvalgte e-postklienten"
+#: ../mail/evolution-mail.schemas.in.h:7
+msgid "Automatic emoticon recognition"
+msgstr "Automatisk gjenkjenning av smilefjes"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:12
-#: ../mail/evolution-mail.schemas.in.h:23
-msgid "Citation highlight color"
-msgstr "Farge for utheving av sitattekst"
+#: ../mail/evolution-mail.schemas.in.h:8
+msgid "Recognize emoticons in text and replace them with images."
+msgstr "Gjenkjenn smilefjes i tekst og erstatt dem med bilder."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:13
-#: ../mail/evolution-mail.schemas.in.h:24
-msgid "Citation highlight color."
-msgstr "Farge for utheving av sitattekst."
+msgid "Attribute message"
+msgstr "Attributtmelding"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:14
-msgid "Composer load/attach directory"
+msgid ""
+"The text that is inserted when replying to a message, attributing the "
+"message to the original author"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:15
-#: ../mail/evolution-mail.schemas.in.h:27
-msgid "Compress display of addresses in TO/CC/BCC"
-msgstr "Komprimer visning av adresser i Til/Cc/Bcc"
+msgid "Forward message"
+msgstr "Videresend melding"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:16
-#: ../mail/evolution-mail.schemas.in.h:28
 msgid ""
-"Compress display of addresses in TO/CC/BCC to the number specified in "
-"address_count."
+"The text that is inserted when forwarding a message, saying that the "
+"forwarded message follows"
 msgstr ""
-"Komprimer visning av adresser i Til/Cc/Bcc til antall oppgitt i "
-"address_count."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:17
-#: ../mail/evolution-mail.schemas.in.h:29
-msgid ""
-"Controls how frequently local changes are synchronized with the remote mail "
-"server. The interval must be at least 30 seconds."
-msgstr ""
-"Kontrollerer hvor ofte lokale endringer synkroniseres med ekstern e-"
-"posttjener. Intervallet må være minst 30 sekunder."
+msgid "Original message"
+msgstr "Opprinnelig melding"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:18
-#: ../mail/evolution-mail.schemas.in.h:30
-msgid "Custom headers to use while checking for junk."
-msgstr "Egendefinert meldingshode som skal sjekkes for uønsket e-post."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:19
-#: ../mail/evolution-mail.schemas.in.h:31
 msgid ""
-"Custom headers to use while checking for junk. The list elements are string "
-"in the format \"headername=value\"."
+"The text that is inserted when replying to a message (top posting), saying "
+"that the original message follows"
 msgstr ""
-"Egendefinerte meldingshoder som brukes ved sjekk etter uønsket e-post. "
-"Formatet for listeelementene er «headername=value»."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:9
+msgid "Group Reply replies to list"
+msgstr "Gruppesvar svarer til listen"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:20
-#: ../mail/evolution-mail.schemas.in.h:32
-msgid "Default charset in which to compose messages"
-msgstr "Forvalgt tegnsett for nye meldinger"
+#: ../mail/evolution-mail.schemas.in.h:10
+msgid ""
+"Instead of the normal \"Reply to All\" behaviour, this option will make the "
+"'Group Reply' toolbar button try to reply only to the mailing list through "
+"which you happened to receive the copy of the message to which you're "
+"replying."
+msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:21
-#: ../mail/evolution-mail.schemas.in.h:33
-msgid "Default charset in which to compose messages."
-msgstr "Forvalgt tegnsett for nye meldinger."
+#: ../mail/evolution-mail.schemas.in.h:13
+msgid "Put the cursor at the bottom of replies"
+msgstr "Plasser markør ved bunnen av svar"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:22
-#: ../mail/evolution-mail.schemas.in.h:34
-msgid "Default charset in which to display messages"
-msgstr "Forvalgt tegnsett for visning av meldinger"
+#: ../mail/evolution-mail.schemas.in.h:14
+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 ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:23
-#: ../mail/evolution-mail.schemas.in.h:35
-msgid "Default charset in which to display messages."
-msgstr "Forvalgt tegnsett for visning av meldinger."
+#: ../mail/evolution-mail.schemas.in.h:15
+msgid "Always request read receipt"
+msgstr "Alltid be om lesekvittering"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:24
-#: ../mail/evolution-mail.schemas.in.h:36
-msgid "Default forward style"
-msgstr "Forvalgt videresendingsstil"
+#: ../mail/evolution-mail.schemas.in.h:16
+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."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:25
-#: ../mail/evolution-mail.schemas.in.h:41
-msgid "Default value for thread expand state"
-msgstr "Forvalgt verdi for trådutvidelsestilstand"
+#: ../mail/evolution-mail.schemas.in.h:17
+msgid "Send HTML mail by default"
+msgstr "Send HTML e-post som forvalg"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:26
-msgid ""
-"Describes whether message headers in paned view should be collapsed or "
-"expanded by default. \"0\" = expanded and \"1\" = collapsed"
-msgstr ""
+#: ../mail/evolution-mail.schemas.in.h:18
+msgid "Send HTML mail by default."
+msgstr "Send HTML e-post som forvalg."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:27
-#: ../mail/evolution-mail.schemas.in.h:45
-msgid ""
-"Determines whether to look up addresses for junk filtering in local address "
-"book only"
-msgstr ""
-"Bestemmer om oppslag for filtrering av uønsket e-post kun skal slås opp i "
-"lokale adressebøker"
+#: ../mail/evolution-mail.schemas.in.h:19
+msgid "Spell checking color"
+msgstr "Farge for stavekontroll"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:28
-#: ../mail/evolution-mail.schemas.in.h:46
-msgid "Determines whether to lookup in address book for sender email"
-msgstr "Bestemmer om avsenders e-post skal slås opp i adresseboken"
+#: ../mail/evolution-mail.schemas.in.h:20
+msgid "Underline color for misspelled words when using inline spelling."
+msgstr "Farge for understreking av feilstavede ord ved bruk av stavekontroll."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:29
-#: ../mail/evolution-mail.schemas.in.h:47
-msgid ""
-"Determines whether to lookup the sender email in address book. If found, it "
-"shouldn't be a spam. It looks up in the books marked for autocompletion. It "
-"can be slow, if remote address books (like LDAP) are marked for "
-"autocompletion."
-msgstr ""
-"Bestemmer om avsender skal slås opp i adresseboken. Hvis dette er tilfelle "
-"vil meldingen ikke merkes som uønsket. Oppslag blir gjort mot adressebøker "
-"som er merket for automatisk fullføring. Operasjonen kan være treg hvils "
-"eksterne adressebøker som LDAP er merket for automatisk fullføring."
+#: ../mail/evolution-mail.schemas.in.h:21
+msgid "Spell checking languages"
+msgstr "Språk for stavekontroll"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:30
-#: ../mail/evolution-mail.schemas.in.h:48
-msgid "Determines whether to use custom headers to check for junk"
-msgstr ""
-"Bestemmer om egendefinerte meldingshoder skal brukes for å se etter uønsket "
-"e-post"
+#: ../mail/evolution-mail.schemas.in.h:22
+msgid "List of dictionary language codes used for spell checking."
+msgstr "Liste med språkkoder for ordliste som skal brukes for stavekontroll."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:31
-#: ../mail/evolution-mail.schemas.in.h:49
-msgid ""
-"Determines whether to use custom headers to check for junk. If this option "
-"is enabled and the headers are mentioned, it will be improve the junk "
-"checking speed."
-msgstr ""
-"Bestemmer om egendefinerte meldingshoder skal brukes for å finne uønsket e-"
-"post. Hvis dette alternativet er aktivert og meldingshodene finnes vil  "
-"dette forbedre hastigheten for denne sjekken."
+#: ../mail/evolution-mail.schemas.in.h:23
+msgid "Show \"Bcc\" field when sending a mail message"
+msgstr "Vis «Bcc» feltet når meldinger sendes"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid ""
-"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
-"lines in the \"Messages\" column in vertical view"
+"Show the \"Bcc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
 msgstr ""
-"Bestemmer om samme skrift skal brukes for både «Fra» og «Emne»-linjene i "
-"«Meldinger»-kolonnen i vertikal visning"
+"Vis «Bcc»-feltet når en melding sendes. Dette kontrolleres fra «Vis»-menyen "
+"når en e-postkonto velges."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:33
-#: ../mail/evolution-mail.schemas.in.h:50
-msgid ""
-"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
-"lines in the \"Messages\" column in vertical view."
-msgstr ""
-"Bestemmer om samme skrift skal brukes for både «Fra» og «Emne»-linjene i "
-"«Meldinger»-kolonnen i vertikal visning."
+#: ../mail/evolution-mail.schemas.in.h:25
+msgid "Show \"Cc\" field when sending a mail message"
+msgstr "Vis «Cc» feltet når meldinger sendes"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:34
-msgid "Digitally sign replies when the original message is signed"
-msgstr "Signer svar digitalt når opprinnelig melding er signert"
+#: ../mail/evolution-mail.schemas.in.h:26
+msgid ""
+"Show the \"Cc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr ""
+"Vis «Cc»-feltet når en melding sendes. Dette kontrolleres fra «Vis»-menyen "
+"når en e-postkonto velges."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:35
-msgid "Directory for loading/attaching files to composer."
-msgstr "Katalog for å laste/legge ved filer i redigering."
+#: ../mail/evolution-mail.schemas.in.h:27
+msgid "Show \"Reply To\" field when sending a mail message"
+msgstr "Vis «Svar-til» feltet når meldinger sendes"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
-#: ../mail/evolution-mail.schemas.in.h:52
-msgid "Directory for saving mail component files."
-msgstr "Katalog for å lagre komponentfiler for e-post."
+#: ../mail/evolution-mail.schemas.in.h:28
+msgid ""
+"Show the \"Reply To\" field when sending a mail message. This is controlled "
+"from the View menu when a mail account is chosen."
+msgstr ""
+"Vis «Svar-til»-feltet når en melding sendes. Dette kontrolleres fra «Vis»-"
+"menyen når en e-postkonto velges."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
-#: ../mail/evolution-mail.schemas.in.h:53
-msgid "Disable or enable ellipsizing of folder names in side bar"
-msgstr "Slå av eller på bruk av ellipse for mappenavn i sidelinjen"
+#: ../mail/evolution-mail.schemas.in.h:29
+msgid "Show \"From\" field when posting to a newsgroup"
+msgstr "Vis «Fra» feltet når du poster til en nyhetsgruppe"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
-#: ../mail/evolution-mail.schemas.in.h:54
-msgid "Display only message texts not exceeding certain size"
-msgstr "Vis kun meldingstekst som ikke overstiger en bestemt størrelse"
+#: ../mail/evolution-mail.schemas.in.h:30
+msgid ""
+"Show the \"From\" field when posting to a newsgroup. This is controlled from "
+"the View menu when a news account is chosen."
+msgstr ""
+"Vis «Fra»-feltet når en melding sendes til en nyhetsgruppe. Dette "
+"kontrolleres fra «Vis»-menyen når en e-postkonto velges."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
-#: ../mail/evolution-mail.schemas.in.h:55
-msgid "Do not add signature delimiter"
-msgstr "Ikke legg til skillelinje for signatur"
+#: ../mail/evolution-mail.schemas.in.h:31
+msgid "Show \"Reply To\" field when posting to a newsgroup"
+msgstr "Vis «Svar-til» feltet når du poster til en nyhetsgruppe"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
-#: ../mail/evolution-mail.schemas.in.h:56
-msgid "Draw spelling error indicators on words as you type."
-msgstr "Vis indikatorer for stavefeil mens du skriver."
+#: ../mail/evolution-mail.schemas.in.h:32
+msgid ""
+"Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
+"from the View menu when a news account is chosen."
+msgstr ""
+"Vis «Svar-til»-feltet når en melding sendes til en nyhetsgruppe. Dette "
+"kontrolleres fra «Vis»-menyen når en e-postkonto velges."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:41
-#: ../mail/evolution-mail.schemas.in.h:57
-msgid "Empty Junk folders on exit"
-msgstr "Tøm mappe for uønsket e-post når programmet avsluttes"
+msgid "Digitally sign replies when the original message is signed"
+msgstr "Signer svar digitalt når opprinnelig melding er signert"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:42
-#: ../mail/evolution-mail.schemas.in.h:58
-msgid "Empty Trash folders on exit"
-msgstr "Tøm papirkurven når programmet avsluttes"
+#: ../mail/evolution-mail.schemas.in.h:12
+msgid ""
+"Automatically enable PGP or S/MIME signatures when replying to a message "
+"which is also PGP or S/MIME signed."
+msgstr ""
+"Slå på PGP- eller S/MIME-signaturer automatisk ved svar på en melding som "
+"også er signert med PGP eller S/MIME."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
-#: ../mail/evolution-mail.schemas.in.h:59
-msgid "Empty all Junk folders when exiting Evolution."
-msgstr "Tøm alle mapper for uønsket e-post når programmet avsluttes."
+#: ../mail/evolution-mail.schemas.in.h:33 ../mail/mail-config.ui.h:15
+msgid "Encode file names in an Outlook/GMail way"
+msgstr "Bruk samme koding for filnavn som Outlook/GMail"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
-#: ../mail/evolution-mail.schemas.in.h:60
-msgid "Empty all Trash folders when exiting Evolution."
-msgstr "Tøm alle papirkurver når programmet avsluttes."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid ""
-"Enable animated images in HTML mail. Many users find animated images "
-"annoying and prefer to see a static image instead."
+"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, "
+"because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
+"standard."
 msgstr ""
-"Slå på animerte bilder i HTML-meldinger. Mange brukere synes at animerte "
-"bilder er plagsomme og foretrekker å se et statisk bilde i stedet."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:35
+msgid "Put personalized signatures at the top of replies"
+msgstr "Plasser personlige signaturer på toppen av svar"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:46
-#: ../mail/evolution-mail.schemas.in.h:62
-msgid "Enable caret mode, so that you can see a cursor when reading mail."
+#: ../mail/evolution-mail.schemas.in.h:36
+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 ""
-"Slå på skrivemerkemodus slik at insettingspunktet vises når du leser e-post."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:47
-#: ../mail/evolution-mail.schemas.in.h:63
-msgid "Enable local folders"
-msgstr "Slå på lokale mapper"
+#: ../mail/evolution-mail.schemas.in.h:37
+msgid "Do not add signature delimiter"
+msgstr "Ikke legg til skillelinje for signatur"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:48
-#: ../mail/evolution-mail.schemas.in.h:64
-msgid "Enable or disable magic space bar"
-msgstr "Aktiver eller deaktiver magisk mellomrom"
+#: ../mail/evolution-mail.schemas.in.h:38
+msgid ""
+"Set to TRUE in case you do not want to add signature delimiter before your "
+"signature when composing a mail."
+msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:49
-#: ../mail/evolution-mail.schemas.in.h:65
-msgid "Enable or disable the prompt whilst marking multiple messages."
-msgstr "Slå av/på spørring ved merking av flere meldinger."
+#: ../mail/evolution-mail.schemas.in.h:43
+msgid "Ignore list Reply-To:"
+msgstr "Ignorer Reply-To: for lister"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:50
-#: ../mail/evolution-mail.schemas.in.h:66
-msgid "Enable or disable type ahead search feature"
-msgstr "Aktiver eller deaktiver funksjon for å søke mens du skriver"
+#: ../mail/evolution-mail.schemas.in.h:44
+msgid ""
+"Some mailing lists set a Reply-To: header to trick users into sending "
+"replies to the list, even when they ask Evolution to make a private reply. "
+"Setting this option to TRUE will attempt to ignore such Reply-To: headers, "
+"so that Evolution will do as you ask it. If you use the private reply "
+"action, it will reply privately, while if you use the 'Reply to List' action "
+"it will do that. It works by comparing the Reply-To: header with a List-"
+"Post: header, if there is one."
+msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:51
-#: ../mail/evolution-mail.schemas.in.h:67
-msgid "Enable search folders"
-msgstr "Aktiver søkemapper"
+msgid "List of localized 'Re'"
+msgstr "Liste med oversettelser av «Re»"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:52
-#: ../mail/evolution-mail.schemas.in.h:68
-msgid "Enable search folders on startup."
-msgstr "Aktiver søkemapper ved oppstart."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
-#: ../mail/evolution-mail.schemas.in.h:69
 msgid ""
-"Enable the side bar search feature to allow interactive searching of folder "
-"names."
+"Comma-separated list of localized 'Re' abbreviations to skip in a subject "
+"text when replying to a message, as an addition to the standard \"Re\" "
+"prefix. An example is 'SV,AV'."
 msgstr ""
-"Slår på søkefunksjonen for sidelinjen for å muliggjøre interaktive søk etter "
-"mappenavn."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:53
+msgid "Show image animations"
+msgstr "Vis bildeanimasjoner"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid ""
-"Enable this to use Space bar key to scroll in message preview, message list "
-"and folders."
+"Enable animated images in HTML mail. Many users find animated images "
+"annoying and prefer to see a static image instead."
 msgstr ""
-"Aktiver dette for å bruke mellomrom-tasten til å gå forover i "
-"meldingsvisning, meldingsliste og mapper."
+"Slå på animerte bilder i HTML-meldinger. Mange brukere synes at animerte "
+"bilder er plagsomme og foretrekker å se et statisk bilde i stedet."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
-#: ../mail/evolution-mail.schemas.in.h:71
-msgid ""
-"Enable to display only message texts not exceeding size defined in "
-"'message_text_part_limit' key."
-msgstr ""
+#: ../mail/evolution-mail.schemas.in.h:55
+msgid "Enable or disable type ahead search feature"
+msgstr "Aktiver eller deaktiver funksjon for å søke mens du skriver"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
-#: ../mail/evolution-mail.schemas.in.h:72
-msgid "Enable to use a similar message list view settings for all folders"
+#: ../mail/evolution-mail.schemas.in.h:56
+msgid ""
+"Enable the side bar search feature to allow interactive searching of folder "
+"names."
 msgstr ""
-"Slå på for å bruke like innstillinger for meldingslistevisning i alle mapper"
+"Slår på søkefunksjonen for sidelinjen for å muliggjøre interaktive søk etter "
+"mappenavn."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
-#: ../mail/evolution-mail.schemas.in.h:73
-msgid "Enable to use a similar message list view settings for all folders."
-msgstr "Slå på for å bruke en lignende meldingslistevisning for alle mapper."
+#: ../mail/evolution-mail.schemas.in.h:57
+msgid "Disable or enable ellipsizing of folder names in side bar"
+msgstr "Slå av eller på bruk av ellipse for mappenavn i sidelinjen"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
-#: ../mail/evolution-mail.schemas.in.h:74
-msgid "Enable/disable caret mode"
-msgstr "Aktiver/deaktiver markørmodus"
+#: ../mail/evolution-mail.schemas.in.h:58
+msgid "Whether disable ellipsizing feature of folder names in side bar."
+msgstr "Slå av eller på bruk av ellipse for mappenavn i sidelinjen."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
-#: ../mail/evolution-mail.schemas.in.h:75 ../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:59
+msgid "Enable or disable magic space bar"
+msgstr "Aktiver eller deaktiver magisk mellomrom"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:60
 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, "
-"because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
-"standard."
+"Enable this to use Space bar key to scroll in message preview, message list "
+"and folders."
 msgstr ""
+"Aktiver dette for å bruke mellomrom-tasten til å gå forover i "
+"meldingsvisning, meldingsliste og mapper."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
-#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
-msgid ""
-"Every time Evolution starts, check whether or not it is the default mailer."
+#: ../mail/evolution-mail.schemas.in.h:61
+msgid "Enable to use a similar message list view settings for all folders"
 msgstr ""
-"Undersøk om Evolution er den forvalgte e-postklienten ved hver oppstart."
+"Slå på for å bruke like innstillinger for meldingslistevisning i alle mapper"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
-#: ../mail/evolution-mail.schemas.in.h:77
-msgid "Flush Outbox after filtering"
-msgstr "Tøm utboks etter filtrering"
+#: ../mail/evolution-mail.schemas.in.h:62
+msgid "Enable to use a similar message list view settings for all folders."
+msgstr "Slå på for å bruke en lignende meldingslistevisning for alle mapper."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
-msgid "Forward message"
-msgstr "Videresend melding"
+#: ../mail/evolution-mail.schemas.in.h:63
+msgid "Mark citations in the message \"Preview\""
+msgstr "Merk sitat in e-posten «Forhåndsvisning»"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
-#: ../mail/evolution-mail.schemas.in.h:79
-msgid "Group Reply replies to list"
-msgstr "Gruppesvar svarer til listen"
+#: ../mail/evolution-mail.schemas.in.h:64
+msgid "Mark citations in the message \"Preview\"."
+msgstr "Merk sitat in e-posten «Forhåndsvisning»."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
-#: ../mail/evolution-mail.schemas.in.h:80
-msgid "Height of the message-list pane"
-msgstr "Høyde på e-postlistefeltet"
+#: ../mail/evolution-mail.schemas.in.h:65
+msgid "Citation highlight color"
+msgstr "Farge for utheving av sitattekst"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
-#: ../mail/evolution-mail.schemas.in.h:81
-msgid "Height of the message-list pane."
-msgstr "Høyde på e-postlistefeltet."
+#: ../mail/evolution-mail.schemas.in.h:66
+msgid "Citation highlight color."
+msgstr "Farge for utheving av sitattekst."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
-#: ../mail/evolution-mail.schemas.in.h:82
-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:67
+msgid "Enable/disable caret mode"
+msgstr "Aktiver/deaktiver markørmodus"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
-#: ../mail/evolution-mail.schemas.in.h:83
-msgid ""
-"If a user tries to open 10 or more messages at one time, ask the user if "
-"they really want to do it."
+#: ../mail/evolution-mail.schemas.in.h:68
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
-"Spør brukeren om han virkelig vil gjøre det hvis han prøver å åpne 10 eller "
-"flere e-poster på en gang."
+"Slå på skrivemerkemodus slik at insettingspunktet vises når du leser e-post."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
-#: ../mail/evolution-mail.schemas.in.h:84
-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 "
-"in GNOME's MIME type database may be used for displaying content."
-msgstr ""
-"Hvis det ikke finnes et innebygd program for visning av en bestemt MIME-type "
-"i Evolution kan du bruke GNOME's MIME-type database til å vise innhold for "
-"enhver MIME-type i denne listen som har en tilsvarende Bonobo-komponent for "
-"visnin."
+#: ../mail/evolution-mail.schemas.in.h:69
+msgid "Default charset in which to display messages"
+msgstr "Forvalgt tegnsett for visning av meldinger"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
-#: ../mail/evolution-mail.schemas.in.h:85
-msgid "Ignore list Reply-To:"
-msgstr "Ignorer Reply-To: for lister"
+#: ../mail/evolution-mail.schemas.in.h:70
+msgid "Default charset in which to display messages."
+msgstr "Forvalgt tegnsett for visning av meldinger."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
-#: ../mail/evolution-mail.schemas.in.h:98
-msgid ""
-"Instead of the normal \"Reply to All\" behaviour, this option will make the "
-"'Group Reply' toolbar button try to reply only to the mailing list through "
-"which you happened to receive the copy of the message to which you're "
-"replying."
-msgstr ""
+#: ../mail/evolution-mail.schemas.in.h:71
+msgid "Load images for HTML messages over HTTP"
+msgstr "Last bilder for HTML-meldinger og HTTP"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:72
 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 "
-"the search results."
+"Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
+"Never load images off the net. \"1\" - Load images in messages from "
+"contacts. \"2\" - Always load images off the net."
 msgstr ""
-"Aktiverer/deaktiverer funksjonen som varsler om at sletting av meldinger fra "
-"en søkemappe sletter meldingene permanent, og ikke bare fjerner dem fra "
-"søkeresultatene."
+"Last bilder for HTML e-poster over HTTP(S). Mulige verdier er: «0» - Aldri "
+"last bilder fra nettet «1» - Last bilder i e-poster fra kontakter «2» - "
+"Alltid last bilder fra nettet."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
-#: ../mail/evolution-mail.schemas.in.h:100
-msgid ""
-"It disables/enables the repeated prompts to warn that you are sending a "
-"private reply to a message which arrived via a mailing list."
-msgstr ""
-"Aktiverer/deaktiverer funksjonen som varsler om at du sender et privat svar "
-"på en melding som har kommet via en e-postliste."
+#: ../mail/evolution-mail.schemas.in.h:73
+msgid "Show Animations"
+msgstr "Vis animasjoner"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
-#: ../mail/evolution-mail.schemas.in.h:101
-msgid ""
-"It disables/enables the repeated prompts to warn that you are sending a "
-"reply to many people."
-msgstr "Slår av/på varsel om at du sender et svar til mange personer."
+#: ../mail/evolution-mail.schemas.in.h:74
+msgid "Show animated images as animations."
+msgstr "Vis animerte bilder som animasjoner."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
-#: ../mail/evolution-mail.schemas.in.h:102
-msgid ""
-"It disables/enables the repeated prompts to warn that you are trying sending "
-"a private reply to a message which arrived via a mailing list, but the list "
-"sets a Reply-To: header which redirects your reply back to the list"
-msgstr ""
+#: ../mail/evolution-mail.schemas.in.h:75
+msgid "Show all message headers"
+msgstr "Vis alle meldingshoder"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
-#: ../mail/evolution-mail.schemas.in.h:103
-msgid ""
-"It disables/enables the repeated prompts to warn that you are trying to send "
-"a message to recipients not entered as mail addresses"
-msgstr ""
-"Aktiverer/deaktiverer funksjonen som varsler om at du prøver å sende en "
-"melding til mottakere som ikke er oppgitt som e-postadresser"
+#: ../mail/evolution-mail.schemas.in.h:76
+msgid "Show all the headers when viewing a messages."
+msgstr "Vis alle meldingshoder når en melding vises."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
-#: ../mail/evolution-mail.schemas.in.h:104
-msgid "Last time Empty Junk was run"
-msgstr "Siste gang mapper for uønsket e-post ble tømt"
+#: ../mail/evolution-mail.schemas.in.h:77
+msgid "List of custom headers and whether they are enabled."
+msgstr "Liste over tillpassede topptekster og om de er slått på."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
-#: ../mail/evolution-mail.schemas.in.h:105
-msgid "Last time Empty Trash was run"
-msgstr "Siste gang papirkurven ble tømt"
+#: ../mail/evolution-mail.schemas.in.h:78
+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;"
+"header enabled&gt; - set enabled if the header is to be displayed in the "
+"mail view."
+msgstr ""
+"Denne nøkkelen burde inneholde en liste over XML-strukturer som spesifiserer "
+"tilpassede topptekster og om de skal vises. Formatet til XML-strukturen er "
+"&lt;header enabled&gt; - sett «enabled» hvis toppteksten skal vises i e-"
+"postvisningen. "
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
-#: ../mail/evolution-mail.schemas.in.h:106
-msgid "Layout style"
-msgstr "Stil for utforming"
+#: ../mail/evolution-mail.schemas.in.h:79
+msgid "Show photo of the sender"
+msgstr "Vis bilde av avsender"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
-#: ../mail/evolution-mail.schemas.in.h:107
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
-msgid "Level beyond which the message should be logged."
-msgstr "Over dette nivået skal meldingen logges."
+#: ../mail/evolution-mail.schemas.in.h:80
+msgid "Show the photo of the sender in the message reading pane."
+msgstr "Vis bilde av avsender i meldingsområdet."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
-#: ../mail/evolution-mail.schemas.in.h:108
-msgid "List of Labels and their associated colors"
-msgstr "Liste over etiketter og deres assosierte farger"
+#: ../mail/evolution-mail.schemas.in.h:81
+msgid "Search for the sender photo in local address books"
+msgstr "Søk etter bilde av avsender i lokale adressebøker"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
-#: ../mail/evolution-mail.schemas.in.h:109
-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:82
+msgid "This option would help in improving the speed of fetching."
+msgstr "Dette valget vil øke hastigheten ved henting."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
-#: ../mail/evolution-mail.schemas.in.h:113
-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:83
+msgid "List of MIME types to check for Bonobo component viewers"
+msgstr "Liste over MIME-typer som skal se etter bonobo-komponentvisere"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
-#: ../mail/evolution-mail.schemas.in.h:114
-msgid "List of dictionary language codes used for spell checking."
-msgstr "Liste med språkkoder for ordliste som skal brukes for stavekontroll."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:84
 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."
+"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 "
+"in GNOME's MIME type database may be used for displaying content."
 msgstr ""
-"Liste over etiketter som e-postkomponenten til Evolution kjenner til. Listen "
-"inneholder strenger som inneholder «name:color» hvor «color» bruker HTML hex "
-"koding."
+"Hvis det ikke finnes et innebygd program for visning av en bestemt MIME-type "
+"i Evolution kan du bruke GNOME's MIME-type database til å vise innhold for "
+"enhver MIME-type i denne listen som har en tilsvarende Bonobo-komponent for "
+"visnin."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:85
+msgid "Mark as Seen after specified timeout"
+msgstr "Merk som «lest» etter spesifisert tidsgrense"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
-#: ../mail/evolution-mail.schemas.in.h:117
-msgid "Load images for HTML messages over HTTP"
-msgstr "Last bilder for HTML-meldinger og HTTP"
+#: ../mail/evolution-mail.schemas.in.h:86
+msgid "Mark as Seen after specified timeout."
+msgstr "Merk som «sett» etter spesifisert tidsgrense."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
-#: ../mail/evolution-mail.schemas.in.h:118
-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 "
-"contacts. \"2\" - Always load images off the net."
-msgstr ""
-"Last bilder for HTML e-poster over HTTP(S). Mulige verdier er: «0» - Aldri "
-"last bilder fra nettet «1» - Last bilder i e-poster fra kontakter «2» - "
-"Alltid last bilder fra nettet."
+#: ../mail/evolution-mail.schemas.in.h:90
+msgid "Timeout for marking message as seen"
+msgstr "Tidsgrense for å merke e-post som sett"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
-#: ../mail/evolution-mail.schemas.in.h:119
-msgid "Log filter actions"
-msgstr "Loggfør filterhandlinger"
+#: ../mail/evolution-mail.schemas.in.h:91
+msgid "Timeout for marking message as seen."
+msgstr "Tidsavbrydd å merke e-poster som sett."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
-#: ../mail/evolution-mail.schemas.in.h:120
-msgid "Log filter actions to the specified log file."
-msgstr "Logg filterhandlinger til oppgitt loggfil."
+#: ../mail/evolution-mail.schemas.in.h:87
+msgid "Sender email-address column in the message list"
+msgstr "Kolonne for avsenders e-postadresse i meldingslisten"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
-#: ../mail/evolution-mail.schemas.in.h:121
-msgid "Logfile to log filter actions"
-msgstr "Loggfil med filterhandlinger"
+#: ../mail/evolution-mail.schemas.in.h:88
+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."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
-#: ../mail/evolution-mail.schemas.in.h:122
-msgid "Logfile to log filter actions."
-msgstr "Loggfil med filterhandlinger."
+msgid ""
+"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
+"lines in the \"Messages\" column in vertical view"
+msgstr ""
+"Bestemmer om samme skrift skal brukes for både «Fra» og «Emne»-linjene i "
+"«Meldinger»-kolonnen i vertikal visning"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
-#: ../mail/evolution-mail.schemas.in.h:126
-msgid "Mark as Seen after specified timeout"
-msgstr "Merk som «lest» etter spesifisert tidsgrense"
+#: ../mail/evolution-mail.schemas.in.h:89
+msgid ""
+"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
+"lines in the \"Messages\" column in vertical view."
+msgstr ""
+"Bestemmer om samme skrift skal brukes for både «Fra» og «Emne»-linjene i "
+"«Meldinger»-kolonnen i vertikal visning."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
-#: ../mail/evolution-mail.schemas.in.h:127
-msgid "Mark as Seen after specified timeout."
-msgstr "Merk som «sett» etter spesifisert tidsgrense."
+#: ../mail/evolution-mail.schemas.in.h:92
+msgid "Show deleted messages in the message-list"
+msgstr "Vis slettede meldinger i meldingslisten"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
-#: ../mail/evolution-mail.schemas.in.h:128
-msgid "Mark citations in the message \"Preview\""
-msgstr "Merk sitat in e-posten «Forhåndsvisning»"
+#: ../mail/evolution-mail.schemas.in.h:93
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr "Vis slettede meldinger i meldingslisten (gjennomstreket)."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
-#: ../mail/evolution-mail.schemas.in.h:129
-msgid "Mark citations in the message \"Preview\"."
-msgstr "Merk sitat in e-posten «Forhåndsvisning»."
+#: ../mail/evolution-mail.schemas.in.h:96
+msgid "Enable local folders"
+msgstr "Slå på lokale mapper"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
-#: ../mail/evolution-mail.schemas.in.h:130
-msgid "Message text limit for display"
-msgstr "Grense for tekst i meldingsvisning"
+msgid "Whether to show local folders (On This Computer) in a folder tree"
+msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
-#: ../mail/evolution-mail.schemas.in.h:131
-msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
-msgstr "Stil på e-postvisning («normal», «full headers», «source»)"
+#: ../mail/evolution-mail.schemas.in.h:94
+msgid "Enable search folders"
+msgstr "Aktiver søkemapper"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
-#: ../mail/evolution-mail.schemas.in.h:132
-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:95
+msgid "Enable search folders on startup."
+msgstr "Aktiver søkemapper ved oppstart."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
-#: ../mail/evolution-mail.schemas.in.h:133
-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:98
+msgid "Hides the per-folder preview and removes the selection"
+msgstr "Skjuler per-mappe forhåndsvisning og fjerner utvalget"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
-#: ../mail/evolution-mail.schemas.in.h:134
-msgid "Minimum time between emptying the junk on exit, in days."
+#: ../mail/evolution-mail.schemas.in.h:99
+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."
 msgstr ""
-"Minste tidsperiode mellom tømming av mapper for uønsket e-post ved "
-"avslutting, i dager."
+"Denne nøkkelen leses kun en gang og settes til «false» etter at den er lest. "
+"Dette fjerner markering fra e-posten i listen og fjerner forhåndsvisning for "
+"den mappen."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
-#: ../mail/evolution-mail.schemas.in.h:135
-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:100
+msgid "Height of the message-list pane"
+msgstr "Høyde på e-postlistefeltet"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
-#: ../mail/evolution-mail.schemas.in.h:136
-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:101
+msgid "Height of the message-list pane."
+msgstr "Høyde på e-postlistefeltet."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
-msgid "Original message"
-msgstr "Opprinnelig melding"
+#: ../mail/evolution-mail.schemas.in.h:126
+msgid "State of message headers in paned view"
+msgstr "Tilstand for meldingshoder i vertikal visning"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
-#: ../mail/evolution-mail.schemas.in.h:138
-msgid "Path where picture gallery should search for its content"
-msgstr "Sti for søk etter innhold til bildegalleri"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
 msgid ""
-"Possible values are: 'never' - to never close browser window, 'always' - to "
-"always close browser window or 'ask' - (or any other value) will ask user."
+"Describes whether message headers in paned view should be collapsed or "
+"expanded by default. \"0\" = expanded and \"1\" = collapsed"
 msgstr ""
 
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:102
+msgid "Width of the message-list pane"
+msgstr "Bredde på e-postlistefeltet"
+
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
-#: ../mail/evolution-mail.schemas.in.h:140
-msgid "Prompt before sending to recipients not entered as mail addresses"
-msgstr ""
-"Varsle før utsending til mottakere som ikke er oppgitt som e-postadresser"
+#: ../mail/evolution-mail.schemas.in.h:103
+msgid "Width of the message-list pane."
+msgstr "Bredde på e-postlistefeltet."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
-#: ../mail/evolution-mail.schemas.in.h:141
-msgid "Prompt on empty subject"
-msgstr "Stopp og spør ved tomt emne"
+#: ../mail/evolution-mail.schemas.in.h:104
+msgid "Layout style"
+msgstr "Stil for utforming"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
-msgid "Prompt the user when he or she tries to empty the trash."
-msgstr "Spør bruker ved forsøk på å tømme papirkurven."
+#: ../mail/evolution-mail.schemas.in.h:105
+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 "
+"message list. \"1\" (Vertical View) places the preview pane next to the "
+"message list."
+msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
-#: ../mail/evolution-mail.schemas.in.h:142
-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:106
+msgid "Variable width font"
+msgstr "Skrift for variabel bredde"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
-#: ../mail/evolution-mail.schemas.in.h:143
-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:107
+msgid "The variable width font for mail display."
+msgstr "Skrift med variabel bredde for meldingsvisning."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
-#: ../mail/evolution-mail.schemas.in.h:144
-msgid "Prompt when deleting messages in search folder"
-msgstr "Spør ved sletting av meldinger fra søkemappe"
+#: ../mail/evolution-mail.schemas.in.h:108
+msgid "Terminal font"
+msgstr "Terminalskrift"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
-msgid "Prompt when emptying the trash"
-msgstr "Spør ved tømming av papirkurven"
+#: ../mail/evolution-mail.schemas.in.h:109
+msgid "The terminal font for mail display."
+msgstr "Terminalskrift for meldingsvisning."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
-#: ../mail/evolution-mail.schemas.in.h:145
-msgid "Prompt when mailing list hijacks private replies"
-msgstr "Spør når e-postlister stikker av med private svar"
+#: ../mail/evolution-mail.schemas.in.h:110
+msgid "Use custom fonts"
+msgstr "Bruk egendefinerte skrifter"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
-#: ../mail/evolution-mail.schemas.in.h:146
-msgid "Prompt when replying privately to list messages"
-msgstr "Spør ved privat svar til meldinger fra e-postlister"
+#: ../mail/evolution-mail.schemas.in.h:111
+msgid "Use custom fonts for displaying mail."
+msgstr "Bruk tilpassede skrifttyper for e-postvisning."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
-#: ../mail/evolution-mail.schemas.in.h:147
-msgid "Prompt when replying to many recipients"
-msgstr "Spør ved svar til mange mottakere"
+#: ../mail/evolution-mail.schemas.in.h:112
+msgid "Compress display of addresses in TO/CC/BCC"
+msgstr "Komprimer visning av adresser i Til/Cc/Bcc"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
-#: ../mail/evolution-mail.schemas.in.h:148
-msgid "Prompt when user expunges"
-msgstr "Stopp og spør før tømming"
+#: ../mail/evolution-mail.schemas.in.h:113
+msgid ""
+"Compress display of addresses in TO/CC/BCC to the number specified in "
+"address_count."
+msgstr ""
+"Komprimer visning av adresser i Til/Cc/Bcc til antall oppgitt i "
+"address_count."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
-#: ../mail/evolution-mail.schemas.in.h:149
-msgid "Prompt when user only fills Bcc"
-msgstr "Stopp og spør når bare «Bcc» er utfylt"
+#: ../mail/evolution-mail.schemas.in.h:114
+msgid "Display only message texts not exceeding certain size"
+msgstr "Vis kun meldingstekst som ikke overstiger en bestemt størrelse"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
-#: ../mail/evolution-mail.schemas.in.h:150
-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"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid ""
-"Prompt when user tries to send HTML mail to recipients that may not want to "
-"receive HTML mail."
+"Enable to display only message texts not exceeding size defined in "
+"'message_text_part_limit' key."
 msgstr ""
-"Spør når bruker prøver å sende HTML-meldinger til mottakere som ikke ønsker "
-"å motta HTML-meldinger."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:116
+msgid "Message text limit for display"
+msgstr "Grense for tekst i meldingsvisning"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
-#: ../mail/evolution-mail.schemas.in.h:152
-msgid "Prompt when user tries to send a message with no To or Cc recipients."
+#: ../mail/evolution-mail.schemas.in.h:117
+msgid ""
+"This decides the max size of the message text that will be displayed under "
+"Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
+"is used only when 'force_message_limit' key is activated."
 msgstr ""
-"Spør når bruker prøver å sende en melding uten Til- eller Cc-mottakere."
+"Bestemmer maksimal størrelse for tekstdelen som kan formatteres i evolution. "
+"Forvalg er 4MB / 4096 KB og oppgis i KB. Verdien brukes kun hvis nøkkelen "
+"«force_message_limit» er slått på."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
-#: ../mail/evolution-mail.schemas.in.h:153
-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:118
+msgid "Number of addresses to display in TO/CC/BCC"
+msgstr "Antall adresser som skal vises i Til/Cc/Bcc"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
-#: ../mail/evolution-mail.schemas.in.h:154
-msgid "Prompt while marking multiple messages"
-msgstr "Spør ved merking av flere meldinger"
+#: ../mail/evolution-mail.schemas.in.h:119
+msgid ""
+"This sets the number of addresses to show in default message list view, "
+"beyond which a '...' is shown."
+msgstr ""
+"Setter antall adresser som skal vises i forvalgt listevisning for meldinger. "
+"Etter dette vises «…»."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
-#: ../mail/evolution-mail.schemas.in.h:155
-msgid "Put personalized signatures at the top of replies"
-msgstr "Plasser personlige signaturer på toppen av svar"
+#: ../mail/evolution-mail.schemas.in.h:120
+msgid "Thread the message-list based on Subject"
+msgstr "Lag tråder av e-postlisten basert på emne"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
-#: ../mail/evolution-mail.schemas.in.h:156
-msgid "Put the cursor at the bottom of replies"
-msgstr "Plasser markør ved bunnen av svar"
+#: ../mail/evolution-mail.schemas.in.h:121
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
+msgstr ""
+"Om e-poster skal sorteres etter emner når de ikke inneholder «In-Reply-To» "
+"eller referansetopptekster."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
-#: ../mail/evolution-mail.schemas.in.h:157
-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:122
+msgid "Default value for thread expand state"
+msgstr "Forvalgt verdi for trådutvidelsestilstand"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
-#: ../mail/evolution-mail.schemas.in.h:158
-msgid "Recognize links in text and replace them."
-msgstr "Gjenkjenn lenker i tekst og erstatt dem."
+msgid ""
+"This setting specifies whether the threads should be in expanded or "
+"collapsed state by default. Evolution requires a restart."
+msgstr ""
+"Denne innstillingen spesifiserer om tråder skal være i utvidet eller "
+"sammenslått tilstand som forvalg. Evolution må startes på nytt hvis denne "
+"endres."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
-#: ../mail/evolution-mail.schemas.in.h:159
-msgid "Run junk test on incoming mail."
-msgstr "Sjekk om innkommende e-post er uønsket."
+#: ../mail/evolution-mail.schemas.in.h:124
+msgid "Whether sort threads based on latest message in that thread"
+msgstr "Om tråder sorteres basert på siste melding i den tråden"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
-#: ../mail/evolution-mail.schemas.in.h:160
-msgid "Save directory"
-msgstr "Lagre katalog"
+#: ../mail/evolution-mail.schemas.in.h:125
+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 "
+"restart."
+msgstr ""
+"Denne innstillingen spesifiserer om tråder skal sorteres basert på siste "
+"melding i hver tråd i stedet for meldingens dato. Evolution må startes på "
+"nytt."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
-#: ../mail/evolution-mail.schemas.in.h:161
-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:128
+msgid "Sort accounts alphabetically in a folder tree"
+msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
-#: ../mail/evolution-mail.schemas.in.h:162
-msgid "Send HTML mail by default"
-msgstr "Send HTML e-post som forvalg"
+msgid ""
+"Tells how to sort accounts in a folder tree used in a Mail view. When set to "
+"true accounts are sorted alphabetically, with an exception of On This "
+"Computer and Search folders, otherwise accounts are sorted based on an order "
+"given by a user"
+msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
-#: ../mail/evolution-mail.schemas.in.h:163
-msgid "Send HTML mail by default."
-msgstr "Send HTML e-post som forvalg."
+#: ../mail/evolution-mail.schemas.in.h:142
+msgid "Log filter actions"
+msgstr "Loggfør filterhandlinger"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
-#: ../mail/evolution-mail.schemas.in.h:164
-msgid "Sender email-address column in the message list"
-msgstr "Kolonne for avsenders e-postadresse i meldingslisten"
+#: ../mail/evolution-mail.schemas.in.h:143
+msgid "Log filter actions to the specified log file."
+msgstr "Logg filterhandlinger til oppgitt loggfil."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
-#: ../mail/evolution-mail.schemas.in.h:165
-msgid "Server synchronization interval"
-msgstr "Intervall for serversynkronisering"
+#: ../mail/evolution-mail.schemas.in.h:144
+msgid "Logfile to log filter actions"
+msgstr "Loggfil med filterhandlinger"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
-#: ../mail/evolution-mail.schemas.in.h:166
-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:145
+msgid "Logfile to log filter actions."
+msgstr "Loggfil med filterhandlinger."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
-#: ../mail/evolution-mail.schemas.in.h:167
-msgid "Show \"Bcc\" field when sending a mail message"
-msgstr "Vis «Bcc» feltet når meldinger sendes"
+#: ../mail/evolution-mail.schemas.in.h:146
+msgid "Flush Outbox after filtering"
+msgstr "Tøm utboks etter filtrering"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
-#: ../mail/evolution-mail.schemas.in.h:168
-msgid "Show \"Cc\" field when sending a mail message"
-msgstr "Vis «Cc» feltet når meldinger sendes"
+#: ../mail/evolution-mail.schemas.in.h:147
+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 ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
-#: ../mail/evolution-mail.schemas.in.h:169
-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:148
+msgid "Default forward style"
+msgstr "Forvalgt videresendingsstil"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
-#: ../mail/evolution-mail.schemas.in.h:170
-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:150
+msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
+msgstr "Stil på e-postvisning («normal», «full headers», «source»)"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
-#: ../mail/evolution-mail.schemas.in.h:171
-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:151
+msgid "Prompt on empty subject"
+msgstr "Stopp og spør ved tomt emne"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
-#: ../mail/evolution-mail.schemas.in.h:172
-msgid "Show Animations"
-msgstr "Vis animasjoner"
+#: ../mail/evolution-mail.schemas.in.h:152
+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."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
-#: ../mail/evolution-mail.schemas.in.h:173
-msgid "Show all message headers"
-msgstr "Vis alle meldingshoder"
+msgid "Prompt when emptying the trash"
+msgstr "Spør ved tømming av papirkurven"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
-#: ../mail/evolution-mail.schemas.in.h:174
-msgid "Show all the headers when viewing a messages."
-msgstr "Vis alle meldingshoder når en melding vises."
+msgid "Prompt the user when he or she tries to empty the trash."
+msgstr "Spør bruker ved forsøk på å tømme papirkurven."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
-#: ../mail/evolution-mail.schemas.in.h:175
-msgid "Show animated images as animations."
-msgstr "Vis animerte bilder som animasjoner."
+#: ../mail/evolution-mail.schemas.in.h:153
+msgid "Prompt when user expunges"
+msgstr "Stopp og spør før tømming"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
-#: ../mail/evolution-mail.schemas.in.h:176
-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:154
+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."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
-#: ../mail/evolution-mail.schemas.in.h:177
-msgid "Show deleted messages in the message-list"
-msgstr "Vis slettede meldinger i meldingslisten"
+#: ../mail/evolution-mail.schemas.in.h:173
+msgid "Prompt before sending to recipients not entered as mail addresses"
+msgstr ""
+"Varsle før utsending til mottakere som ikke er oppgitt som e-postadresser"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
-#: ../mail/evolution-mail.schemas.in.h:178
-msgid "Show image animations"
-msgstr "Vis bildeanimasjoner"
+#: ../mail/evolution-mail.schemas.in.h:174
+msgid ""
+"It disables/enables the repeated prompts to warn that you are trying to send "
+"a message to recipients not entered as mail addresses"
+msgstr ""
+"Aktiverer/deaktiverer funksjonen som varsler om at du prøver å sende en "
+"melding til mottakere som ikke er oppgitt som e-postadresser"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
-#: ../mail/evolution-mail.schemas.in.h:179
-msgid "Show original \"Date\" header value."
-msgstr "Vis opprinnelig verdi for «Date»-meldingshode."
+#: ../mail/evolution-mail.schemas.in.h:155
+msgid "Prompt when user only fills Bcc"
+msgstr "Stopp og spør når bare «Bcc» er utfylt"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
-#: ../mail/evolution-mail.schemas.in.h:180
-msgid "Show photo of the sender"
-msgstr "Vis bilde av avsender"
+#: ../mail/evolution-mail.schemas.in.h:156
+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."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
-#: ../mail/evolution-mail.schemas.in.h:181
-msgid ""
-"Show the \"Bcc\" field when sending a mail message. This is controlled from "
-"the View menu when a mail account is chosen."
-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:157
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr "Spør når bruker prøver å sende uønsket HTML"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid ""
-"Show the \"Cc\" field when sending a mail message. This is controlled from "
-"the View menu when a mail account is chosen."
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
 msgstr ""
-"Vis «Cc»-feltet når en melding sendes. Dette kontrolleres fra «Vis»-menyen "
-"når en e-postkonto velges."
+"Spør når bruker prøver å sende HTML-meldinger til mottakere som ikke ønsker "
+"å motta HTML-meldinger."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
-#: ../mail/evolution-mail.schemas.in.h:183
-msgid ""
-"Show the \"From\" field when posting to a newsgroup. This is controlled from "
-"the View menu when a news account is chosen."
-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:159
+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"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
-#: ../mail/evolution-mail.schemas.in.h:184
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid ""
-"Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
-"from the View menu when a news account is chosen."
+"If a user tries to open 10 or more messages at one time, ask the user if "
+"they really want to do it."
 msgstr ""
-"Vis «Svar-til»-feltet når en melding sendes til en nyhetsgruppe. Dette "
-"kontrolleres fra «Vis»-menyen når en e-postkonto velges."
+"Spør brukeren om han virkelig vil gjøre det hvis han prøver å åpne 10 eller "
+"flere e-poster på en gang."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
-#: ../mail/evolution-mail.schemas.in.h:185
-msgid ""
-"Show the \"Reply To\" field when sending a mail message. This is controlled "
-"from the View menu when a mail account is chosen."
-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:161
+msgid "Prompt while marking multiple messages"
+msgstr "Spør ved merking av flere meldinger"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
-#: ../mail/evolution-mail.schemas.in.h:186
-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:162
+msgid "Enable or disable the prompt whilst marking multiple messages."
+msgstr "Slå av/på spørring ved merking av flere meldinger."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
-#: ../mail/evolution-mail.schemas.in.h:187
-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:163
+msgid "Prompt when deleting messages in search folder"
+msgstr "Spør ved sletting av meldinger fra søkemappe"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
-#: ../mail/evolution-mail.schemas.in.h:188
-msgid "Show the photo of the sender in the message reading pane."
-msgstr "Vis bilde av avsender i meldingsområdet."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
-#: ../mail/evolution-mail.schemas.in.h:189
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid ""
-"Some mailing lists set a Reply-To: header to trick users into sending "
-"replies to the list, even when they ask Evolution to make a private reply. "
-"Setting this option to TRUE will attempt to ignore such Reply-To: headers, "
-"so that Evolution will do as you ask it. If you use the private reply "
-"action, it will reply privately, while if you use the 'Reply to List' action "
-"it will do that. It works by comparing the Reply-To: header with a List-"
-"Post: header, if there is one."
+"It disables/enables the repeated prompts to warn that deleting messages from "
+"a search folder permanently deletes the message, not simply removing it from "
+"the search results."
 msgstr ""
+"Aktiverer/deaktiverer funksjonen som varsler om at sletting av meldinger fra "
+"en søkemappe sletter meldingene permanent, og ikke bare fjerner dem fra "
+"søkeresultatene."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:165
+msgid "Prompt when replying privately to list messages"
+msgstr "Spør ved privat svar til meldinger fra e-postlister"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
-#: ../mail/evolution-mail.schemas.in.h:190
-msgid "Sort accounts alphabetically in a folder tree"
+#: ../mail/evolution-mail.schemas.in.h:166
+msgid ""
+"It disables/enables the repeated prompts to warn that you are sending a "
+"private reply to a message which arrived via a mailing list."
 msgstr ""
+"Aktiverer/deaktiverer funksjonen som varsler om at du sender et privat svar "
+"på en melding som har kommet via en e-postliste."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
-#: ../mail/evolution-mail.schemas.in.h:191
-msgid "Spell check inline"
-msgstr "Stavekontroll i meldingen"
+#: ../mail/evolution-mail.schemas.in.h:167
+msgid "Prompt when mailing list hijacks private replies"
+msgstr "Spør når e-postlister stikker av med private svar"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
-#: ../mail/evolution-mail.schemas.in.h:192
-msgid "Spell checking color"
-msgstr "Farge for stavekontroll"
+#: ../mail/evolution-mail.schemas.in.h:168
+msgid ""
+"It disables/enables the repeated prompts to warn that you are trying sending "
+"a private reply to a message which arrived via a mailing list, but the list "
+"sets a Reply-To: header which redirects your reply back to the list"
+msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
-#: ../mail/evolution-mail.schemas.in.h:193
-msgid "Spell checking languages"
-msgstr "Språk for stavekontroll"
+#: ../mail/evolution-mail.schemas.in.h:169
+msgid "Prompt when replying to many recipients"
+msgstr "Spør ved svar til mange mottakere"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
-#: ../mail/evolution-mail.schemas.in.h:194
-msgid "State of message headers in paned view"
-msgstr "Tilstand for meldingshoder i vertikal visning"
+#: ../mail/evolution-mail.schemas.in.h:170
+msgid ""
+"It disables/enables the repeated prompts to warn that you are sending a "
+"reply to many people."
+msgstr "Slår av/på varsel om at du sender et svar til mange personer."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid ""
-"Tells how to sort accounts in a folder tree used in a Mail view. When set to "
-"true accounts are sorted alphabetically, with an exception of On This "
-"Computer and Search folders, otherwise accounts are sorted based on an order "
-"given by a user"
+"Asks whether to close the message window when the user forwards or replies "
+"to the message shown in the window"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
-#: ../mail/evolution-mail.schemas.in.h:196
-msgid "Terminal font"
-msgstr "Terminalskrift"
+msgid ""
+"Possible values are: 'never' - to never close browser window, 'always' - to "
+"always close browser window or 'ask' - (or any other value) will ask user."
+msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
-#: ../mail/evolution-mail.schemas.in.h:197
-msgid "The default plugin for Junk hook"
-msgstr "Forvalgt tillegg for uønsket e-post"
+#: ../mail/evolution-mail.schemas.in.h:175
+msgid "Empty Trash folders on exit"
+msgstr "Tøm papirkurven når programmet avsluttes"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
-#: ../mail/evolution-mail.schemas.in.h:198
-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 1 januar 1970 "
-"(epoch)."
+#: ../mail/evolution-mail.schemas.in.h:176
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr "Tøm alle papirkurver når programmet avsluttes."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
-#: ../mail/evolution-mail.schemas.in.h:199
-msgid ""
-"The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
-msgstr "Sist gang papirkurven ble tømt, i dager siden 1 januar, 1970 (Epoch)."
+#: ../mail/evolution-mail.schemas.in.h:177
+msgid "Minimum days between emptying the trash on exit"
+msgstr "Minimum antall dager mellom tømming av papirkurven ved avslutting"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
-#: ../mail/evolution-mail.schemas.in.h:200
-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 "
-"message list. \"1\" (Vertical View) places the preview pane next to the "
-"message list."
+#: ../mail/evolution-mail.schemas.in.h:178
+msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
+"Minste tidsperiode mellom tømming av papirkurven ved avslutting, i dager."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
-#: ../mail/evolution-mail.schemas.in.h:201
-msgid "The terminal font for mail display."
-msgstr "Terminalskrift for meldingsvisning."
+#: ../mail/evolution-mail.schemas.in.h:179
+msgid "Last time Empty Trash was run"
+msgstr "Siste gang papirkurven ble tømt"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid ""
-"The text that is inserted when forwarding a message, saying that the "
-"forwarded message follows"
-msgstr ""
+"The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
+msgstr "Sist gang papirkurven ble tømt, i dager siden 1 januar, 1970 (Epoch)."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
-msgid ""
-"The text that is inserted when replying to a message (top posting), saying "
-"that the original message follows"
-msgstr ""
+#: ../mail/evolution-mail.schemas.in.h:181
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:125
+msgid "Amount of time in seconds the error should be shown on the status bar."
+msgstr "Antall sekunder feilen skal vises i statuslinjen."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
-msgid ""
-"The text that is inserted when replying to a message, attributing the "
-"message to the original author"
-msgstr ""
+#: ../mail/evolution-mail.schemas.in.h:182
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:126
+msgid "Level beyond which the message should be logged."
+msgstr "Over dette nivået skal meldingen logges."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
-#: ../mail/evolution-mail.schemas.in.h:205
-msgid "The variable width font for mail display."
-msgstr "Skrift med variabel bredde for meldingsvisning."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
-#: ../mail/evolution-mail.schemas.in.h:206
+#: ../mail/evolution-mail.schemas.in.h:183
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -9329,218 +9337,225 @@ msgstr ""
 "Denne har tre mulige verdier. «0» for feil. «1» for advarsler. «2» for "
 "feilsøkingsmeldinger."
 
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:184
+msgid "Show original \"Date\" header value."
+msgstr "Vis opprinnelig verdi for «Date»-meldingshode."
+
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
-#: ../mail/evolution-mail.schemas.in.h:207
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid ""
-"This decides the max size of the message text that will be displayed under "
-"Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
-"is used only when 'force_message_limit' key is activated."
+"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 ""
-"Bestemmer maksimal størrelse for tekstdelen som kan formatteres i evolution. "
-"Forvalg er 4MB / 4096 KB og oppgis i KB. Verdien brukes kun hvis nøkkelen "
-"«force_message_limit» er slått på."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
-#: ../mail/evolution-mail.schemas.in.h:208
-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 "
-"to the other available plugins."
-msgstr ""
-"Dette er forvalgt tillegg for håndtering av uønsket e-post selv om flere "
-"tillegg er aktivert. Hvis forvalgt tillegg deaktiveres vil ikke de andre "
-"brukes."
+#: ../mail/evolution-mail.schemas.in.h:186
+msgid "List of Labels and their associated colors"
+msgstr "Liste over etiketter og deres assosierte farger"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
-#: ../mail/evolution-mail.schemas.in.h:209
+#: ../mail/evolution-mail.schemas.in.h:187
 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."
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
-"Denne nøkkelen leses kun en gang og settes til «false» etter at den er lest. "
-"Dette fjerner markering fra e-posten i listen og fjerner forhåndsvisning for "
-"den mappen."
+"Liste over etiketter som e-postkomponenten til Evolution kjenner til. Listen "
+"inneholder strenger som inneholder «name:color» hvor «color» bruker HTML hex "
+"koding."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
-#: ../mail/evolution-mail.schemas.in.h:210
-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;"
-"header enabled&gt; - set enabled if the header is to be displayed in the "
-"mail view."
-msgstr ""
-"Denne nøkkelen burde inneholde en liste over XML-strukturer som spesifiserer "
-"tilpassede topptekster og om de skal vises. Formatet til XML-strukturen er "
-"&lt;header enabled&gt; - sett «enabled» hvis toppteksten skal vises i e-"
-"postvisningen. "
+#: ../mail/evolution-mail.schemas.in.h:188
+msgid "Check incoming mail being junk"
+msgstr "Sjekk om innkommende meldinger er uønsket e-post"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
-#: ../mail/evolution-mail.schemas.in.h:211
-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:189
+msgid "Run junk test on incoming mail."
+msgstr "Sjekk om innkommende e-post er uønsket."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
-#: ../mail/evolution-mail.schemas.in.h:212
-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:190
+msgid "Empty Junk folders on exit"
+msgstr "Tøm mappe for uønsket e-post når programmet avsluttes"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
-#: ../mail/evolution-mail.schemas.in.h:213
-msgid ""
-"This sets the number of addresses to show in default message list view, "
-"beyond which a '...' is shown."
-msgstr ""
-"Setter antall adresser som skal vises i forvalgt listevisning for meldinger. "
-"Etter dette vises «…»."
+#: ../mail/evolution-mail.schemas.in.h:191
+msgid "Empty all Junk folders when exiting Evolution."
+msgstr "Tøm alle mapper for uønsket e-post når programmet avsluttes."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
-msgid ""
-"This setting specifies whether the threads should be in expanded or "
-"collapsed state by default. Evolution requires a restart."
+#: ../mail/evolution-mail.schemas.in.h:192
+msgid "Minimum days between emptying the junk on exit"
 msgstr ""
-"Denne innstillingen spesifiserer om tråder skal være i utvidet eller "
-"sammenslått tilstand som forvalg. Evolution må startes på nytt hvis denne "
-"endres."
+"Minimum antall dager mellom tømming av mapper for uønsket e-post ved "
+"avslutting"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
-#: ../mail/evolution-mail.schemas.in.h:215
-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 "
-"restart."
+#: ../mail/evolution-mail.schemas.in.h:193
+msgid "Minimum time between emptying the junk on exit, in days."
 msgstr ""
-"Denne innstillingen spesifiserer om tråder skal sorteres basert på siste "
-"melding i hver tråd i stedet for meldingens dato. Evolution må startes på "
-"nytt."
+"Minste tidsperiode mellom tømming av mapper for uønsket e-post ved "
+"avslutting, i dager."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
-msgid ""
-"This value can be an empty string, which means it'll use the system Picture "
-"folder, usually set to ~/Pictures. This folder will be also used when the "
-"set path is not pointing to the existent folder"
-msgstr ""
+#: ../mail/evolution-mail.schemas.in.h:194
+msgid "Last time Empty Junk was run"
+msgstr "Siste gang mapper for uønsket e-post ble tømt"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
-#: ../mail/evolution-mail.schemas.in.h:217
-msgid "Thread the message-list based on Subject"
-msgstr "Lag tråder av e-postlisten basert på emne"
+#: ../mail/evolution-mail.schemas.in.h:195
+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 1 januar 1970 "
+"(epoch)."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
-#: ../mail/evolution-mail.schemas.in.h:218
-msgid "Timeout for marking message as seen"
-msgstr "Tidsgrense for å merke e-post som sett"
+#: ../mail/evolution-mail.schemas.in.h:196
+msgid "The default plugin for Junk hook"
+msgstr "Forvalgt tillegg for uønsket e-post"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
-#: ../mail/evolution-mail.schemas.in.h:219
-msgid "Timeout for marking message as seen."
-msgstr "Tidsavbrydd å merke e-poster som sett."
+#: ../mail/evolution-mail.schemas.in.h:197
+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 "
+"to the other available plugins."
+msgstr ""
+"Dette er forvalgt tillegg for håndtering av uønsket e-post selv om flere "
+"tillegg er aktivert. Hvis forvalgt tillegg deaktiveres vil ikke de andre "
+"brukes."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
-#: ../mail/evolution-mail.schemas.in.h:220
-msgid "UID string of the default account."
-msgstr "UID-streng for forvalgt konto."
+#: ../mail/evolution-mail.schemas.in.h:198
+msgid "Determines whether to lookup in address book for sender email"
+msgstr "Bestemmer om avsenders e-post skal slås opp i adresseboken"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
-#: ../mail/evolution-mail.schemas.in.h:221
-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:199
+msgid ""
+"Determines whether to lookup the sender email in address book. If found, it "
+"shouldn't be a spam. It looks up in the books marked for autocompletion. It "
+"can be slow, if remote address books (like LDAP) are marked for "
+"autocompletion."
+msgstr ""
+"Bestemmer om avsender skal slås opp i adresseboken. Hvis dette er tilfelle "
+"vil meldingen ikke merkes som uønsket. Oppslag blir gjort mot adressebøker "
+"som er merket for automatisk fullføring. Operasjonen kan være treg hvils "
+"eksterne adressebøker som LDAP er merket for automatisk fullføring."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
-#: ../mail/evolution-mail.schemas.in.h:222
-msgid "Use custom fonts"
-msgstr "Bruk egendefinerte skrifter"
+#: ../mail/evolution-mail.schemas.in.h:200
+msgid ""
+"Determines whether to look up addresses for junk filtering in local address "
+"book only"
+msgstr ""
+"Bestemmer om oppslag for filtrering av uønsket e-post kun skal slås opp i "
+"lokale adressebøker"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
-#: ../mail/evolution-mail.schemas.in.h:223
-msgid "Use custom fonts for displaying mail."
-msgstr "Bruk tilpassede skrifttyper for e-postvisning."
+#: ../mail/evolution-mail.schemas.in.h:201
+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 ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
-#: ../mail/evolution-mail.schemas.in.h:224
-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."
+#: ../mail/evolution-mail.schemas.in.h:202
+msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
+"Bestemmer om egendefinerte meldingshoder skal brukes for å se etter uønsket "
+"e-post"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
-#: ../mail/evolution-mail.schemas.in.h:225
+#: ../mail/evolution-mail.schemas.in.h:203
 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."
+"Determines whether to use custom headers to check for junk. If this option "
+"is enabled and the headers are mentioned, it will be improve the junk "
+"checking speed."
 msgstr ""
+"Bestemmer om egendefinerte meldingshoder skal brukes for å finne uønsket e-"
+"post. Hvis dette alternativet er aktivert og meldingshodene finnes vil  "
+"dette forbedre hastigheten for denne sjekken."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
-#: ../mail/evolution-mail.schemas.in.h:226
-msgid "Variable width font"
-msgstr "Skrift for variabel bredde"
+#: ../mail/evolution-mail.schemas.in.h:204
+msgid "Custom headers to use while checking for junk."
+msgstr "Egendefinert meldingshode som skal sjekkes for uønsket e-post."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
-#: ../mail/evolution-mail.schemas.in.h:227
-msgid "Whether a read receipt request gets added to every message by default."
+#: ../mail/evolution-mail.schemas.in.h:205
+msgid ""
+"Custom headers to use while checking for junk. The list elements are string "
+"in the format \"headername=value\"."
 msgstr ""
-"Om en forespørsel om lesekvittering skal legges til alle meldinger som "
-"forvalg."
+"Egendefinerte meldingshoder som brukes ved sjekk etter uønsket e-post. "
+"Formatet for listeelementene er «headername=value»."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
-#: ../mail/evolution-mail.schemas.in.h:228
-msgid ""
-"Whether check for new messages in all active accounts regardless of the "
-"account \"Check for new messages every X minutes\" option when Evolution is "
-"started. This option is used only together with 'send_recv_on_start' option."
-msgstr ""
+#: ../mail/evolution-mail.schemas.in.h:206
+msgid "UID string of the default account."
+msgstr "UID-streng for forvalgt konto."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
-#: ../mail/evolution-mail.schemas.in.h:229
-msgid ""
-"Whether check for new messages when Evolution is started. This includes also "
-"sending messages from Outbox."
-msgstr ""
+#: ../mail/evolution-mail.schemas.in.h:211
+msgid "Save directory"
+msgstr "Lagre katalog"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
-#: ../mail/evolution-mail.schemas.in.h:230
-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:212
+msgid "Directory for saving mail component files."
+msgstr "Katalog for å lagre komponentfiler for e-post."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
-#: ../mail/evolution-mail.schemas.in.h:231
-msgid ""
-"Whether or not to fall back on threading by subjects when the messages do "
-"not contain In-Reply-To or References headers."
+msgid "Composer load/attach directory"
 msgstr ""
-"Om e-poster skal sorteres etter emner når de ikke inneholder «In-Reply-To» "
-"eller referansetopptekster."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
-#: ../mail/evolution-mail.schemas.in.h:232
-msgid "Whether sort threads based on latest message in that thread"
-msgstr "Om tråder sorteres basert på siste melding i den tråden"
+msgid "Directory for loading/attaching files to composer."
+msgstr "Katalog for å laste/legge ved filer i redigering."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
-#: ../mail/evolution-mail.schemas.in.h:233
-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:219
+msgid "Check for new messages on start"
+msgstr "Se etter nye meldinger ved oppstart"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
-msgid "Whether to show local folders (On This Computer) in a folder tree"
+#: ../mail/evolution-mail.schemas.in.h:220
+msgid ""
+"Whether check for new messages when Evolution is started. This includes also "
+"sending messages from Outbox."
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
-#: ../mail/evolution-mail.schemas.in.h:235
-msgid "Width of the message-list pane"
-msgstr "Bredde på e-postlistefeltet"
+#: ../mail/evolution-mail.schemas.in.h:221
+msgid "Check for new messages in all active accounts"
+msgstr "Se etter nye meldinger i alle aktive kontoer"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
-#: ../mail/evolution-mail.schemas.in.h:236
-msgid "Width of the message-list pane."
-msgstr "Bredde på e-postlistefeltet."
+#: ../mail/evolution-mail.schemas.in.h:222
+msgid ""
+"Whether check for new messages in all active accounts regardless of the "
+"account \"Check for new messages every X minutes\" option when Evolution is "
+"started. This option is used only together with 'send_recv_on_start' option."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
+#: ../mail/evolution-mail.schemas.in.h:239
+msgid "Server synchronization interval"
+msgstr "Intervall for serversynkronisering"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
+#: ../mail/evolution-mail.schemas.in.h:240
+msgid ""
+"Controls how frequently local changes are synchronized with the remote mail "
+"server. The interval must be at least 30 seconds."
+msgstr ""
+"Kontrollerer hvor ofte lokale endringer synkroniseres med ekstern e-"
+"posttjener. Intervallet må være minst 30 sekunder."
 
 #: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:1
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
@@ -9569,47 +9584,47 @@ msgstr ""
 "Adressebok som skal brukes til å lagre automatisk synkroniserte kontakter"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:3
-msgid "Address book to use for storing automatically synced contacts from GAIM"
-msgstr ""
-"Adressebok som skal brukes til å lagre automatisk synkroniserte kontakter "
-"fra GAIM"
-
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:4
 msgid "Auto sync GAIM contacts"
 msgstr "Automatisk synkronisering av kontakter fra GAIM"
 
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:5
-msgid "Check interval for GAIM syncing of contacts"
-msgstr "Intervall for sjekk før synkronisering av kontakter fra GAIM"
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:4
+msgid "Whether GAIM contacts should be automaticall synced"
+msgstr "Om kontakter fra GAIM skal synkroniseres automatisk"
 
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:6
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:5
 msgid "Enable autocontacts"
 msgstr "Slå på automatiske kontakter"
 
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:6
+msgid ""
+"Whether contacts should be automatically added to the user's addressbook"
+msgstr "Om kontakter skal legges til automatisk i brukers adressebok"
+
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:7
 msgid "GAIM address book source"
 msgstr "Kilde for GAIM-adressebok"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:8
-msgid "GAIM check interval"
-msgstr "Intervall for sjekk mot GAIM"
+msgid "Address book to use for storing automatically synced contacts from GAIM"
+msgstr ""
+"Adressebok som skal brukes til å lagre automatisk synkroniserte kontakter "
+"fra GAIM"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:9
-msgid "GAIM last sync MD5"
-msgstr "MD5-sum for siste synkronisering fra GAIM"
+msgid "GAIM check interval"
+msgstr "Intervall for sjekk mot GAIM"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:10
-msgid "GAIM last sync time"
-msgstr "Tid for siste synkronisering fra GAIM"
+msgid "Check interval for GAIM syncing of contacts"
+msgstr "Intervall for sjekk før synkronisering av kontakter fra GAIM"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:11
-msgid "Whether GAIM contacts should be automaticall synced"
-msgstr "Om kontakter fra GAIM skal synkroniseres automatisk"
+msgid "GAIM last sync MD5"
+msgstr "MD5-sum for siste synkronisering fra GAIM"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:12
-msgid ""
-"Whether contacts should be automatically added to the user's addressbook"
-msgstr "Om kontakter skal legges til automatisk i brukers adressebok"
+msgid "GAIM last sync time"
+msgstr "Tid for siste synkronisering fra GAIM"
 
 #: ../data/org.gnome.evolution.plugin.email-custom-header.gschema.xml.in.h:1
 #: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
@@ -9629,25 +9644,25 @@ msgstr ""
 "adskilt med «;»"
 
 #: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:1
-msgid "Automatically launch editor when key is pressed in the mail composer."
-msgstr ""
-"Start redigeringsprogram automatisk når tasten trykkes i e-postredigering"
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
+msgid "Default External Editor"
+msgstr "Forvalgt eksternt redigeringsprogram"
 
 #: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:2
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
-#: ../plugins/external-editor/external-editor.c:125
-msgid "Automatically launch when a new mail is edited"
-msgstr "Start automatisk når en ny e-post redigeres"
+msgid "The default command that must be used as the editor."
+msgstr "Forvalgt kommando som må brukes som redigeringsprogram."
 
 #: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:3
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:3
-msgid "Default External Editor"
-msgstr "Forvalgt eksternt redigeringsprogram"
+#: ../plugins/external-editor/external-editor.c:125
+msgid "Automatically launch when a new mail is edited"
+msgstr "Start automatisk når en ny e-post redigeres"
 
 #: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:4
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:4
-msgid "The default command that must be used as the editor."
-msgstr "Forvalgt kommando som må brukes som redigeringsprogram."
+msgid "Automatically launch editor when key is pressed in the mail composer."
+msgstr ""
+"Start redigeringsprogram automatisk når tasten trykkes i e-postredigering"
 
 #: ../data/org.gnome.evolution.plugin.face-picture.gschema.xml.in.h:1
 #: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:1
@@ -9671,89 +9686,89 @@ msgstr "Om prosesserte iTip-objekter skal slettes"
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:1
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
-msgid "Beep or play sound file."
-msgstr "Pip eller spill av en lydfil."
+msgid "Notify new messages for Inbox only."
+msgstr "Varslingsmelding kun for innboks."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:2
-msgid "Enable D-Bus messages."
-msgstr "Slå på D-Bus-meldinger."
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
+msgid "Whether to notify new messages in Inbox folder only."
+msgstr "Im nye meldinger kun skal varsles i innboksen."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:3
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
-msgid "Enable icon in notification area."
-msgstr "Aktiver ikon i varslingsområdet."
+msgid "Enable D-Bus messages."
+msgstr "Slå på D-Bus-meldinger."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:4
-msgid "FIXME"
-msgstr "FIKSMEG"
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:5
 msgid "Generates a D-Bus message when new mail messages arrive."
 msgstr "Genererer en D-Bus-melding når det kommer nye meldinger."
 
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:6
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:5
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
-msgid ""
-"If \"true\", then beep, otherwise will play sound file when new messages "
-"arrive."
-msgstr "Pip hvis «true», eller spill en lydfil når nye meldinger ankommer."
+msgid "Enable icon in notification area."
+msgstr "Aktiver ikon i varslingsområdet."
 
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:7
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:6
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
-msgid "Notify new messages for Inbox only."
-msgstr "Varslingsmelding kun for innboks."
+msgid "Show new mail icon in notification area when new messages arrive."
+msgstr "Vis ikon for ny melding i varslingsområdet når nye meldinger ankommer."
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:7
+msgid "Popup message together with the icon."
+msgstr "Vis melding sammen med ikonet."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:8
+msgid "Whether show message over the icon when new messages arrive."
+msgstr "Om meldingen skal vises over ikonet når nye meldinger ankommer."
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:9
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
 msgid "Play sound when new messages arrive."
 msgstr "Spill en lyd når nye meldinger ankommer."
 
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:9
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
-msgid "Play themed sound when new messages arrive, if not in beep mode."
-msgstr ""
-"Spill av lyd fra lydtema når nye meldinger ankommer hvis ikke pip-modus er "
-"aktivert."
-
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:10
-msgid "Popup message together with the icon."
-msgstr "Vis melding sammen med ikonet."
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
+msgid "Whether play sound or beep when new messages arrive."
+msgstr "Om en lydfil eller et pip skal spilles av når nye meldinger ankommer."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:11
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
-msgid "Show new mail icon in notification area when new messages arrive."
-msgstr "Vis ikon for ny melding i varslingsområdet når nye meldinger ankommer."
+msgid "Beep or play sound file."
+msgstr "Pip eller spill av en lydfil."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:12
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
-msgid "Sound file name to be played."
-msgstr "Navn på lydfil som skal spilles av."
+msgid ""
+"If \"true\", then beep, otherwise will play sound file when new messages "
+"arrive."
+msgstr "Pip hvis «true», eller spill en lydfil når nye meldinger ankommer."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:13
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
+msgid "Sound file name to be played."
+msgstr "Navn på lydfil som skal spilles av."
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:14
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
 msgid "Sound file to be played when new messages arrive, if not in beep mode."
 msgstr ""
 "Lydfil som skal spilles av når nye meldinger ankommer hvis pip-modus ikke er "
 "aktivert."
 
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:14
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
-msgid "Use sound theme"
-msgstr "Bruk lydtema"
-
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:15
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
-msgid "Whether play sound or beep when new messages arrive."
-msgstr "Om en lydfil eller et pip skal spilles av når nye meldinger ankommer."
+msgid "FIXME"
+msgstr "FIKSMEG"
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:16
-msgid "Whether show message over the icon when new messages arrive."
-msgstr "Om meldingen skal vises over ikonet når nye meldinger ankommer."
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
+msgid "Use sound theme"
+msgstr "Bruk lydtema"
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:17
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
-msgid "Whether to notify new messages in Inbox folder only."
-msgstr "Im nye meldinger kun skal varsles i innboksen."
+msgid "Play themed sound when new messages arrive, if not in beep mode."
+msgstr ""
+"Spill av lyd fra lydtema når nye meldinger ankommer hvis ikke pip-modus er "
+"aktivert."
 
 #: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:1
 msgid "Mode to use when displaying mails"
@@ -9780,85 +9795,88 @@ msgstr ""
 "meldingskropp."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:1
-#: ../shell/apps_evolution_shell.schemas.in.h:4
-msgid "Default sidebar width"
-msgstr "Forvalgt bredde på sidelinje"
+#: ../shell/apps_evolution_shell.schemas.in.h:5
+msgid "Skip development warning dialog"
+msgstr "Hopp over varseldialogen om utviklingsversjonen"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:2
-#: ../shell/apps_evolution_shell.schemas.in.h:10
-msgid "Enable express mode"
-msgstr "Slå på ekspressmodus"
+#: ../shell/apps_evolution_shell.schemas.in.h:6
+msgid ""
+"Whether the warning dialog in development versions of Evolution is skipped."
+msgstr ""
+"Om advarselsdialogen i utviklingsversjoner av Evolution blir hoppet over."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:3
-#: ../shell/apps_evolution_shell.schemas.in.h:12
-msgid "Flag that enables a much simplified user interface."
-msgstr "Flagg som slår på et forenklet brukergrensesnitt."
+#: ../shell/apps_evolution_shell.schemas.in.h:7
+msgid "Initial attachment view"
+msgstr "Forvalgt vedleggsvisning"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:4
-#: ../shell/apps_evolution_shell.schemas.in.h:17
-msgid "ID or alias of the component to be shown by default at start-up."
-msgstr "ID eller alias for komponenten som skal være forvalgt ved oppstart."
+#: ../shell/apps_evolution_shell.schemas.in.h:8
+msgid ""
+"Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
+"View."
+msgstr ""
+"Startvisning for vedleggslinjekomponenter. «0» er ikonvisning, «1» er "
+"listevisning."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:5
-#: ../shell/apps_evolution_shell.schemas.in.h:19
-msgid "Initial attachment view"
-msgstr "Forvalgt vedleggsvisning"
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:6
 msgid "Initial file chooser folder"
 msgstr "Forhåndsvalgt mappe for filvelger"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:6
 msgid "Initial folder for GtkFileChooser dialogs."
 msgstr "Startmappe for GtkFileChooser dialoger."
 
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:9 ../shell/main.c:317
+msgid "Start in offline mode"
+msgstr "Start i frakoblet modus"
+
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:8
-#: ../shell/apps_evolution_shell.schemas.in.h:20
-msgid ""
-"Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
-"View."
+#: ../shell/apps_evolution_shell.schemas.in.h:10
+msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr ""
-"Startvisning for vedleggslinjekomponenter. «0» er ikonvisning, «1» er "
-"listevisning."
+"Om Evolution skal startes i frakoblet modus i stedet for tilkoblet modus."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:9
+msgid "Offline folder paths"
+msgstr "Sti til frakoblede mapper"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:10
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage."
 msgstr ""
 "Liste med stier for mapper som skal bli synkronisert til disk for frakoblet "
 "bruk."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:10
-msgid "Offline folder paths"
-msgstr "Sti til frakoblede mapper"
-
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:11
-#: ../shell/apps_evolution_shell.schemas.in.h:31
-msgid "Sidebar is visible"
-msgstr "Sidelinjen er synlig"
+#: ../shell/apps_evolution_shell.schemas.in.h:61
+msgid "Enable express mode"
+msgstr "Slå på ekspressmodus"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:12
-#: ../shell/apps_evolution_shell.schemas.in.h:32
-msgid "Skip development warning dialog"
-msgstr "Hopp over varseldialogen om utviklingsversjonen"
+#: ../shell/apps_evolution_shell.schemas.in.h:62
+msgid "Flag that enables a much simplified user interface."
+msgstr "Flagg som slår på et forenklet brukergrensesnitt."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:13
-#: ../shell/apps_evolution_shell.schemas.in.h:33 ../shell/main.c:317
-msgid "Start in offline mode"
-msgstr "Start i frakoblet modus"
+#: ../shell/apps_evolution_shell.schemas.in.h:22
+msgid "Window buttons are visible"
+msgstr "Vindusknapper er synlige"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:14
-#: ../shell/apps_evolution_shell.schemas.in.h:34
-msgid "Statusbar is visible"
-msgstr "Statuslinjen er synlig"
+#: ../shell/apps_evolution_shell.schemas.in.h:23
+msgid "Whether the window buttons should be visible."
+msgstr "Om vinduknappene skal være synlige."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:15
-#: ../shell/apps_evolution_shell.schemas.in.h:40
-msgid "The default width for the sidebar, in pixels."
-msgstr "Forvalgt bredde på sidelinjen i piksler."
+#: ../shell/apps_evolution_shell.schemas.in.h:24
+msgid "Window button style"
+msgstr "Knappestil for vindu"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:16
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -9869,87 +9887,84 @@ msgstr ""
 "instillingene."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:17
-#: ../shell/apps_evolution_shell.schemas.in.h:50
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Toolbar is visible"
 msgstr "Verktøylinjen er synlig"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:18
-#: ../shell/apps_evolution_shell.schemas.in.h:54
-msgid "Whether Evolution will start up in offline mode instead of online mode."
-msgstr ""
-"Om Evolution skal startes i frakoblet modus i stedet for tilkoblet modus."
+#: ../shell/apps_evolution_shell.schemas.in.h:27
+msgid "Whether the toolbar should be visible."
+msgstr "Om verktøylinjen skal være synlig."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:19
-#: ../shell/apps_evolution_shell.schemas.in.h:56
-msgid "Whether the sidebar should be visible."
-msgstr "Om sidelinjen skal være synlig."
+#: ../shell/apps_evolution_shell.schemas.in.h:28
+msgid "Sidebar is visible"
+msgstr "Sidelinjen er synlig"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:20
-#: ../shell/apps_evolution_shell.schemas.in.h:57
-msgid "Whether the status bar should be visible."
-msgstr "Om statuslinjen skal være synlig."
+#: ../shell/apps_evolution_shell.schemas.in.h:29
+msgid "Whether the sidebar should be visible."
+msgstr "Om sidelinjen skal være synlig."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:21
-#: ../shell/apps_evolution_shell.schemas.in.h:58
-msgid "Whether the toolbar should be visible."
-msgstr "Om verktøylinjen skal være synlig."
+#: ../shell/apps_evolution_shell.schemas.in.h:30
+msgid "Statusbar is visible"
+msgstr "Statuslinjen er synlig"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:22
-#: ../shell/apps_evolution_shell.schemas.in.h:59
-msgid ""
-"Whether the warning dialog in development versions of Evolution is skipped."
-msgstr ""
-"Om advarselsdialogen i utviklingsversjoner av Evolution blir hoppet over."
+#: ../shell/apps_evolution_shell.schemas.in.h:31
+msgid "Whether the status bar should be visible."
+msgstr "Om statuslinjen skal være synlig."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:23
-#: ../shell/apps_evolution_shell.schemas.in.h:60
-msgid "Whether the window buttons should be visible."
-msgstr "Om vinduknappene skal være synlige."
+#: ../shell/apps_evolution_shell.schemas.in.h:32
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr "ID eller alias for komponenten som skal være forvalgt ved oppstart."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:24
-#: ../shell/apps_evolution_shell.schemas.in.h:61
-msgid "Window button style"
-msgstr "Knappestil for vindu"
+#: ../shell/apps_evolution_shell.schemas.in.h:33
+msgid "Default sidebar width"
+msgstr "Forvalgt bredde på sidelinje"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:25
-#: ../shell/apps_evolution_shell.schemas.in.h:62
-msgid "Window buttons are visible"
-msgstr "Vindusknapper er synlige"
+#: ../shell/apps_evolution_shell.schemas.in.h:34
+msgid "The default width for the sidebar, in pixels."
+msgstr "Forvalgt bredde på sidelinjen i piksler."
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:1
-msgid "Socket path for SpamAssassin"
-msgstr "Sti for plugg for SpamAssassin"
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:1
+msgid "Use only local spam tests."
+msgstr "Bruk bare lokale tester for uønsket e-post."
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:2
-msgid "SpamAssassin client binary"
-msgstr "Kjørbar fil for SpamAssassin-klient"
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:2
+msgid "Use only the local spam tests (no DNS)."
+msgstr "Bruk bare lokale tester for uønsket e-post (ingen DNS)."
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:3
-msgid "SpamAssassin daemon binary"
-msgstr "Kjørbar fil for SpamAssassin-tjeneste"
+msgid "Socket path for SpamAssassin"
+msgstr "Sti for plugg for SpamAssassin"
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:4
-#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:1
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:3
 msgid "Use SpamAssassin daemon and client"
 msgstr "Bruk SpamAssassin tjener og klient"
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:5
-#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:2
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:4
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "Bruk SpamAssassin tjener og klient (spamd/spamc)."
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:6
-#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:3
-msgid "Use only local spam tests."
-msgstr "Bruk bare lokale tester for uønsket e-post."
+msgid "SpamAssassin client binary"
+msgstr "Kjørbar fil for SpamAssassin-klient"
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:7
-#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:4
-msgid "Use only the local spam tests (no DNS)."
-msgstr "Bruk bare lokale tester for uønsket e-post (ingen DNS)."
+msgid "SpamAssassin daemon binary"
+msgstr "Kjørbar fil for SpamAssassin-tjeneste"
 
 #: ../em-format/em-format.c:1060 ../em-format/em-format-quote.c:318
-#: ../mail/e-mail-tag-editor.c:327 ../mail/message-list.etspec.h:7
+#: ../mail/e-mail-tag-editor.c:327 ../mail/message-list.etspec.h:5
 #: ../modules/mail/em-mailer-prefs.c:70
 msgid "From"
 msgstr "Fra"
@@ -9960,25 +9975,25 @@ msgid "Reply-To"
 msgstr "Svar-til"
 
 #: ../em-format/em-format.c:1063 ../em-format/em-format-quote.c:318
-#: ../mail/em-format-html.c:2630 ../mail/em-format-html.c:2698
-#: ../mail/em-format-html.c:2721 ../modules/mail/em-mailer-prefs.c:73
+#: ../mail/em-format-html.c:2664 ../mail/em-format-html.c:2732
+#: ../mail/em-format-html.c:2755 ../modules/mail/em-mailer-prefs.c:73
 msgid "Cc"
 msgstr "Cc"
 
 #: ../em-format/em-format.c:1064 ../em-format/em-format-quote.c:318
-#: ../mail/em-format-html.c:2631 ../mail/em-format-html.c:2702
-#: ../mail/em-format-html.c:2724 ../modules/mail/em-mailer-prefs.c:74
+#: ../mail/em-format-html.c:2665 ../mail/em-format-html.c:2736
+#: ../mail/em-format-html.c:2758 ../modules/mail/em-mailer-prefs.c:74
 msgid "Bcc"
 msgstr "Bcc"
 
 #: ../em-format/em-format.c:1065 ../em-format/em-format-quote.c:463
 #: ../mail/e-mail-tag-editor.c:332 ../mail/em-filter-i18n.h:74
-#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:75
+#: ../mail/message-list.etspec.h:6 ../modules/mail/em-mailer-prefs.c:75
 #: ../smime/lib/e-cert.c:1147
 msgid "Subject"
 msgstr "Emne"
 
-#: ../em-format/em-format.c:1066 ../mail/message-list.etspec.h:2
+#: ../em-format/em-format.c:1066 ../mail/message-list.etspec.h:7
 #: ../modules/mail/em-mailer-prefs.c:76 ../widgets/misc/e-dateedit.c:523
 #: ../widgets/misc/e-dateedit.c:545
 msgid "Date"
@@ -9989,7 +10004,7 @@ msgid "Newsgroups"
 msgstr "Nyhetsgrupper"
 
 #: ../em-format/em-format.c:1068 ../modules/mail/em-mailer-prefs.c:78
-#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+#: ../plugins/face/org-gnome-face.eplug.xml.h:1
 msgid "Face"
 msgstr "Ansikt"
 
@@ -10036,8 +10051,8 @@ msgid "Could not parse PGP message: "
 msgstr "Kunne ikke lese PGP-melding:"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:474 ../mail/em-format-html.c:2823
-#: ../modules/mail/em-mailer-prefs.c:1026
+#: ../em-format/em-format-quote.c:474 ../mail/em-format-html.c:2857
+#: ../modules/mail/em-mailer-prefs.c:1025
 msgid "Mailer"
 msgstr "E-postprogram"
 
@@ -10256,9 +10271,9 @@ msgstr "Skriver «%s»"
 msgid "Writing \"%s\" to %s"
 msgstr "Skriver «%s» til %s"
 
-#: ../e-util/e-plugin-util.c:455 ../filter/filter.ui.h:22
+#: ../e-util/e-plugin-util.c:455 ../filter/filter.ui.h:9
 #: ../plugins/google-account-setup/google-contacts-source.c:388
-#: ../plugins/publish-calendar/publish-calendar.ui.h:33
+#: ../plugins/publish-calendar/publish-calendar.ui.h:7
 msgid "weeks"
 msgstr "uker"
 
@@ -10280,28 +10295,28 @@ msgid "Autogenerated"
 msgstr "Generert automatisk"
 
 #: ../e-util/e-system.error.xml.h:1
-msgid "Because \"{1}\"."
-msgstr "Fordi «{1}»."
+msgid "File exists \"{0}\"."
+msgstr "Filen «{0}» eksisterer."
 
 #: ../e-util/e-system.error.xml.h:2
-msgid "Cannot open file \"{0}\"."
-msgstr "Kan ikke åpne fil «{0}»."
+msgid "Do you wish to overwrite it?"
+msgstr "Vil du overskrive den?"
 
-#: ../e-util/e-system.error.xml.h:3
-msgid "Cannot save file \"{0}\"."
-msgstr "Kan ikke lagre fil «{0}»."
+#: ../e-util/e-system.error.xml.h:3 ../mail/mail.error.xml.h:113
+msgid "_Overwrite"
+msgstr "_Overskriv"
 
 #: ../e-util/e-system.error.xml.h:4
-msgid "Do you wish to overwrite it?"
-msgstr "Vil du overskrive den?"
+msgid "Cannot save file \"{0}\"."
+msgstr "Kan ikke lagre fil «{0}»."
 
 #: ../e-util/e-system.error.xml.h:5
-msgid "File exists \"{0}\"."
-msgstr "Filen «{0}» eksisterer."
+msgid "Because \"{1}\"."
+msgstr "Fordi «{1}»."
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:163
-msgid "_Overwrite"
-msgstr "_Overskriv"
+#: ../e-util/e-system.error.xml.h:6
+msgid "Cannot open file \"{0}\"."
+msgstr "Kan ikke åpne fil «{0}»."
 
 #: ../e-util/e-util.c:245
 msgid "Could not open the link."
@@ -10433,62 +10448,62 @@ msgstr "Velg en tid å sammenligne mot"
 msgid "Choose a File"
 msgstr "Velg en fil"
 
-#: ../filter/e-filter-rule.c:666
+#: ../filter/e-filter-rule.c:675
 msgid "R_ule name:"
 msgstr "Regel_navn:"
 
-#: ../filter/e-filter-rule.c:696
+#: ../filter/e-filter-rule.c:705
 msgid "Find items that meet the following conditions"
 msgstr "Finn oppføringer som møter følgende kriterier"
 
-#: ../filter/e-filter-rule.c:721
+#: ../filter/e-filter-rule.c:730
 msgid "If all conditions are met"
 msgstr "Hvis alle kriterier er møtt"
 
-#: ../filter/e-filter-rule.c:722
+#: ../filter/e-filter-rule.c:731
 msgid "If any conditions are met"
 msgstr "Hvis noe kriterie er møtt"
 
-#: ../filter/e-filter-rule.c:725
+#: ../filter/e-filter-rule.c:734
 msgid "_Find items:"
 msgstr "_Finn oppføringer:"
 
 #. Translators: "None" for not including threads;
 #. * part of "Include threads: None"
-#: ../filter/e-filter-rule.c:754
+#: ../filter/e-filter-rule.c:763
 msgid "None"
 msgstr "Ingen"
 
-#: ../filter/e-filter-rule.c:755
+#: ../filter/e-filter-rule.c:764
 msgid "All related"
 msgstr "Alle relaterte"
 
-#: ../filter/e-filter-rule.c:756 ../widgets/misc/e-send-options.ui.h:19
+#: ../filter/e-filter-rule.c:765 ../widgets/misc/e-send-options.ui.h:19
 msgid "Replies"
 msgstr "Svar"
 
-#: ../filter/e-filter-rule.c:757
+#: ../filter/e-filter-rule.c:766
 msgid "Replies and parents"
 msgstr "Svar med opphav"
 
-#: ../filter/e-filter-rule.c:758
+#: ../filter/e-filter-rule.c:767
 msgid "No reply or parent"
 msgstr "Ingen svar eller opphav"
 
-#: ../filter/e-filter-rule.c:761
+#: ../filter/e-filter-rule.c:770
 msgid "I_nclude threads:"
 msgstr "Ta _med tråder:"
 
-#: ../filter/e-filter-rule.c:786
+#: ../filter/e-filter-rule.c:795
 msgid "A_dd Condition"
 msgstr "Legg til _kriterie"
 
-#: ../filter/e-filter-rule.c:1135 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:293
+#: ../filter/e-filter-rule.c:1146 ../filter/filter.ui.h:1
+#: ../mail/em-utils.c:304
 msgid "Incoming"
 msgstr "Innkommende"
 
-#: ../filter/e-filter-rule.c:1135 ../mail/em-utils.c:294
+#: ../filter/e-filter-rule.c:1146 ../mail/em-utils.c:305
 msgid "Outgoing"
 msgstr "Utgående"
 
@@ -10501,127 +10516,127 @@ msgid "Edit Rule"
 msgstr "Rediger regel"
 
 #: ../filter/filter.error.xml.h:1
-msgid "Bad regular expression &quot;{0}&quot;."
-msgstr "Ugyldig regulært uttrykk &quot;{0}&quot;."
+msgid "Missing date."
+msgstr "Mangler dato."
 
 #: ../filter/filter.error.xml.h:2
-msgid "Could not compile regular expression &quot;{1}&quot;."
-msgstr "Kunne ikke sette sammen regulært uttrykk &quot;{1}&quot;."
+msgid "You must choose a date."
+msgstr "Du må velge en dato."
 
 #: ../filter/filter.error.xml.h:3
-msgid "File &quot;{0}&quot; does not exist or is not a regular file."
-msgstr "Filen &quot;{0}&quot; eksisterer ikke eller er ikke en vanlig fil."
+msgid "Missing file name."
+msgstr "Mangler filnavn."
 
 #: ../filter/filter.error.xml.h:4
-msgid "Missing date."
-msgstr "Mangler dato."
+msgid "You must specify a file name."
+msgstr "Du må oppgi et filnavn."
 
 #: ../filter/filter.error.xml.h:5
-msgid "Missing file name."
-msgstr "Mangler filnavn."
+msgid "File &quot;{0}&quot; does not exist or is not a regular file."
+msgstr "Filen &quot;{0}&quot; eksisterer ikke eller er ikke en vanlig fil."
+
+#: ../filter/filter.error.xml.h:6
+msgid "Bad regular expression &quot;{0}&quot;."
+msgstr "Ugyldig regulært uttrykk &quot;{0}&quot;."
+
+#: ../filter/filter.error.xml.h:7
+msgid "Could not compile regular expression &quot;{1}&quot;."
+msgstr "Kunne ikke sette sammen regulært uttrykk &quot;{1}&quot;."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:89
+#: ../filter/filter.error.xml.h:8 ../mail/mail.error.xml.h:103
 msgid "Missing name."
 msgstr "Mangler navn."
 
-#: ../filter/filter.error.xml.h:7
+#: ../filter/filter.error.xml.h:9
+msgid "You must name this filter."
+msgstr "Du må gi navn til dette filteret."
+
+#: ../filter/filter.error.xml.h:10
 msgid "Name &quot;{0}&quot; already used."
 msgstr "Navnet &quot;{0}&quot; er allerede i bruk."
 
-#: ../filter/filter.error.xml.h:8
+#: ../filter/filter.error.xml.h:11
 msgid "Please choose another name."
 msgstr "Vennligst velg et annet navn."
 
-#: ../filter/filter.error.xml.h:9
-msgid "You must choose a date."
-msgstr "Du må velge en dato."
+#: ../filter/filter.ui.h:2
+msgid "the current time"
+msgstr "tiden nå"
 
-#: ../filter/filter.error.xml.h:10
-msgid "You must name this filter."
-msgstr "Du må gi navn til dette filteret."
+#: ../filter/filter.ui.h:3
+msgid "the time you specify"
+msgstr "tiden du oppgir"
 
-#: ../filter/filter.error.xml.h:11
-msgid "You must specify a file name."
-msgstr "Du må oppgi et filnavn."
+#: ../filter/filter.ui.h:4
+msgid "a time relative to the current time"
+msgstr "et klokkeslett relativt til klokkeslettet nå"
 
-#: ../filter/filter.ui.h:1
-msgid "Compare against"
-msgstr "Sammenligne med"
+#: ../filter/filter.ui.h:5
+msgid "seconds"
+msgstr "sekunder"
 
-#: ../filter/filter.ui.h:3
+#: ../filter/filter.ui.h:10
+#: ../plugins/publish-calendar/publish-calendar.ui.h:8
+msgid "months"
+msgstr "måneder"
+
+#: ../filter/filter.ui.h:11
+msgid "years"
+msgstr "år"
+
+#: ../filter/filter.ui.h:12
+msgid "ago"
+msgstr "siden"
+
+#: ../filter/filter.ui.h:13
+msgid "in the future"
+msgstr "i fremtiden"
+
+#: ../filter/filter.ui.h:14
 msgid "Show filters for mail:"
 msgstr "Vis filtre for e-post:"
 
-#: ../filter/filter.ui.h:4
+#: ../filter/filter.ui.h:15 ../mail/em-filter-editor.c:163
+msgid "_Filter Rules"
+msgstr "_Filterregler"
+
+#: ../filter/filter.ui.h:17
+msgid "Compare against"
+msgstr "Sammenligne med"
+
+#: ../filter/filter.ui.h:18
 msgid ""
 "The message's date will be compared against\n"
-"12:00am of the date specified."
+"the current time when filtering occurs."
 msgstr ""
 "Meldingens dato vil bli sammenlignet med\n"
-"12:00 på spesifiserert dato."
+"tiden da filtreringen skjer."
 
-#: ../filter/filter.ui.h:6
+#: ../filter/filter.ui.h:20
 msgid ""
 "The message's date will be compared against\n"
-"a time relative to when filtering occurs."
+"12:00am of the date specified."
 msgstr ""
 "Meldingens dato vil bli sammenlignet med\n"
-"en tid relativ til tiden da filtreringen skjer."
+"12:00 på spesifiserert dato."
 
-#: ../filter/filter.ui.h:8
+#: ../filter/filter.ui.h:22
 msgid ""
 "The message's date will be compared against\n"
-"the current time when filtering occurs."
+"a time relative to when filtering occurs."
 msgstr ""
 "Meldingens dato vil bli sammenlignet med\n"
-"tiden da filtreringen skjer."
-
-#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:163
-msgid "_Filter Rules"
-msgstr "_Filterregler"
-
-#: ../filter/filter.ui.h:12
-msgid "a time relative to the current time"
-msgstr "et klokkeslett relativt til klokkeslettet nå"
-
-#: ../filter/filter.ui.h:13
-msgid "ago"
-msgstr "siden"
-
-#: ../filter/filter.ui.h:16
-msgid "in the future"
-msgstr "i fremtiden"
-
-#: ../filter/filter.ui.h:18
-#: ../plugins/publish-calendar/publish-calendar.ui.h:32
-msgid "months"
-msgstr "måneder"
-
-#: ../filter/filter.ui.h:19
-msgid "seconds"
-msgstr "sekunder"
-
-#: ../filter/filter.ui.h:20
-msgid "the current time"
-msgstr "tiden nå"
-
-#: ../filter/filter.ui.h:21
-msgid "the time you specify"
-msgstr "tiden du oppgir"
-
-#: ../filter/filter.ui.h:23
-msgid "years"
-msgstr "år"
+"en tid relativ til tiden da filtreringen skjer."
 
-#: ../mail/e-mail-account-manager.c:404
+#: ../mail/e-mail-account-manager.c:405
 msgid "_Restore Default"
 msgstr "Gjenopp_rett forvalg"
 
-#: ../mail/e-mail-account-manager.c:417
+#: ../mail/e-mail-account-manager.c:418
 msgid "You can drag and drop account names to reorder them."
 msgstr "Du kan dra og slippe kontonavn for å endre rekkefølge."
 
-#: ../mail/e-mail-account-manager.c:462
+#: ../mail/e-mail-account-manager.c:463
 msgid "De_fault"
 msgstr "_Forvalgt"
 
@@ -10639,7 +10654,7 @@ msgstr "Kontonavn"
 #. we changed user, thus reset the chosen calendar combo too, because
 #. * other user means other calendars subscribed
 #: ../mail/e-mail-account-tree-view.c:116 ../mail/e-mail-reader.c:3362
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:51
 #: ../plugins/google-account-setup/google-source.c:316
 #: ../plugins/google-account-setup/google-source.c:558
 #: ../plugins/google-account-setup/google-source.c:695
@@ -10647,8 +10662,8 @@ msgid "Default"
 msgstr "Forvalgt"
 
 #: ../mail/e-mail-attachment-bar.c:102 ../mail/e-mail-attachment-bar.c:107
-#: ../mail/em-format-html-display.c:1398 ../mail/mail-config.ui.h:14
-#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:172
+#: ../mail/em-format-html-display.c:1398 ../mail/mail-config.ui.h:58
+#: ../mail/message-list.etspec.h:4 ../widgets/misc/e-attachment-paned.c:172
 #: ../widgets/misc/e-attachment-paned.c:177
 msgid "Attachment"
 msgid_plural "Attachments"
@@ -10744,7 +10759,7 @@ msgid_plural "Saving %d messages"
 msgstr[0] "Lagrer %d melding"
 msgstr[1] "Lagrer %d meldinger"
 
-#: ../mail/e-mail-folder-utils.c:1525 ../mail/em-folder-utils.c:629
+#: ../mail/e-mail-folder-utils.c:1525 ../mail/em-folder-utils.c:622
 #, c-format
 msgid "Invalid folder URI '%s'"
 msgstr "Ugyldig URI for mappe «%s»"
@@ -10784,7 +10799,7 @@ msgid "_Later"
 msgstr "_Senere"
 
 #: ../mail/e-mail-label-manager.c:170
-#: ../modules/mail/e-mail-shell-view-actions.c:674
+#: ../modules/mail/e-mail-shell-view-actions.c:705
 msgid "Add Label"
 msgstr "Legg til etikett"
 
@@ -10825,7 +10840,7 @@ msgstr "Vennligst velg en mappe"
 msgid "Copy to Folder"
 msgstr "Kopier til mappe"
 
-#: ../mail/e-mail-reader.c:310 ../mail/em-folder-utils.c:488
+#: ../mail/e-mail-reader.c:310 ../mail/em-folder-utils.c:486
 msgid "C_opy"
 msgstr "K_opier"
 
@@ -10833,7 +10848,7 @@ msgstr "K_opier"
 msgid "Move to Folder"
 msgstr "Flytt til mappe"
 
-#: ../mail/e-mail-reader.c:825 ../mail/em-folder-utils.c:488
+#: ../mail/e-mail-reader.c:825 ../mail/em-folder-utils.c:486
 msgid "_Move"
 msgstr "_Flytt"
 
@@ -11202,7 +11217,7 @@ msgstr "Fjern du_plikatmeldinger"
 msgid "Checks selected messages for duplicates"
 msgstr "Sjekk valgte meldinger for duplikater"
 
-#: ../mail/e-mail-reader.c:2101 ../mail/mail.error.xml.h:107
+#: ../mail/e-mail-reader.c:2101 ../mail/mail.error.xml.h:27
 #: ../modules/calendar/e-cal-shell-view-actions.c:1510
 #: ../modules/mail/e-mail-attachment-handler.c:177
 msgid "Reply to _All"
@@ -11212,7 +11227,7 @@ msgstr "Svar til _alle"
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "Skriv et svar til alle mottakere av den valgte meldingen"
 
-#: ../mail/e-mail-reader.c:2108 ../mail/mail.error.xml.h:108
+#: ../mail/e-mail-reader.c:2108 ../mail/mail.error.xml.h:25
 msgid "Reply to _List"
 msgstr "Svar til _listen"
 
@@ -11423,7 +11438,7 @@ msgstr "Neste"
 msgid "Previous"
 msgstr "Forrige"
 
-#: ../mail/e-mail-reader.c:3675 ../mail/mail-dialogs.ui.h:17
+#: ../mail/e-mail-reader.c:3675 ../mail/mail-dialogs.ui.h:20
 msgid "Reply"
 msgstr "Svar"
 
@@ -11438,7 +11453,7 @@ msgstr "Ikke varsle meg igjen"
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:637
+#: ../mail/e-mail-reader-utils.c:639
 #, c-format
 msgid ""
 "Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -11453,7 +11468,7 @@ msgstr[1] ""
 "Mappen «%s» inneholder %u duplikatmeldinger. Er du sikker på at du vil "
 "slette dem?"
 
-#: ../mail/e-mail-reader-utils.c:1014
+#: ../mail/e-mail-reader-utils.c:1016
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Lagre melding"
@@ -11464,90 +11479,90 @@ msgstr[1] "Lagre meldinger"
 #. * mbox format, when the first message doesn't have a
 #. * subject.  The extension ".mbox" is appended to the
 #. * string; for example "Message.mbox".
-#: ../mail/e-mail-reader-utils.c:1035
+#: ../mail/e-mail-reader-utils.c:1037
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Melding"
 msgstr[1] "Meldinger"
 
-#: ../mail/e-mail-session.c:121 ../mail/em-folder-properties.c:313
+#: ../mail/e-mail-session.c:135 ../mail/em-folder-properties.c:308
 #: ../mail/em-folder-tree-model.c:714
-#: ../modules/mail/e-mail-shell-view-private.c:1069
-#: ../modules/mail/e-mail-shell-view-private.c:1080
+#: ../modules/mail/e-mail-shell-view-private.c:1070
+#: ../modules/mail/e-mail-shell-view-private.c:1081
 msgid "Inbox"
 msgstr "Innboks"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../mail/e-mail-session.c:122 ../mail/em-folder-tree-model.c:707
-#: ../modules/mail/e-mail-shell-view-private.c:1067
+#: ../mail/e-mail-session.c:136 ../mail/em-folder-tree-model.c:707
+#: ../modules/mail/e-mail-shell-view-private.c:1068
 msgid "Drafts"
 msgstr "Skisser"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../mail/e-mail-session.c:123 ../mail/em-folder-tree-model.c:718
-#: ../modules/mail/e-mail-shell-view-private.c:1071
+#: ../mail/e-mail-session.c:137 ../mail/em-folder-tree-model.c:718
+#: ../modules/mail/e-mail-shell-view-private.c:1072
 msgid "Outbox"
 msgstr "Utboks"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../mail/e-mail-session.c:124 ../mail/em-folder-tree-model.c:722
-#: ../modules/mail/e-mail-shell-view-private.c:1073
+#: ../mail/e-mail-session.c:138 ../mail/em-folder-tree-model.c:722
+#: ../modules/mail/e-mail-shell-view-private.c:1074
 msgid "Sent"
 msgstr "Sendt"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../mail/e-mail-session.c:125 ../mail/em-folder-tree-model.c:710
-#: ../modules/mail/e-mail-shell-view-private.c:1075
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+#: ../mail/e-mail-session.c:139 ../mail/em-folder-tree-model.c:710
+#: ../modules/mail/e-mail-shell-view-private.c:1076
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
 #: ../plugins/templates/templates.c:1035 ../plugins/templates/templates.c:1335
 #: ../plugins/templates/templates.c:1345
 msgid "Templates"
 msgstr "Maler"
 
-#: ../mail/e-mail-session.c:850 ../mail/mail-vfolder.c:1116
+#: ../mail/e-mail-session.c:908 ../mail/mail-vfolder.c:1104
 msgid "Search Folders"
 msgstr "Søkemapper"
 
-#: ../mail/e-mail-session.c:1270
+#: ../mail/e-mail-session.c:1340
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Skriv inn passord for %s"
 
-#: ../mail/e-mail-session.c:1274
+#: ../mail/e-mail-session.c:1344
 msgid "Enter Passphrase"
 msgstr "Skriv inn passord"
 
-#: ../mail/e-mail-session.c:1278
+#: ../mail/e-mail-session.c:1348
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Skriv inn passord for %s"
 
-#: ../mail/e-mail-session.c:1282
+#: ../mail/e-mail-session.c:1352
 msgid "Enter Password"
 msgstr "Skriv inn passord"
 
-#: ../mail/e-mail-session.c:1333
+#: ../mail/e-mail-session.c:1403
 #, c-format
 msgid "User canceled operation."
 msgstr "Operasjon avbrutt av bruker."
 
-#: ../mail/e-mail-session.c:1450
+#: ../mail/e-mail-session.c:1522
 #, c-format
 msgid ""
 "No destination address provided, forward of the message has been cancelled."
 msgstr "Ingen måladresse oppgitt. Videresending av meldingen ble avbrutt."
 
-#: ../mail/e-mail-session.c:1459
+#: ../mail/e-mail-session.c:1531
 #, c-format
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr "Fant ingen konto å bruke. Videresending av meldingen ble avbrutt."
 
-#: ../mail/e-mail-session.c:1611
+#: ../mail/e-mail-session.c:1685
 #, c-format
 msgid "%s authentication failed"
 msgstr "%s autentisering feilet"
 
-#: ../mail/e-mail-session.c:1685
+#: ../mail/e-mail-session.c:1759
 #, c-format
 msgid "No password was provided"
 msgstr "Passord ikke oppgitt"
@@ -11557,13 +11572,13 @@ msgstr "Passord ikke oppgitt"
 msgid "Cannot get transport for account '%s'"
 msgstr "Kan ikke hente transport for konto «%s»"
 
-#: ../mail/e-mail-session-utils.c:499 ../mail/mail-ops.c:646
+#: ../mail/e-mail-session-utils.c:499 ../mail/mail-ops.c:612
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Feil under påføring av utgående filtre: %s"
 
 #: ../mail/e-mail-session-utils.c:525 ../mail/e-mail-session-utils.c:559
-#: ../mail/mail-ops.c:665 ../mail/mail-ops.c:701
+#: ../mail/mail-ops.c:631 ../mail/mail-ops.c:667
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -11572,13 +11587,13 @@ msgstr ""
 "Kunne ikke legge til i %s: %s\n"
 "Legger til i lokal «Sendt»-mappe i stedet."
 
-#: ../mail/e-mail-session-utils.c:579 ../mail/mail-ops.c:721
+#: ../mail/e-mail-session-utils.c:579 ../mail/mail-ops.c:687
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "Kunne ikke legge til i lokal Sendt-mappe: %s"
 
-#: ../mail/e-mail-session-utils.c:789 ../mail/mail-ops.c:847
-#: ../mail/mail-ops.c:943
+#: ../mail/e-mail-session-utils.c:789 ../mail/mail-ops.c:810
+#: ../mail/mail-ops.c:906
 msgid "Sending message"
 msgstr "Sender melding"
 
@@ -11607,42 +11622,42 @@ msgid "Flag to Follow Up"
 msgstr "Merk for oppfølging"
 
 #. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:1581 ../widgets/misc/e-signature-combo-box.c:75
+#: ../mail/em-account-editor.c:1600 ../widgets/misc/e-signature-combo-box.c:75
 msgctxt "mail-signature"
 msgid "None"
 msgstr "Ingen"
 
-#: ../mail/em-account-editor.c:1663 ../mail/em-account-editor.c:4681
-#: ../mail/em-account-editor.c:4697
+#: ../mail/em-account-editor.c:1682 ../mail/em-account-editor.c:4688
+#: ../mail/em-account-editor.c:4713
 msgid "Never"
 msgstr "Aldri"
 
-#: ../mail/em-account-editor.c:1664
+#: ../mail/em-account-editor.c:1683
 msgid "Always"
 msgstr "Alltid"
 
-#: ../mail/em-account-editor.c:1665
+#: ../mail/em-account-editor.c:1684
 msgid "Ask for each message"
 msgstr "Spør for hver melding"
 
-#: ../mail/em-account-editor.c:2407
+#: ../mail/em-account-editor.c:2426
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "Ingen"
 
-#: ../mail/em-account-editor.c:2809 ../mail/mail-config.ui.h:169
+#: ../mail/em-account-editor.c:2835 ../mail/mail-config.ui.h:164
 msgid "_Path:"
 msgstr "S_ti:"
 
-#: ../mail/em-account-editor.c:2812
+#: ../mail/em-account-editor.c:2838
 msgid "Fil_e:"
 msgstr "_Fil:"
 
-#: ../mail/em-account-editor.c:2849
+#: ../mail/em-account-editor.c:2875
 msgid "Mail Configuration"
 msgstr "E-post-konfigurasjon"
 
-#: ../mail/em-account-editor.c:2850
+#: ../mail/em-account-editor.c:2876
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -11652,7 +11667,7 @@ msgstr ""
 "\n"
 "Klikk «Fortsett» for å begynne."
 
-#: ../mail/em-account-editor.c:2853
+#: ../mail/em-account-editor.c:2879
 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 "
@@ -11662,19 +11677,19 @@ msgstr ""
 "under må ikke nødvendigvis fylles ut, hvis du ikke ønsker å inkludere denne "
 "informasjonen i meldingene du sender."
 
-#: ../mail/em-account-editor.c:2855 ../mail/em-account-editor.c:3047
+#: ../mail/em-account-editor.c:2881 ../mail/em-account-editor.c:3073
 msgid "Receiving Email"
 msgstr "Innkommende e-post"
 
-#: ../mail/em-account-editor.c:2856
+#: ../mail/em-account-editor.c:2882
 msgid "Please configure the following account settings."
 msgstr "Vennligst konfigurer følgende kontoinnstillinger."
 
-#: ../mail/em-account-editor.c:2858 ../mail/em-account-editor.c:3654
+#: ../mail/em-account-editor.c:2884 ../mail/em-account-editor.c:3680
 msgid "Sending Email"
 msgstr "Utgående e-post"
 
-#: ../mail/em-account-editor.c:2859
+#: ../mail/em-account-editor.c:2885
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -11682,22 +11697,22 @@ 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:2861
+#: ../mail/em-account-editor.c:2887
 msgid "Account Summary"
 msgstr "Kontosammendrag"
 
-#: ../mail/em-account-editor.c:2862
+#: ../mail/em-account-editor.c:2888
 msgid ""
 "This is a summary of the settings which will be used to access your mail."
 msgstr ""
 "Dette er et sammendrag av innstillingene som brukes for å aksessere dine "
 "meldinger."
 
-#: ../mail/em-account-editor.c:2866
+#: ../mail/em-account-editor.c:2892
 msgid "Done"
 msgstr "Ferdig"
 
-#: ../mail/em-account-editor.c:2867
+#: ../mail/em-account-editor.c:2893
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -11711,49 +11726,49 @@ msgstr ""
 "\n"
 "Klikk «Bruk» for å lagre dine innstillinger."
 
-#: ../mail/em-account-editor.c:3412
+#: ../mail/em-account-editor.c:3438
 msgid "Check for _new messages every"
 msgstr "Se etter _nye meldinger hver(t)"
 
-#: ../mail/em-account-editor.c:3420
+#: ../mail/em-account-editor.c:3446
 msgid "minu_tes"
 msgstr "minu_tter"
 
-#: ../mail/em-account-editor.c:4117 ../mail/mail-config.ui.h:109
+#: ../mail/em-account-editor.c:4143 ../mail/mail-config.ui.h:166
 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:4172 ../mail/em-account-editor.c:4274
+#: ../mail/em-account-editor.c:4198 ../mail/em-account-editor.c:4300
 msgid "Receiving Options"
 msgstr "Alternativer for mottak"
 
-#: ../mail/em-account-editor.c:4173 ../mail/em-account-editor.c:4275
+#: ../mail/em-account-editor.c:4199 ../mail/em-account-editor.c:4301
 msgid "Checking for New Messages"
 msgstr "Ser etter nye meldinger"
 
-#: ../mail/em-account-editor.c:4677 ../mail/em-account-editor.c:4693
+#: ../mail/em-account-editor.c:4684 ../mail/em-account-editor.c:4709
 msgid "Always (SSL)"
 msgstr "Alltid (SSL)"
 
-#: ../mail/em-account-editor.c:4679 ../mail/em-account-editor.c:4695
+#: ../mail/em-account-editor.c:4686 ../mail/em-account-editor.c:4711
 msgid "When possible (TLS)"
 msgstr "Når mulig (TLS)"
 
-#: ../mail/em-account-editor.c:4711
+#: ../mail/em-account-editor.c:4733
 msgid "Setup Google con_tacts with Evolution"
 msgstr "Sett opp Google-kon_takter i Evolution"
 
-#: ../mail/em-account-editor.c:4712
+#: ../mail/em-account-editor.c:4734
 msgid "Setup Google ca_lendar with Evolution"
 msgstr "Sett opp Google-ka_lender i Evolution"
 
-#: ../mail/em-account-editor.c:4745
+#: ../mail/em-account-editor.c:4766
 msgid "Setup _Yahoo calendar with Evolution"
 msgstr "Sett opp _Yahoo-kalender i Evolution"
 
-#: ../mail/em-account-editor.c:4771
+#: ../mail/em-account-editor.c:4792
 msgid "Yahoo Calen_dar name:"
 msgstr "Navn på Yahoo-kalen_der:"
 
@@ -11773,19 +11788,19 @@ msgstr ""
 msgid "-----Original Message-----"
 msgstr "-----Opprinnelig melding-----"
 
-#: ../mail/em-composer-utils.c:2359
+#: ../mail/em-composer-utils.c:2416
 msgid "an unknown sender"
 msgstr "en ukjent avsender"
 
-#: ../mail/em-composer-utils.c:2761
+#: ../mail/em-composer-utils.c:2811
 msgid "Posting destination"
 msgstr "Destinasjon for post"
 
-#: ../mail/em-composer-utils.c:2762
+#: ../mail/em-composer-utils.c:2812
 msgid "Choose folders to post the message to."
 msgstr "Velg mapper meldingen skal postes til."
 
-#: ../mail/em-filter-folder-element.c:240
+#: ../mail/em-filter-folder-element.c:243
 msgid "Select Folder"
 msgstr "Velg mappe"
 
@@ -11902,7 +11917,7 @@ msgstr "er ikke satt"
 msgid "is set"
 msgstr "er satt"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:67
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:114
 msgid "Junk"
 msgstr "Uønsket e-post"
 
@@ -11951,11 +11966,11 @@ msgid "Play Sound"
 msgstr "Spill lyd"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:16
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:19
 msgid "Read"
 msgstr "Les"
 
-#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:16
 msgid "Recipients"
 msgstr "Mottakere"
 
@@ -11983,11 +11998,11 @@ msgstr "returnerer mindre enn"
 msgid "Run Program"
 msgstr "Kjør program"
 
-#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:3
 msgid "Score"
 msgstr "Gi poeng"
 
-#: ../mail/em-filter-i18n.h:63 ../mail/message-list.etspec.h:14
+#: ../mail/em-filter-i18n.h:63 ../mail/message-list.etspec.h:15
 msgid "Sender"
 msgstr "Avsender"
 
@@ -12062,7 +12077,7 @@ msgstr "Bruk av kvote (%s):"
 msgid "Quota usage"
 msgstr "Bruk av kvote"
 
-#: ../mail/em-folder-properties.c:318
+#: ../mail/em-folder-properties.c:313
 msgid "Folder Properties"
 msgstr "Egenskaper for mappe"
 
@@ -12070,49 +12085,49 @@ msgstr "Egenskaper for mappe"
 msgid "<click here to select a folder>"
 msgstr "<klikk her for å velge en mappe>"
 
-#: ../mail/em-folder-selector.c:436
+#: ../mail/em-folder-selector.c:388
 msgid "C_reate"
 msgstr "Opp_rett"
 
-#: ../mail/em-folder-selector.c:442
+#: ../mail/em-folder-selector.c:394
 msgid "Folder _name:"
 msgstr "Mappe_navn:"
 
-#: ../mail/em-folder-tree.c:644
+#: ../mail/em-folder-tree.c:642
 msgid "Folder names cannot contain '/'"
 msgstr "Mappenavn kan ikke inneholde tegnet «/»"
 
-#: ../mail/em-folder-tree.c:780
+#: ../mail/em-folder-tree.c:778
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1603
+#: ../mail/em-folder-tree.c:1601
 msgid "Mail Folder Tree"
 msgstr "Tre for e-postmapper"
 
-#: ../mail/em-folder-tree.c:2093 ../mail/em-folder-utils.c:113
+#: ../mail/em-folder-tree.c:2091 ../mail/em-folder-utils.c:113
 #, c-format
 msgid "Moving folder %s"
 msgstr "Flytter mappe %s"
 
-#: ../mail/em-folder-tree.c:2096 ../mail/em-folder-utils.c:115
+#: ../mail/em-folder-tree.c:2094 ../mail/em-folder-utils.c:115
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopierer mappe %s"
 
-#: ../mail/em-folder-tree.c:2103 ../mail/message-list.c:2318
+#: ../mail/em-folder-tree.c:2101 ../mail/message-list.c:2296
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Flytter meldinger til mappe %s"
 
-#: ../mail/em-folder-tree.c:2107 ../mail/message-list.c:2320
+#: ../mail/em-folder-tree.c:2105 ../mail/message-list.c:2298
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopierer meldinger til mappe %s"
 
-#: ../mail/em-folder-tree.c:2126
+#: ../mail/em-folder-tree.c:2124
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Kan ikke slippe melding(er) toppnivå for lageret"
@@ -12126,19 +12141,19 @@ msgstr "UTEN TREFF"
 msgid "Loading..."
 msgstr "Laster …"
 
-#: ../mail/em-folder-utils.c:489
+#: ../mail/em-folder-utils.c:487
 msgid "Move Folder To"
 msgstr "Flytt mappe til"
 
-#: ../mail/em-folder-utils.c:489
+#: ../mail/em-folder-utils.c:487
 msgid "Copy Folder To"
 msgstr "Kopier mappe til"
 
-#: ../mail/em-folder-utils.c:606
+#: ../mail/em-folder-utils.c:599
 msgid "Create Folder"
 msgstr "Opprett mappe"
 
-#: ../mail/em-folder-utils.c:607
+#: ../mail/em-folder-utils.c:600
 msgid "Specify where to create the folder:"
 msgstr "Spesifiser hvor mappen skal opprettes:"
 
@@ -12146,97 +12161,97 @@ msgstr "Spesifiser hvor mappen skal opprettes:"
 msgid "Formatting message"
 msgstr "Formatterer melding"
 
-#: ../mail/em-format-html.c:383
+#: ../mail/em-format-html.c:385
 msgid "Formatting Message..."
 msgstr "Formatterer melding …"
 
-#: ../mail/em-format-html.c:1599 ../mail/em-format-html.c:1609
+#: ../mail/em-format-html.c:1633 ../mail/em-format-html.c:1643
 #, c-format
 msgid "Retrieving '%s'"
 msgstr "Henter «%s»"
 
-#: ../mail/em-format-html.c:1760 ../mail/em-format-html-display.c:93
+#: ../mail/em-format-html.c:1794 ../mail/em-format-html-display.c:93
 msgid "Unsigned"
 msgstr "Usignert"
 
-#: ../mail/em-format-html.c:1761 ../mail/em-format-html-display.c:94
+#: ../mail/em-format-html.c:1795 ../mail/em-format-html-display.c:94
 msgid "Valid signature"
 msgstr "Gyldig signatur"
 
-#: ../mail/em-format-html.c:1762 ../mail/em-format-html-display.c:95
+#: ../mail/em-format-html.c:1796 ../mail/em-format-html-display.c:95
 msgid "Invalid signature"
 msgstr "Ugyldig signatur"
 
-#: ../mail/em-format-html.c:1763 ../mail/em-format-html-display.c:96
+#: ../mail/em-format-html.c:1797 ../mail/em-format-html-display.c:96
 msgid "Valid signature, but cannot verify sender"
 msgstr "Gyldig signatur, men kan ikke verifisere avsender"
 
-#: ../mail/em-format-html.c:1764 ../mail/em-format-html-display.c:97
+#: ../mail/em-format-html.c:1798 ../mail/em-format-html-display.c:97
 msgid "Signature exists, but need public key"
 msgstr "Signatur eksisterer, men trenger offentlig nøkkel"
 
-#: ../mail/em-format-html.c:1770 ../mail/em-format-html-display.c:104
+#: ../mail/em-format-html.c:1804 ../mail/em-format-html-display.c:104
 msgid "Unencrypted"
 msgstr "Ukryptert"
 
-#: ../mail/em-format-html.c:1771 ../mail/em-format-html-display.c:105
+#: ../mail/em-format-html.c:1805 ../mail/em-format-html-display.c:105
 msgid "Encrypted, weak"
 msgstr "Kryptert, svak"
 
-#: ../mail/em-format-html.c:1772 ../mail/em-format-html-display.c:106
+#: ../mail/em-format-html.c:1806 ../mail/em-format-html-display.c:106
 msgid "Encrypted"
 msgstr "Kryptert"
 
-#: ../mail/em-format-html.c:1773 ../mail/em-format-html-display.c:107
+#: ../mail/em-format-html.c:1807 ../mail/em-format-html-display.c:107
 msgid "Encrypted, strong"
 msgstr "Kryptert, sterk"
 
-#: ../mail/em-format-html.c:2173
+#: ../mail/em-format-html.c:2207
 msgid "Unknown external-body part."
 msgstr "Ukjent del av ekstern kropp."
 
-#: ../mail/em-format-html.c:2183
+#: ../mail/em-format-html.c:2217
 msgid "Malformed external-body part."
 msgstr "Feilutformet del for ekstern kropp."
 
-#: ../mail/em-format-html.c:2214
+#: ../mail/em-format-html.c:2248
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Peker til FTP-tjener (%s)"
 
-#: ../mail/em-format-html.c:2225
+#: ../mail/em-format-html.c:2259
 #, 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:2227
+#: ../mail/em-format-html.c:2261
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Peker til lokal fil (%s)"
 
-#: ../mail/em-format-html.c:2248
+#: ../mail/em-format-html.c:2282
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Peker til eksterne data (%s)"
 
-#: ../mail/em-format-html.c:2263
+#: ../mail/em-format-html.c:2297
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Peker til ukjente eksterne data («%s»-type)"
 
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user@example.com"
-#: ../mail/em-format-html.c:2971
+#: ../mail/em-format-html.c:3005
 #: ../plugins/mail-notification/mail-notification.c:395
 #, c-format
 msgid "From: %s"
 msgstr "Fra: %s"
 
-#: ../mail/em-format-html.c:2993
+#: ../mail/em-format-html.c:3027
 msgid "(no subject)"
 msgstr "(uten emne)"
 
-#: ../mail/em-format-html.c:3069
+#: ../mail/em-format-html.c:3103
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "Denne meldingen ble sendt av %s på vegne av %s"
@@ -12316,7 +12331,7 @@ msgstr ""
 "Denne meldingen er kryptert med en sterk algoritme. Det vil være meget "
 "vanskelig for en utenforstående å se innholdet i denne meldingen på kort tid."
 
-#: ../mail/em-format-html-display.c:248 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/em-format-html-display.c:248 ../smime/gui/smime-ui.ui.h:43
 msgid "_View Certificate"
 msgstr "_Vis sertifikat"
 
@@ -12368,7 +12383,7 @@ msgstr "Skjul _uformatterte"
 msgid "O_pen With"
 msgstr "Å_pne med"
 
-#: ../mail/em-format-html-print.c:150
+#: ../mail/em-format-html-print.c:155
 #, c-format
 msgid "Page %d of %d"
 msgstr "Side %d av %d"
@@ -12391,8 +12406,8 @@ msgstr "Abonner på innhold som vises"
 msgid "Subscribe To _All"
 msgstr "Abonner på _alle"
 
-#: ../mail/em-subscription-editor.c:970 ../mail/em-subscription-editor.c:1826
-#: ../modules/mail/e-mail-shell-view-actions.c:1207
+#: ../mail/em-subscription-editor.c:970 ../mail/em-subscription-editor.c:1823
+#: ../modules/mail/e-mail-shell-view-actions.c:1252
 msgid "_Unsubscribe"
 msgstr "_Fjern abonnement"
 
@@ -12404,56 +12419,56 @@ msgstr "_Fjern abonnement på skjulte"
 msgid "Unsubscribe From _All"
 msgstr "Fjern abonnement på _alle"
 
-#: ../mail/em-subscription-editor.c:1661
+#: ../mail/em-subscription-editor.c:1658
 msgid "Folder Subscriptions"
 msgstr "Abonnement på mapper"
 
-#: ../mail/em-subscription-editor.c:1701
+#: ../mail/em-subscription-editor.c:1698
 msgid "_Account:"
 msgstr "K_onto:"
 
-#: ../mail/em-subscription-editor.c:1716
+#: ../mail/em-subscription-editor.c:1713
 msgid "Clear Search"
 msgstr "Tøm søk"
 
-#: ../mail/em-subscription-editor.c:1734
+#: ../mail/em-subscription-editor.c:1731
 msgid "Sho_w items that contain:"
 msgstr "_Vis oppføringer som inneholder:"
 
-#: ../mail/em-subscription-editor.c:1779
+#: ../mail/em-subscription-editor.c:1776
 msgid "Subscribe to the selected folder"
 msgstr "Abonner på valgt mappe"
 
-#: ../mail/em-subscription-editor.c:1780
+#: ../mail/em-subscription-editor.c:1777
 msgid "Su_bscribe"
 msgstr "A_bonner"
 
-#: ../mail/em-subscription-editor.c:1825
-#: ../modules/mail/e-mail-shell-view-actions.c:1209
+#: ../mail/em-subscription-editor.c:1822
+#: ../modules/mail/e-mail-shell-view-actions.c:1254
 msgid "Unsubscribe from the selected folder"
 msgstr "Fjern abonnement på valgt mappe"
 
-#: ../mail/em-subscription-editor.c:1865
+#: ../mail/em-subscription-editor.c:1862
 msgid "Collapse all folders"
 msgstr "Slå sammen alle mapper"
 
-#: ../mail/em-subscription-editor.c:1866
+#: ../mail/em-subscription-editor.c:1863
 msgid "C_ollapse All"
 msgstr "Slå sammen _alle"
 
-#: ../mail/em-subscription-editor.c:1876
+#: ../mail/em-subscription-editor.c:1873
 msgid "Expand all folders"
 msgstr "Utvid alle mapper"
 
-#: ../mail/em-subscription-editor.c:1877
+#: ../mail/em-subscription-editor.c:1874
 msgid "E_xpand All"
 msgstr "Ut_vid alle"
 
-#: ../mail/em-subscription-editor.c:1887
+#: ../mail/em-subscription-editor.c:1884
 msgid "Refresh the folder list"
 msgstr "Oppdater mappelisten"
 
-#: ../mail/em-subscription-editor.c:1899
+#: ../mail/em-subscription-editor.c:1896
 msgid "Stop the current operation"
 msgstr "Stopp aktiv operasjon"
 
@@ -12461,23 +12476,23 @@ msgstr "Stopp aktiv operasjon"
 #. * messages to be opened.  The %d is replaced with the actual
 #. * count of messages. If you need a '%' in your text, then
 #. * write it doubled, like '%%'.
-#: ../mail/em-utils.c:101
+#: ../mail/em-utils.c:108
 #, c-format
 msgid "Are you sure you want to open %d message at once?"
 msgid_plural "Are you sure you want to open %d messages at once?"
 msgstr[0] "Er du sikker på at du vil åpne %d melding samtidig?"
 msgstr[1] "Er du sikker på at du vil åpne %d meldinger samtidig?"
 
-#: ../mail/em-utils.c:157
+#: ../mail/em-utils.c:164
 #: ../modules/mailto-handler/evolution-mailto-handler.c:154
 msgid "_Do not show this message again"
 msgstr "Ikke vis _denne meldingen igjen"
 
-#: ../mail/em-utils.c:305
+#: ../mail/em-utils.c:316
 msgid "Message Filters"
 msgstr "Meldingsfiltre"
 
-#: ../mail/em-utils.c:890
+#: ../mail/em-utils.c:976
 #, c-format
 msgid "Messages from %s"
 msgstr "Meldinger fra %s"
@@ -12490,145 +12505,131 @@ msgstr "Søke_mapper"
 msgid "Add Folder"
 msgstr "Legg til mappe"
 
-#: ../mail/evolution-mail.schemas.in.h:1
-msgid "\"Filter Editor\" window height"
-msgstr "Vinduhøyde for «Filterredigering»"
-
-#: ../mail/evolution-mail.schemas.in.h:2
-msgid "\"Filter Editor\" window maximize state"
-msgstr "Maksimeringstilstand for «Filterredigering»-vindu"
-
-#: ../mail/evolution-mail.schemas.in.h:3
-msgid "\"Filter Editor\" window width"
-msgstr "Vindubredde for «Filterredigering»"
-
-#: ../mail/evolution-mail.schemas.in.h:4
-msgid "\"Folder Subscriptions\" window height"
-msgstr "Vinduhøyde for vinduet «Abonnement på mapper»"
-
-#: ../mail/evolution-mail.schemas.in.h:5
-msgid "\"Folder Subscriptions\" window maximize state"
-msgstr "Maksimeringstilstand for vinduet «Abonnement på mapper»"
-
-#: ../mail/evolution-mail.schemas.in.h:6
-msgid "\"Folder Subscriptions\" window width"
-msgstr "Vindubredde for vinduet «Abonnement på mapper»"
-
-#: ../mail/evolution-mail.schemas.in.h:7
-msgid "\"Search Folder Editor\" window height"
-msgstr "Forvalgt vinduhøyde for «Redigering av søkemapper»"
-
-#: ../mail/evolution-mail.schemas.in.h:8
-msgid "\"Search Folder Editor\" window maximize state"
-msgstr "Maksimeringstilstand for vindu for «Redigering av søkemapper»"
-
-#: ../mail/evolution-mail.schemas.in.h:9
-msgid "\"Search Folder Editor\" window width"
-msgstr "Bredde på vindu for «Redigering av søkemapper»"
-
-#: ../mail/evolution-mail.schemas.in.h:10
-msgid "\"Send and Receive Mail\" window height"
-msgstr "Høyde på vindu for «Send & motta e-post»"
-
 #: ../mail/evolution-mail.schemas.in.h:11
-msgid "\"Send and Receive Mail\" window maximize state"
-msgstr "Maksimeringstilstand for «Send & motta e-post»-vindu"
+msgid "Digitally sign messages when original message signed (PGP or S/MIME)"
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:12
-msgid "\"Send and Receive Mail\" window width"
-msgstr "Bredde på «Send & motta e-post»-vindu"
+#: ../mail/evolution-mail.schemas.in.h:39
+msgid "Composer Window default width"
+msgstr "Forvalgt bredde for skrivevindu"
 
-#: ../mail/evolution-mail.schemas.in.h:16
-msgid "Attribute message."
-msgstr "Attributtmelding."
+#: ../mail/evolution-mail.schemas.in.h:40
+msgid "Default width of the Composer Window."
+msgstr "Forvalgt bredde for redigeringsvinduet."
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid "Composer Window default height"
 msgstr "Forvalgt høyde for skrivevindu"
 
-#: ../mail/evolution-mail.schemas.in.h:26
-msgid "Composer Window default width"
-msgstr "Forvalgt bredde for skrivevindu"
-
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Default height of the Composer Window."
 msgstr "Forvalgt høyde for redigeringsvinduet."
 
-#: ../mail/evolution-mail.schemas.in.h:38
-msgid "Default height of the mail browser window."
-msgstr "Forvalgt høyde for e-postleservinduet."
+#: ../mail/evolution-mail.schemas.in.h:45
+msgid "Attribute message."
+msgstr "Attributtmelding."
 
-#: ../mail/evolution-mail.schemas.in.h:39
-msgid "Default maximized state of the mail browser window."
-msgstr "Forvalgt maksimert tilstand for e-postleservinduet."
+#: ../mail/evolution-mail.schemas.in.h:46
+msgid ""
+"The text that is inserted when replying to a message, attributing the "
+"message to the original author."
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:40
-msgid "Default reply style"
-msgstr "Forvalgt svarstil"
+#: ../mail/evolution-mail.schemas.in.h:47
+msgid "Forward message."
+msgstr "Videresend melding."
 
-#: ../mail/evolution-mail.schemas.in.h:42
-msgid "Default width of the Composer Window."
-msgstr "Forvalgt bredde for redigeringsvinduet."
+#: ../mail/evolution-mail.schemas.in.h:48
+msgid ""
+"The text that is inserted when forwarding a message, saying that the "
+"forwarded message follows."
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:43
-msgid "Default width of the mail browser window."
-msgstr "Forvalgt bredde for e-postleservinduet."
+#: ../mail/evolution-mail.schemas.in.h:49
+msgid "Original message."
+msgstr "Opprinnelig melding."
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid ""
-"Describes whether message headers in paned view should be collapsed or "
-"expanded by default. \"0\" = expanded \"1\" = collapsed"
+"The text that is inserted when replying to a message (top posting), saying "
+"that the original message follows."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:51
-msgid "Digitally sign messages when original message signed (PGP or S/MIME)"
+#: ../mail/evolution-mail.schemas.in.h:52
+msgid ""
+"This value can be an empty string, which means it'll use the system Picture "
+"folder, usually set to ~/Pictures. This folder will be also used when the "
+"set path is not pointing to the existent folder."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:78
-msgid "Forward message."
-msgstr "Videresend melding."
+#: ../mail/evolution-mail.schemas.in.h:97
+msgid "Whether to show local folders (On This Computer) in a folder tree."
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid ""
-"Initial height of the \"Filter Editor\" window. The value updates as the "
-"user resizes the window vertically."
+"This setting specifies whether the threads should be in expanded or "
+"collapsed state by default. Requires a restart to apply."
 msgstr ""
-"Initiell høyde for «Filterredigering»-vinduet. Verdien oppdateres ettersom "
-"bruker endrer størrelse på vinduet vertikalt."
+"Denne innstillingen spesifiserer om tråder skal være i utvidet eller "
+"sammenslått tilstand som forvalg. Evolution må startes på nytt hvis denne "
+"endres."
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid ""
-"Initial height of the \"Folder Subscriptions\" window. The value updates as "
-"the user resizes the window vertically."
+"Describes whether message headers in paned view should be collapsed or "
+"expanded by default. \"0\" = expanded \"1\" = collapsed"
 msgstr ""
-"Initiell høyde for vinduet «Abonnement på mapper». Verdien oppdateres "
-"ettersom bruker endrer størrelse på vinduet vertikalt."
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid ""
-"Initial height of the \"Search Folder Editor\" window. The value updates as "
-"the user resizes the window vertically."
+"Tells how to sort accounts in a folder tree used in a Mail view. When set to "
+"true accounts are sorted alphabetically, with an exception of On This "
+"Computer and Search folders, otherwise accounts are sorted based on an order "
+"given by a user."
 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:89
+#: ../mail/evolution-mail.schemas.in.h:130
+msgid "Mail browser width"
+msgstr "Bredde på e-postleser"
+
+#: ../mail/evolution-mail.schemas.in.h:131
+msgid "Default width of the mail browser window."
+msgstr "Forvalgt bredde for e-postleservinduet."
+
+#: ../mail/evolution-mail.schemas.in.h:132
+msgid "Mail browser height"
+msgstr "Høyde på e-postleser"
+
+#: ../mail/evolution-mail.schemas.in.h:133
+msgid "Default height of the mail browser window."
+msgstr "Forvalgt høyde for e-postleservinduet."
+
+#: ../mail/evolution-mail.schemas.in.h:134
+msgid "Mail browser maximized"
+msgstr "E-postleser maksimert"
+
+#: ../mail/evolution-mail.schemas.in.h:135
+msgid "Default maximized state of the mail browser window."
+msgstr "Forvalgt maksimert tilstand for e-postleservinduet."
+
+#: ../mail/evolution-mail.schemas.in.h:136
+msgid "\"Folder Subscriptions\" window height"
+msgstr "Vinduhøyde for vinduet «Abonnement på mapper»"
+
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid ""
-"Initial height of the \"Send and Receive Mail\" window. The value updates as "
+"Initial height of the \"Folder Subscriptions\" window. The value updates as "
 "the user resizes the window vertically."
 msgstr ""
-"Initiell høyde for «Send og motta e-post»-vinduet. Verdien oppdateres "
+"Initiell høyde for vinduet «Abonnement på mapper». Verdien oppdateres "
 "ettersom bruker endrer størrelse på vinduet vertikalt."
 
-#: ../mail/evolution-mail.schemas.in.h:90
-msgid ""
-"Initial maximize state of the \"Filter Editor\" window. The value updates "
-"when the user maximizes or unmaximizes the window. Note, this particular "
-"value is not used by Evolution since the \"Filter Editor\" window cannot be "
-"maximized. This key exists only as an implementation detail."
-msgstr ""
+#: ../mail/evolution-mail.schemas.in.h:138
+msgid "\"Folder Subscriptions\" window maximize state"
+msgstr "Maksimeringstilstand for vinduet «Abonnement på mapper»"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid ""
 "Initial maximize state of the \"Folder Subscriptions\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -12636,32 +12637,11 @@ msgid ""
 "window cannot be maximized. This key exists only as an implementation detail."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:92
-msgid ""
-"Initial maximize state of the \"Search Folder Editor\" window. The value "
-"updates when the user maximizes or unmaximizes the window. Note, this "
-"particular value is not used by Evolution since the \"Search Folder Editor\" "
-"window cannot be maximized. This key exists only as an implementation detail."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:93
-msgid ""
-"Initial maximize state of the \"Send and Receive Mail\" window. The value "
-"updates when the user maximizes or unmaximizes the window. Note, this "
-"particular value is not used by Evolution since the \"Send and Receive Mail"
-"\" window cannot be maximized. This key exists only as an implementation "
-"detail."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:94
-msgid ""
-"Initial width of the \"Filter Editor\" window. The value updates as the user "
-"resizes the window horizontally."
-msgstr ""
-"Initiell bredde på «Meldingsfiltre»-vinduet. Verdien oppdateres ettersom "
-"bruker endrer størrelse på vinduet horisontalt."
+#: ../mail/evolution-mail.schemas.in.h:140
+msgid "\"Folder Subscriptions\" window width"
+msgstr "Vindubredde for vinduet «Abonnement på mapper»"
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid ""
 "Initial width of the \"Folder Subscriptions\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -12669,31 +12649,21 @@ msgstr ""
 "Initiell bredde på «Abonnement på mapper»-vinduet. Verdien oppdateres "
 "ettersom bruker endrer størrelse på vinduet horisontalt."
 
-#: ../mail/evolution-mail.schemas.in.h:96
-msgid ""
-"Initial width of the \"Search Folder Editor\" window. The value updates as "
-"the user resizes the window horizontally."
-msgstr ""
-"Initiell bredde på «Søkemapper»-vinduet. Verdien oppdateres ettersom bruker "
-"endrer størrelse på vinduet horisontalt."
+#: ../mail/evolution-mail.schemas.in.h:149
+msgid "Default reply style"
+msgstr "Forvalgt svarstil"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid ""
-"Initial width of the \"Send and Receive Mail\" window. The value updates as "
-"the user resizes the window horizontally."
+"Possible values are: never - to never close browser window always - to "
+"always close browser window ask - (or any other value) will ask user"
 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:110
-msgid "List of accepted licenses"
-msgstr "Liste med godtatte lisenser"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:207
 msgid "List of accounts"
 msgstr "Liste med kontoer"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:208
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -12702,84 +12672,149 @@ msgstr ""
 "innholder strenger som er undermapper relativt til /apps/evolution/mail/"
 "accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:209
+msgid "List of accepted licenses"
+msgstr "Liste med godtatte lisenser"
+
+#: ../mail/evolution-mail.schemas.in.h:210
 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:123
-msgid "Mail browser height"
-msgstr "Høyde på e-postleser"
-
-#: ../mail/evolution-mail.schemas.in.h:124
-msgid "Mail browser maximized"
-msgstr "E-postleser maksimert"
+#: ../mail/evolution-mail.schemas.in.h:213
+msgid "\"Filter Editor\" window height"
+msgstr "Vinduhøyde for «Filterredigering»"
 
-#: ../mail/evolution-mail.schemas.in.h:125
-msgid "Mail browser width"
-msgstr "Bredde på e-postleser"
+#: ../mail/evolution-mail.schemas.in.h:214
+msgid ""
+"Initial height of the \"Filter Editor\" window. The value updates as the "
+"user resizes the window vertically."
+msgstr ""
+"Initiell høyde for «Filterredigering»-vinduet. Verdien oppdateres ettersom "
+"bruker endrer størrelse på vinduet vertikalt."
 
-#: ../mail/evolution-mail.schemas.in.h:137
-msgid "Original message."
-msgstr "Opprinnelig melding."
+#: ../mail/evolution-mail.schemas.in.h:215
+msgid "\"Filter Editor\" window maximize state"
+msgstr "Maksimeringstilstand for «Filterredigering»-vindu"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:216
 msgid ""
-"Possible values are: never - to never close browser window always - to "
-"always close browser window ask - (or any other value) will ask user"
+"Initial maximize state of the \"Filter Editor\" window. The value updates "
+"when the user maximizes or unmaximizes the window. Note, this particular "
+"value is not used by Evolution since the \"Filter Editor\" window cannot be "
+"maximized. This key exists only as an implementation detail."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:195
+#: ../mail/evolution-mail.schemas.in.h:217
+msgid "\"Filter Editor\" window width"
+msgstr "Vindubredde for «Filterredigering»"
+
+#: ../mail/evolution-mail.schemas.in.h:218
 msgid ""
-"Tells how to sort accounts in a folder tree used in a Mail view. When set to "
-"true accounts are sorted alphabetically, with an exception of On This "
-"Computer and Search folders, otherwise accounts are sorted based on an order "
-"given by a user."
+"Initial width of the \"Filter Editor\" window. The value updates as the user "
+"resizes the window horizontally."
 msgstr ""
+"Initiell bredde på «Meldingsfiltre»-vinduet. Verdien oppdateres ettersom "
+"bruker endrer størrelse på vinduet horisontalt."
 
-#: ../mail/evolution-mail.schemas.in.h:202
+#: ../mail/evolution-mail.schemas.in.h:223
+msgid "\"Send and Receive Mail\" window height"
+msgstr "Høyde på vindu for «Send & motta e-post»"
+
+#: ../mail/evolution-mail.schemas.in.h:224
 msgid ""
-"The text that is inserted when forwarding a message, saying that the "
-"forwarded message follows."
+"Initial height of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window vertically."
 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:203
+#: ../mail/evolution-mail.schemas.in.h:225
+msgid "\"Send and Receive Mail\" window maximize state"
+msgstr "Maksimeringstilstand for «Send & motta e-post»-vindu"
+
+#: ../mail/evolution-mail.schemas.in.h:226
 msgid ""
-"The text that is inserted when replying to a message (top posting), saying "
-"that the original message follows."
+"Initial maximize state of the \"Send and Receive Mail\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Send and Receive Mail"
+"\" window cannot be maximized. This key exists only as an implementation "
+"detail."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:204
+#: ../mail/evolution-mail.schemas.in.h:227
+msgid "\"Send and Receive Mail\" window width"
+msgstr "Bredde på «Send & motta e-post»-vindu"
+
+#: ../mail/evolution-mail.schemas.in.h:228
 msgid ""
-"The text that is inserted when replying to a message, attributing the "
-"message to the original author."
+"Initial width of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window horizontally."
 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:214
+#: ../mail/evolution-mail.schemas.in.h:229
+msgid "\"Search Folder Editor\" window height"
+msgstr "Forvalgt vinduhøyde for «Redigering av søkemapper»"
+
+#: ../mail/evolution-mail.schemas.in.h:230
 msgid ""
-"This setting specifies whether the threads should be in expanded or "
-"collapsed state by default. Requires a restart to apply."
+"Initial height of the \"Search Folder Editor\" window. The value updates as "
+"the user resizes the window vertically."
 msgstr ""
-"Denne innstillingen spesifiserer om tråder skal være i utvidet eller "
-"sammenslått tilstand som forvalg. Evolution må startes på nytt hvis denne "
-"endres."
+"Initiell høyde for «Rediger søkemapper»-vinduet. Verdien oppdateres ettersom "
+"bruker endrer størrelse på vinduet vertikalt."
 
-#: ../mail/evolution-mail.schemas.in.h:216
+#: ../mail/evolution-mail.schemas.in.h:231
+msgid "\"Search Folder Editor\" window maximize state"
+msgstr "Maksimeringstilstand for vindu for «Redigering av søkemapper»"
+
+#: ../mail/evolution-mail.schemas.in.h:232
 msgid ""
-"This value can be an empty string, which means it'll use the system Picture "
-"folder, usually set to ~/Pictures. This folder will be also used when the "
-"set path is not pointing to the existent folder."
+"Initial maximize state of the \"Search Folder Editor\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Search Folder Editor\" "
+"window cannot be maximized. This key exists only as an implementation detail."
 msgstr ""
 
+#: ../mail/evolution-mail.schemas.in.h:233
+msgid "\"Search Folder Editor\" window width"
+msgstr "Bredde på vindu for «Redigering av søkemapper»"
+
 #: ../mail/evolution-mail.schemas.in.h:234
-msgid "Whether to show local folders (On This Computer) in a folder tree."
+msgid ""
+"Initial width of the \"Search Folder Editor\" window. The value updates as "
+"the user resizes the window horizontally."
+msgstr ""
+"Initiell bredde på «Søkemapper»-vinduet. Verdien oppdateres ettersom bruker "
+"endrer størrelse på vinduet horisontalt."
+
+#: ../mail/evolution-mail.schemas.in.h:235
+msgid "Drag'n'drop export format"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:236
+msgid ""
+"Define the email export format when doing drag'n'drop. Possible values are : "
+"mbox or pdf"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:237
+msgid "Format of the drag'n'drop export filename"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:238
+msgid ""
+"Exported file name will be : YYYmmDDHHMMSS_email_title Possible values : 1 "
+"(: email sent date), 2 (: drag'n'drop date)"
 msgstr ""
 
 #: ../mail/importers/elm-importer.c:181
 msgid "Importing Elm data"
 msgstr "Importerer data fra Elm"
 
-#: ../mail/importers/elm-importer.c:351 ../mail/importers/pine-importer.c:456
-#: ../modules/mail/e-mail-shell-view.c:1041
+#: ../mail/importers/elm-importer.c:351 ../mail/importers/pine-importer.c:451
+#: ../modules/mail/e-mail-shell-view.c:1035
 #: ../widgets/misc/e-send-options.c:520
 msgid "Mail"
 msgstr "E-post"
@@ -12797,34 +12832,34 @@ msgstr "Importer e-post fra Elm."
 msgid "_Destination folder:"
 msgstr "_Målmappe:"
 
-#: ../mail/importers/evolution-mbox-importer.c:149
-#: ../plugins/dbx-import/dbx-importer.c:266
-#: ../plugins/pst-import/pst-importer.c:550
+#: ../mail/importers/evolution-mbox-importer.c:148
+#: ../plugins/dbx-import/dbx-importer.c:265
+#: ../plugins/pst-import/pst-importer.c:554
 msgid "Select folder"
 msgstr "Velg mappe"
 
-#: ../mail/importers/evolution-mbox-importer.c:150
-#: ../plugins/dbx-import/dbx-importer.c:267
-#: ../plugins/pst-import/pst-importer.c:551
+#: ../mail/importers/evolution-mbox-importer.c:149
+#: ../plugins/dbx-import/dbx-importer.c:266
+#: ../plugins/pst-import/pst-importer.c:555
 msgid "Select folder to import into"
 msgstr "Velg mappe å importere til"
 
-#: ../mail/importers/evolution-mbox-importer.c:437
+#: ../mail/importers/evolution-mbox-importer.c:436
 msgctxt "mboxImp"
 msgid "Subject"
 msgstr "Emne"
 
-#: ../mail/importers/evolution-mbox-importer.c:442
+#: ../mail/importers/evolution-mbox-importer.c:441
 msgctxt "mboxImp"
 msgid "From"
 msgstr "Fra"
 
-#: ../mail/importers/evolution-mbox-importer.c:486
+#: ../mail/importers/evolution-mbox-importer.c:485
 #: ../shell/e-shell-utils.c:195
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley Mailbox (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:487
+#: ../mail/importers/evolution-mbox-importer.c:486
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importer mapper i Berkeley Mailbox format"
 
@@ -12834,8 +12869,8 @@ msgstr "Importerer postboks"
 
 #. Destination folder, was set in our widget
 #: ../mail/importers/mail-importer.c:153
-#: ../plugins/dbx-import/dbx-importer.c:616
-#: ../plugins/pst-import/pst-importer.c:757
+#: ../plugins/dbx-import/dbx-importer.c:615
+#: ../plugins/pst-import/pst-importer.c:761
 #, c-format
 msgid "Importing '%s'"
 msgstr "Importerer «%s»"
@@ -12845,20 +12880,20 @@ msgstr "Importerer «%s»"
 msgid "Scanning %s"
 msgstr "Søker i %s"
 
-#: ../mail/importers/pine-importer.c:258
+#: ../mail/importers/pine-importer.c:253
 msgid "Importing Pine data"
 msgstr "Importerer data fra Pine"
 
-#: ../mail/importers/pine-importer.c:461
+#: ../mail/importers/pine-importer.c:456
 #: ../modules/addressbook/addressbook-config.c:1083
 msgid "Address Book"
 msgstr "Adressebok"
 
-#: ../mail/importers/pine-importer.c:507
+#: ../mail/importers/pine-importer.c:502
 msgid "Evolution Pine importer"
 msgstr "Import fra Pine for Evolutions"
 
-#: ../mail/importers/pine-importer.c:508
+#: ../mail/importers/pine-importer.c:503
 msgid "Import mail from Pine."
 msgstr "Importer e-post fra Pine."
 
@@ -12891,7 +12926,7 @@ msgstr "Legg til filterregel"
 #. * folder. For more than one filter rule is each of
 #. * them on a separate line, with four spaces in front
 #. * of its name, without quotes.
-#: ../mail/mail-autofilter.c:507
+#: ../mail/mail-autofilter.c:511
 #, c-format
 msgid ""
 "The filter rule \"%s\" has been modified to account for the deleted folder\n"
@@ -12909,18 +12944,10 @@ msgstr[1] ""
 "«%s»."
 
 #: ../mail/mail-config.ui.h:1
-msgid "Account Information"
-msgstr "Kontoinformasjon"
+msgid "Set custom junk header"
+msgstr "Sett egendefinert meldingshode for uønsket e-post"
 
 #: ../mail/mail-config.ui.h:2
-msgid "Add Ne_w Signature..."
-msgstr "Legg til n_y signatur …"
-
-#: ../mail/mail-config.ui.h:3
-msgid "Al_ways sign outgoing messages when using this account"
-msgstr "All_tid signer utgående meldinger når denne kontoen brukes"
-
-#: ../mail/mail-config.ui.h:4
 msgid ""
 "All new emails with header that matches given content will be automatically "
 "filtered as junk"
@@ -12928,799 +12955,807 @@ msgstr ""
 "Alle nye meldinger med meldingshode som er lik gitt innhold vil automatisk "
 "bli filtrert som uønsket"
 
-#. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:6
-msgid "Allowing a _mailing list to redirect a private reply to the list"
-msgstr "En e-postliste tillates å o_mdirigere private svar til listen"
+#: ../mail/mail-config.ui.h:3
+msgid "Header name"
+msgstr "Navn på meldingshode"
 
-#: ../mail/mail-config.ui.h:7
-msgid "Also encrypt to sel_f when sending encrypted messages"
-msgstr "Send krypterte me_ldinger til meg selv når kryptert e-post sendes"
+#: ../mail/mail-config.ui.h:4
+msgid "Header content"
+msgstr "Innhold i meldingshode"
 
-#: ../mail/mail-config.ui.h:8
-msgid "Alway_s carbon-copy (cc) to:"
-msgstr "All_tid _kopi (cc) til:"
+#: ../mail/mail-config.ui.h:5
+msgid "_Add Signature"
+msgstr "_Legg til signatur"
 
-#: ../mail/mail-config.ui.h:9
-msgid "Always _blind carbon-copy (bcc) to:"
-msgstr "Alltid _blindkopi (bcc) til:"
+#: ../mail/mail-config.ui.h:6
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only. "
+msgstr ""
+"Utdata fra dette skriptet vil brukes som din\n"
+"signatur. Navnet du oppgir vil kun brukes\n"
+"for visning på skjermen."
 
 #: ../mail/mail-config.ui.h:10
-msgid "Always _trust keys in my keyring when encrypting"
-msgstr "Alltid s_tol på nøkler i min nøkkelring ved kryptering"
+msgid "_Script:"
+msgstr "_Skript:"
 
 #: ../mail/mail-config.ui.h:11
-msgid "Always encrypt to _myself when sending encrypted messages"
-msgstr "Alltid krypter til _meg selv ved sending av krypterte meldinger"
+msgid "Default Behavior"
+msgstr "Forvalgt oppførsel"
 
 #: ../mail/mail-config.ui.h:12
-msgid "Always request rea_d receipt"
-msgstr "Allti_d be om lesekvittering"
+msgid "Format messages in _HTML"
+msgstr "Formater meldinger med _HTML"
 
 #: ../mail/mail-config.ui.h:13
-msgid "Apply the same _view settings to all folders"
-msgstr "Bruk samme _visningsinnstillinger for alle mapper"
-
-#: ../mail/mail-config.ui.h:15
-#: ../modules/addressbook/addressbook-config.c:1090
-msgid "Authentication"
-msgstr "Autentisering"
-
-#: ../mail/mail-config.ui.h:16
 msgid "Automatically insert _emoticon images"
 msgstr "S_ett inn smilefjes automatisk"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:14
+msgid "Always request rea_d receipt"
+msgstr "Allti_d be om lesekvittering"
+
+#: ../mail/mail-config.ui.h:16
 msgid "C_haracter set:"
 msgstr "Te_gnsett:"
 
+#: ../mail/mail-config.ui.h:17
+msgid "Replies and Forwards"
+msgstr "Svar og videresending"
+
 #: ../mail/mail-config.ui.h:18
-msgid "Ch_eck for Supported Types"
-msgstr "Sj_ekk støttede typer"
+msgid "_Reply style:"
+msgstr "Sva_rstil:"
 
 #: ../mail/mail-config.ui.h:19
-msgid "Check cu_stom headers for junk"
-msgstr "_Sjekk egendefinerte meldingshoder for uønsket e-post"
+msgid "_Forward style:"
+msgstr "_Videresendingsstil:"
 
 #: ../mail/mail-config.ui.h:20
-msgid "Check for new _messages on start"
-msgstr "Se etter nye _meldinger ved oppstart"
+msgid "Start _typing at the bottom on replying"
+msgstr "S_tart skriving under meldingen ved svar"
 
 #: ../mail/mail-config.ui.h:21
-msgid "Check for new messa_ges in all active accounts"
-msgstr "Se etter nye meldin_ger i alle aktive kontoer"
+msgid "_Keep signature above the original message on replying"
+msgstr "_Plasser signaturen over opprinnelig melding ved svar"
 
 #: ../mail/mail-config.ui.h:22
-msgid "Check incoming _messages for junk"
-msgstr "Sjekk om innkommende _meldinger er uønsket"
+msgid "Ignore Reply-To: for mailing lists"
+msgstr "Ignorer Reply-To: for e-postlister"
 
 #: ../mail/mail-config.ui.h:23
-msgid "Check spelling while I _type"
-msgstr "Sjekk s_taving mens jeg skriver"
+msgid "Group Reply goes only to mailing list, if possible"
+msgstr "Gruppesvar går kun til e-postliste hvis mulig"
 
 #: ../mail/mail-config.ui.h:24
-msgid "Cle_ar"
-msgstr "_Tøm"
-
-#: ../mail/mail-config.ui.h:25
-msgid "Clea_r"
-msgstr "Tø_m"
+msgid "Digitally _sign messages when original message signed (PGP or S/MIME)"
+msgstr ""
+"_Signer meldinger digitalt når opprinnelig melding er signert (PGP eller S/"
+"MIME)"
 
 #: ../mail/mail-config.ui.h:26
-msgid "Color for _misspelled words:"
-msgstr "_Farge for feilstavede ord:"
-
-#: ../mail/mail-config.ui.h:27
-msgid "Composing Messages"
-msgstr "Skriver meldinger"
+msgid "Sig_natures"
+msgstr "Sig_naturer"
 
 #: ../mail/mail-config.ui.h:28
-#: ../modules/plugin-manager/evolution-plugin-manager.c:160
-msgid "Configuration"
-msgstr "Konfigurasjon"
+msgid "Signatures"
+msgstr "Signaturer"
 
 #: ../mail/mail-config.ui.h:29
-msgid "Confirm _when expunging a folder"
-msgstr "_Bekreft ved tømming av en mappe"
+msgid "_Languages"
+msgstr "_Språk"
 
 #: ../mail/mail-config.ui.h:30
-msgid "Confirmations"
-msgstr "Bekreftelser"
+msgid ""
+"The list of languages here reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+"Språklisten som vises her reflekterer kun de språkene du har installert en "
+"ordbok for."
 
 #: ../mail/mail-config.ui.h:31
-#: ../modules/addressbook/autocompletion-config.c:188
-#: ../modules/calendar/e-calendar-preferences.ui.h:10
-msgid "Date/Time Format"
-msgstr "Fromat for dato ogklokkeslett"
+msgid "Languages Table"
+msgstr "Språktabell"
 
 #: ../mail/mail-config.ui.h:33
-msgid "Default Behavior"
-msgstr "Forvalgt oppførsel"
+msgid "Check spelling while I _type"
+msgstr "Sjekk s_taving mens jeg skriver"
 
 #: ../mail/mail-config.ui.h:34
-msgid "Default character e_ncoding:"
-msgstr "Forvalgt teg_nkoding:"
+msgid "Color for _misspelled words:"
+msgstr "_Farge for feilstavede ord:"
 
 #: ../mail/mail-config.ui.h:35
-msgid "Delete Mail"
-msgstr "Slett e-post"
+#: ../modules/calendar/e-calendar-preferences.ui.h:58
+msgid "Pick a color"
+msgstr "Velg en farge"
 
 #: ../mail/mail-config.ui.h:36
-msgid "Delete junk messages on e_xit"
-msgstr "Slett uønsket e-post når programmet a_vsluttes"
+msgid "Spell Checking"
+msgstr "Stavekontroll"
 
-#: ../mail/mail-config.ui.h:39
-msgid "Digitally _sign messages when original message signed (PGP or S/MIME)"
+#: ../mail/mail-config.ui.h:37
+msgid ""
+"To help avoid email accidents and embarrassments, ask for confirmation "
+"before taking the following checkmarked actions:"
 msgstr ""
-"_Signer meldinger digitalt når opprinnelig melding er signert (PGP eller S/"
-"MIME)"
+"Spør om bekreftelse før utføring av følgende avkryssede handlinger for å "
+"hjelpe med å unngå uhell og flauser med e-post:"
 
-#: ../mail/mail-config.ui.h:40
-msgid "Digitally sign o_utgoing messages (by default)"
-msgstr "Signer _utgående meldinger digitalt (som forvalg)"
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:39
+msgid "Sending a message with an _empty subject line"
+msgstr "Ved sending av en melding med tomt _emnefelt"
 
+#. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:41
-msgid "Displayed Message Headers"
-msgstr "Viste meldingshoder"
-
-#: ../mail/mail-config.ui.h:42
-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"
+msgid "Sending a message with only _Bcc recipients defined"
+msgstr "Ved sending av en melding med kun _Bcc-mottakere definert"
 
+#. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:43
-msgid "Do not quote"
-msgstr "Ikke siter"
-
-#: ../mail/mail-config.ui.h:44
-msgid "Drafts _Folder:"
-msgstr "Mappe _for skisser:"
+msgid "Sending a _private reply to a mailing list message"
+msgstr "Ved sending av _privat svar til meldinger fra e-postlister"
 
+#. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:45
-msgid "Email _Address:"
-msgstr "E-post_adresse:"
+msgid "Sending a reply to a large _number of recipients"
+msgstr "Ved sending av svar til et stort a_ntall mottakere"
 
+#. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:47
-msgid "Empty trash folders on e_xit"
-msgstr "_Tøm papirkurven når programmet avsluttes"
+msgid "Allowing a _mailing list to redirect a private reply to the list"
+msgstr "En e-postliste tillates å o_mdirigere private svar til listen"
 
+#. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:49
-msgid "Encry_ption certificate:"
-msgstr "Sertifikat for kry_ptering:"
+msgid "Sending a message with _recipients not entered as mail addresses"
+msgstr "Sender en melding med mottakere oppgitt uten e-postadresser"
 
 #: ../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:51
-msgid "Encryption:"
-msgstr "Kryptering:"
+msgid "Confirmations"
+msgstr "Bekreftelser"
 
 #: ../mail/mail-config.ui.h:52
-msgid "F_all back to threading messages by subject"
-msgstr "F_all tilbake til tråding av meldinger etter emne"
+msgid "SHA1"
+msgstr "SHA1"
 
 #: ../mail/mail-config.ui.h:53
-msgid "Fix_ed Width Font:"
-msgstr "Skrift med fast br_edde:"
+msgid "SHA256"
+msgstr "SHA256"
 
 #: ../mail/mail-config.ui.h:54
-msgid "Format messages in _HTML"
-msgstr "Formater meldinger med _HTML"
+msgid "SHA384"
+msgstr "SHA384"
 
 #: ../mail/mail-config.ui.h:55
-msgid "Full Nam_e:"
-msgstr "_Fullt navn:"
+msgid "SHA512"
+msgstr "SHA512"
 
-#: ../mail/mail-config.ui.h:57
-msgid "Group Reply goes only to mailing list, if possible"
-msgstr "Gruppesvar går kun til e-postliste hvis mulig"
+#: ../mail/mail-config.ui.h:56 ../smime/gui/smime-ui.ui.h:1
+msgid "a"
+msgstr "a"
 
-#: ../mail/mail-config.ui.h:58
-msgid "HTML Messages"
-msgstr "HTML-meldinger"
+#: ../mail/mail-config.ui.h:57 ../smime/gui/smime-ui.ui.h:2
+msgid "b"
+msgstr "b"
 
 #: ../mail/mail-config.ui.h:59
-msgid "H_TTP Proxy:"
-msgstr "H_TTP-proxy:"
+msgid "Inline (Outlook style)"
+msgstr "I meldingen (som i Outlook)"
 
 #: ../mail/mail-config.ui.h:60
-msgid "Header content"
-msgstr "Innhold i meldingshode"
+msgid "Quoted"
+msgstr "Sitert"
 
 #: ../mail/mail-config.ui.h:61
-msgid "Header name"
-msgstr "Navn på meldingshode"
+msgid "Do not quote"
+msgstr "Ikke siter"
 
 #: ../mail/mail-config.ui.h:62
-msgid "Headers"
-msgstr "Meldingshoder"
+msgid "Inline"
+msgstr "I meldingen"
 
 #: ../mail/mail-config.ui.h:63
-msgid "Highlight _quotations with"
-msgstr "_Merk sitering med"
+msgid "Proxy Settings"
+msgstr "Innstillinger for proxy"
 
 #: ../mail/mail-config.ui.h:64
-msgid "Ignore Reply-To: for mailing lists"
-msgstr "Ignorer Reply-To: for e-postlister"
+msgid "_Use system defaults"
+msgstr "Br_uk systemets forvalg"
 
 #: ../mail/mail-config.ui.h:65
-msgid "Inline"
-msgstr "I meldingen"
+msgid "_Direct connection to the Internet"
+msgstr "_Direkte tilkobling til internett"
 
 #: ../mail/mail-config.ui.h:66
-msgid "Inline (Outlook style)"
-msgstr "I meldingen (som i Outlook)"
+msgid "_Manual proxy configuration:"
+msgstr "_Manuell konfigurasjon av proxy:"
 
-#: ../mail/mail-config.ui.h:68 ../mail/message-list.etspec.h:8
-msgid "Labels"
-msgstr "Etiketter"
+#: ../mail/mail-config.ui.h:67
+msgid "H_TTP Proxy:"
+msgstr "H_TTP-proxy:"
+
+#: ../mail/mail-config.ui.h:68
+msgid "_Secure HTTP Proxy:"
+msgstr "_Sikker HTTP-proxy:"
 
 #: ../mail/mail-config.ui.h:69
-msgid "Languages Table"
-msgstr "Språktabell"
+msgid "SOC_KS Proxy:"
+msgstr "SOC_KS-proxy:"
 
 #: ../mail/mail-config.ui.h:70
-msgid "Loading Images"
-msgstr "Laster bilder"
+msgid "No _Proxy for:"
+msgstr "Ingen _proxy for:"
 
 #: ../mail/mail-config.ui.h:71
-msgid "Mail Headers Table"
-msgstr "Tabell med meldingshoder"
+msgid "Port:"
+msgstr "Port:"
 
 #: ../mail/mail-config.ui.h:72
-msgid "Mailbox location"
-msgstr "Plassering av postboks"
+msgid "Use Authe_ntication"
+msgstr "Bruk aute_ntisering"
 
 #: ../mail/mail-config.ui.h:73
-msgid "Message Display"
-msgstr "Meldingsvisning"
+msgid "Us_ername:"
+msgstr "Bruk_ernavn:"
 
 #: ../mail/mail-config.ui.h:74
-msgid "Message Receipts"
-msgstr "Meldingsmottakere"
+msgid "Pass_word:"
+msgstr "Pass_ord:"
+
+#: ../mail/mail-config.ui.h:75
+msgid "Start up"
+msgstr "Oppstart"
 
 #: ../mail/mail-config.ui.h:76
-msgid "No _Proxy for:"
-msgstr "Ingen _proxy for:"
+msgid "Check for new _messages on start"
+msgstr "Se etter nye _meldinger ved oppstart"
 
-#: ../mail/mail-config.ui.h:77 ../modules/addressbook/ldap-config.ui.h:9
-msgid "No encryption"
-msgstr "Ingen kryptering"
+#: ../mail/mail-config.ui.h:77
+msgid "Check for new messa_ges in all active accounts"
+msgstr "Se etter nye meldin_ger i alle aktive kontoer"
 
 #: ../mail/mail-config.ui.h:78
-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."
+msgid "Message Display"
+msgstr "Meldingsvisning"
 
 #: ../mail/mail-config.ui.h:79
-#: ../plugins/publish-calendar/publish-calendar.ui.h:10
-msgid "Optional Information"
-msgstr "Valgfri informasjon"
+msgid "_Use the same fonts as other applications"
+msgstr "Br_uk samme skrifter som andre programmer"
+
+#: ../mail/mail-config.ui.h:80
+msgid "S_tandard Font:"
+msgstr "Forvalg_t skrift:"
 
 #: ../mail/mail-config.ui.h:81
-msgid "Or_ganization:"
-msgstr "Or_ganisasjon:"
+msgid "Select HTML fixed width font"
+msgstr "Velg skrift med fast bredde for HTML"
 
 #: ../mail/mail-config.ui.h:82
-msgid "PGP/GPG _Key ID:"
-msgstr "PGP/GPG-nø_kkel ID:"
+msgid "Select HTML variable width font"
+msgstr "Velg skrift med variabel bredde for HTML"
 
 #: ../mail/mail-config.ui.h:83
-msgid "Pass_word:"
-msgstr "Pass_ord:"
+msgid "Fix_ed Width Font:"
+msgstr "Skrift med fast br_edde:"
 
 #: ../mail/mail-config.ui.h:84
-msgid "Personal Details:"
-msgstr "Personlige detaljer:"
+msgid "Highlight _quotations with"
+msgstr "_Merk sitering med"
 
 #: ../mail/mail-config.ui.h:85
-#: ../modules/calendar/e-calendar-preferences.ui.h:23
-msgid "Pick a color"
-msgstr "Velg en farge"
+msgid "color"
+msgstr "farge"
 
 #: ../mail/mail-config.ui.h:86
-msgid "Port:"
-msgstr "Port:"
+msgid "Default character e_ncoding:"
+msgstr "Forvalgt teg_nkoding:"
 
 #: ../mail/mail-config.ui.h:87
-msgid "Pretty Good Privacy (PGP/GPG)"
-msgstr "Pretty Good Privacy (PGP/GPG)"
+msgid "Apply the same _view settings to all folders"
+msgstr "Bruk samme _visningsinnstillinger for alle mapper"
+
+#: ../mail/mail-config.ui.h:88
+msgid "F_all back to threading messages by subject"
+msgstr "F_all tilbake til tråding av meldinger etter emne"
 
 #: ../mail/mail-config.ui.h:89
-msgid "Proxy Settings"
-msgstr "Innstillinger for proxy"
+msgid "Delete Mail"
+msgstr "Slett e-post"
 
 #: ../mail/mail-config.ui.h:90
-msgid "Quoted"
-msgstr "Sitert"
+msgid "Empty trash folders on e_xit"
+msgstr "_Tøm papirkurven når programmet avsluttes"
 
 #: ../mail/mail-config.ui.h:91
-msgid "Re_member password"
-msgstr "_Husk passord"
+msgid "Confirm _when expunging a folder"
+msgstr "_Bekreft ved tømming av en mappe"
 
-#: ../mail/mail-config.ui.h:92
-msgid "Re_ply-To:"
-msgstr "S_var-til:"
+#. If enabled, show animation; if disabled, only display a static image without any animation
+#: ../mail/mail-config.ui.h:93
+msgid "_Show animated images"
+msgstr "Vi_s animerte bilder"
 
 #: ../mail/mail-config.ui.h:94
-msgid "Remember _password"
-msgstr "Husk _passord"
+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:95
-msgid "Replies and Forwards"
-msgstr "Svar og videresending"
+msgid "Loading Images"
+msgstr "Laster bilder"
 
 #: ../mail/mail-config.ui.h:96
-msgid "Required Information"
-msgstr "Nødvendig informasjon"
+msgid "_Never load images from the Internet"
+msgstr "Aldri last bilder fra Internett"
 
 #: ../mail/mail-config.ui.h:97
-msgid "SHA1"
-msgstr "SHA1"
+msgid "_Load images only in messages from contacts"
+msgstr "_Last kun bilder i meldinger fra kontakter"
 
 #: ../mail/mail-config.ui.h:98
-msgid "SHA256"
-msgstr "SHA256"
+msgid "_Always load images from the Internet"
+msgstr "_Alltid last bilder fra Internett"
 
 #: ../mail/mail-config.ui.h:99
-msgid "SHA384"
-msgstr "SHA384"
+msgid "HTML Messages"
+msgstr "HTML-meldinger"
 
-#: ../mail/mail-config.ui.h:100
-msgid "SHA512"
-msgstr "SHA512"
+#: ../mail/mail-config.ui.h:100 ../mail/message-list.etspec.h:19
+msgid "Labels"
+msgstr "Etiketter"
 
 #: ../mail/mail-config.ui.h:101
-msgid "SOC_KS Proxy:"
-msgstr "SOC_KS-proxy:"
+msgid "Sender Photograph"
+msgstr "Bilde av avsender"
 
-#: ../mail/mail-config.ui.h:102 ../modules/addressbook/ldap-config.ui.h:12
-msgid "SSL encryption"
-msgstr "SSL-kryptering"
+#: ../mail/mail-config.ui.h:102
+msgid "_Show the photograph of sender in the message preview"
+msgstr "Vi_s bilde av avsender i forhåndsvisning av meldingen"
 
 #: ../mail/mail-config.ui.h:103
-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:104
 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:104
+msgid "Displayed Message Headers"
+msgstr "Viste meldingshoder"
+
 #: ../mail/mail-config.ui.h:105
-msgid "S_elect..."
-msgstr "V_elg …"
+msgid "Mail Headers Table"
+msgstr "Tabell med meldingshoder"
 
 #: ../mail/mail-config.ui.h:106
-msgid "S_end message receipts:"
-msgstr "Send kvittering for m_eldinger:"
+#: ../modules/addressbook/autocompletion-config.c:188
+#: ../modules/calendar/e-calendar-preferences.ui.h:54
+msgid "Date/Time Format"
+msgstr "Fromat for dato ogklokkeslett"
 
 #: ../mail/mail-config.ui.h:107
-msgid "S_tandard Font:"
-msgstr "Forvalg_t skrift:"
+msgid "Headers"
+msgstr "Meldingshoder"
 
 #: ../mail/mail-config.ui.h:108
-msgid "Secure MIME (S/MIME)"
-msgstr "Sikker MIME (S/MIME)"
+msgid "Check incoming _messages for junk"
+msgstr "Sjekk om innkommende _meldinger er uønsket"
+
+#: ../mail/mail-config.ui.h:109
+msgid "Delete junk messages on e_xit"
+msgstr "Slett uønsket e-post når programmet a_vsluttes"
 
 #: ../mail/mail-config.ui.h:110
-msgid "Select HTML fixed width font"
-msgstr "Velg skrift med fast bredde for HTML"
+msgid "Check cu_stom headers for junk"
+msgstr "_Sjekk egendefinerte meldingshoder for uønsket e-post"
 
 #: ../mail/mail-config.ui.h:111
-msgid "Select HTML variable width font"
-msgstr "Velg skrift med variabel bredde for HTML"
+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:112
-msgid "Sender Photograph"
-msgstr "Bilde av avsender"
+msgid "_Lookup in local address book only"
+msgstr "S_lå kun opp i lokale adressebokmapper"
 
-#. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:115
-msgid "Sending a _private reply to a mailing list message"
-msgstr "Ved sending av _privat svar til meldinger fra e-postlister"
+#: ../mail/mail-config.ui.h:113
+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."
 
-#. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:117
-msgid "Sending a message with _recipients not entered as mail addresses"
-msgstr "Sender en melding med mottakere oppgitt uten e-postadresser"
+#: ../mail/mail-config.ui.h:115 ../modules/addressbook/ldap-config.ui.h:3
+msgid "No encryption"
+msgstr "Ingen kryptering"
+
+#: ../mail/mail-config.ui.h:116 ../modules/addressbook/ldap-config.ui.h:1
+msgid "TLS encryption"
+msgstr "TLS-kryptering"
+
+#: ../mail/mail-config.ui.h:117 ../modules/addressbook/ldap-config.ui.h:2
+msgid "SSL encryption"
+msgstr "SSL-kryptering"
+
+#: ../mail/mail-config.ui.h:118
+msgid "Special Folders"
+msgstr "Spesielle mapper"
 
-#. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:119
-msgid "Sending a message with an _empty subject line"
-msgstr "Ved sending av en melding med tomt _emnefelt"
+msgid "Drafts _Folder:"
+msgstr "Mappe _for skisser:"
+
+#: ../mail/mail-config.ui.h:120
+msgid "Sent _Messages Folder:"
+msgstr "Mappe for sendte _meldinger:"
 
-#. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:121
-msgid "Sending a message with only _Bcc recipients defined"
-msgstr "Ved sending av en melding med kun _Bcc-mottakere definert"
+msgid "_Trash Folder:"
+msgstr "Mappe for _papirkurv:"
+
+#: ../mail/mail-config.ui.h:122
+msgid "_Junk Folder:"
+msgstr "Mappe for _uønsket e-post:"
 
-#. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:123
-msgid "Sending a reply to a large _number of recipients"
-msgstr "Ved sending av svar til et stort a_ntall mottakere"
+msgid "Composing Messages"
+msgstr "Skriver meldinger"
 
 #: ../mail/mail-config.ui.h:124
-msgid "Sent _Messages Folder:"
-msgstr "Mappe for sendte _meldinger:"
+msgid "Always _blind carbon-copy (bcc) to:"
+msgstr "Alltid _blindkopi (bcc) til:"
 
 #: ../mail/mail-config.ui.h:125
-msgid "Ser_ver requires authentication"
-msgstr "Tjener kre_ver autentisering"
+msgid "Alway_s carbon-copy (cc) to:"
+msgstr "All_tid _kopi (cc) til:"
 
 #: ../mail/mail-config.ui.h:126
-msgid "Server Configuration"
-msgstr "Tjenerkonfigurasjon"
+msgid "Message Receipts"
+msgstr "Meldingsmottakere"
 
 #: ../mail/mail-config.ui.h:127
-msgid "Server _Type:"
-msgstr "Tjener_type:"
+msgid "S_end message receipts:"
+msgstr "Send kvittering for m_eldinger:"
 
-#: ../mail/mail-config.ui.h:130
-msgid "Set custom junk header"
-msgstr "Sett egendefinert meldingshode for uønsket e-post"
+#: ../mail/mail-config.ui.h:128
+msgid "Account Information"
+msgstr "Kontoinformasjon"
+
+#: ../mail/mail-config.ui.h:129
+msgid ""
+"Type the name by which you would like to refer to this account.\n"
+"For example: \"Work\" or \"Personal\""
+msgstr ""
+"Skriv navnet du vil referere til denne kontoen.\n"
+"For eksempel «Arbeid» eller «Personlig»"
 
 #: ../mail/mail-config.ui.h:131
-msgid "Si_gning algorithm:"
-msgstr "Si_gneringsalgoritme:"
+msgid "Required Information"
+msgstr "Nødvendig informasjon"
 
 #: ../mail/mail-config.ui.h:132
-msgid "Sig_natures"
-msgstr "Sig_naturer"
+msgid "Email _Address:"
+msgstr "E-post_adresse:"
 
 #: ../mail/mail-config.ui.h:133
-msgid "Sig_ning certificate:"
-msgstr "Sertifikat for sig_nering:"
+msgid "Full Nam_e:"
+msgstr "_Fullt navn:"
 
 #: ../mail/mail-config.ui.h:134
-msgid "Signat_ure:"
-msgstr "Signat_ur:"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:26
+msgid "Optional Information"
+msgstr "Valgfri informasjon"
 
 #: ../mail/mail-config.ui.h:135
-msgid "Signatures"
-msgstr "Signaturer"
+msgid "Signat_ure:"
+msgstr "Signat_ur:"
 
 #: ../mail/mail-config.ui.h:136
-msgid "Signing _algorithm:"
-msgstr "Signerings_algoritme:"
+msgid "Add Ne_w Signature..."
+msgstr "Legg til n_y signatur …"
 
 #: ../mail/mail-config.ui.h:137
-msgid "Special Folders"
-msgstr "Spesielle mapper"
+msgid "Or_ganization:"
+msgstr "Or_ganisasjon:"
 
 #: ../mail/mail-config.ui.h:138
-msgid "Spell Checking"
-msgstr "Stavekontroll"
+msgid "Re_ply-To:"
+msgstr "S_var-til:"
 
 #: ../mail/mail-config.ui.h:139
-msgid "Start _typing at the bottom on replying"
-msgstr "S_tart skriving under meldingen ved svar"
+msgid "_Make this my default account"
+msgstr "_Bruk denne som forvalgt konto"
 
 #: ../mail/mail-config.ui.h:140
-msgid "Start up"
-msgstr "Oppstart"
+msgid "_Do not sign meeting requests (for Outlook compatibility)"
+msgstr "Ikke signer _møteforespørsler (for kompatibilitet med Outlook)"
 
-#: ../mail/mail-config.ui.h:141 ../modules/addressbook/ldap-config.ui.h:21
-msgid "TLS encryption"
-msgstr "TLS-kryptering"
+#: ../mail/mail-config.ui.h:141
+msgid "Pretty Good Privacy (PGP/GPG)"
+msgstr "Pretty Good Privacy (PGP/GPG)"
 
 #: ../mail/mail-config.ui.h:142
-msgid "T_ype:"
-msgstr "T_ype:"
+msgid "PGP/GPG _Key ID:"
+msgstr "PGP/GPG-nø_kkel ID:"
 
 #: ../mail/mail-config.ui.h:143
-msgid ""
-"The list of languages here reflects only the languages for which you have a "
-"dictionary installed."
-msgstr ""
-"Språklisten som vises her reflekterer kun de språkene du har installert en "
-"ordbok for."
+msgid "Si_gning algorithm:"
+msgstr "Si_gneringsalgoritme:"
 
 #: ../mail/mail-config.ui.h:144
-msgid ""
-"The output of this script will be used as your\n"
-"signature. The name you specify will be used\n"
-"for display purposes only. "
-msgstr ""
-"Utdata fra dette skriptet vil brukes som din\n"
-"signatur. Navnet du oppgir vil kun brukes\n"
-"for visning på skjermen."
+msgid "Al_ways sign outgoing messages when using this account"
+msgstr "All_tid signer utgående meldinger når denne kontoen brukes"
+
+#: ../mail/mail-config.ui.h:145
+msgid "Always encrypt to _myself when sending encrypted messages"
+msgstr "Alltid krypter til _meg selv ved sending av krypterte meldinger"
+
+#: ../mail/mail-config.ui.h:146
+msgid "Always _trust keys in my keyring when encrypting"
+msgstr "Alltid s_tol på nøkler i min nøkkelring ved kryptering"
 
 #: ../mail/mail-config.ui.h:147
-msgid ""
-"To help avoid email accidents and embarrassments, ask for confirmation "
-"before taking the following checkmarked actions:"
-msgstr ""
-"Spør om bekreftelse før utføring av følgende avkryssede handlinger for å "
-"hjelpe med å unngå uhell og flauser med e-post:"
+msgid "Secure MIME (S/MIME)"
+msgstr "Sikker MIME (S/MIME)"
 
 #: ../mail/mail-config.ui.h:148
-msgid ""
-"Type the name by which you would like to refer to this account.\n"
-"For example: \"Work\" or \"Personal\""
-msgstr ""
-"Skriv navnet du vil referere til denne kontoen.\n"
-"For eksempel «Arbeid» eller «Personlig»"
+msgid "Also encrypt to sel_f when sending encrypted messages"
+msgstr "Send krypterte me_ldinger til meg selv når kryptert e-post sendes"
+
+#: ../mail/mail-config.ui.h:149
+msgid "Encrypt out_going messages (by default)"
+msgstr "Krypter ut_gående meldinger (som forvalg)"
 
 #: ../mail/mail-config.ui.h:150
-msgid "Us_ername:"
-msgstr "Bruk_ernavn:"
+msgid "Digitally sign o_utgoing messages (by default)"
+msgstr "Signer _utgående meldinger digitalt (som forvalg)"
 
 #: ../mail/mail-config.ui.h:151
-msgid "Use Authe_ntication"
-msgstr "Bruk aute_ntisering"
+msgid "Encry_ption certificate:"
+msgstr "Sertifikat for kry_ptering:"
 
 #: ../mail/mail-config.ui.h:152
-msgid "User _Name:"
-msgstr "Bruker_navn:"
+msgid "Sig_ning certificate:"
+msgstr "Sertifikat for sig_nering:"
+
+#: ../mail/mail-config.ui.h:153
+msgid "S_elect..."
+msgstr "V_elg …"
 
 #: ../mail/mail-config.ui.h:154
-msgid "_Add Signature"
-msgstr "_Legg til signatur"
+msgid "Clea_r"
+msgstr "Tø_m"
 
 #: ../mail/mail-config.ui.h:155
-msgid "_Always load images from the Internet"
-msgstr "_Alltid last bilder fra Internett"
-
-#: ../mail/mail-config.ui.h:156
-msgid "_Authentication Type"
-msgstr "_Autentiseringstype"
+msgid "Signing _algorithm:"
+msgstr "Signerings_algoritme:"
 
 #: ../mail/mail-config.ui.h:157
-msgid "_Direct connection to the Internet"
-msgstr "_Direkte tilkobling til internett"
+msgid "Cle_ar"
+msgstr "_Tøm"
 
 #: ../mail/mail-config.ui.h:158
-msgid "_Do not sign meeting requests (for Outlook compatibility)"
-msgstr "Ikke signer _møteforespørsler (for kompatibilitet med Outlook)"
-
-#: ../mail/mail-config.ui.h:159
-msgid "_Forward style:"
-msgstr "_Videresendingsstil:"
+msgid "Server _Type:"
+msgstr "Tjener_type:"
 
 #: ../mail/mail-config.ui.h:160
-msgid "_Junk Folder:"
-msgstr "Mappe for _uønsket e-post:"
+msgid "description"
+msgstr "beskrivelse"
 
 #: ../mail/mail-config.ui.h:161
-msgid "_Keep signature above the original message on replying"
-msgstr "_Plasser signaturen over opprinnelig melding ved svar"
+#: ../modules/plugin-manager/evolution-plugin-manager.c:160
+msgid "Configuration"
+msgstr "Konfigurasjon"
 
 #: ../mail/mail-config.ui.h:162
-msgid "_Languages"
-msgstr "_Språk"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:24
+msgid "_Server:"
+msgstr "Tj_ener:"
 
 #: ../mail/mail-config.ui.h:163
-msgid "_Load images only in messages from contacts"
-msgstr "_Last kun bilder i meldinger fra kontakter"
-
-#: ../mail/mail-config.ui.h:164
-msgid "_Lookup in local address book only"
-msgstr "S_lå kun opp i lokale adressebokmapper"
+msgid "User _Name:"
+msgstr "Bruker_navn:"
 
 #: ../mail/mail-config.ui.h:165
-msgid "_Make this my default account"
-msgstr "_Bruk denne som forvalgt konto"
+msgid "Mailbox location"
+msgstr "Plassering av postboks"
 
-#: ../mail/mail-config.ui.h:166
-msgid "_Manual proxy configuration:"
-msgstr "_Manuell konfigurasjon av proxy:"
+#: ../mail/mail-config.ui.h:167
+msgid "_Use secure connection:"
+msgstr "Br_uk sikker forbindelse:"
 
 #: ../mail/mail-config.ui.h:168
-msgid "_Never load images from the Internet"
-msgstr "Aldri last bilder fra Internett"
+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:170 ../modules/addressbook/ldap-config.ui.h:29
-msgid "_Port:"
-msgstr "_Port:"
+#: ../mail/mail-config.ui.h:169
+msgid "_Authentication Type"
+msgstr "_Autentiseringstype"
+
+#: ../mail/mail-config.ui.h:170
+msgid "Ch_eck for Supported Types"
+msgstr "Sj_ekk støttede typer"
 
 #: ../mail/mail-config.ui.h:171
-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"
+msgid "Re_member password"
+msgstr "_Husk passord"
 
 #: ../mail/mail-config.ui.h:172
-msgid "_Reply style:"
-msgstr "Sva_rstil:"
+msgid "Server Configuration"
+msgstr "Tjenerkonfigurasjon"
 
-#: ../mail/mail-config.ui.h:173
-msgid "_Script:"
-msgstr "_Skript:"
+#: ../mail/mail-config.ui.h:173 ../modules/addressbook/ldap-config.ui.h:13
+msgid "_Port:"
+msgstr "_Port:"
 
 #: ../mail/mail-config.ui.h:174
-msgid "_Secure HTTP Proxy:"
-msgstr "_Sikker HTTP-proxy:"
-
-#: ../mail/mail-config.ui.h:176
-#: ../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:178
-msgid "_Show animated images"
-msgstr "Vi_s animerte bilder"
-
-#: ../mail/mail-config.ui.h:179
-msgid "_Show the photograph of sender in the message preview"
-msgstr "Vi_s bilde av avsender i forhåndsvisning av meldingen"
-
-#: ../mail/mail-config.ui.h:180
-msgid "_Trash Folder:"
-msgstr "Mappe for _papirkurv:"
-
-#: ../mail/mail-config.ui.h:181
-msgid "_Use secure connection:"
-msgstr "Br_uk sikker forbindelse:"
-
-#: ../mail/mail-config.ui.h:182
-msgid "_Use system defaults"
-msgstr "Br_uk systemets forvalg"
+msgid "Ser_ver requires authentication"
+msgstr "Tjener kre_ver autentisering"
 
-#: ../mail/mail-config.ui.h:183
-msgid "_Use the same fonts as other applications"
-msgstr "Br_uk samme skrifter som andre programmer"
+#: ../mail/mail-config.ui.h:175
+#: ../modules/addressbook/addressbook-config.c:1090
+msgid "Authentication"
+msgstr "Autentisering"
 
-#: ../mail/mail-config.ui.h:184 ../smime/gui/smime-ui.ui.h:48
-msgid "a"
-msgstr "a"
+#: ../mail/mail-config.ui.h:176
+msgid "T_ype:"
+msgstr "T_ype:"
 
-#: ../mail/mail-config.ui.h:185 ../smime/gui/smime-ui.ui.h:49
-msgid "b"
-msgstr "b"
+#: ../mail/mail-config.ui.h:177
+msgid "Remember _password"
+msgstr "Husk _passord"
 
-#: ../mail/mail-config.ui.h:186
-msgid "color"
-msgstr "farge"
+#: ../mail/mail-config.ui.h:178
+msgid "Personal Details:"
+msgstr "Personlige detaljer:"
 
 #: ../mail/mail-config.ui.h:187
-msgid "description"
-msgstr "beskrivelse"
+msgid "Encryption:"
+msgstr "Kryptering:"
 
 #: ../mail/mail-config.ui.h:188
-msgid "label"
-msgstr "etikett"
-
-#: ../mail/mail-config.ui.h:189
 msgid "none"
 msgstr "ingen"
 
+#: ../mail/mail-config.ui.h:189
+msgid "label"
+msgstr "etikett"
+
 #: ../mail/mail-dialogs.ui.h:1
+msgid "Search Folder Sources"
+msgstr "Kilder for søkemapper"
+
+#: ../mail/mail-dialogs.ui.h:2
+msgid "All local folders"
+msgstr "Alle lokale mapper"
+
+#: ../mail/mail-dialogs.ui.h:3
 msgid "All active remote folders"
 msgstr "Alle aktive eksterne mapper"
 
-#: ../mail/mail-dialogs.ui.h:2
+#: ../mail/mail-dialogs.ui.h:4
 msgid "All local and active remote folders"
 msgstr "Alle lokale og aktive eksterne mapper"
 
-#: ../mail/mail-dialogs.ui.h:3
-msgid "All local folders"
-msgstr "Alle lokale mapper"
+#: ../mail/mail-dialogs.ui.h:5
+msgid "Specific folders"
+msgstr "Spesifikke mapper"
 
-#: ../mail/mail-dialogs.ui.h:4
-msgid "Call"
-msgstr "Ring"
+#: ../mail/mail-dialogs.ui.h:6
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+msgstr ""
+"Meldingene du har valgt for oppfølging er listet under.\n"
+"Vennligst velg en handling for oppfølging fra menyen «Flagg»."
+
+#: ../mail/mail-dialogs.ui.h:8
+msgid "_Flag:"
+msgstr "_Flagg:"
+
+#: ../mail/mail-dialogs.ui.h:9
+msgid "_Due By:"
+msgstr "_Ferdig til:"
 
 #. Translators: Flag Completed
-#: ../mail/mail-dialogs.ui.h:6
+#: ../mail/mail-dialogs.ui.h:11
 msgid "Co_mpleted"
 msgstr "Fu_llført"
 
-#: ../mail/mail-dialogs.ui.h:7
-msgid "Digital Signature"
-msgstr "Digital signatur"
+#: ../mail/mail-dialogs.ui.h:12
+msgid "Call"
+msgstr "Ring"
 
-#: ../mail/mail-dialogs.ui.h:8
+#: ../mail/mail-dialogs.ui.h:13
 msgid "Do Not Forward"
 msgstr "Ikke videresend"
 
-#: ../mail/mail-dialogs.ui.h:9
-msgid "Encryption"
-msgstr "Kryptering"
-
-#: ../mail/mail-dialogs.ui.h:10
+#: ../mail/mail-dialogs.ui.h:14
 msgid "Follow-Up"
 msgstr "Følg opp"
 
-#: ../mail/mail-dialogs.ui.h:11
+#: ../mail/mail-dialogs.ui.h:15
 msgid "For Your Information"
 msgstr "Til din informasjon"
 
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:16
 msgid "Forward"
 msgstr "Videresend"
 
-#: ../mail/mail-dialogs.ui.h:13
-msgid "License Agreement"
-msgstr "Lisensavtale"
-
-#: ../mail/mail-dialogs.ui.h:14
+#: ../mail/mail-dialogs.ui.h:17
 msgid "No Response Necessary"
 msgstr "Ingen respons nødvendig"
 
-#: ../mail/mail-dialogs.ui.h:18
+#: ../mail/mail-dialogs.ui.h:21
 msgid "Reply to All"
 msgstr "Svar til alle"
 
-#: ../mail/mail-dialogs.ui.h:19
+#: ../mail/mail-dialogs.ui.h:22
 msgid "Review"
 msgstr "Gjennomgå"
 
-#: ../mail/mail-dialogs.ui.h:20
-msgid "Search Folder Sources"
-msgstr "Kilder for søkemapper"
-
-#: ../mail/mail-dialogs.ui.h:21
-msgid "Security Information"
-msgstr "Sikkerhetsinformasjon"
-
-#: ../mail/mail-dialogs.ui.h:22
-msgid "Specific folders"
-msgstr "Spesifikke mapper"
-
 #: ../mail/mail-dialogs.ui.h:23
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
-msgstr ""
-"Meldingene du har valgt for oppfølging er listet under.\n"
-"Vennligst velg en handling for oppfølging fra menyen «Flagg»."
+msgid "License Agreement"
+msgstr "Lisensavtale"
+
+#: ../mail/mail-dialogs.ui.h:24
+msgid "_Tick this to accept the license agreement"
+msgstr "_Kryss av her for å godta lisensen"
 
 #: ../mail/mail-dialogs.ui.h:25
 msgid "_Accept License"
 msgstr "Godt_a lisensen"
 
 #: ../mail/mail-dialogs.ui.h:26
-msgid "_Due By:"
-msgstr "_Ferdig til:"
+msgid "Security Information"
+msgstr "Sikkerhetsinformasjon"
 
 #: ../mail/mail-dialogs.ui.h:27
-msgid "_Flag:"
-msgstr "_Flagg:"
+msgid "Digital Signature"
+msgstr "Digital signatur"
 
 #: ../mail/mail-dialogs.ui.h:28
-msgid "_Tick this to accept the license agreement"
-msgstr "_Kryss av her for å godta lisensen"
+msgid "Encryption"
+msgstr "Kryptering"
 
 #: ../mail/mail.error.xml.h:1
-msgid "\"Check Junk\" Failed"
-msgstr "Sjekk etter uønsket e-post feilet"
+msgid "Invalid authentication"
+msgstr "Ugyldig autentisering"
 
 #: ../mail/mail.error.xml.h:2
-msgid "\"Report Junk\" Failed"
-msgstr "Feil under rapportering av uønsket e-post"
+msgid ""
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+msgstr ""
+"Tjener støtter ikke denne typen autentisering. Det kan hende den ikke "
+"støtter autentisering i det hele tatt."
 
 #: ../mail/mail.error.xml.h:3
-msgid "\"Report Not Junk\" Failed"
-msgstr "Feil under rapportering av e-post som ønsket"
+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:4
-msgid "A folder named \"{0}\" already exists. Please use a different name."
+msgid ""
+"Check to make sure your password is spelled correctly. Remember that many "
+"passwords are case sensitive; your caps lock might be on."
 msgstr ""
-"En mappe med navn «{0}» eksisterer allerede. Vennligst bruk et annet navn."
+"Sjekk at passordet ditt er skrevet korrekt. Husk at mange passord skiller "
+"mellom store og små bokstaver. Caps lock kan være på."
 
 #: ../mail/mail.error.xml.h:5
-msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr ""
-"En mappe med navn «{1}» eksisterer allerede. Vennligst bruk et annet navn."
+msgid "Are you sure you want to send a message in HTML format?"
+msgstr "Er du sikker på at du vil sende en melding i HTML-format?"
 
 #: ../mail/mail.error.xml.h:6
 msgid ""
-"A non-empty folder at \"{1}\" already exists.\n"
-"\n"
-"You can choose to ignore this folder, overwrite or append its contents, or "
-"quit."
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}"
 msgstr ""
-"En mappe med innhold eksisterer allerede i «{1}».\n"
-"\n"
-"Du kan velge å ignorere denne mappen, overskrive eller legge til innhold "
-"der, eller avslutte."
+"Sjekk at følgende mottakere kan og ønsker å motta e-post som HTML:\n"
+"{0}"
 
 #: ../mail/mail.error.xml.h:9
-msgid ""
-"A signature already exists with the name \"{0}\". Please specify a different "
-"name."
-msgstr ""
-"En signatur med navn «{0}» eksisterer allerede. Vennligst bruk et annet navn."
+msgid "Are you sure you want to send a message without a subject?"
+msgstr "Er du sikker på at du vil sende en melding uten emne?"
 
 #: ../mail/mail.error.xml.h:10
 msgid ""
@@ -13731,698 +13766,698 @@ msgstr ""
 "forstå hva meldingen din handler om."
 
 #: ../mail/mail.error.xml.h:11
-msgid "Are you sure you want to delete this account and all its proxies?"
-msgstr ""
-"Er du sikker på at du vil slette denne kontoen med alle stedfortredere?"
+msgid "Are you sure you want to send a message with only BCC recipients?"
+msgstr "Er du sikker på at du ønsker å sende en melding med kun BCB-mottakere?"
 
 #: ../mail/mail.error.xml.h:12
-msgid "Are you sure you want to delete this account?"
-msgstr "Er du sikker på at du vil slette denne kontoen?"
-
-#: ../mail/mail.error.xml.h:13
-msgid ""
-"Are you sure you want to disable this account and delete all its proxies?"
-msgstr ""
-"Er du sikker på at du vil slette denne kontoen med alle stedfortredere?"
-
-#: ../mail/mail.error.xml.h:14
 msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
+"The contact list you are sending to is configured to hide list recipients.\n"
+"\n"
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients in "
+"your message. To avoid this, you should add at least one To: or CC: "
+"recipient. "
 msgstr ""
-"Er du sikker på at du vil fjerne alle slettede meldinger fra alle mapper "
-"permanent?"
+"Kontaktlisten du sender til er satt opp til å skjule listemottakere.\n"
+"\n"
+"Mange e-postsystemer legger til et Apparently-To-meldingshode i meldinger "
+"som kun har BCC-mottakere. Dette meldingshodet vil liste alle mottakere av "
+"meldingen likevel. For å unngå dette bør du legge inn minst en mottaker i "
+"Til: eller Cc:."
 
 #: ../mail/mail.error.xml.h:15
 msgid ""
-"Are you sure you want to permanently remove all the deleted messages in "
-"folder \"{0}\"?"
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients to "
+"your message anyway. To avoid this, you should add at least one To: or CC: "
+"recipient."
 msgstr ""
-"Er du sikker på at du vil fjerne alle slettede meldinger fra mappe «{0}» "
-"permanent?"
+"Mange e-postsystemer legger til et Apparently-To-meldingshode i meldinger "
+"som kun har BCC-mottakere. Dette meldingshodet vil liste alle mottakere av "
+"meldingen likevel. For å unngå dette bør du legge inn minst en mottaker i "
+"Til: eller Cc:."
 
 #: ../mail/mail.error.xml.h:16
-msgid "Are you sure you want to send a message in HTML format?"
-msgstr "Er du sikker på at du vil sende en melding i HTML-format?"
-
-#: ../mail/mail.error.xml.h:17
 msgid "Are you sure you want to send a message with invalid address?"
 msgstr "Er du sikker på at du vil sende en melding med ugyldig adresse?"
 
-#: ../mail/mail.error.xml.h:18
-msgid "Are you sure you want to send a message with invalid addresses?"
-msgstr "Er du sikker på at du vil sende en melding med ugyldige adresser?"
+#: ../mail/mail.error.xml.h:17
+msgid ""
+"The following recipient was not recognized as a valid mail address:\n"
+"{0}"
+msgstr ""
+"Følgende mottaker ble ikke gjenkjent som en gyldig e-postadresse:\n"
+"{0}"
 
 #: ../mail/mail.error.xml.h:19
-msgid "Are you sure you want to send a message with only BCC recipients?"
-msgstr "Er du sikker på at du ønsker å sende en melding med kun BCB-mottakere?"
+msgid "Are you sure you want to send a message with invalid addresses?"
+msgstr "Er du sikker på at du vil sende en melding med ugyldige adresser?"
 
 #: ../mail/mail.error.xml.h:20
-msgid "Are you sure you want to send a message without a subject?"
-msgstr "Er du sikker på at du vil sende en melding uten emne?"
-
-#: ../mail/mail.error.xml.h:21
-msgid "Blank Signature"
-msgstr "Tom signatur"
+msgid ""
+"The following recipients were not recognized as valid mail addresses:\n"
+"{0}"
+msgstr ""
+"Følgende mottakere ble ikke gjenkjent som gyldige e-postadresser:\n"
+"{0}"
 
 #: ../mail/mail.error.xml.h:22
-msgid "Cannot add Search Folder \"{0}\"."
-msgstr "Kan ikke legge til søkemappe «{0}»."
+msgid "Send private reply?"
+msgstr "Send privat svar?"
 
 #: ../mail/mail.error.xml.h:23
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "Kan ikke kopiere mappe «{0}» til «{1}»."
+msgid ""
+"You are replying privately to a message which arrived via a mailing list, "
+"but the list is trying to redirect your reply to go back to the list. Are "
+"you sure you want to proceed?"
+msgstr ""
+"Du svarer privat på en melding som kom via en e-postliste, men listen prøver "
+"å omdirigere ditt svar tilbake til listen. Er du sikker på at du vil "
+"fortsette?"
 
 #: ../mail/mail.error.xml.h:24
-msgid "Cannot create folder \"{0}\"."
-msgstr "Kan ikke opprette mappe «{0}»."
-
-#: ../mail/mail.error.xml.h:25
-msgid "Cannot create temporary save directory."
-msgstr "Kan ikke opprette midlertidig katalog."
+msgid "Reply _Privately"
+msgstr "Svar _privat"
 
 #: ../mail/mail.error.xml.h:26
-msgid "Cannot create the save directory, because \"{1}\""
-msgstr "Kan ikke opprette katalog for lagring fordi «{1}»"
-
-#: ../mail/mail.error.xml.h:27
-msgid "Cannot delete folder \"{0}\"."
-msgstr "Kunne ikke slette mappe «{0}»."
+msgid ""
+"You are replying to a message which arrived via a mailing list, but you are "
+"replying privately to the sender; not to the list. Are you sure you want to "
+"proceed?"
+msgstr ""
+"Du svarer på en melding som kom via en e-postliste, men du svarer privat til "
+"avsender og ikke til listen. Er du sikker på at du vil fortsette?"
 
 #: ../mail/mail.error.xml.h:28
-msgid "Cannot delete system folder \"{0}\"."
-msgstr "Kan ikke slette systemmappe «{0}»."
+msgid "Send reply to all recipients?"
+msgstr "Send svar til alle mottakere?"
 
 #: ../mail/mail.error.xml.h:29
-msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
-msgstr "Kan ikke redigere søkemappe «{0}» da den ikke eksisterer."
+msgid ""
+"You are replying to a message which was sent to many recipients. Are you "
+"sure you want to reply to ALL of them?"
+msgstr ""
+"Du svarer på en melding som ble sendt til mange mottakere. Er du sikker på "
+"at du vil svare til ALLE mottakerene?"
 
 #: ../mail/mail.error.xml.h:30
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
-msgstr "Kunne ikke flytte mappe «{0}» til «{1}»."
+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:31
-msgid "Cannot open source \"{1}\"."
-msgstr "Kan ikke åpne kilde «{1}»."
+msgid ""
+"Please enter a valid email address in the To: field. You can search for "
+"email addresses by clicking on the To: button next to the entry box."
+msgstr ""
+"Vennligst oppgi en gyldig e-postadresse i Til:-feltet. Du kan søke etter e-"
+"postadresser ved å klikke på Til:-knappen ved siden av inntastingsfeltet."
 
 #: ../mail/mail.error.xml.h:32
-msgid "Cannot open source \"{2}\"."
-msgstr "Kan ikke åpne kilde «{2}»."
+msgid "Use default drafts folder?"
+msgstr "Bruk forvalgt mappe for skisser?"
 
 #: ../mail/mail.error.xml.h:33
-msgid "Cannot open target \"{2}\"."
-msgstr "Kan ikke åpne mål «{2}»."
-
-#: ../mail/mail.error.xml.h:34
 msgid ""
-"Cannot read the license file \"{0}\", due to an installation problem. You "
-"will not be able to use this provider until you can accept its license."
+"Unable to open the drafts folder for this account. Use the system drafts "
+"folder instead?"
 msgstr ""
-"Kan ikke lese lisensfil «{0}» pga et installasjonsproblem. Du vil ikke kunne "
-"bruke denne tilbyderen før du har mulighet til å godta lisensen."
+"Kan ikke åpne skisse-mappen for denne kontoen. Vil du bruke forvalgt mappe "
+"for skisser i stedet?"
+
+#: ../mail/mail.error.xml.h:34
+msgid "Use _Default"
+msgstr "Bruk _forvalg"
 
 #: ../mail/mail.error.xml.h:35
-msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr "Kan ikke endre navn på «{0}» til «{1}»."
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in "
+"folder \"{0}\"?"
+msgstr ""
+"Er du sikker på at du vil fjerne alle slettede meldinger fra mappe «{0}» "
+"permanent?"
 
 #: ../mail/mail.error.xml.h:36
-msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "Kan ikke endre navn på eller flytte systemmappe «{0}»."
+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:37
-msgid "Cannot save changes to account."
-msgstr "Kan ikke lagre endringer for kontoen."
+msgid "_Expunge"
+msgstr "T_øm"
 
 #: ../mail/mail.error.xml.h:38
-msgid "Cannot save to directory \"{0}\"."
-msgstr "Kan ikke lagre til katalog «{0}»."
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr ""
+"Er du sikker på at du vil fjerne alle slettede meldinger fra alle mapper "
+"permanent?"
 
 #: ../mail/mail.error.xml.h:39
-msgid "Cannot save to file \"{0}\"."
-msgstr "Kan ikke lagre til fil «{0}»."
+#: ../modules/mail/e-mail-shell-view-actions.c:1154
+msgid "_Empty Trash"
+msgstr "_Tøm papirkurven"
 
 #: ../mail/mail.error.xml.h:40
-msgid "Cannot set signature script \"{0}\"."
-msgstr "Kan ikke sette signaturskript «{0}»."
+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:41
-msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
-msgstr ""
-"Sjekk at passordet ditt er skrevet korrekt. Husk at mange passord skiller "
-"mellom store og små bokstaver. Caps lock kan være på."
+msgid "_Open Messages"
+msgstr "_Åpne meldinger"
 
 #: ../mail/mail.error.xml.h:42
-msgid "Close message window."
-msgstr "Lukk meldingsvinduet."
+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:43
-msgid "Could not save signature file."
-msgstr "Kunne ikke lagre signaturfil."
-
-#: ../mail/mail.error.xml.h:45
-msgid "Do _Not Disable"
-msgstr "I_kke slå av"
-
-#: ../mail/mail.error.xml.h:46
-msgid "Do _Not Synchronize"
-msgstr "Ikke sy_nkroniser"
+msgid ""
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
+msgstr ""
+"Hvis du avslutter vil ikke disse meldingene sendes før Evolution startes "
+"igjen."
 
+#. 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:47
-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?"
+msgid "Error while {0}."
+msgstr "Feil under {0}."
 
 #: ../mail/mail.error.xml.h:48
-msgid "Do you want to mark all messages as read?"
-msgstr "Vil du merke alle meldinger som lest?"
+msgid "Error while performing operation."
+msgstr "Feil under utføring av operasjon."
 
 #: ../mail/mail.error.xml.h:49
-msgid "Do you wish to save your changes?"
-msgstr "Vil du lagre dine endringer?"
-
-#: ../mail/mail.error.xml.h:50
 msgid "Enter password."
 msgstr "Oppgi passord."
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:50
 msgid "Error loading filter definitions."
 msgstr "Feil under lasting av filterdefinisjoner."
 
+#: ../mail/mail.error.xml.h:51
+msgid "Cannot save to directory \"{0}\"."
+msgstr "Kan ikke lagre til katalog «{0}»."
+
 #: ../mail/mail.error.xml.h:52
-msgid "Error while performing operation."
-msgstr "Feil under utføring av operasjon."
+msgid "Cannot save to file \"{0}\"."
+msgstr "Kan ikke lagre til fil «{0}»."
+
+#: ../mail/mail.error.xml.h:53
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr "Kan ikke opprette katalog for lagring fordi «{1}»"
+
+#: ../mail/mail.error.xml.h:54
+msgid "Cannot create temporary save directory."
+msgstr "Kan ikke opprette midlertidig katalog."
+
+#: ../mail/mail.error.xml.h:55
+msgid "File exists but cannot overwrite it."
+msgstr "Filen eksisterer men kan ikke overskrives."
 
-#. 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:56
-msgid "Error while {0}."
-msgstr "Feil under {0}."
+msgid "File exists but is not a regular file."
+msgstr "Filen eksisterer, men den er ikke en vanlig fil."
 
 #: ../mail/mail.error.xml.h:57
+msgid "Cannot delete folder \"{0}\"."
+msgstr "Kunne ikke slette mappe «{0}»."
+
+#: ../mail/mail.error.xml.h:58
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "Kan ikke slette systemmappe «{0}»."
+
+#: ../mail/mail.error.xml.h:59
 msgid ""
-"Evolution's local mail format has changed from mbox to Maildir. Your local "
-"mail must be migrated to the new format before Evolution can proceed. Do you "
-"want to migrate now?\n"
-"\n"
-"An mbox account will be created to preserve the old mbox folders. You can "
-"delete the account after ensuring the data is safely migrated. Please make "
-"sure there is enough disk space if you choose to migrate now."
+"System folders are required for Evolution to function correctly and cannot "
+"be renamed, moved, or deleted."
 msgstr ""
-"Evolutions lokale e-postformat er endret fra mbox- til Maildir. Din lokale e-"
-"post må migreres til det nye formatet før Evolution kan fortsette. Vil du "
-"migrere nå?\n"
-"\n"
-"En mbox-konto vil bli opprettet for å bevare de gamle mbox-mappene. Du kan "
-"slette denne etter å ha sjekket at data ble migrert uten problemer. "
-"Vennligst sjekk at det er nok plass hvis du velger å migrere."
+"Systemmapper kreves for at Evolution skal fungere korrekt og du kan ikke "
+"endre navn på, flytte eller slette disse."
 
 #: ../mail/mail.error.xml.h:60
-msgid "Evolution's local mail format has changed."
-msgstr "Evolutions lokale e-postformat er endret."
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "Kan ikke endre navn på eller flytte systemmappe «{0}»."
 
 #: ../mail/mail.error.xml.h:61
-msgid "Failed to download messages for offline viewing."
-msgstr "Klarte ikke å laste ned meldinger for frakoblet visning."
+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:62
-msgid "Failed to find duplicate messages."
-msgstr "Klarte ikke å finne duplikatmeldinger."
-
-#: ../mail/mail.error.xml.h:63
-msgid "Failed to open folder."
-msgstr "Klarte ikke å åpne mappe."
-
-#: ../mail/mail.error.xml.h:64
 msgid ""
-"Failed to query server for a list of supported authentication mechanisms."
+"If you delete the folder, all of its contents and its subfolders' contents "
+"will be deleted permanently."
 msgstr ""
-"Klarte ikke å spørre tjener etter en liste med støttede "
-"autentiseringsmekanismer."
+"Hvis du sletter mappen vil alt innhold i denne og undermapper slettes "
+"permanent."
+
+#: ../mail/mail.error.xml.h:64
+msgid "Really delete folder \"{0}\"?"
+msgstr "Vil du virkelig slette mappen «{0}»?"
 
 #: ../mail/mail.error.xml.h:65
-msgid "Failed to remove attachments from messages."
-msgstr "Klarte ikke å fjerne vedlegg fra meldinger."
+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:66
-msgid "Failed to retrieve messages."
-msgstr "Klarte ikke å hente meldinger."
+msgid "These messages are not copies."
+msgstr "Disse meldingene er ikke kopier."
 
 #: ../mail/mail.error.xml.h:67
-msgid "Failed to save messages to disk."
-msgstr "Klarte ikke å lagre meldinger til disk."
+msgid ""
+"Messages shown in Search Folders are not copies. Deleting them from a Search "
+"Folder will delete the actual messages from the folder or folders in which "
+"they physically reside. Do you really want to delete these messages?"
+msgstr ""
+"Meldinger som vises i søkemapper er ikke kopier. Hvis du sletter dem fra en "
+"søkemappe sletter du de faktiske meldingene fra dine lokale eller eksterne "
+"mapper. Vil du virkelig slette disse meldingene?"
 
 #: ../mail/mail.error.xml.h:68
-msgid "Failed to unsubscribe from folder."
-msgstr "Klarte ikke å fjerne abonnement på mappe."
+msgid "Cannot rename \"{0}\" to \"{1}\"."
+msgstr "Kan ikke endre navn på «{0}» til «{1}»."
 
 #: ../mail/mail.error.xml.h:69
-msgid "File exists but cannot overwrite it."
-msgstr "Filen eksisterer men kan ikke overskrives."
+msgid "A folder named \"{1}\" already exists. Please use a different name."
+msgstr ""
+"En mappe med navn «{1}» eksisterer allerede. Vennligst bruk et annet navn."
 
 #: ../mail/mail.error.xml.h:70
-msgid "File exists but is not a regular file."
-msgstr "Filen eksisterer, men den er ikke en vanlig fil."
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "Kunne ikke flytte mappe «{0}» til «{1}»."
+
+#: ../mail/mail.error.xml.h:71
+msgid "Cannot open source \"{2}\"."
+msgstr "Kan ikke åpne kilde «{2}»."
 
-#. Translators: {0} is replaced with a folder name
 #: ../mail/mail.error.xml.h:72
-msgid "Folder '{0}' doesn't contain any duplicate message."
-msgstr "Mappe «{0}» inneholder ingen duplikatmeldinger."
+msgid "Cannot open target \"{2}\"."
+msgstr "Kan ikke åpne mål «{2}»."
 
 #: ../mail/mail.error.xml.h:73
-msgid "Hidden file is attached."
-msgstr "Skjult fil er vedlagt."
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgstr "Kan ikke kopiere mappe «{0}» til «{1}»."
 
 #: ../mail/mail.error.xml.h:74
-msgid "If you continue, you will not be able to recover these messages."
-msgstr "Hvis du fortsetter vil du ikke kunne gjenopprette disse meldingene."
+msgid "Cannot create folder \"{0}\"."
+msgstr "Kan ikke opprette mappe «{0}»."
 
 #: ../mail/mail.error.xml.h:75
-msgid ""
-"If you delete the folder, all of its contents and its subfolders' contents "
-"will be deleted permanently."
-msgstr ""
-"Hvis du sletter mappen vil alt innhold i denne og undermapper slettes "
-"permanent."
+msgid "Cannot open source \"{1}\"."
+msgstr "Kan ikke åpne kilde «{1}»."
 
 #: ../mail/mail.error.xml.h:76
-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."
+msgid "Cannot save changes to account."
+msgstr "Kan ikke lagre endringer for kontoen."
 
 #: ../mail/mail.error.xml.h:77
-msgid "If you proceed, all proxy accounts will be deleted permanently."
-msgstr "Hvis du fortsetter vil stedfortrederkontoer bli slettet permanent."
+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:78
-msgid ""
-"If you proceed, the account information and\n"
-"all proxy information will be deleted permanently."
-msgstr ""
-"Hvis du fortsetter vil all kontoinformasjon og\n"
-"mellomtjenerinformasjon bli slettet permanent."
+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:79
+msgid "Are you sure you want to delete this account?"
+msgstr "Er du sikker på at du vil slette denne kontoen?"
 
 #: ../mail/mail.error.xml.h:80
 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:81
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr ""
-"Hvis du avslutter vil ikke disse meldingene sendes før Evolution startes "
-"igjen."
+"Er du sikker på at du vil slette denne kontoen med alle stedfortredere?"
 
 #: ../mail/mail.error.xml.h:82
-msgid "Ignore"
-msgstr "Ignorer"
-
-#: ../mail/mail.error.xml.h:83
-msgid "Invalid authentication"
-msgstr "Ugyldig autentisering"
+msgid ""
+"If you proceed, the account information and\n"
+"all proxy information will be deleted permanently."
+msgstr ""
+"Hvis du fortsetter vil all kontoinformasjon og\n"
+"mellomtjenerinformasjon bli slettet permanent."
 
 #: ../mail/mail.error.xml.h:84
-msgid "Mail Deletion Failed"
-msgstr "Sletting av e-post feilet"
+msgid ""
+"Are you sure you want to disable this account and delete all its proxies?"
+msgstr ""
+"Er du sikker på at du vil slette denne kontoen med alle stedfortredere?"
 
 #: ../mail/mail.error.xml.h:85
-msgid "Mail filters automatically updated."
-msgstr "E-postfiltre oppdatert automatisk."
+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:86
-msgid ""
-"Many email systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients to "
-"your message anyway. To avoid this, you should add at least one To: or CC: "
-"recipient."
-msgstr ""
-"Mange e-postsystemer legger til et Apparently-To-meldingshode i meldinger "
-"som kun har BCC-mottakere. Dette meldingshodet vil liste alle mottakere av "
-"meldingen likevel. For å unngå dette bør du legge inn minst en mottaker i "
-"Til: eller Cc:."
+msgid "Do _Not Disable"
+msgstr "I_kke slå av"
 
 #: ../mail/mail.error.xml.h:87
-msgid ""
-"Messages shown in Search Folders are not copies. Deleting them from a Search "
-"Folder will delete the actual messages from the folder or folders in which "
-"they physically reside. Do you really want to delete these messages?"
-msgstr ""
-"Meldinger som vises i søkemapper er ikke kopier. Hvis du sletter dem fra en "
-"søkemappe sletter du de faktiske meldingene fra dine lokale eller eksterne "
-"mapper. Vil du virkelig slette disse meldingene?"
+#: ../plugins/publish-calendar/publish-calendar.c:611
+msgid "_Disable"
+msgstr "_Deaktiver"
 
 #: ../mail/mail.error.xml.h:88
-msgid "Missing folder."
-msgstr "Mangler mappe."
+msgid "Could not save signature file."
+msgstr "Kunne ikke lagre signaturfil."
+
+#: ../mail/mail.error.xml.h:89
+msgid "Cannot set signature script \"{0}\"."
+msgstr "Kan ikke sette signaturskript «{0}»."
 
 #: ../mail/mail.error.xml.h:90
-msgid "N_ever"
-msgstr "A_ldri"
+msgid "The script file must exist and be executable."
+msgstr "Skriptfilen må eksistere og være kjørbar."
 
 #: ../mail/mail.error.xml.h:91
-msgid "No duplicate messages found."
-msgstr "Ingen duplikatmeldinger funnet."
+msgid "Do you wish to save your changes?"
+msgstr "Vil du lagre dine endringer?"
 
 #: ../mail/mail.error.xml.h:92
-msgid "No sources selected."
-msgstr "Ingen kilder valgt."
+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:93
-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."
+msgid "_Discard changes"
+msgstr "_Forkast endringene"
 
 #: ../mail/mail.error.xml.h:94
-msgid "Please check your account settings and try again."
-msgstr "Vennligst sjekk innstillingene for kontoen og prøv igjen."
+msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
+msgstr "Kan ikke redigere søkemappe «{0}» da den ikke eksisterer."
 
 #: ../mail/mail.error.xml.h:95
-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:96
 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."
+"This folder may have been added implicitly,\n"
+"go to the Search Folder editor to add it explicitly, if required."
 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."
+"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:97
-msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email:\n"
-"{0}"
+msgid "Cannot add Search Folder \"{0}\"."
+msgstr "Kan ikke legge til søkemappe «{0}»."
+
+#: ../mail/mail.error.xml.h:98
+msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgstr ""
-"Sjekk at følgende mottakere kan og ønsker å motta e-post som HTML:\n"
-"{0}"
+"En mappe med navn «{0}» eksisterer allerede. Vennligst bruk et annet navn."
 
 #: ../mail/mail.error.xml.h:99
-msgid "Please provide an unique name to identify this signature."
-msgstr "Oppgi et unikt navn for å identifisere denne signaturen."
+msgid "Search Folders automatically updated."
+msgstr "Søkemapper oppdatert automatisk."
 
 #: ../mail/mail.error.xml.h:100
-msgid "Please wait."
-msgstr "Vennligst vent."
+msgid "Mail filters automatically updated."
+msgstr "E-postfiltre oppdatert automatisk."
 
 #: ../mail/mail.error.xml.h:101
-msgid "Problem migrating old mail folder \"{0}\"."
-msgstr "Det oppsto et problem under migrering av gammel meldingsmappe «{0}»."
+msgid "Missing folder."
+msgstr "Mangler mappe."
 
 #: ../mail/mail.error.xml.h:102
-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:103
-msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr "Vil du virkelig slette mappen «{0}» og alle undermapper?"
+msgid "You must specify a folder."
+msgstr "Du må oppgi en mappe."
 
 #: ../mail/mail.error.xml.h:104
-msgid "Really delete folder \"{0}\"?"
-msgstr "Vil du virkelig slette mappen «{0}»?"
+msgid "You must name this Search Folder."
+msgstr "Du må gi navn til denne søkemappen."
 
 #: ../mail/mail.error.xml.h:105
-msgid "Remove duplicate messages?"
-msgstr "Fjern duplikatmeldinger?"
+msgid "No sources selected."
+msgstr "Ingen kilder valgt."
 
 #: ../mail/mail.error.xml.h:106
-msgid "Reply _Privately"
-msgstr "Svar _privat"
-
-#: ../mail/mail.error.xml.h:109
-msgid "Search Folders automatically updated."
-msgstr "Søkemapper oppdatert automatisk."
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting all local "
+"folders, all remote folders, or both."
+msgstr ""
+"Du må velge minst en mappe som kilde.\n"
+"Enten ved å velge mappene individuelt og/eller å velge alle lokale mapper, "
+"alle eksterne mapper eller begge deler."
 
-#: ../mail/mail.error.xml.h:110
-msgid "Send private reply?"
-msgstr "Send privat svar?"
+#: ../mail/mail.error.xml.h:108
+msgid "Problem migrating old mail folder \"{0}\"."
+msgstr "Det oppsto et problem under migrering av gammel meldingsmappe «{0}»."
 
-#: ../mail/mail.error.xml.h:111
-msgid "Send reply to all recipients?"
-msgstr "Send svar til alle mottakere?"
+#: ../mail/mail.error.xml.h:109
+msgid ""
+"A non-empty folder at \"{1}\" already exists.\n"
+"\n"
+"You can choose to ignore this folder, overwrite or append its contents, or "
+"quit."
+msgstr ""
+"En mappe med innhold eksisterer allerede i «{1}».\n"
+"\n"
+"Du kan velge å ignorere denne mappen, overskrive eller legge til innhold "
+"der, eller avslutte."
 
 #: ../mail/mail.error.xml.h:112
-msgid "Signature Already Exists"
-msgstr "Signaturen eksisterer allerede"
-
-#: ../mail/mail.error.xml.h:113
-msgid "Synchronize folders locally for offline usage?"
-msgstr "Synkroniser mapper lokalt for frakoblet bruk?"
+msgid "Ignore"
+msgstr "Ignorer"
 
 #: ../mail/mail.error.xml.h:114
-msgid ""
-"System folders are required for Evolution to function correctly and cannot "
-"be renamed, moved, or deleted."
-msgstr ""
-"Systemmapper kreves for at Evolution skal fungere korrekt og du kan ikke "
-"endre navn på, flytte eller slette disse."
+msgid "_Append"
+msgstr "_Legg til"
 
 #: ../mail/mail.error.xml.h:115
-msgid ""
-"The attachment named {0} is a hidden file and may contain sensitive data. "
-"Please review it before sending."
-msgstr ""
-"Vedleg med navn {0} er en skjult fil og kan inneholde sensitive data. "
-"Vennlist se gjennom den før du sender meldingen."
+msgid "Evolution's local mail format has changed."
+msgstr "Evolutions lokale e-postformat er endret."
 
 #: ../mail/mail.error.xml.h:116
 msgid ""
-"The contact list you are sending to is configured to hide list recipients.\n"
+"Evolution's local mail format has changed from mbox to Maildir. Your local "
+"mail must be migrated to the new format before Evolution can proceed. Do you "
+"want to migrate now?\n"
 "\n"
-"Many email systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients in "
-"your message. To avoid this, you should add at least one To: or CC: "
-"recipient. "
+"An mbox account will be created to preserve the old mbox folders. You can "
+"delete the account after ensuring the data is safely migrated. Please make "
+"sure there is enough disk space if you choose to migrate now."
 msgstr ""
-"Kontaktlisten du sender til er satt opp til å skjule listemottakere.\n"
+"Evolutions lokale e-postformat er endret fra mbox- til Maildir. Din lokale e-"
+"post må migreres til det nye formatet før Evolution kan fortsette. Vil du "
+"migrere nå?\n"
 "\n"
-"Mange e-postsystemer legger til et Apparently-To-meldingshode i meldinger "
-"som kun har BCC-mottakere. Dette meldingshodet vil liste alle mottakere av "
-"meldingen likevel. For å unngå dette bør du legge inn minst en mottaker i "
-"Til: eller Cc:."
+"En mbox-konto vil bli opprettet for å bevare de gamle mbox-mappene. Du kan "
+"slette denne etter å ha sjekket at data ble migrert uten problemer. "
+"Vennligst sjekk at det er nok plass hvis du velger å migrere."
 
 #: ../mail/mail.error.xml.h:119
-msgid ""
-"The following recipient was not recognized as a valid mail address:\n"
-"{0}"
-msgstr ""
-"Følgende mottaker ble ikke gjenkjent som en gyldig e-postadresse:\n"
-"{0}"
+msgid "_Exit Evolution"
+msgstr "Avslutt _Evolution"
+
+#: ../mail/mail.error.xml.h:120
+msgid "_Migrate Now"
+msgstr "_Migrer nå"
 
 #: ../mail/mail.error.xml.h:121
+msgid "Unable to read license file."
+msgstr "Kan ikke lese lisensfilen."
+
+#: ../mail/mail.error.xml.h:122
 msgid ""
-"The following recipients were not recognized as valid mail addresses:\n"
-"{0}"
+"Cannot read the license file \"{0}\", due to an installation problem. You "
+"will not be able to use this provider until you can accept its license."
 msgstr ""
-"Følgende mottakere ble ikke gjenkjent som gyldige e-postadresser:\n"
-"{0}"
+"Kan ikke lese lisensfil «{0}» pga et installasjonsproblem. Du vil ikke kunne "
+"bruke denne tilbyderen før du har mulighet til å godta lisensen."
+
+#: ../mail/mail.error.xml.h:123
+msgid "Please wait."
+msgstr "Vennligst vent."
 
 #: ../mail/mail.error.xml.h:124
-msgid "The script file must exist and be executable."
-msgstr "Skriptfilen må eksistere og være kjørbar."
+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:125
-msgid "These messages are not copies."
-msgstr "Disse meldingene er ikke kopier."
-
-#: ../mail/mail.error.xml.h:126
 msgid ""
-"This folder may have been added implicitly,\n"
-"go to the Search Folder editor to add it explicitly, if required."
+"Failed to query server for a list of supported authentication mechanisms."
 msgstr ""
-"Denne mappen er lagt til implisitt. Gå til redigering av søkemapper og legg "
-"den inn eksplisitt hvis det er nødvendig."
+"Klarte ikke å spørre tjener etter en liste med støttede "
+"autentiseringsmekanismer."
+
+#: ../mail/mail.error.xml.h:126
+msgid "Unable to connect to the GroupWise server."
+msgstr "Kunne ikke koble til GroupWise-tjener."
+
+#: ../mail/mail.error.xml.h:127
+msgid "Please check your account settings and try again."
+msgstr "Vennligst sjekk innstillingene for kontoen og prøv igjen."
 
 #: ../mail/mail.error.xml.h:128
-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"
+msgid "Synchronize folders locally for offline usage?"
+msgstr "Synkroniser mapper lokalt for frakoblet bruk?"
 
 #: ../mail/mail.error.xml.h:129
 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"
+"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:130
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
-msgstr ""
-"Tjener støtter ikke denne typen autentisering. Det kan hende den ikke "
-"støtter autentisering i det hele tatt."
+msgid "Do _Not Synchronize"
+msgstr "Ikke sy_nkroniser"
 
 #: ../mail/mail.error.xml.h:131
-msgid "This signature has been changed, but has not been saved."
-msgstr "Denne signaturen er endret, men er ikke lagret."
+msgid "_Synchronize"
+msgstr "_Synkroniser"
 
 #: ../mail/mail.error.xml.h:132
-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."
+msgid "Do you want to mark all messages as read?"
+msgstr "Vil du merke alle meldinger som lest?"
 
 #: ../mail/mail.error.xml.h:133
 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:134
-msgid "Unable to connect to the GroupWise server."
-msgstr "Kunne ikke koble til GroupWise-tjener."
+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:135
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
-msgstr ""
-"Kan ikke åpne skisse-mappen for denne kontoen. Vil du bruke forvalgt mappe "
-"for skisser i stedet?"
+msgid "Close message window."
+msgstr "Lukk meldingsvinduet."
 
 #: ../mail/mail.error.xml.h:136
-msgid "Unable to read license file."
-msgstr "Kan ikke lese lisensfilen."
+msgid "Would you like to close the message window?"
+msgstr "Vil du lukke meldingsvinduet?"
 
 #: ../mail/mail.error.xml.h:137
-msgid "Unable to retrieve message."
-msgstr "Kunne ikke hente melding."
+msgid "_Yes"
+msgstr "_Ja"
 
 #: ../mail/mail.error.xml.h:138
-msgid "Use _Default"
-msgstr "Bruk _forvalg"
+msgid "_No"
+msgstr "_Nei"
 
 #: ../mail/mail.error.xml.h:139
-msgid "Use default drafts folder?"
-msgstr "Bruk forvalgt mappe for skisser?"
+msgid "_Always"
+msgstr "_Alltid"
 
 #: ../mail/mail.error.xml.h:140
-msgid "Would you like to close the message window?"
-msgstr "Vil du lukke meldingsvinduet?"
+msgid "N_ever"
+msgstr "A_ldri"
 
 #: ../mail/mail.error.xml.h:141
-msgid ""
-"You are replying privately to a message which arrived via a mailing list, "
-"but the list is trying to redirect your reply to go back to the list. Are "
-"you sure you want to proceed?"
-msgstr ""
-"Du svarer privat på en melding som kom via en e-postliste, men listen prøver "
-"å omdirigere ditt svar tilbake til listen. Er du sikker på at du vil "
-"fortsette?"
+msgid "Signature Already Exists"
+msgstr "Signaturen eksisterer allerede"
 
 #: ../mail/mail.error.xml.h:142
 msgid ""
-"You are replying to a message which arrived via a mailing list, but you are "
-"replying privately to the sender; not to the list. Are you sure you want to "
-"proceed?"
+"A signature already exists with the name \"{0}\". Please specify a different "
+"name."
 msgstr ""
-"Du svarer på en melding som kom via en e-postliste, men du svarer privat til "
-"avsender og ikke til listen. Er du sikker på at du vil fortsette?"
+"En signatur med navn «{0}» eksisterer allerede. Vennligst bruk et annet navn."
 
 #: ../mail/mail.error.xml.h:143
-msgid ""
-"You are replying to a message which was sent to many recipients. Are you "
-"sure you want to reply to ALL of them?"
-msgstr ""
-"Du svarer på en melding som ble sendt til mange mottakere. Er du sikker på "
-"at du vil svare til ALLE mottakerene?"
+msgid "Blank Signature"
+msgstr "Tom signatur"
 
 #: ../mail/mail.error.xml.h:144
-msgid "You do not have sufficient permissions to delete this mail."
-msgstr "Du har ikke tilstrekkelige rettigheter til å slette denne meldingen."
+msgid "Please provide an unique name to identify this signature."
+msgstr "Oppgi et unikt navn for å identifisere denne signaturen."
 
 #: ../mail/mail.error.xml.h:145
-msgid "You have not filled in all of the required information."
-msgstr "Du har ikke fylt ut all nødvendig informasjon."
+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:146
-msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr "Du har usendte meldinger. Vil du avslutte likevel?"
+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:147
-msgid "You may not create two accounts with the same name."
-msgstr "Du kan ikke opprette to kontoer med samme navn."
+msgid "Mail Deletion Failed"
+msgstr "Sletting av e-post feilet"
 
 #: ../mail/mail.error.xml.h:148
-msgid "You must name this Search Folder."
-msgstr "Du må gi navn til denne søkemappen."
+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:149
-msgid "You must specify a folder."
-msgstr "Du må oppgi en mappe."
+msgid "\"Check Junk\" Failed"
+msgstr "Sjekk etter uønsket e-post feilet"
 
 #: ../mail/mail.error.xml.h:150
-msgid ""
-"You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting all local "
-"folders, all remote folders, or both."
-msgstr ""
-"Du må velge minst en mappe som kilde.\n"
-"Enten ved å velge mappene individuelt og/eller å velge alle lokale mapper, "
-"alle eksterne mapper eller begge deler."
+msgid "\"Report Junk\" Failed"
+msgstr "Feil under rapportering av uønsket e-post"
+
+#: ../mail/mail.error.xml.h:151
+msgid "\"Report Not Junk\" Failed"
+msgstr "Feil under rapportering av e-post som ønsket"
 
 #: ../mail/mail.error.xml.h:152
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
-msgstr "Din pålogging på tjener «{0}» som «{0}» feilet."
+msgid "Remove duplicate messages?"
+msgstr "Fjern duplikatmeldinger?"
 
 #: ../mail/mail.error.xml.h:153
-msgid "_Always"
-msgstr "_Alltid"
-
-#: ../mail/mail.error.xml.h:154
-msgid "_Append"
-msgstr "_Legg til"
+msgid "No duplicate messages found."
+msgstr "Ingen duplikatmeldinger funnet."
 
+#. Translators: {0} is replaced with a folder name
 #: ../mail/mail.error.xml.h:155
-#: ../plugins/publish-calendar/publish-calendar.c:611
-msgid "_Disable"
-msgstr "_Deaktiver"
+msgid "Folder '{0}' doesn't contain any duplicate message."
+msgstr "Mappe «{0}» inneholder ingen duplikatmeldinger."
 
 #: ../mail/mail.error.xml.h:156
-msgid "_Discard changes"
-msgstr "_Forkast endringene"
-
-#: ../mail/mail.error.xml.h:157
-#: ../modules/mail/e-mail-shell-view-actions.c:1109
-msgid "_Empty Trash"
-msgstr "_Tøm papirkurven"
+msgid "Failed to unsubscribe from folder."
+msgstr "Klarte ikke å fjerne abonnement på mappe."
 
 #: ../mail/mail.error.xml.h:158
-msgid "_Exit Evolution"
-msgstr "Avslutt _Evolution"
+msgid "Unable to retrieve message."
+msgstr "Kunne ikke hente melding."
 
 #: ../mail/mail.error.xml.h:159
-msgid "_Expunge"
-msgstr "T_øm"
+msgid "{0}"
+msgstr "{0}"
 
 #: ../mail/mail.error.xml.h:160
-msgid "_Migrate Now"
-msgstr "_Migrer nå"
+msgid "Failed to open folder."
+msgstr "Klarte ikke å åpne mappe."
 
 #: ../mail/mail.error.xml.h:161
-msgid "_No"
-msgstr "_Nei"
+msgid "Failed to find duplicate messages."
+msgstr "Klarte ikke å finne duplikatmeldinger."
 
 #: ../mail/mail.error.xml.h:162
-msgid "_Open Messages"
-msgstr "_Åpne meldinger"
+msgid "Failed to retrieve messages."
+msgstr "Klarte ikke å hente meldinger."
+
+#: ../mail/mail.error.xml.h:163
+msgid "Failed to remove attachments from messages."
+msgstr "Klarte ikke å fjerne vedlegg fra meldinger."
+
+#: ../mail/mail.error.xml.h:164
+msgid "Failed to download messages for offline viewing."
+msgstr "Klarte ikke å laste ned meldinger for frakoblet visning."
 
 #: ../mail/mail.error.xml.h:165
-msgid "_Synchronize"
-msgstr "_Synkroniser"
+msgid "Failed to save messages to disk."
+msgstr "Klarte ikke å lagre meldinger til disk."
 
 #: ../mail/mail.error.xml.h:166
-msgid "_Yes"
-msgstr "_Ja"
+msgid "Hidden file is attached."
+msgstr "Skjult fil er vedlagt."
 
 #: ../mail/mail.error.xml.h:167
-msgid "{0}"
-msgstr "{0}"
+msgid ""
+"The attachment named {0} is a hidden file and may contain sensitive data. "
+"Please review it before sending."
+msgstr ""
+"Vedleg med navn {0} er en skjult fil og kan inneholde sensitive data. "
+"Vennlist se gjennom den før du sender meldingen."
 
-#: ../mail/mail-folder-cache.c:883
+#: ../mail/mail-folder-cache.c:885
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinger %s"
@@ -14435,90 +14470,90 @@ msgstr "Filtrerer valgte meldinger"
 msgid "Fetching Mail"
 msgstr "Henter e-post"
 
-#: ../mail/mail-ops.c:858
+#: ../mail/mail-ops.c:821
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sender melding %d av %d"
 
-#: ../mail/mail-ops.c:906
+#: ../mail/mail-ops.c:869
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Feil under sending av %d av %d meldinger"
 
-#: ../mail/mail-ops.c:910 ../mail/mail-send-recv.c:846
+#: ../mail/mail-ops.c:873 ../mail/mail-send-recv.c:872
 msgid "Canceled."
 msgstr "Avbrutt."
 
-#: ../mail/mail-ops.c:912 ../mail/mail-send-recv.c:848
+#: ../mail/mail-ops.c:875 ../mail/mail-send-recv.c:874
 msgid "Complete."
 msgstr "Fullført."
 
-#: ../mail/mail-ops.c:1027
+#: ../mail/mail-ops.c:987
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Flytter meldinger til «%s»"
 
-#: ../mail/mail-ops.c:1028
+#: ../mail/mail-ops.c:988
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Kopierer meldinger til «%s»"
 
-#: ../mail/mail-ops.c:1146
+#: ../mail/mail-ops.c:1105
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Lagrer mappe «%s»"
 
-#: ../mail/mail-ops.c:1222
+#: ../mail/mail-ops.c:1178
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Tømmer og lagrer konto «%s»"
 
-#: ../mail/mail-ops.c:1223
+#: ../mail/mail-ops.c:1179
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Lagrer konto «%s»"
 
-#: ../mail/mail-ops.c:1285
+#: ../mail/mail-ops.c:1241
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "Oppdaterer mappe «%s»"
 
-#: ../mail/mail-ops.c:1494
+#: ../mail/mail-ops.c:1457
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "Tømmer mappe «%s»"
 
-#: ../mail/mail-ops.c:1585
+#: ../mail/mail-ops.c:1550
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Tømmer søppel i «%s»"
 
-#: ../mail/mail-ops.c:1687
+#: ../mail/mail-ops.c:1646
 #, c-format
 msgid "Disconnecting %s"
 msgstr "Kobler fra %s"
 
-#: ../mail/mail-send-recv.c:201
+#: ../mail/mail-send-recv.c:200
 msgid "Canceling..."
 msgstr "Avbryter …"
 
-#: ../mail/mail-send-recv.c:457
+#: ../mail/mail-send-recv.c:523
 msgid "Send & Receive Mail"
 msgstr "Send & motta e-post"
 
-#: ../mail/mail-send-recv.c:477
+#: ../mail/mail-send-recv.c:539
 msgid "Cancel _All"
 msgstr "Avbryt _alle"
 
-#: ../mail/mail-send-recv.c:601 ../mail/mail-send-recv.c:994
+#: ../mail/mail-send-recv.c:639 ../mail/mail-send-recv.c:1016
 msgid "Updating..."
 msgstr "Oppdaterer …"
 
-#: ../mail/mail-send-recv.c:601 ../mail/mail-send-recv.c:696
+#: ../mail/mail-send-recv.c:639 ../mail/mail-send-recv.c:725
 msgid "Waiting..."
 msgstr "Venter …"
 
-#: ../mail/mail-send-recv.c:973
+#: ../mail/mail-send-recv.c:996
 #, c-format
 msgid "Checking for new mail"
 msgstr "Ser etter nye meldinger"
@@ -14542,12 +14577,12 @@ msgstr "Videresendt melding - %s"
 msgid "Forwarded message"
 msgstr "Videresendt melding"
 
-#: ../mail/mail-vfolder.c:82
+#: ../mail/mail-vfolder.c:79
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "Setter opp søkemappe: %s"
 
-#: ../mail/mail-vfolder.c:222
+#: ../mail/mail-vfolder.c:216
 #, c-format
 msgid "Updating Search Folders for '%s' : %s"
 msgstr "Oppdaterer søkemapper for «%s» : %s"
@@ -14557,7 +14592,7 @@ msgstr "Oppdaterer søkemapper for «%s» : %s"
 #. * removed folder. For more than one search folder is
 #. * each of them on a separate line, with four spaces
 #. * in front of its name, without quotes.
-#: ../mail/mail-vfolder.c:556
+#: ../mail/mail-vfolder.c:559
 #, c-format
 msgid ""
 "The Search Folder \"%s\" has been modified to account for the deleted "
@@ -14575,99 +14610,99 @@ msgstr[1] ""
 "%s ble oppdatert fordi de brukte en mappe som ble slettet\n"
 "«%s»."
 
-#: ../mail/mail-vfolder.c:1191
+#: ../mail/mail-vfolder.c:1179
 msgid "Edit Search Folder"
 msgstr "Rediger søkemappe"
 
-#: ../mail/mail-vfolder.c:1294
+#: ../mail/mail-vfolder.c:1284
 msgid "New Search Folder"
 msgstr "Ny søkemappe"
 
-#: ../mail/message-list.c:1273
+#: ../mail/message-list.c:1269
 msgid "Unseen"
 msgstr "Ulest"
 
-#: ../mail/message-list.c:1274
+#: ../mail/message-list.c:1270
 msgid "Seen"
 msgstr "Lest"
 
-#: ../mail/message-list.c:1275
+#: ../mail/message-list.c:1271
 msgid "Answered"
 msgstr "Besvart"
 
-#: ../mail/message-list.c:1276
+#: ../mail/message-list.c:1272
 msgid "Forwarded"
 msgstr "Videresendt"
 
-#: ../mail/message-list.c:1277
+#: ../mail/message-list.c:1273
 msgid "Multiple Unseen Messages"
 msgstr "Flere uleste meldinger"
 
-#: ../mail/message-list.c:1278
+#: ../mail/message-list.c:1274
 msgid "Multiple Messages"
 msgstr "Flere meldinger"
 
-#: ../mail/message-list.c:1282
+#: ../mail/message-list.c:1278
 msgid "Lowest"
 msgstr "Lavest"
 
-#: ../mail/message-list.c:1283
+#: ../mail/message-list.c:1279
 msgid "Lower"
 msgstr "Lavere"
 
-#: ../mail/message-list.c:1287
+#: ../mail/message-list.c:1283
 msgid "Higher"
 msgstr "Høyere"
 
-#: ../mail/message-list.c:1288
+#: ../mail/message-list.c:1284
 msgid "Highest"
 msgstr "Høyest"
 
-#: ../mail/message-list.c:1921 ../widgets/table/e-cell-date.c:51
+#: ../mail/message-list.c:1901 ../widgets/table/e-cell-date.c:51
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:1928 ../plugins/itip-formatter/itip-view.c:204
+#: ../mail/message-list.c:1908 ../plugins/itip-formatter/itip-view.c:204
 msgid "Today %l:%M %p"
 msgstr "I dag %l:%M %p"
 
-#: ../mail/message-list.c:1937
+#: ../mail/message-list.c:1917
 msgid "Yesterday %l:%M %p"
 msgstr "I går %l:%M %p"
 
-#: ../mail/message-list.c:1949
+#: ../mail/message-list.c:1929
 msgid "%a %l:%M %p"
 msgstr "%a %H.%M"
 
-#: ../mail/message-list.c:1957
+#: ../mail/message-list.c:1937
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H.%M"
 
-#: ../mail/message-list.c:1959
+#: ../mail/message-list.c:1939
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../mail/message-list.c:2766
+#: ../mail/message-list.c:2738
 msgid "Select all visible messages"
 msgstr "Velg alle synlige meldinger"
 
-#: ../mail/message-list.c:2902 ../mail/message-list.etspec.h:10
+#: ../mail/message-list.c:2874 ../mail/message-list.etspec.h:17
 msgid "Messages"
 msgstr "Meldinger"
 
 #. default follow-up flag name to use when clicked in the message list column
-#: ../mail/message-list.c:4115
+#: ../mail/message-list.c:4087
 msgid "Follow-up"
 msgstr "Følg opp"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4630 ../mail/message-list.c:5050
+#: ../mail/message-list.c:4602 ../mail/message-list.c:5022
 msgid "Generating message list"
 msgstr "Genererer meldingsliste"
 
-#: ../mail/message-list.c:4867
+#: ../mail/message-list.c:4839
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -14675,71 +14710,71 @@ 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:4869
+#: ../mail/message-list.c:4841
 msgid "There are no messages in this folder."
 msgstr "Det er ingen meldinger i denne mappen."
 
-#: ../mail/message-list.etspec.h:3
-msgid "Due By"
-msgstr "Ferdig til"
+#: ../mail/message-list.etspec.h:2
+msgid "Flagged"
+msgstr "Merket"
+
+#: ../mail/message-list.etspec.h:8
+msgid "Received"
+msgstr "Mottatt"
+
+#: ../mail/message-list.etspec.h:10
+#: ../widgets/misc/e-attachment-tree-view.c:572
+msgid "Size"
+msgstr "Størrelse"
 
-#: ../mail/message-list.etspec.h:4
+#: ../mail/message-list.etspec.h:11
 msgid "Flag Status"
 msgstr "Status for merking"
 
-#: ../mail/message-list.etspec.h:5
-msgid "Flagged"
-msgstr "Merket"
-
-#: ../mail/message-list.etspec.h:6
+#: ../mail/message-list.etspec.h:12
 msgid "Follow Up Flag"
 msgstr "Følg opp-flagg"
 
-#: ../mail/message-list.etspec.h:11
-msgid "Received"
-msgstr "Mottatt"
+#: ../mail/message-list.etspec.h:13
+msgid "Due By"
+msgstr "Ferdig til"
 
-#: ../mail/message-list.etspec.h:15
+#: ../mail/message-list.etspec.h:18
 msgid "Sent Messages"
 msgstr "Sendte meldinger"
 
-#: ../mail/message-list.etspec.h:16
-#: ../widgets/misc/e-attachment-tree-view.c:572
-msgid "Size"
-msgstr "Størrelse"
-
-#: ../mail/message-list.etspec.h:19
+#: ../mail/message-list.etspec.h:20
 msgid "Subject - Trimmed"
 msgstr "Forkortet emne"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1549
-msgid "Body contains"
-msgstr "Kropp inneholder"
+msgid "Subject or Addresses contains"
+msgstr "Emne eller adresser inneholder"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1556
-msgid "Message contains"
-msgstr "Melding inneholder"
-
-#: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1563
+#: ../modules/mail/e-mail-shell-view-actions.c:1608
 msgid "Recipients contain"
 msgstr "Mottakere inneholder"
 
-#: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1570
-msgid "Sender contains"
-msgstr "Avsender inneholder"
+#: ../mail/searchtypes.xml.h:3
+#: ../modules/mail/e-mail-shell-view-actions.c:1601
+msgid "Message contains"
+msgstr "Melding inneholder"
 
-#: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1577
+#: ../mail/searchtypes.xml.h:4
+#: ../modules/mail/e-mail-shell-view-actions.c:1622
 msgid "Subject contains"
 msgstr "Emne inneholder"
 
+#: ../mail/searchtypes.xml.h:5
+#: ../modules/mail/e-mail-shell-view-actions.c:1615
+msgid "Sender contains"
+msgstr "Avsender inneholder"
+
 #: ../mail/searchtypes.xml.h:6
-msgid "Subject or Addresses contains"
-msgstr "Emne eller adresser inneholder"
+#: ../modules/mail/e-mail-shell-view-actions.c:1594
+msgid "Body contains"
+msgstr "Kropp inneholder"
 
 #: ../modules/addressbook/addressbook-config.c:204
 msgid ""
@@ -14811,7 +14846,7 @@ msgid "Server Information"
 msgstr "Tjenerinformasjon"
 
 #: ../modules/addressbook/addressbook-config.c:1093
-#: ../smime/gui/smime-ui.ui.h:13
+#: ../smime/gui/smime-ui.ui.h:25
 msgid "Details"
 msgstr "Detaljer"
 
@@ -14832,15 +14867,15 @@ msgstr "Egenskaper for adressebok"
 msgid "New Address Book"
 msgstr "Ny adressebok"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:5
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:1
 msgid "EFolderList XML for the list of completion URIs"
 msgstr "EFolderList XML for listen med URIer for fullføring"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:6
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:2
 msgid "EFolderList XML for the list of completion URIs."
 msgstr "EFolderList XML for listen med URIer for fullføring"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
 msgid ""
 "The UID of the selected (or \"primary\") address book in the sidebar of the "
 "\"Contacts\" view."
@@ -14848,19 +14883,19 @@ msgstr ""
 "UID for valgt (eller «primær») adressebok i sidelinjen av «Kontakter»-"
 "visningen."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:19
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:20
+msgid "Whether to show maps in preview pane."
+msgstr "Om kart skal vises i forhåndsvisningsområdet."
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:22
 msgid ""
 "Whether addresses should be formatted according to standard in their "
 "destination country."
 msgstr ""
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:21
-msgid "Whether to show maps in preview pane."
-msgstr "Om kart skal vises i forhåndsvisningsområdet."
-
 #. 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:194
-#: ../modules/mail/em-mailer-prefs.c:1047
+#: ../modules/mail/em-mailer-prefs.c:1046
 msgid "_Table column:"
 msgstr "Kolonne i _tabell:"
 
@@ -15003,7 +15038,7 @@ msgstr "Vis kart med alle kontakter fra valgt adressebok"
 #: ../modules/calendar/e-cal-shell-view-actions.c:1405
 #: ../modules/calendar/e-memo-shell-view-actions.c:640
 #: ../modules/calendar/e-task-shell-view-actions.c:764
-#: ../modules/mail/e-mail-shell-view-actions.c:1186
+#: ../modules/mail/e-mail-shell-view-actions.c:1231
 msgid "_Rename..."
 msgstr "End_re navn …"
 
@@ -15084,7 +15119,7 @@ msgstr "H_andlinger"
 #: ../modules/addressbook/e-book-shell-view-actions.c:944
 #: ../modules/calendar/e-memo-shell-view-actions.c:677
 #: ../modules/calendar/e-task-shell-view-actions.c:829
-#: ../modules/mail/e-mail-shell-view-actions.c:1344
+#: ../modules/mail/e-mail-shell-view-actions.c:1389
 msgid "_Preview"
 msgstr "_Forhåndsvis"
 
@@ -15122,7 +15157,7 @@ msgstr "Vis kart i forhåndsvisning av kontakter"
 #: ../modules/addressbook/e-book-shell-view-actions.c:1022
 #: ../modules/calendar/e-memo-shell-view-actions.c:747
 #: ../modules/calendar/e-task-shell-view-actions.c:911
-#: ../modules/mail/e-mail-shell-view-actions.c:1459
+#: ../modules/mail/e-mail-shell-view-actions.c:1504
 msgid "_Classic View"
 msgstr "_Klassisk visning"
 
@@ -15133,7 +15168,7 @@ msgstr "Vis forhåndsvisning av kontakt under kontaktlisten"
 #: ../modules/addressbook/e-book-shell-view-actions.c:1029
 #: ../modules/calendar/e-memo-shell-view-actions.c:754
 #: ../modules/calendar/e-task-shell-view-actions.c:918
-#: ../modules/mail/e-mail-shell-view-actions.c:1466
+#: ../modules/mail/e-mail-shell-view-actions.c:1511
 msgid "_Vertical View"
 msgstr "_Vertikal visning"
 
@@ -15159,7 +15194,7 @@ msgstr "Ingen treff"
 #: ../modules/calendar/e-cal-shell-view-actions.c:1727
 #: ../modules/calendar/e-memo-shell-view-actions.c:781
 #: ../modules/calendar/e-task-shell-view-actions.c:980
-#: ../modules/mail/e-mail-shell-view-actions.c:1542
+#: ../modules/mail/e-mail-shell-view-actions.c:1587
 #: ../shell/e-shell-content.c:664
 msgid "Advanced Search"
 msgstr "Avansert søk"
@@ -15214,102 +15249,102 @@ msgstr "_Send melding til liste"
 msgid "_Send Message to Contact"
 msgstr "_Send melding til kontakt"
 
-#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
-#: ../modules/addressbook/ldap-config.ui.h:2
-msgid "1"
-msgstr "1"
-
-#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../modules/addressbook/ldap-config.ui.h:4
-msgid "5"
-msgstr "5"
-
-#: ../modules/addressbook/ldap-config.ui.h:5
 msgid "Anonymously"
 msgstr "Anonymt"
 
-#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
-#: ../modules/addressbook/ldap-config.ui.h:7
-msgid "B_rowse this book until limit reached"
-msgstr "B_la gjennom denne boken til grensen nås"
+#: ../modules/addressbook/ldap-config.ui.h:5
+msgid "Using email address"
+msgstr "Bruker e-postadresse"
 
-#: ../modules/addressbook/ldap-config.ui.h:8
-msgid "Lo_gin:"
-msgstr "Lo_gin"
+#: ../modules/addressbook/ldap-config.ui.h:6
+msgid "Using distinguished name (DN)"
+msgstr "Bruk distinguished name (DN)"
 
 #. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:11
+#: ../modules/addressbook/ldap-config.ui.h:8
 msgid "One"
 msgstr "En"
 
-#: ../modules/addressbook/ldap-config.ui.h:13
-msgid "S_earch filter:"
-msgstr "Søk_efilter:"
+#. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
+#: ../modules/addressbook/ldap-config.ui.h:10
+msgid "Sub"
+msgstr "Sub"
+
+#: ../modules/addressbook/ldap-config.ui.h:11
+msgid "Supported Search Bases"
+msgstr "Støttede søkebaser"
 
 #: ../modules/addressbook/ldap-config.ui.h:14
-msgid "Search Filter"
-msgstr "Søkefilter"
+msgid "Ser_ver:"
+msgstr "T_jener:"
 
 #: ../modules/addressbook/ldap-config.ui.h:15
-msgid "Search _base:"
-msgstr "Søke_base:"
+msgid "Use secure _connection:"
+msgstr "Bruk sikker til_kobling:"
 
 #: ../modules/addressbook/ldap-config.ui.h:16
-msgid ""
-"Search filter is the type of object to be searched for. If this is not "
-"modified, the default search will be performed on the type \"person\"."
-msgstr ""
-"Søkefilter angir type objekter det skal søkes etter når et søk utføres. Hvis "
-"dette ikke endres vil søket bruke objektklassen «person» som forvalg."
+msgid "_Login method:"
+msgstr "Metode for på_logging:"
 
 #: ../modules/addressbook/ldap-config.ui.h:17
-msgid "Ser_ver:"
-msgstr "T_jener:"
+msgid "Lo_gin:"
+msgstr "Lo_gin"
+
+#: ../modules/addressbook/ldap-config.ui.h:18
+msgid "Search _base:"
+msgstr "Søke_base:"
 
-#. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
 #: ../modules/addressbook/ldap-config.ui.h:19
-msgid "Sub"
-msgstr "Sub"
+msgid "_Search scope:"
+msgstr "_Søkeområde:"
 
 #: ../modules/addressbook/ldap-config.ui.h:20
-msgid "Supported Search Bases"
-msgstr "Støttede søkebaser"
+msgid "_Find Possible Search Bases"
+msgstr "_Finn mulige søkebaser"
+
+#: ../modules/addressbook/ldap-config.ui.h:21
+msgid "S_earch filter:"
+msgstr "Søk_efilter:"
 
 #: ../modules/addressbook/ldap-config.ui.h:22
-msgid "Use secure _connection:"
-msgstr "Bruk sikker til_kobling:"
+msgid "Search Filter"
+msgstr "Søkefilter"
 
 #: ../modules/addressbook/ldap-config.ui.h:23
-msgid "Using distinguished name (DN)"
-msgstr "Bruk distinguished name (DN)"
-
-#: ../modules/addressbook/ldap-config.ui.h:24
-msgid "Using email address"
-msgstr "Bruker e-postadresse"
+msgid ""
+"Search filter is the type of object to be searched for. If this is not "
+"modified, the default search will be performed on the type \"person\"."
+msgstr ""
+"Søkefilter angir type objekter det skal søkes etter når et søk utføres. Hvis "
+"dette ikke endres vil søket bruke objektklassen «person» som forvalg."
 
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../modules/addressbook/ldap-config.ui.h:25
-msgid "_Download limit:"
-msgstr "Grense for ne_dlasting:"
-
-#: ../modules/addressbook/ldap-config.ui.h:26
-msgid "_Find Possible Search Bases"
-msgstr "_Finn mulige søkebaser"
+msgid "1"
+msgstr "1"
 
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../modules/addressbook/ldap-config.ui.h:27
-msgid "_Login method:"
-msgstr "Metode for på_logging:"
+msgid "5"
+msgstr "5"
 
 #: ../modules/addressbook/ldap-config.ui.h:30
-msgid "_Search scope:"
-msgstr "_Søkeområde:"
+msgid "cards"
+msgstr "kort"
 
 #: ../modules/addressbook/ldap-config.ui.h:31
 msgid "_Timeout:"
 msgstr "_Tidsavbrudd:"
 
 #: ../modules/addressbook/ldap-config.ui.h:32
-msgid "cards"
-msgstr "kort"
+msgid "_Download limit:"
+msgstr "Grense for ne_dlasting:"
+
+#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
+#: ../modules/addressbook/ldap-config.ui.h:34
+msgid "B_rowse this book until limit reached"
+msgstr "B_la gjennom denne boken til grensen nås"
 
 #: ../modules/bogofilter/evolution-bogofilter.c:145
 #, c-format
@@ -15336,60 +15371,42 @@ msgstr "Konverter tekst i meldinger til _Unicode"
 msgid "Bogofilter"
 msgstr "Bogofilter"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
-msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
-msgstr "Farge for oppgaver som går ut i dag i «#rrggbb»-format."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:2
+msgid ""
+"The UID of the selected (or \"primary\") calendar in the sidebar of the "
+"\"Calendar\" view."
+msgstr ""
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:4
-msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
-msgstr "Farge for oppgaver som har gått ut i «#rrggbb»-format."
+msgid ""
+"The default timezone to use for dates and times in the calendar, as an "
+"untranslated Olsen timezone database location like \"America/New York\"."
+msgstr ""
+"Den forvalgte tidssonen å bruke for datoer og tidspunkt i kalenderen som en "
+"uoversatt Olsen tidssonedatabaseplassering som «America/New York»."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:8
-msgid "Calendars to run reminders for"
-msgstr "Kalendere det skal kjøres påminnelser for"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
+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."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:9
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:8
 msgid ""
-"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
-msgstr "Farge på Marcus Bains-linjen i tidslinjen (tom for forvalg)."
+"Shows the second time zone in a Day View, if set. Value is similar to one "
+"used in a 'timezone' key."
+msgstr ""
+"Viser sekundærtidssone i en dagvisning hvis den er satt. Verdien er lik den "
+"som brukes i nøkkelen «tidssone»."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
-msgid "Color to draw the Marcus Bains line in the Day View."
-msgstr "Farge på Marcus Bains-linjen i dagsvisningen."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
-msgid "Days on which the start and end of work hours should be indicated."
-msgstr "Dager som starten og slutten på arbeidstid skal være indikert."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:18
-msgid "Free/busy server URLs"
-msgstr "Tjener-URLer for ledig/opptatt-informasjon"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:24
-msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
-msgstr "Klokkeslett arbeidsdagen slutter på i 24-timers format, 0 til 23."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:26
-msgid "If \"true\", show the memo preview pane in the main window."
-msgstr "Vis forhåndsvisningsområdet for notater i hovedvinduet hvis «true»."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
-msgid "If \"true\", show the task preview pane in the main window."
-msgstr "Vis forhåndsvisningsområdet for oppgaver i hovedvinduet hvis «true»."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
-msgid "Intervals shown in Day and Work Week views, in minutes."
-msgstr "Intervaller i minutter som vises i dag- og arbeidsukevisningene."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
 msgid "List of recently used second time zones in a Day View."
 msgstr "Liste med nylig brukte sekundærtidssoner i en dagvisning."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:32
-msgid "List of server URLs for free/busy publishing."
-msgstr "Liste over tjener-URLer for publisering av ledig/opptatt tid."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
+msgid "Maximum number of recently used timezones to remember."
+msgstr "Maksimalt antall nylig brukte tidssoner som skal huskes."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:36
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:12
 msgid ""
 "Maximum number of recently used timezones to remember in a "
 "'day_second_zones' list."
@@ -15397,24 +15414,24 @@ msgstr ""
 "Maksimalt antall nylig brukte tidssoner som skal huskes i en liste med "
 "«day_second_zones»."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
-msgid "Maximum number of recently used timezones to remember."
-msgstr "Maksimalt antall nylig brukte tidssoner som skal huskes."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:14
+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."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:45
-msgid "Number of units for determining a birthday or anniversary reminder."
-msgstr ""
-"Antall enheter for å bestemme en påminnelse om fødselsdag eller jubileum."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
+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)."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:46
-msgid "Number of units for determining a default reminder."
-msgstr "Antall enheter for å bestemme en forvalgt påminnelse."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:34
+msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
+msgstr "Klokkeslett arbeidsdagen slutter på i 24-timers format, 0 til 23."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:47
-msgid "Number of units for determining when to hide tasks."
-msgstr "Antall enheter for å bestemme når oppgaver skal skjules"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
+msgid "Intervals shown in Day and Work Week views, in minutes."
+msgstr "Intervaller i minutter som vises i dag- og arbeidsukevisningene."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:49
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:40
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -15422,7 +15439,19 @@ msgstr ""
 "Posisjonen til det horisontale feltet mellom minikalenderen og oppgavelisten "
 "utenom månedsvisning, i piksler."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:41
+msgid "Vertical pane position"
+msgstr "Posisjon til vertikalt felt"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:42
+msgid ""
+"Position of the vertical pane, between the view and the date navigator "
+"calendar and task list when not in the month view, in pixels."
+msgstr ""
+"Posisjonen til det vertikale feltet mellom visning, minikalenderen og "
+"oppgavelisten utenom månedsvisning, i piksler."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:44
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -15430,53 +15459,91 @@ msgstr ""
 "Posisjonen til det horisontale feltet mellom visning, minikalender og "
 "oppgavelisten i månedsvisning, i piksler."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:51
-msgid "Position of the memo preview pane when oriented vertically."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:46
+msgid ""
+"Position of the vertical pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels."
 msgstr ""
-"Posisjon for forhåndsvisningsområdet for notater med vertikal orientering."
+"Posisjonen til det vertikale feltet mellom visning, minikalenderen og "
+"oppgavelisten i månedsvisning, i piksler."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:47
+msgid ""
+"Position of the vertical pane, between the calendar lists and the date "
+"navigator calendar."
+msgstr "Plassering av vertikalt felt mellom kalenderlisten og minikalenderen."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:49
+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 ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:51
+msgid "If \"true\", show the memo preview pane in the main window."
+msgstr "Vis forhåndsvisningsområdet for notater i hovedvinduet hvis «true»."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:53
 msgid "Position of the task preview pane when oriented horizontally."
 msgstr ""
 "Posisjon for forhåndsvisningsområdet for oppgaver med horisontall "
 "orientering."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:53
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
+msgid "Position of the memo preview pane when oriented vertically."
+msgstr ""
+"Posisjon for forhåndsvisningsområdet for notater med vertikal orientering."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
+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 ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:59
+msgid "If \"true\", show the task preview pane in the main window."
+msgstr "Vis forhåndsvisningsområdet for oppgaver i hovedvinduet hvis «true»."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:62
 msgid "Position of the task preview pane when oriented vertically."
 msgstr ""
 "Posisjon for forhåndsvisningsområdet for oppgaver med vertikal orientering."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:64
 msgid ""
-"Position of the vertical pane, between the calendar lists and the date "
-"navigator calendar."
-msgstr "Plassering av vertikalt felt mellom kalenderlisten og minikalenderen."
+"Whether to compress weekends in the month view, which puts Saturday and "
+"Sunday in the space of one weekday."
+msgstr ""
+"Komprimere helger i månedsvisningen slik at lørdag og søndag bruker plassen "
+"til en ukedag."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
-msgid ""
-"Position of the vertical pane, between the view and the date navigator "
-"calendar and task list in the month view, in pixels."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:66
+msgid "Whether to display the end time of events in the week and month views."
 msgstr ""
-"Posisjonen til det vertikale feltet mellom visning, minikalenderen og "
-"oppgavelisten i månedsvisning, i piksler."
+"Om tidspunktet en hendelse slutter på skal vises i uke- og månedsvisninger."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:68
+msgid "Days on which the start and end of work hours should be indicated."
+msgstr "Dager som starten og slutten på arbeidstid skal være indikert."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:70
 msgid ""
-"Position of the vertical pane, between the view and the date navigator "
-"calendar and task list when not in the month view, in pixels."
+"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr ""
-"Posisjonen til det vertikale feltet mellom visning, minikalenderen og "
-"oppgavelisten utenom månedsvisning, i piksler."
+"Om Marcus Bains-linjen (linjen på nåværende tid) skal vises i kalenderen."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
-msgid "Programs that are allowed to be run by reminders."
-msgstr "Programmer som er tillat å kjøres av påminnelser."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:72
+msgid "Color to draw the Marcus Bains line in the Day View."
+msgstr "Farge på Marcus Bains-linjen i dagsvisningen."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:65
-msgid "Scroll Month View by a week"
-msgstr "Rull månedsvisning en uke om gangen"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:74
+msgid ""
+"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgstr "Farge på Marcus Bains-linjen i tidslinjen (tom for forvalg)."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:70
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:76
 msgid "Show days with recurrent events in italic font in bottom left calendar."
 msgstr ""
 "Vis dager med gjentakende hendelser i kursiv skrift i kalenderen nederst til "
@@ -15484,165 +15551,133 @@ msgstr ""
 
 #: ../modules/calendar/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."
-msgstr ""
-"Viser sekundærtidssone i en dagvisning hvis den er satt. Verdien er lik den "
-"som brukes i nøkkelen «tidssone»."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:83
-msgid ""
-"The UID of the selected (or \"primary\") calendar in the sidebar of the "
-"\"Calendar\" view."
-msgstr ""
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:84
-msgid ""
 "The UID of the selected (or \"primary\") memo list in the sidebar of the "
 "\"Memos\" view."
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:85
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:80
 msgid ""
 "The UID of the selected (or \"primary\") task list in the sidebar of the "
 "\"Tasks\" view."
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:87
-#, no-c-format
-msgid ""
-"The URL template to use as a free/busy data fallback, %u is replaced by the "
-"user part of the mail address and %d is replaced by the domain."
-msgstr ""
-"URL-mal som brukes som reserveløsning for ledig/opptatt, %u er erstattet med "
-"brukerdelen av e-postadressen og %d er erstattet med domenet."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:82
+msgid "Whether to hide completed tasks in the tasks view."
+msgstr "Om fullførte oppgaver skal skjules i oppgavevisningen."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:88
+#: ../modules/calendar/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\"."
+"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
-"Den forvalgte tidssonen å bruke for datoer og tidspunkt i kalenderen som en "
-"uoversatt Olsen tidssonedatabaseplassering som «America/New York»."
+"Enheter for å bestemme når oppgaver skal skjules. «minutes», «hours» eller "
+"«days»."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:89
-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 ""
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:86
+msgid "Number of units for determining when to hide tasks."
+msgstr "Antall enheter for å bestemme når oppgaver skal skjules"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:88
+msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
+msgstr "Farge for oppgaver som går ut i dag i «#rrggbb»-format."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:90
-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 ""
+msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
+msgstr "Farge for oppgaver som har gått ut i «#rrggbb»-format."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:92
-msgid ""
-"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
-"debug messages."
+msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr ""
-"Denne har tre mulige verdier. 0 for feil. 1 for advarsler. 2 for "
-"feilsøkingsmeldinger."
+"Om det skal spørres etter bekreftelse ved sletting av en avtale eller "
+"oppgave."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:94
-msgid "Time the last reminder ran, in time_t."
-msgstr "Tid for forrige påminnelse, som time_t."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:97
-msgid ""
-"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
-"\"days\"."
+msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr ""
-"Enhet for forvalgt påminnelse for jubileum. «minutes», «hours», eller «days»."
+"Om det skal spørres etter bekreftelse ved tømming av avtaler eller oppgaver."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:96
+msgid "Whether to set a default reminder for appointments."
+msgstr "Om en forvalgt påminnelse skal bli satt for avtaler."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:98
+msgid "Number of units for determining a default reminder."
+msgstr "Antall enheter for å bestemme en forvalgt påminnelse."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:100
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "Enhet for forvalgt påminnelse. «minutes», «hours», eller «days»."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:99
-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»."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:101
-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."
-
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:102
-msgid "Vertical pane position"
-msgstr "Posisjon til vertikalt felt"
+msgid "Whether to set a reminder for birthdays and anniversaries."
+msgstr "Om en forvalgt påminnelse skal bli satt for fødselsdager og jubileum."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:104
-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)."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:105
-msgid "Whether or not to use the notification tray for display reminders."
-msgstr "Hvorvidt varslingsfeltet skal brukes for påminnelser på skjermen."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:106
-msgid "Whether to ask for confirmation when deleting an appointment or task."
+msgid "Number of units for determining a birthday or anniversary reminder."
 msgstr ""
-"Om det skal spørres etter bekreftelse ved sletting av en avtale eller "
-"oppgave."
+"Antall enheter for å bestemme en påminnelse om fødselsdag eller jubileum."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:107
-msgid "Whether to ask for confirmation when expunging appointments and tasks."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:106
+msgid ""
+"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
+"\"days\"."
 msgstr ""
-"Om det skal spørres etter bekreftelse ved tømming av avtaler eller oppgaver."
+"Enhet for forvalgt påminnelse for jubileum. «minutes», «hours», eller «days»."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:108
-msgid ""
-"Whether to compress weekends in the month view, which puts Saturday and "
-"Sunday in the space of one weekday."
-msgstr ""
-"Komprimere helger i månedsvisningen slik at lørdag og søndag bruker plassen "
-"til en ukedag."
+msgid "Whether to show week numbers in various places in the Calendar."
+msgstr "Om ukenummer skal vises på relevante steder i kalenderen."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:109
-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."
+msgid "Scroll Month View by a week"
+msgstr "Rull månedsvisning en uke om gangen"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:110
-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."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:111
-msgid "Whether to hide completed tasks in the tasks view."
-msgstr "Om fullførte oppgaver skal skjules i oppgavevisningen."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:112
 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."
 
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:112
+msgid "Time the last reminder ran, in time_t."
+msgstr "Tid for forrige påminnelse, som time_t."
+
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:113
-msgid "Whether to set a default reminder for appointments."
-msgstr "Om en forvalgt påminnelse skal bli satt for avtaler."
+msgid "Calendars to run reminders for"
+msgstr "Kalendere det skal kjøres påminnelser for"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:114
-msgid "Whether to set a reminder for birthdays and anniversaries."
-msgstr "Om en forvalgt påminnelse skal bli satt for fødselsdager og jubileum."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:115
+msgid "Programs that are allowed to be run by reminders."
+msgstr "Programmer som er tillat å kjøres av påminnelser."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:117
+msgid "Whether or not to use the notification tray for display reminders."
+msgstr "Hvorvidt varslingsfeltet skal brukes for påminnelser på skjermen."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:118
+msgid "Free/busy server URLs"
+msgstr "Tjener-URLer for ledig/opptatt-informasjon"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:119
-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."
+msgid "List of server URLs for free/busy publishing."
+msgstr "Liste over tjener-URLer for publisering av ledig/opptatt tid."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:122
-msgid "Whether to show week numbers in various places in the Calendar."
-msgstr "Om ukenummer skal vises på relevante steder i kalenderen."
+#, no-c-format
+msgid ""
+"The URL template to use as a free/busy data fallback, %u is replaced by the "
+"user part of the mail address and %d is replaced by the domain."
+msgstr ""
+"URL-mal som brukes som reserveløsning for ledig/opptatt, %u er erstattet med "
+"brukerdelen av e-postadressen og %d er erstattet med domenet."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:127
+msgid ""
+"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
+"debug messages."
+msgstr ""
+"Denne har tre mulige verdier. 0 for feil. 1 for advarsler. 2 for "
+"feilsøkingsmeldinger."
 
 #: ../modules/calendar/e-cal-attachment-handler.c:312
-#: ../smime/gui/smime-ui.ui.h:22
+#: ../smime/gui/smime-ui.ui.h:32
 msgid "I_mport"
 msgstr "I_mporter"
 
@@ -15674,216 +15709,216 @@ msgstr "T_id og dato:"
 msgid "_Date only:"
 msgstr "Kun _dato:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:2
-#, no-c-format
-msgid "%u and %d will be replaced by user and domain from the email address."
-msgstr "%u og %d vil bli erstattet av brukernavn og domene fra e-postadressen."
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:3
-msgid "(Shown in a Day View)"
-msgstr "(Vises i dagvisning)"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:4
-msgid "05 minutes"
-msgstr "05 minutter"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:5
-msgid "10 minutes"
-msgstr "10 minutter"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:6
-msgid "15 minutes"
-msgstr "15 minutter"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:7
-msgid "30 minutes"
-msgstr "30 minutter"
-
 #: ../modules/calendar/e-calendar-preferences.ui.h:8
-msgid "60 minutes"
-msgstr "60 minutter"
+msgid "Minutes"
+msgstr "Minutter"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:9
-msgid "Alerts"
-msgstr "Varsel"
+msgid "Hours"
+msgstr "Timer"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:10
+msgid "Days"
+msgstr "Dager"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:11
-msgid "Day _ends:"
-msgstr "Dag_en slutter:"
+msgid "60 minutes"
+msgstr "60 minutter"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:12
-msgid "Days"
-msgstr "Dager"
+msgid "30 minutes"
+msgstr "30 minutter"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:13
-msgid "Default Free/Busy Server"
-msgstr "Forvalgt ledig/opptatt-tjener"
+msgid "15 minutes"
+msgstr "15 minutter"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:14
-msgid "Display"
-msgstr "Vis"
+msgid "10 minutes"
+msgstr "10 minutter"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:15
-msgid "Display reminders in _notification area only"
-msgstr "Vis alarmer kun i varsli_ngsområdet"
+msgid "05 minutes"
+msgstr "05 minutter"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:18
-msgid "Highlight _overdue tasks"
-msgstr "Uthev utgåtte _oppgaver"
+#: ../modules/calendar/e-calendar-preferences.ui.h:16
+#: ../widgets/misc/e-dateedit.c:592
+msgid "Time"
+msgstr "Tid"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:19
-msgid "Highlight t_asks due today"
-msgstr "Uthev oppg_aver som går ut i dag"
+#: ../modules/calendar/e-calendar-preferences.ui.h:17
+msgid "Se_cond zone:"
+msgstr "Se_kundær sone:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:20
-msgid "Hours"
-msgstr "Timer"
+#: ../modules/calendar/e-calendar-preferences.ui.h:19
+msgid "(Shown in a Day View)"
+msgstr "(Vises i dagvisning)"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:21
-msgid "Minutes"
-msgstr "Minutter"
+msgid "Use s_ystem time zone"
+msgstr "Bruk s_ystemets tidssone"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:22
+msgid "Time format:"
+msgstr "Tidformat:"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:23
+msgid "_12 hour (AM/PM)"
+msgstr "_12 timer (AM/PM)"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:24
-msgid "Publishing Information"
-msgstr "Publiserer informasjon"
+msgid "_24 hour"
+msgstr "_24 timer"
 
-#. Sunday
+#: ../modules/calendar/e-calendar-preferences.ui.h:25
+#: ../modules/calendar/e-cal-shell-view-actions.c:1679
+msgid "Work Week"
+msgstr "Arbeidsuke"
+
+#. A weekday like "Monday" follows
 #: ../modules/calendar/e-calendar-preferences.ui.h:27
-msgid "S_un"
-msgstr "S_ø."
+msgid "Wee_k starts on:"
+msgstr "Uk_en starter på:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:29
-msgid "Sc_roll Month View by a week"
-msgstr "_Rull månedsvisning en uke om gangen"
+#: ../modules/calendar/e-calendar-preferences.ui.h:28
+msgid "Work days:"
+msgstr "Arbeidsdager:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:30
-msgid "Se_cond zone:"
-msgstr "Se_kundær sone:"
+#: ../modules/calendar/e-calendar-preferences.ui.h:29
+msgid "_Day begins:"
+msgstr "_Dagen begynner:"
 
+#. Monday
 #: ../modules/calendar/e-calendar-preferences.ui.h:31
-msgid "Select the calendars for reminder notification"
-msgstr "Velg kalendere for varsling av påminnelser"
+msgid "_Mon"
+msgstr "_Ma."
 
-#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
+#. Tuesday
 #: ../modules/calendar/e-calendar-preferences.ui.h:33
-msgid "Sh_ow a reminder"
-msgstr "_Vis en påminnelse"
+msgid "_Tue"
+msgstr "_Ti."
 
-#. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#. Wednesday
 #: ../modules/calendar/e-calendar-preferences.ui.h:35
-msgid "Show a _reminder"
-msgstr "Vis en _påminnelse"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:36
-msgid "Show r_ecurring events in italic in bottom left calendar"
-msgstr "Vis r_epeterende hendelser i kursiv i kalender nede til venstre"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:37
-msgid "Show week _numbers"
-msgstr "Vis uke_nummer"
+msgid "_Wed"
+msgstr "_On."
 
 #. Thursday
-#: ../modules/calendar/e-calendar-preferences.ui.h:40
+#: ../modules/calendar/e-calendar-preferences.ui.h:37
 msgid "T_hu"
 msgstr "T_o."
 
+#. Friday
+#: ../modules/calendar/e-calendar-preferences.ui.h:39
+msgid "_Fri"
+msgstr "_Fr."
+
+#. Saturday
+#: ../modules/calendar/e-calendar-preferences.ui.h:41
+msgid "_Sat"
+msgstr "L_ø."
+
+#. Sunday
 #: ../modules/calendar/e-calendar-preferences.ui.h:43
-msgid "Template:"
-msgstr "Mal:"
+msgid "S_un"
+msgstr "S_ø."
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:44
+msgid "Day _ends:"
+msgstr "Dag_en slutter:"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:45
-#: ../widgets/misc/e-dateedit.c:592
-msgid "Time"
-msgstr "Tid"
+msgid "Alerts"
+msgstr "Varsel"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:47
-msgid "Time format:"
-msgstr "Tidformat:"
+#: ../modules/calendar/e-calendar-preferences.ui.h:46
+msgid "_Ask for confirmation when deleting items"
+msgstr "Spør etter bekreftelse ved sletting _av oppføringer"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:48
+msgid "_Time divisions:"
+msgstr "Oppdeling av _tid:"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:49
-msgid "Use s_ystem time zone"
-msgstr "Bruk s_ystemets tidssone"
+msgid "_Show appointment end times in week and month view"
+msgstr "Vi_s tid for avtalers slutt i ukes- og månedsvisning"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:50
+msgid "_Compress weekends in month view"
+msgstr "_Komprimer helger i månedsvisning"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:51
+msgid "Show week _numbers"
+msgstr "Vis uke_nummer"
 
-#. A weekday like "Monday" follows
 #: ../modules/calendar/e-calendar-preferences.ui.h:52
-msgid "Wee_k starts on:"
-msgstr "Uk_en starter på:"
+msgid "Show r_ecurring events in italic in bottom left calendar"
+msgstr "Vis r_epeterende hendelser i kursiv i kalender nede til venstre"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:53
-#: ../modules/calendar/e-cal-shell-view-actions.c:1679
-msgid "Work Week"
-msgstr "Arbeidsuke"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:54
-msgid "Work days:"
-msgstr "Arbeidsdager:"
+msgid "Sc_roll Month View by a week"
+msgstr "_Rull månedsvisning en uke om gangen"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:55
-msgid "_12 hour (AM/PM)"
-msgstr "_12 timer (AM/PM)"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:56
-msgid "_24 hour"
-msgstr "_24 timer"
+msgid "Display"
+msgstr "Vis"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:57
-msgid "_Ask for confirmation when deleting items"
-msgstr "Spør etter bekreftelse ved sletting _av oppføringer"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:58
-msgid "_Compress weekends in month view"
-msgstr "_Komprimer helger i månedsvisning"
+msgid "Highlight t_asks due today"
+msgstr "Uthev oppg_aver som går ut i dag"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:59
-msgid "_Day begins:"
-msgstr "_Dagen begynner:"
-
-#. Friday
-#: ../modules/calendar/e-calendar-preferences.ui.h:61
-msgid "_Fri"
-msgstr "_Fr."
+msgid "Highlight _overdue tasks"
+msgstr "Uthev utgåtte _oppgaver"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:62
+#: ../modules/calendar/e-calendar-preferences.ui.h:60
 msgid "_Hide completed tasks after"
 msgstr "Sk_jul utførte oppgaver etter"
 
-#. Monday
-#: ../modules/calendar/e-calendar-preferences.ui.h:64
-msgid "_Mon"
-msgstr "_Ma."
+#: ../modules/calendar/e-calendar-preferences.ui.h:63
+msgid "Display reminders in _notification area only"
+msgstr "Vis alarmer kun i varsli_ngsområdet"
 
-#. Saturday
-#: ../modules/calendar/e-calendar-preferences.ui.h:66
-msgid "_Sat"
-msgstr "L_ø."
+#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../modules/calendar/e-calendar-preferences.ui.h:65
+msgid "Sh_ow a reminder"
+msgstr "_Vis en påminnelse"
 
+#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
 #: ../modules/calendar/e-calendar-preferences.ui.h:67
-msgid "_Show appointment end times in week and month view"
-msgstr "Vi_s tid for avtalers slutt i ukes- og månedsvisning"
+msgid "before every appointment"
+msgstr "før hver avtale"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:68
-msgid "_Time divisions:"
-msgstr "Oppdeling av _tid:"
+#. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../modules/calendar/e-calendar-preferences.ui.h:69
+msgid "Show a _reminder"
+msgstr "Vis en _påminnelse"
 
-#. Tuesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:70
-msgid "_Tue"
-msgstr "_Ti."
+#. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../modules/calendar/e-calendar-preferences.ui.h:71
+msgid "before every anniversary/birthday"
+msgstr "før hvert jubileum/bursdag"
 
-#. Wednesday
 #: ../modules/calendar/e-calendar-preferences.ui.h:72
-msgid "_Wed"
-msgstr "_On."
+msgid "Select the calendars for reminder notification"
+msgstr "Velg kalendere for varsling av påminnelser"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:73
+msgid "Default Free/Busy Server"
+msgstr "Forvalgt ledig/opptatt-tjener"
 
-#. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
 #: ../modules/calendar/e-calendar-preferences.ui.h:74
-msgid "before every anniversary/birthday"
-msgstr "før hvert jubileum/bursdag"
+msgid "Template:"
+msgstr "Mal:"
 
-#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
 #: ../modules/calendar/e-calendar-preferences.ui.h:76
-msgid "before every appointment"
-msgstr "før hver avtale"
+#, no-c-format
+msgid "%u and %d will be replaced by user and domain from the email address."
+msgstr "%u og %d vil bli erstattet av brukernavn og domene fra e-postadressen."
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:77
+msgid "Publishing Information"
+msgstr "Publiserer informasjon"
 
 #. Create the Webcal source group
 #: ../modules/calendar/e-cal-shell-backend.c:123
@@ -16644,11 +16679,11 @@ msgid_plural "%d tasks"
 msgstr[0] "%d oppgave"
 msgstr[1] "%d oppgaver"
 
-#: ../modules/mail/em-account-prefs.c:204
+#: ../modules/mail/em-account-prefs.c:205
 msgid "Evolution Account Assistant"
 msgstr "Evolution kontoassistent"
 
-#: ../modules/mail/em-account-prefs.c:248
+#: ../modules/mail/em-account-prefs.c:249
 msgid "Account Editor"
 msgstr "Kontoredigering"
 
@@ -16658,407 +16693,407 @@ msgstr "Kontoredigering"
 msgid "%d attached messages"
 msgstr "%d vedlagte meldinger"
 
-#: ../modules/mail/e-mail-shell-backend.c:197
+#: ../modules/mail/e-mail-shell-backend.c:199
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "E-post_melding"
 
-#: ../modules/mail/e-mail-shell-backend.c:199
+#: ../modules/mail/e-mail-shell-backend.c:201
 msgid "Compose a new mail message"
 msgstr "Skriv en ny e-postmelding"
 
-#: ../modules/mail/e-mail-shell-backend.c:207
+#: ../modules/mail/e-mail-shell-backend.c:209
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "E-post_mappe"
 
-#: ../modules/mail/e-mail-shell-backend.c:209
+#: ../modules/mail/e-mail-shell-backend.c:211
 msgid "Create a new mail folder"
 msgstr "Opprett en ny e-postmappe"
 
-#: ../modules/mail/e-mail-shell-backend.c:424
+#: ../modules/mail/e-mail-shell-backend.c:426
 msgid "Mail Accounts"
 msgstr "E-post-konti"
 
-#: ../modules/mail/e-mail-shell-backend.c:432
+#: ../modules/mail/e-mail-shell-backend.c:434
 msgid "Mail Preferences"
 msgstr "Brukervalg for e-post"
 
-#: ../modules/mail/e-mail-shell-backend.c:440
+#: ../modules/mail/e-mail-shell-backend.c:442
 msgid "Composer Preferences"
 msgstr "Brukervalg for redigering"
 
-#: ../modules/mail/e-mail-shell-backend.c:448
+#: ../modules/mail/e-mail-shell-backend.c:450
 msgid "Network Preferences"
 msgstr "Brukervalg for nettverk"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1102
-#: ../modules/mail/e-mail-shell-view.c:950
+#: ../modules/mail/e-mail-shell-view-actions.c:1147
+#: ../modules/mail/e-mail-shell-view.c:944
 msgid "_Disable Account"
 msgstr "_Deaktiver konto"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1104
+#: ../modules/mail/e-mail-shell-view-actions.c:1149
 msgid "Disable this account"
 msgstr "Deaktiver denne kontoen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1111
+#: ../modules/mail/e-mail-shell-view-actions.c:1156
 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:1116
+#: ../modules/mail/e-mail-shell-view-actions.c:1161
 msgid "_Download Messages for Offline Usage"
 msgstr "Last ne_d meldinger for frakoblet bruk"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1118
+#: ../modules/mail/e-mail-shell-view-actions.c:1163
 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:1123
+#: ../modules/mail/e-mail-shell-view-actions.c:1168
 msgid "Fl_ush Outbox"
 msgstr "T_øm utboks"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1130
+#: ../modules/mail/e-mail-shell-view-actions.c:1175
 msgid "_Copy Folder To..."
 msgstr "_Kopier mappe til …"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1132
+#: ../modules/mail/e-mail-shell-view-actions.c:1177
 msgid "Copy the selected folder into another folder"
 msgstr "Kopier valgt mappe til en annen mappe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1139
+#: ../modules/mail/e-mail-shell-view-actions.c:1184
 msgid "Permanently remove this folder"
 msgstr "Fjern denne mappen permanent"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1144
+#: ../modules/mail/e-mail-shell-view-actions.c:1189
 msgid "E_xpunge"
 msgstr "T_øm"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1146
+#: ../modules/mail/e-mail-shell-view-actions.c:1191
 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:1151
+#: ../modules/mail/e-mail-shell-view-actions.c:1196
 msgid "Mar_k All Messages as Read"
 msgstr "Mer_k alle meldinger som lest"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1153
+#: ../modules/mail/e-mail-shell-view-actions.c:1198
 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:1158
+#: ../modules/mail/e-mail-shell-view-actions.c:1203
 msgid "_Move Folder To..."
 msgstr "Flytt _mappe til …"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1160
+#: ../modules/mail/e-mail-shell-view-actions.c:1205
 msgid "Move the selected folder into another folder"
 msgstr "Flytt valgt mappe til en annen mappe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1165
+#: ../modules/mail/e-mail-shell-view-actions.c:1210
 msgid "_New..."
 msgstr "_Ny …"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1167
+#: ../modules/mail/e-mail-shell-view-actions.c:1212
 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:1174
+#: ../modules/mail/e-mail-shell-view-actions.c:1219
 msgid "Change the properties of this folder"
 msgstr "Endre egenskaper for denne mappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1181
+#: ../modules/mail/e-mail-shell-view-actions.c:1226
 msgid "Refresh the folder"
 msgstr "Oppdater mappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1188
+#: ../modules/mail/e-mail-shell-view-actions.c:1233
 msgid "Change the name of this folder"
 msgstr "Endre navn på denne mappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1193
+#: ../modules/mail/e-mail-shell-view-actions.c:1238
 msgid "Select Message _Thread"
 msgstr "Velg meldings_tråd"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1195
+#: ../modules/mail/e-mail-shell-view-actions.c:1240
 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:1200
+#: ../modules/mail/e-mail-shell-view-actions.c:1245
 msgid "Select Message S_ubthread"
 msgstr "Velg _undertråd for melding"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1202
+#: ../modules/mail/e-mail-shell-view-actions.c:1247
 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:1214
+#: ../modules/mail/e-mail-shell-view-actions.c:1259
 msgid "Empty _Trash"
 msgstr "Tøm _papirkurven"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1216
+#: ../modules/mail/e-mail-shell-view-actions.c:1261
 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:1221
+#: ../modules/mail/e-mail-shell-view-actions.c:1266
 msgid "_New Label"
 msgstr "_Ny etikett"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1230
+#: ../modules/mail/e-mail-shell-view-actions.c:1275
 msgid "N_one"
 msgstr "_Ingen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1244
+#: ../modules/mail/e-mail-shell-view-actions.c:1289
 msgid "_Manage Subscriptions"
 msgstr "_Håndter abonnement"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1246
-#: ../modules/mail/e-mail-shell-view-actions.c:1323
+#: ../modules/mail/e-mail-shell-view-actions.c:1291
+#: ../modules/mail/e-mail-shell-view-actions.c:1368
 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:1251
-#: ../modules/mail/e-mail-shell-view-actions.c:1272
+#: ../modules/mail/e-mail-shell-view-actions.c:1296
+#: ../modules/mail/e-mail-shell-view-actions.c:1317
 msgid "Send / _Receive"
 msgstr "Send / _motta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1253
+#: ../modules/mail/e-mail-shell-view-actions.c:1298
 msgid "Send queued items and retrieve new items"
 msgstr "Send kølagte oppføringer og hent nye oppføringer"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1258
+#: ../modules/mail/e-mail-shell-view-actions.c:1303
 msgid "R_eceive All"
 msgstr "Motta all_e"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1260
+#: ../modules/mail/e-mail-shell-view-actions.c:1305
 msgid "Receive new items from all accounts"
 msgstr "Motta nye oppføringer fra alle kontoer"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1265
+#: ../modules/mail/e-mail-shell-view-actions.c:1310
 msgid "_Send All"
 msgstr "_Send alle"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1267
+#: ../modules/mail/e-mail-shell-view-actions.c:1312
 msgid "Send queued items in all accounts"
 msgstr "Send kølagte oppføringer i alle kontoer"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1293
+#: ../modules/mail/e-mail-shell-view-actions.c:1338
 #: ../widgets/misc/e-activity-proxy.c:310
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1295
+#: ../modules/mail/e-mail-shell-view-actions.c:1340
 msgid "Cancel the current mail operation"
 msgstr "Avbryt aktiv e-postoperasjon"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1300
+#: ../modules/mail/e-mail-shell-view-actions.c:1345
 msgid "Collapse All _Threads"
 msgstr "Slå sammen alle _tråder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1302
+#: ../modules/mail/e-mail-shell-view-actions.c:1347
 msgid "Collapse all message threads"
 msgstr "Slå sammen alle meldingstråder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1307
+#: ../modules/mail/e-mail-shell-view-actions.c:1352
 msgid "E_xpand All Threads"
 msgstr "Ut_vid alle tråder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1309
+#: ../modules/mail/e-mail-shell-view-actions.c:1354
 msgid "Expand all message threads"
 msgstr "Utvid alle meldingstråder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1314
+#: ../modules/mail/e-mail-shell-view-actions.c:1359
 msgid "_Message Filters"
 msgstr "_Meldingsfiltre"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1316
+#: ../modules/mail/e-mail-shell-view-actions.c:1361
 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:1321
+#: ../modules/mail/e-mail-shell-view-actions.c:1366
 msgid "_Subscriptions..."
 msgstr "_Abonnement …"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1330
+#: ../modules/mail/e-mail-shell-view-actions.c:1375
 msgid "F_older"
 msgstr "M_appe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1337
+#: ../modules/mail/e-mail-shell-view-actions.c:1382
 msgid "_Label"
 msgstr "_Etikett"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1354
+#: ../modules/mail/e-mail-shell-view-actions.c:1399
 msgid "C_reate Search Folder From Search..."
 msgstr "Opp_rett søkemappe fra søk …"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1361
+#: ../modules/mail/e-mail-shell-view-actions.c:1406
 msgid "Search F_olders"
 msgstr "Søk i _mapper"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1363
+#: ../modules/mail/e-mail-shell-view-actions.c:1408
 msgid "Create or edit search folder definitions"
 msgstr "Opprett eller rediger søkemappedefinisjoner"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1394
+#: ../modules/mail/e-mail-shell-view-actions.c:1439
 msgid "_New Folder..."
 msgstr "_Ny mappe …"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1422
+#: ../modules/mail/e-mail-shell-view-actions.c:1467
 msgid "Show Message _Preview"
 msgstr "Vis _forhåndsvisning av melding"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1424
+#: ../modules/mail/e-mail-shell-view-actions.c:1469
 msgid "Show message preview pane"
 msgstr "Vis område for forhåndsvisning av melding"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1430
+#: ../modules/mail/e-mail-shell-view-actions.c:1475
 msgid "Show _Deleted Messages"
 msgstr "Vis slette_de meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1432
+#: ../modules/mail/e-mail-shell-view-actions.c:1477
 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:1438
+#: ../modules/mail/e-mail-shell-view-actions.c:1483
 msgid "_Group By Threads"
 msgstr "_Grupper etter tråder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1440
+#: ../modules/mail/e-mail-shell-view-actions.c:1485
 msgid "Threaded message list"
 msgstr "Meldingsliste med tråder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1461
+#: ../modules/mail/e-mail-shell-view-actions.c:1506
 msgid "Show message preview below the message list"
 msgstr "Vis meldingen under meldingslisten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1468
+#: ../modules/mail/e-mail-shell-view-actions.c:1513
 msgid "Show message preview alongside the message list"
 msgstr "Vis meldingen ved siden av meldingslisten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1476
+#: ../modules/mail/e-mail-shell-view-actions.c:1521
 msgid "All Messages"
 msgstr "Alle meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1483
+#: ../modules/mail/e-mail-shell-view-actions.c:1528
 msgid "Important Messages"
 msgstr "Viktige meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1490
+#: ../modules/mail/e-mail-shell-view-actions.c:1535
 msgid "Last 5 Days' Messages"
 msgstr "Meldinger fra de siste 5 dagene"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1497
+#: ../modules/mail/e-mail-shell-view-actions.c:1542
 msgid "Messages Not Junk"
 msgstr "Meldinger som ikke er uønsket e-post"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1504
+#: ../modules/mail/e-mail-shell-view-actions.c:1549
 msgid "Messages with Attachments"
 msgstr "Meldinger med vedlegg"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1511
+#: ../modules/mail/e-mail-shell-view-actions.c:1556
 msgid "No Label"
 msgstr "Ingen etikett"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1518
+#: ../modules/mail/e-mail-shell-view-actions.c:1563
 msgid "Read Messages"
 msgstr "Leste meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1525
+#: ../modules/mail/e-mail-shell-view-actions.c:1570
 msgid "Recent Messages"
 msgstr "Nye meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1532
+#: ../modules/mail/e-mail-shell-view-actions.c:1577
 msgid "Unread Messages"
 msgstr "Uleste meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1584
+#: ../modules/mail/e-mail-shell-view-actions.c:1629
 msgid "Subject or Addresses contain"
 msgstr "Emne eller adresser inneholder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1594
+#: ../modules/mail/e-mail-shell-view-actions.c:1639
 msgid "All Accounts"
 msgstr "Alle konti"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1601
+#: ../modules/mail/e-mail-shell-view-actions.c:1646
 msgid "Current Account"
 msgstr "Denne kontoen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1608
+#: ../modules/mail/e-mail-shell-view-actions.c:1653
 msgid "Current Folder"
 msgstr "Denne mappen"
 
-#: ../modules/mail/e-mail-shell-view.c:565
+#: ../modules/mail/e-mail-shell-view.c:560
 msgid "All Account Search"
 msgstr "Søk i alle konti"
 
-#: ../modules/mail/e-mail-shell-view.c:726
+#: ../modules/mail/e-mail-shell-view.c:721
 msgid "Account Search"
 msgstr "Søk i konto"
 
-#: ../modules/mail/e-mail-shell-view.c:948
+#: ../modules/mail/e-mail-shell-view.c:942
 msgid "Proxy _Logout"
 msgstr "_Logg ut proxy"
 
-#: ../modules/mail/e-mail-shell-view-private.c:997
+#: ../modules/mail/e-mail-shell-view-private.c:998
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d valgt, "
 msgstr[1] "%d valgt, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:1008
+#: ../modules/mail/e-mail-shell-view-private.c:1009
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d slettet"
 msgstr[1] "%d slettet"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1014
-#: ../modules/mail/e-mail-shell-view-private.c:1021
+#: ../modules/mail/e-mail-shell-view-private.c:1015
+#: ../modules/mail/e-mail-shell-view-private.c:1022
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d uønsket e-post"
 msgstr[1] "%d uønsket e-poster"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1027
+#: ../modules/mail/e-mail-shell-view-private.c:1028
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d skisse"
 msgstr[1] "%d skisser"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1033
+#: ../modules/mail/e-mail-shell-view-private.c:1034
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d usendt"
 msgstr[1] "%d usendte"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1039
+#: ../modules/mail/e-mail-shell-view-private.c:1040
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d sendt"
 msgstr[1] "%d sendt"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1051
+#: ../modules/mail/e-mail-shell-view-private.c:1052
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d ulest, "
 msgstr[1] "%d uleste, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:1054
+#: ../modules/mail/e-mail-shell-view-private.c:1055
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d totalt"
 msgstr[1] "%d totalt"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1077
+#: ../modules/mail/e-mail-shell-view-private.c:1078
 msgid "Trash"
 msgstr "Papirkurv"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1547
+#: ../modules/mail/e-mail-shell-view-private.c:1554
 msgid "Send / Receive"
 msgstr "Send / motta"
 
@@ -17091,11 +17126,11 @@ msgid "Contains Value"
 msgstr "Inneholder verdi"
 
 #. 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:1049
+#: ../modules/mail/em-mailer-prefs.c:1048
 msgid "_Date header:"
 msgstr "_Datohode:"
 
-#: ../modules/mail/em-mailer-prefs.c:1050
+#: ../modules/mail/em-mailer-prefs.c:1049
 msgid "Show _original header value"
 msgstr "Vis _opprinnelig verdi for hode"
 
@@ -17116,36 +17151,36 @@ msgstr "Din melding til %s om «%s» den %s er har blitt lest."
 msgid "Delivery Notification for \"%s\""
 msgstr "Varsling om levering for «%s»"
 
-#: ../modules/mdn/evolution-mdn.c:448
+#: ../modules/mdn/evolution-mdn.c:447
 #, c-format
 msgid "Send a read receipt to '%s'"
 msgstr "Send en lesekvittering til «%s»"
 
 #. name doesn't matter
-#: ../modules/mdn/evolution-mdn.c:453
+#: ../modules/mdn/evolution-mdn.c:452
 msgid "_Notify Sender"
 msgstr "Varsle avse_nder"
 
 #: ../modules/mdn/evolution-mdn.error.xml.h:1
-msgid "Sender has been notified that you have read this message."
-msgstr "Sender har blitt varslet om at du har lest denne meldingen."
-
-#: ../modules/mdn/evolution-mdn.error.xml.h:2
 msgid "Sender wants to be notified when you have read this message."
 msgstr "Sender ønsker å bli varslet når du har lest denne meldingen."
 
+#: ../modules/mdn/evolution-mdn.error.xml.h:2
+msgid "Sender has been notified that you have read this message."
+msgstr "Sender har blitt varslet om at du har lest denne meldingen."
+
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:1
+msgid "Evolution is currently offline."
+msgstr "Evolution er frakoblet."
+
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:2
 msgid "Click 'Work Online' to return to online mode."
 msgstr "Klikk «Arbeid tilkoblet» for å gå tilbake i tilkoblet modus."
 
-#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:2
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:3
 msgid "Evolution is currently offline due to a network outage."
 msgstr "Evolution er frakoblet fordi nettverket ikke er tilgjengelig."
 
-#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:3
-msgid "Evolution is currently offline."
-msgstr "Evolution er frakoblet."
-
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:4
 msgid ""
 "Evolution will return to online mode once a network connection is "
@@ -17211,13 +17246,13 @@ msgid "Test Plugin for Python EPlugin loader."
 msgstr "Testtillegg for Python EPlugin laster."
 
 #: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
-msgid "Hello Python"
-msgstr "Hallo Python"
-
-#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:2
 msgid "Python Plugin Loader tests"
 msgstr "Test av tilleggslaster for Python"
 
+#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:2
+msgid "Hello Python"
+msgstr "Hallo Python"
+
 #: ../modules/spamassassin/evolution-spamassassin.c:190
 #, c-format
 msgid "Failed to spawn SpamAssassin (%s): "
@@ -17301,13 +17336,13 @@ msgid "Loading accounts..."
 msgstr "Laster kontoer …"
 
 #: ../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."
-
-#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
 msgid "Local Address Books"
 msgstr "Lokal adressebok"
 
+#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
+msgid "Add local address books to Evolution."
+msgstr "Legg til lokale adressebøker i Evolution."
+
 #: ../plugins/attachment-reminder/attachment-reminder.c:126
 msgid "_Do not show this message again."
 msgstr "Ikke vis _denne meldingen igjen."
@@ -17318,6 +17353,10 @@ msgid "Keywords"
 msgstr "Nøkkelord"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
+msgid "Message has no attachments"
+msgstr "Melding har ingen vedlegg"
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
 msgid ""
 "Evolution has found some keywords that suggest that this message should "
 "contain an attachment, but cannot find one."
@@ -17325,10 +17364,6 @@ msgstr ""
 "Evolution har funnet noen nøkkelord som antyder at denne meldingen burde "
 "inneholde et vedlegg, men kan ikke finne et."
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
-msgid "Message has no attachments"
-msgstr "Melding har ingen vedlegg"
-
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
 msgid "_Add Attachment..."
 msgstr "L_egg til vedlegg …"
@@ -17524,40 +17559,18 @@ msgstr ""
 "Sikkerhetskopiering og gjenoppretting av data og innstillinger for Evolution."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
-msgid "Are you sure you want to close Evolution?"
-msgstr "Er du sikker på at du vil avslutte Evolution?"
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
-msgid ""
-"Are you sure you want to restore Evolution from the selected backup file?"
-msgstr ""
-"Er du sikker på at du vil gjenopprette Evolution fra valgt sikkerhetskopifil?"
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
-msgid "Close and Back up Evolution"
-msgstr "Lukk og ta sikkerhetskopi av Evolution"
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
-msgid "Close and Restore Evolution"
-msgstr "Lukk og gjenopprett Evolution"
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
-msgid "Insufficient Permissions"
-msgstr "Ikke tilstrekkelige rettigheter"
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
 msgid "Invalid Evolution backup file"
 msgstr "Ugyldig sikkerhetskopifil for Evolution"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
 msgid "Please select a valid backup file to restore."
 msgstr "Velg en gyldig sikkerhetskopifil for gjenoppretting."
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
-msgid "The selected folder is not writable."
-msgstr "Valgt mappe er ikke skrivbar."
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
+msgid "Are you sure you want to close Evolution?"
+msgstr "Er du sikker på at du vil avslutte Evolution?"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:9
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
 msgid ""
 "To back up your data and settings, you must first close Evolution. Please "
 "make sure that you save any unsaved data before proceeding."
@@ -17565,7 +17578,17 @@ msgstr ""
 "Du må lukke Evolution før du sikkerhetskopierer dine data og innstillinger. "
 "Vennligst sjekk at du lagrer alle data som ikke er lagret før du fortsetter."
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:10
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
+msgid "Close and Back up Evolution"
+msgstr "Lukk og ta sikkerhetskopi av Evolution"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
+msgid ""
+"Are you sure you want to restore Evolution from the selected backup file?"
+msgstr ""
+"Er du sikker på at du vil gjenopprette Evolution fra valgt sikkerhetskopifil?"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
 msgid ""
 "To restore your data and settings, you must first close Evolution. Please "
 "make sure that you save any unsaved data before proceeding. This will delete "
@@ -17577,35 +17600,47 @@ msgstr ""
 "Dette vil slette alle dine data og innstillinger i Evolution og gjenopprette "
 "dem fra din sikkerhetskopi."
 
-#: ../plugins/bbdb/bbdb.c:667 ../plugins/bbdb/bbdb.c:676
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
+msgid "Close and Restore Evolution"
+msgstr "Lukk og gjenopprett Evolution"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:9
+msgid "Insufficient Permissions"
+msgstr "Ikke tilstrekkelige rettigheter"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:10
+msgid "The selected folder is not writable."
+msgstr "Valgt mappe er ikke skrivbar."
+
+#: ../plugins/bbdb/bbdb.c:666 ../plugins/bbdb/bbdb.c:675
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Automatiske kontakter"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:691
+#: ../plugins/bbdb/bbdb.c:690
 msgid "Create _address book entries when sending mails"
 msgstr "Opprett oppføringer i adresseboken _automatisk når du sender e-post"
 
-#: ../plugins/bbdb/bbdb.c:697
+#: ../plugins/bbdb/bbdb.c:696
 msgid "Select Address book for Automatic Contacts"
 msgstr "Velg adressebok for automatiske kontakter"
 
-#: ../plugins/bbdb/bbdb.c:712
+#: ../plugins/bbdb/bbdb.c:711
 msgid "Instant Messaging Contacts"
 msgstr "Kontakter for lynmeldinger"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:727
+#: ../plugins/bbdb/bbdb.c:726
 msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr "_Synkroniser kontaktinformasjon og bilder fra vennelisten i Pidgin"
 
-#: ../plugins/bbdb/bbdb.c:733
+#: ../plugins/bbdb/bbdb.c:732
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Velg adressebok for venneliste fra Pidgin"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:744
+#: ../plugins/bbdb/bbdb.c:743
 msgid "Synchronize with _buddy list now"
 msgstr "Synkroniser med _vennelisten nå"
 
@@ -17761,13 +17796,13 @@ msgid "Re_fresh:"
 msgstr "O_ppdater"
 
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
-msgid "Add CalDAV support to Evolution."
-msgstr "Legg til støtte for CalDAV i Evolution."
-
-#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
 msgid "CalDAV Support"
 msgstr "CalDAV-støtte"
 
+#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
+msgid "Add CalDAV support to Evolution."
+msgstr "Legg til støtte for CalDAV i Evolution."
+
 #: ../plugins/calendar-file/calendar-file.c:134
 msgid "_Customize options"
 msgstr "_Tilpass alternativer"
@@ -17797,25 +17832,25 @@ msgid "Force read _only"
 msgstr "Tvungen _skrivebeskyttelse"
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
-msgid "Add local calendars to Evolution."
-msgstr "Legg til lokale kalendere i Evolution."
-
-#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
 msgid "Local Calendars"
 msgstr "Lokale kalendere"
 
+#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
+msgid "Add local calendars to Evolution."
+msgstr "Legg til lokale kalendere i Evolution."
+
 #: ../plugins/calendar-http/calendar-http.c:207
 msgid "Userna_me:"
 msgstr "Bruker_navn:"
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
-msgid "Add web calendars to Evolution."
-msgstr "Legg til web-kalendere i Evolution."
-
-#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
 msgid "Web Calendars"
 msgstr "Web-kalendere"
 
+#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
+msgid "Add web calendars to Evolution."
+msgstr "Legg til web-kalendere i Evolution."
+
 #: ../plugins/calendar-weather/calendar-weather.c:65
 msgid "Weather: Fog"
 msgstr "Vær: tåke"
@@ -17876,29 +17911,29 @@ msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "Imerisk (Fahrenheit, tommer, osv)"
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1
-msgid "Add weather calendars to Evolution."
-msgstr "Legg til værkalendere i Evolution."
-
-#: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
 msgid "Weather Calendars"
 msgstr "Værkalendere"
 
-#: ../plugins/dbx-import/dbx-importer.c:290
+#: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
+msgid "Add weather calendars to Evolution."
+msgstr "Legg til værkalendere i Evolution."
+
+#: ../plugins/dbx-import/dbx-importer.c:289
 msgid "Importing Outlook Express data"
 msgstr "Importerer data fra Outlook Express"
 
 #: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:1
-msgid "Import Outlook Express messages from DBX file"
-msgstr "Importer Outlook Express-meldinger fra DBX-fil"
-
-#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:2
 msgid "Outlook DBX import"
 msgstr "Outlook DBX-import"
 
-#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:3
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:2
 msgid "Outlook Express 5/6 personal folders (.dbx)"
 msgstr "Outlook Express 5/6 personlige mapper (.dbx)"
 
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:3
+msgid "Import Outlook Express messages from DBX file"
+msgstr "Importer Outlook Express-meldinger fra DBX-fil"
+
 #: ../plugins/default-source/default-source.c:169
 msgid "Mark as _default address book"
 msgstr "Merk som _forvalgt adressebok"
@@ -17989,20 +18024,20 @@ msgstr "Nøkkel"
 msgid "Values"
 msgstr "Verdier"
 
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:1
+msgid "Custom Header"
+msgstr "Egendefinert meldingshode"
+
 #. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to specify what value for the message header would be added
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:2
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
 msgid "Add custom headers to outgoing mail messages."
 msgstr "Legger til egendefinerte meldingshoder i utgående meldinger."
 
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
-msgid "Custom Header"
-msgstr "Egendefinert meldingshode"
-
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:1
 msgid "Email Custom Header"
 msgstr "Egendefinert meldingshode i e-post"
 
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:4
 msgid "Automatically launch editor when key is pressed in the mail composer"
 msgstr ""
 "Start redigeringsprogram automatisk når tasten trykkes i e-postredigering"
@@ -18035,14 +18070,22 @@ msgstr ""
 "postmeldinger."
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:1
-msgid "Cannot create Temporary File"
-msgstr "Kan ikke opprette midlertidig fil"
-
-#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:2
 msgid "Editor not launchable"
 msgstr "Redigering kunne ikke starte"
 
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:2
+msgid ""
+"The external editor set in your plugin preferences cannot be launched. Try "
+"setting a different editor."
+msgstr ""
+"Eksternt redigeringsprogram som er satt i dine brukervalg for tillegg kan "
+"ikke startes. Prøv å bruke et annet redigeringsprogram."
+
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:3
+msgid "Cannot create Temporary File"
+msgstr "Kan ikke opprette midlertidig fil"
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:4
 msgid ""
 "Evolution is unable to create a temporary file to save your mail. Retry "
 "later."
@@ -18050,11 +18093,11 @@ msgstr ""
 "Evolution kan ikke opprette en midlertidig fil for å lagre meldingen. Prøv "
 "igjen senere."
 
-#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:4
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:5
 msgid "External editor still running"
 msgstr "Eksternt redigeringsprogram kjører fremdeles"
 
-#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:5
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:6
 msgid ""
 "The external editor is still running. The mail composer window cannot be "
 "closed as long as the editor is active."
@@ -18062,14 +18105,6 @@ msgstr ""
 "Eksternt redigeringsprogram kjører fremdeles. Vindu for ny e-post kan ikke "
 "lukkes så lenge redigeringsprogrammet er aktivt."
 
-#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:6
-msgid ""
-"The external editor set in your plugin preferences cannot be launched. Try "
-"setting a different editor."
-msgstr ""
-"Eksternt redigeringsprogram som er satt i dine brukervalg for tillegg kan "
-"ikke startes. Prøv å bruke et annet redigeringsprogram."
-
 #: ../plugins/face/face.c:292
 msgid "Select a Face Picture"
 msgstr "Velg en et ansiktsbilde"
@@ -18090,7 +18125,7 @@ msgstr "Last nytt ansikts_bilde"
 msgid "Include _Face"
 msgstr "Ta _med ansikt"
 
-#: ../plugins/face/org-gnome-face.eplug.xml.h:1
+#: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Attach a small picture of your face to outgoing messages."
 msgstr "Legg ved et lite bilde av ditt ansikt til utgående meldinger."
 
@@ -18099,20 +18134,20 @@ msgid "Failed Read"
 msgstr "Lesing feilet"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:2
-msgid "Invalid Image Size"
-msgstr "Ugyldig bildestørrelse"
+msgid "The file cannot be read"
+msgstr "Filen kunne ikke leses"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:3
-msgid "Not an image"
-msgstr "Ikke et bilde"
+msgid "Invalid Image Size"
+msgstr "Ugyldig bildestørrelse"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:4
 msgid "Please select an image of size 48 * 48"
 msgstr "Vennligst velg et bilde med størrelse 48 * 48"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:5
-msgid "The file cannot be read"
-msgstr "Filen kunne ikke leses"
+msgid "Not an image"
+msgstr "Ikke et bilde"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:6
 msgid "The file you selected does not look like a valid .png image. Error: {0}"
@@ -18152,13 +18187,13 @@ msgid "Retrieve _List"
 msgstr "Hent _liste"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "Add Google Calendars to Evolution."
-msgstr "Legg til kalendere fra Google i Evolution."
-
-#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
 msgid "Google Calendars"
 msgstr "Google kalendere"
 
+#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
+msgid "Add Google Calendars to Evolution."
+msgstr "Legg til kalendere fra Google i Evolution."
+
 #: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
 msgid "Inline Image"
 msgstr "Bilde i e-postmeldingen"
@@ -18168,31 +18203,16 @@ msgid "View image attachments directly in mail messages."
 msgstr "Vis bildevedlegg direkte i e-postmeldinger."
 
 #: ../plugins/imap-features/imap-headers.c:335
-#: ../plugins/imap-features/imap-headers.ui.h:2
+#: ../plugins/imap-features/imap-headers.ui.h:10
 msgid "Custom Headers"
 msgstr "Egendefinerte meldingshoder"
 
 #: ../plugins/imap-features/imap-headers.c:347
-#: ../plugins/imap-features/imap-headers.ui.h:5
+#: ../plugins/imap-features/imap-headers.ui.h:7
 msgid "IMAP Headers"
 msgstr "IMAP-meldingshoder"
 
 #: ../plugins/imap-features/imap-headers.ui.h:1
-msgid "Basic and _Mailing List Headers (Default)"
-msgstr ""
-"Grunnleggende meldingshoder og meldingshoder for e-postlister (Forvalg)"
-
-#: ../plugins/imap-features/imap-headers.ui.h:3
-msgid ""
-"Give the extra headers that you need to fetch in addition to the above "
-"standard headers. \n"
-"You can ignore this if you choose \"All Headers\"."
-msgstr ""
-"Oppgi ekstra meldingshoder du skal hente i tillegg til forvalgte "
-"meldingshoder oppgitt over.\n"
-"Du kan overse dette hvis du velger «Alle meldingshoder»."
-
-#: ../plugins/imap-features/imap-headers.ui.h:6
 msgid ""
 "Select your IMAP Header Preferences. \n"
 "The more headers you have the more time it will take to download."
@@ -18201,7 +18221,11 @@ msgstr ""
 "Hvis du velger flere meldingshoder her vil dette påvirke tiden det tar å "
 "laste dem ned."
 
-#: ../plugins/imap-features/imap-headers.ui.h:8
+#: ../plugins/imap-features/imap-headers.ui.h:3
+msgid "_Fetch All Headers"
+msgstr "Hent alle meldin_gshoder"
+
+#: ../plugins/imap-features/imap-headers.ui.h:4
 msgid ""
 "_Basic Headers (Fastest) \n"
 "Use this if you do not have filters based on mailing lists"
@@ -18209,18 +18233,29 @@ msgstr ""
 "_Grunnleggende meldingshoder - (Raskest)\n"
 "Bruk dette valget hvis du ikke har filter basert på e-postlister"
 
-#: ../plugins/imap-features/imap-headers.ui.h:10
-msgid "_Fetch All Headers"
-msgstr "Hent alle meldin_gshoder"
+#: ../plugins/imap-features/imap-headers.ui.h:6
+msgid "Basic and _Mailing List Headers (Default)"
+msgstr ""
+"Grunnleggende meldingshoder og meldingshoder for e-postlister (Forvalg)"
 
-#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:1
-msgid "Fine-tune your IMAP accounts."
-msgstr "Endre innstillinger for dine IMAP-kontoer."
+#: ../plugins/imap-features/imap-headers.ui.h:8
+msgid ""
+"Give the extra headers that you need to fetch in addition to the above "
+"standard headers. \n"
+"You can ignore this if you choose \"All Headers\"."
+msgstr ""
+"Oppgi ekstra meldingshoder du skal hente i tillegg til forvalgte "
+"meldingshoder oppgitt over.\n"
+"Du kan overse dette hvis du velger «Alle meldingshoder»."
 
-#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:2
+#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:1
 msgid "IMAP Features"
 msgstr "IMAP-funksjoner"
 
+#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:2
+msgid "Fine-tune your IMAP accounts."
+msgstr "Endre innstillinger for dine IMAP-kontoer."
+
 #. Translators: The first '%s' is replaced with a calendar name,
 #. * the second '%s' with an error message
 #: ../plugins/itip-formatter/itip-formatter.c:496
@@ -18928,26 +18963,26 @@ msgid "_Memos:"
 msgstr "_Notater:"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
-msgid "Display \"text/calendar\" MIME parts in mail messages."
-msgstr "Viser MIME-deler av type «text/calender» i e-poster."
-
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
 msgid "Itip Formatter"
 msgstr "Formattering av iTip"
 
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
+msgid "Display \"text/calendar\" MIME parts in mail messages."
+msgstr "Viser MIME-deler av type «text/calender» i e-poster."
+
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
-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}'?"
+msgid ""
+"This response is not from a current attendee. Add the sender as an attendee?"
+msgstr ""
+"Dette svaret er ikke fra en nåværende deltaker. Legg til sender som deltaker?"
 
 #: ../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:3
-msgid ""
-"This response is not from a current attendee. Add the sender as an attendee?"
-msgstr ""
-"Dette svaret er ikke fra en nåværende deltaker. Legg til sender som deltaker?"
+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/mailing-list-actions/mailing-list-actions.c:345
 msgid "Get List _Archive"
@@ -19016,30 +19051,17 @@ msgstr "Handlingen er ikke tilgjengelig"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
 msgid ""
-"An e-mail message will be sent to the URL \"{0}\". You can either send the "
-"message automatically, or see and change it first.\n"
-"\n"
-"You should receive an answer from the mailing list shortly after the message "
-"has been sent."
+"This message does not contain the header information required for this "
+"action."
 msgstr ""
-"En e-postmelding vil bli sendt til URL «{0}». Du kan enten sende meldingen "
-"automatisk eller se på og endre den først.\n"
-"\n"
-"Du skal motta et svar fra e-postlisten snarlig etter at meldingen er sendt."
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:5
-msgid "Malformed header"
-msgstr "Feilutformet hode"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:6
-msgid "No e-mail action"
-msgstr "Ingen handling for e-post"
+"Denne meldingen inneholder ikke nok «header»-informasjon som er nødvendig "
+"for denne handlingen."
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:7
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:3
 msgid "Posting not allowed"
 msgstr "Posting er ikke tillatt"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:8
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:4
 msgid ""
 "Posting to this mailing list is not allowed. Possibly, this is a read-only "
 "mailing list. Contact the list owner for details."
@@ -19047,23 +19069,36 @@ msgstr ""
 "Det er ikke tillat å sende e-post til denne e-postlisten. Det er muligens en "
 "skrivebeskyttet liste. Kontakt eieren for detaljer."
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:5
 msgid "Send e-mail message to mailing list?"
 msgstr "Send melding til e-postliste?"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:6
 msgid ""
-"The action could not be performed. The header for this action did not "
-"contain any action that could be processed.\n"
+"An e-mail message will be sent to the URL \"{0}\". You can either send the "
+"message automatically, or see and change it first.\n"
 "\n"
-"Header: {0}"
+"You should receive an answer from the mailing list shortly after the message "
+"has been sent."
 msgstr ""
-"Handlingen kunne ikke utføres. Meldingshodet for denne handlingen ikke "
-"inneholdt en handling som kunne prosesseres.\n"
+"En e-postmelding vil bli sendt til URL «{0}». Du kan enten sende meldingen "
+"automatisk eller se på og endre den først.\n"
 "\n"
-"Hode: {0}"
+"Du skal motta et svar fra e-postlisten snarlig etter at meldingen er sendt."
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
+msgid "_Send message"
+msgstr "_Send melding"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
+msgid "_Edit message"
+msgstr "R_ediger melding"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:13
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:11
+msgid "Malformed header"
+msgstr "Feilutformet hode"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:12
 msgid ""
 "The {0} header of this message is malformed and could not be processed.\n"
 "\n"
@@ -19073,21 +19108,21 @@ msgstr ""
 "\n"
 "Hode: {1}"
 
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:15
+msgid "No e-mail action"
+msgstr "Ingen handling for e-post"
+
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
 msgid ""
-"This message does not contain the header information required for this "
-"action."
+"The action could not be performed. The header for this action did not "
+"contain any action that could be processed.\n"
+"\n"
+"Header: {0}"
 msgstr ""
-"Denne meldingen inneholder ikke nok «header»-informasjon som er nødvendig "
-"for denne handlingen."
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
-msgid "_Edit message"
-msgstr "R_ediger melding"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:18
-msgid "_Send message"
-msgstr "_Send melding"
+"Handlingen kunne ikke utføres. Meldingshodet for denne handlingen ikke "
+"inneholdt en handling som kunne prosesseres.\n"
+"\n"
+"Hode: {0}"
 
 #: ../plugins/mail-notification/mail-notification.c:384
 #, c-format
@@ -19350,15 +19385,15 @@ msgstr "Merk alle som lest"
 msgid "Mark all messages in a folder as read."
 msgstr "Merk alle meldinger i en mappe som lest."
 
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:1
+msgid "Prefer Plain Text"
+msgstr "Foretrekk vanlig tekst"
+
 #. but then we also need to create our own section frame
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:2
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:3
 msgid "Plain Text Mode"
 msgstr "Tekstmodus"
 
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:3
-msgid "Prefer Plain Text"
-msgstr "Foretrekk vanlig tekst"
-
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:4
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr ""
@@ -19404,42 +19439,42 @@ msgid "HTML _Mode"
 msgstr "HTML-_modus"
 
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
-msgid "Import Outlook messages from PST file"
-msgstr "Importer Outlook-meldinger fra PST-fil"
-
-#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
 msgid "Outlook PST import"
 msgstr "Outlook PST-import"
 
-#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
 msgid "Outlook personal folders (.pst)"
 msgstr "Outlook personlige mapper (.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:540
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
+msgid "Import Outlook messages from PST file"
+msgstr "Importer Outlook-meldinger fra PST-fil"
+
+#: ../plugins/pst-import/pst-importer.c:542
 msgid "_Mail"
 msgstr "_E-post"
 
-#: ../plugins/pst-import/pst-importer.c:560
+#: ../plugins/pst-import/pst-importer.c:564
 msgid "Destination folder:"
 msgstr "Målmappe:"
 
-#: ../plugins/pst-import/pst-importer.c:568
+#: ../plugins/pst-import/pst-importer.c:572
 msgid "_Address Book"
 msgstr "_Adressebok"
 
-#: ../plugins/pst-import/pst-importer.c:573
+#: ../plugins/pst-import/pst-importer.c:577
 msgid "A_ppointments"
 msgstr "A_vtaler"
 
-#: ../plugins/pst-import/pst-importer.c:578 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:582 ../views/tasks/galview.xml.h:1
 msgid "_Tasks"
 msgstr "_Oppgaver"
 
-#: ../plugins/pst-import/pst-importer.c:583
+#: ../plugins/pst-import/pst-importer.c:587
 msgid "_Journal entries"
 msgstr "_Journaloppføringer"
 
-#: ../plugins/pst-import/pst-importer.c:694
+#: ../plugins/pst-import/pst-importer.c:698
 msgid "Importing Outlook data"
 msgstr "Importerer data fra Outlook"
 
@@ -19485,7 +19520,7 @@ msgid "Mount of %s failed:"
 msgstr "Montering av %s feilet:"
 
 #: ../plugins/publish-calendar/publish-calendar.c:611
-#: ../plugins/publish-calendar/publish-calendar.ui.h:4
+#: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "E_nable"
 msgstr "A_ktiver"
 
@@ -19504,93 +19539,93 @@ msgstr "Kunne ikke opprette tråd for publisering."
 msgid "_Publish Calendar Information"
 msgstr "_Publiser kalenderinformasjon"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:2
-msgid "Custom Location"
-msgstr "Egendefinert plassering"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:1
+msgid "iCal"
+msgstr "iCal"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:3
 msgid "Daily"
 msgstr "Daglig"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:5
-msgid "FTP (with login)"
-msgstr "FTP (med pålogging)"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:4
+msgid "Weekly"
+msgstr "Ukentlig"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:9
+#: ../plugins/publish-calendar/publish-calendar.ui.h:5
 msgid "Manual (via Actions menu)"
 msgstr "Manuell (via menyen Handlinger)"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:11
-msgid "P_ort:"
-msgstr "P_ort:"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:9
+msgid "Secure FTP (SFTP)"
+msgstr "Sikker FTP (SFTP)"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:12
+#: ../plugins/publish-calendar/publish-calendar.ui.h:10
 msgid "Public FTP"
 msgstr "Offentlig FTP"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:13
-msgid "Publishing Location"
-msgstr "Plassering for publisering"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:11
+msgid "FTP (with login)"
+msgstr "FTP (med pålogging)"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:14
-msgid "Publishing _Frequency:"
-msgstr "Publiserings_frekvens<"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:12
+msgid "Windows share"
+msgstr "Delt Windows-ressurs"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:15
-msgid "Secure FTP (SFTP)"
-msgstr "Sikker FTP (SFTP)"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:13
+msgid "WebDAV (HTTP)"
+msgstr "WebDAV (HTTP)"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:16
+#: ../plugins/publish-calendar/publish-calendar.ui.h:14
 msgid "Secure WebDAV (HTTPS)"
 msgstr "Sikker WebDAV (HTTPS)"
 
+#: ../plugins/publish-calendar/publish-calendar.ui.h:15
+msgid "Custom Location"
+msgstr "Egendefinert plassering"
+
 #: ../plugins/publish-calendar/publish-calendar.ui.h:17
-msgid "Service _type:"
-msgstr "Type tjeneste:"
+msgid "_Publish as:"
+msgstr "_Publiser som:"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:18
-msgid "Sources"
-msgstr "Kilder"
+msgid "Publishing _Frequency:"
+msgstr "Publiserings_frekvens<"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:19
 msgid "Time _duration:"
 msgstr "Varig_het i tid:"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:20
-msgid "WebDAV (HTTP)"
-msgstr "WebDAV (HTTP)"
-
-#: ../plugins/publish-calendar/publish-calendar.ui.h:21
-msgid "Weekly"
-msgstr "Ukentlig"
+msgid "Sources"
+msgstr "Kilder"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:22
-msgid "Windows share"
-msgstr "Delt Windows-ressurs"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:23
+msgid "Service _type:"
+msgstr "Type tjeneste:"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:24
+#: ../plugins/publish-calendar/publish-calendar.ui.h:25
 msgid "_File:"
 msgstr "_Fil:"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:25
+#: ../plugins/publish-calendar/publish-calendar.ui.h:27
+msgid "P_ort:"
+msgstr "P_ort:"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:28
+msgid "_Username:"
+msgstr "Br_ukernavn:"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:29
 msgid "_Password:"
 msgstr "_Passord:"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:26
-msgid "_Publish as:"
-msgstr "_Publiser som:"
-
-#: ../plugins/publish-calendar/publish-calendar.ui.h:27
+#: ../plugins/publish-calendar/publish-calendar.ui.h:30
 msgid "_Remember password"
 msgstr "Hu_sk passord"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:29
-msgid "_Username:"
-msgstr "Br_ukernavn:"
-
 #: ../plugins/publish-calendar/publish-calendar.ui.h:31
-msgid "iCal"
-msgstr "iCal"
+msgid "Publishing Location"
+msgstr "Plassering for publisering"
 
 #: ../plugins/publish-calendar/publish-format-fb.c:94
 #: ../plugins/publish-calendar/publish-format-ical.c:91
@@ -19730,7 +19765,7 @@ msgstr "Lagre valgt notatliste til disk"
 msgid "Save the selected task list to disk"
 msgstr "Lagre valgt oppgaveliste til disk"
 
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 msgid ""
 "Drafts based template plugin. You can use variables like $ORIG[subject], "
 "$ORIG[from], $ORIG[to] or $ORIG[body], which will be replaced by values from "
@@ -19753,13 +19788,13 @@ msgid "Save as Template"
 msgstr "Lagre som mal"
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
-msgid "Decode TNEF (winmail.dat) attachments from Microsoft Outlook."
-msgstr "Dekoding av TNEF-vedlegg (winmail.dat) fra Microsoft Outlook."
-
-#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
 msgid "TNEF Decoder"
 msgstr "Dekoding av TNEF-vedlegg"
 
+#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
+msgid "Decode TNEF (winmail.dat) attachments from Microsoft Outlook."
+msgstr "Dekoding av TNEF-vedlegg (winmail.dat) fra Microsoft Outlook."
+
 #: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:1
 msgid "Inline vCards"
 msgstr "vCard i e-post"
@@ -19793,13 +19828,13 @@ msgid "Save in Address Book"
 msgstr "Lagre i adressebok"
 
 #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
-msgid "Add WebDAV contacts to Evolution."
-msgstr "Legg til WebDAV-kontakter i Evolution."
-
-#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
 msgid "WebDAV contacts"
 msgstr "WebDAV-kontakter"
 
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
+msgid "Add WebDAV contacts to Evolution."
+msgstr "Legg til WebDAV-kontakter i Evolution."
+
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:68
 msgid "WebDAV"
 msgstr "WebDAV"
@@ -19812,101 +19847,58 @@ msgstr "URL:"
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "_Unngå IfMatch (kreves med Apache < 2.2.8)"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:1
-msgid "Authenticate proxy server connections"
-msgstr "Autentiser tilkoblinger via proxy-tjener"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:2
-msgid "Automatic proxy configuration URL"
-msgstr "URL for automatisk konfigurasjon av proxy"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:5
-msgid "Default window X coordinate"
-msgstr "Forvalgt X-koordinat for vinduet"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:6
-msgid "Default window Y coordinate"
-msgstr "Forvalgt Y-koordinat for vinduet"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:7
-msgid "Default window height"
-msgstr "Forvalgt vinduhøyde"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:8
-msgid "Default window state"
-msgstr "Forvalgt vindutilstand"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:9
-msgid "Default window width"
-msgstr "Forvalgt vindubredde"
-
 #: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid ""
-"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
+"List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
-"Aktiverer innstillinger for proxy ved aksess via HTTP/sikker HTTP over "
-"internett."
+"Liste over stier for mapper som skal bli synkronisert til disk for frakoblet "
+"bruk"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:12
+msgid "Default window Y coordinate"
+msgstr "Forvalgt Y-koordinat for vinduet"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:13
-msgid "HTTP proxy host name"
-msgstr "Vertsnavn for HTTP-proxy"
+msgid "The default Y coordinate for the main window."
+msgstr "Forvalgt Y-koordinat for hovedvinduet."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:14
-msgid "HTTP proxy password"
-msgstr "Passord for HTTP-proxy"
+msgid "Default window X coordinate"
+msgstr "Forvalgt X-koordinat for vinduet"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:15
-msgid "HTTP proxy port"
-msgstr "Port for HTTP-proxy"
+msgid "The default X coordinate for the main window."
+msgstr "Forvalgt X-koordinat for hovedvinduet."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:16
-msgid "HTTP proxy username"
-msgstr "Brukernavn for HTTP-proxy"
+msgid "Default window width"
+msgstr "Forvalgt vindubredde"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:17
+msgid "The default width for the main window, in pixels."
+msgstr "Forvalgt bredde på hovedvinduet i piksler."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:18
-msgid ""
-"If true, then connections to the proxy server require authentication. The "
-"username is retrieved from the \"/apps/evolution/shell/network_config/"
-"authentication_user\" GConf key, and the password is retrieved from either "
-"gnome-keyring or the ~/.gnome2_private/Evolution password file."
-msgstr ""
+msgid "Default window height"
+msgstr "Forvalgt vinduhøyde"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
-msgid ""
-"List of paths for the folders to be synchronized to disk for offline usage"
-msgstr ""
-"Liste over stier for mapper som skal bli synkronisert til disk for frakoblet "
-"bruk"
+#: ../shell/apps_evolution_shell.schemas.in.h:19
+msgid "The default height for the main window, in pixels."
+msgstr "Forvalgt høyde på hovedvinduet i piksler."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
-msgid "Non-proxy hosts"
-msgstr "Verter som ikke bruker proxy"
+#: ../shell/apps_evolution_shell.schemas.in.h:20
+msgid "Default window state"
+msgstr "Forvalgt vindutilstand"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
-msgid "Password to pass as authentication when doing HTTP proxying."
-msgstr "Passord som skal sendes som autentisering ved bruk av HTTP-proxy."
+#: ../shell/apps_evolution_shell.schemas.in.h:21
+msgid "Whether or not the window should be maximized."
+msgstr "Om vinduet skal være maksimert."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid "Proxy configuration mode"
 msgstr "Konfigurasjonsmodus for proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
-msgid "SOCKS proxy host name"
-msgstr "Vertsnavn for SOCKS-proxy"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:27
-msgid "SOCKS proxy port"
-msgstr "Port for SOCKS-proxy"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:28
-msgid "Secure HTTP proxy host name"
-msgstr "Vertsnavn for sikker HTTP-proxy"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:29
-msgid "Secure HTTP proxy port"
-msgstr "Port for sikker HTTP-proxy"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid ""
 "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
 "representing \"use system settings\", \"no proxy\", \"use manual proxy "
@@ -19914,42 +19906,30 @@ msgid ""
 "\" respectively."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
-msgid "The default X coordinate for the main window."
-msgstr "Forvalgt X-koordinat for hovedvinduet."
-
 #: ../shell/apps_evolution_shell.schemas.in.h:37
-msgid "The default Y coordinate for the main window."
-msgstr "Forvalgt Y-koordinat for hovedvinduet."
+msgid "HTTP proxy port"
+msgstr "Port for HTTP-proxy"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:38
-msgid "The default height for the main window, in pixels."
-msgstr "Forvalgt høyde på hovedvinduet i piksler."
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"http_host\" that you proxy through."
+msgstr ""
+"Porten på proxy definert av «/apps/evolution/shell/network_config/http_host»."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:39
-msgid "The default width for the main window, in pixels."
-msgstr "Forvalgt bredde på hovedvinduet i piksler."
+msgid "HTTP proxy host name"
+msgstr "Vertsnavn for HTTP-proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:42
+#: ../shell/apps_evolution_shell.schemas.in.h:40
 msgid "The machine name to proxy HTTP through."
 msgstr "Maskinnavn for HTTP-proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
-msgid "The machine name to proxy secure HTTP through."
-msgstr "Maskinnavn for HTTPS-proxy."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:44
-msgid "The machine name to proxy socks through."
-msgstr "Maskinnavn for socks-proxy."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:45
-msgid ""
-"The port on the machine defined by \"/apps/evolution/shell/network_config/"
-"http_host\" that you proxy through."
-msgstr ""
-"Porten på proxy definert av «/apps/evolution/shell/network_config/http_host»."
+#: ../shell/apps_evolution_shell.schemas.in.h:41
+msgid "Secure HTTP proxy port"
+msgstr "Port for sikker HTTP-proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "secure_host\" that you proxy through."
@@ -19957,7 +19937,19 @@ msgstr ""
 "Porten på proxy definert av «/apps/evolution/shell/network_config/"
 "secure_host»."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:43
+msgid "Secure HTTP proxy host name"
+msgstr "Vertsnavn for sikker HTTP-proxy"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:44
+msgid "The machine name to proxy secure HTTP through."
+msgstr "Maskinnavn for HTTPS-proxy."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:45
+msgid "SOCKS proxy port"
+msgstr "Port for SOCKS-proxy"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "socks_host\" that you proxy through."
@@ -19965,29 +19957,72 @@ msgstr ""
 "Porten på proxy definert av «/apps/evolution/shell/network_config/"
 "socks_host»."
 
+#: ../shell/apps_evolution_shell.schemas.in.h:47
+msgid "SOCKS proxy host name"
+msgstr "Vertsnavn for SOCKS-proxy"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:48
+msgid "The machine name to proxy socks through."
+msgstr "Maskinnavn for socks-proxy."
+
 #: ../shell/apps_evolution_shell.schemas.in.h:49
+msgid "Use HTTP proxy"
+msgstr "Bruk HTTP-proxy"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid ""
-"This key contains a list of hosts which are connected to directly, rather "
-"than via the proxy (if it is active). The values can be hostnames, domains "
-"(using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and "
-"IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
+"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
 msgstr ""
+"Aktiverer innstillinger for proxy ved aksess via HTTP/sikker HTTP over "
+"internett."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:51
-msgid "URL that provides proxy configuration values."
-msgstr "URL som oppgir verdier for konfigurasjon av proxy."
+msgid "Authenticate proxy server connections"
+msgstr "Autentiser tilkoblinger via proxy-tjener"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:52
-msgid "Use HTTP proxy"
-msgstr "Bruk HTTP-proxy"
+msgid ""
+"If true, then connections to the proxy server require authentication. The "
+"username is retrieved from the \"/apps/evolution/shell/network_config/"
+"authentication_user\" GConf key, and the password is retrieved from either "
+"gnome-keyring or the ~/.gnome2_private/Evolution password file."
+msgstr ""
 
 #: ../shell/apps_evolution_shell.schemas.in.h:53
+msgid "HTTP proxy username"
+msgstr "Brukernavn for HTTP-proxy"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Username to pass as authentication when doing HTTP proxying."
 msgstr "Brukernavn for autentisering med HTTP-proxy."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:55
-msgid "Whether or not the window should be maximized."
-msgstr "Om vinduet skal være maksimert."
+msgid "HTTP proxy password"
+msgstr "Passord for HTTP-proxy"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:56
+msgid "Password to pass as authentication when doing HTTP proxying."
+msgstr "Passord som skal sendes som autentisering ved bruk av HTTP-proxy."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:57
+msgid "Non-proxy hosts"
+msgstr "Verter som ikke bruker proxy"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:58
+msgid ""
+"This key contains a list of hosts which are connected to directly, rather "
+"than via the proxy (if it is active). The values can be hostnames, domains "
+"(using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and "
+"IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:59
+msgid "Automatic proxy configuration URL"
+msgstr "URL for automatisk konfigurasjon av proxy"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:60
+msgid "URL that provides proxy configuration values."
+msgstr "URL som oppgir verdier for konfigurasjon av proxy."
 
 #: ../shell/e-shell.c:312
 msgid "Preparing to go offline..."
@@ -19997,7 +20032,7 @@ msgstr "Forbereder frakoblet bruk …"
 msgid "Preparing to go online..."
 msgstr "Forbereder tilkoblet bruk …"
 
-#: ../shell/e-shell.c:435
+#: ../shell/e-shell.c:436
 msgid "Preparing to quit..."
 msgstr "Forbereder avslutting …"
 
@@ -20451,19 +20486,35 @@ msgstr ""
 "%s: --force-online og --offline kan ikke brukes samtidig.\n"
 "  Bruk «%s --help» for mer informasjon.\n"
 
-#: ../shell/shell.error.xml.h:1
-msgid "Are you sure you want to forget all remembered passwords?"
-msgstr "Er du sikker på at du vil glemme alle lagrede passord?"
-
 #: ../shell/shell.error.xml.h:2
-msgid "Cannot upgrade directly from version {0}"
-msgstr "Kan ikke oppgradere direkte fra versjon {0}?"
+msgid "Upgrade from previous version failed:"
+msgstr "Oppgradering fra forrige versjon feilet:"
 
 #: ../shell/shell.error.xml.h:3
+msgid ""
+"{0}\n"
+"\n"
+"If you choose to continue, you may not have access to some of your old "
+"data.\n"
+msgstr ""
+"{0}\n"
+"\n"
+"Hvis du velger å fortsette vil du kanskje ikke få tilgang til alle dine "
+"gamle data.\n"
+
+#: ../shell/shell.error.xml.h:7
 msgid "Continue Anyway"
 msgstr "Fortsett likevel"
 
-#: ../shell/shell.error.xml.h:4
+#: ../shell/shell.error.xml.h:8
+msgid "Quit Now"
+msgstr "Avslutt nå"
+
+#: ../shell/shell.error.xml.h:9
+msgid "Cannot upgrade directly from version {0}"
+msgstr "Kan ikke oppgradere direkte fra versjon {0}?"
+
+#: ../shell/shell.error.xml.h:10
 msgid ""
 "Evolution no longer supports upgrading directly from version {0}. However as "
 "a workaround you might try first upgrading to Evolution 2, and then "
@@ -20472,7 +20523,11 @@ msgstr ""
 "Evolution støtter ikke lenger å oppgradere direkte fra versjon {0}. Du kan "
 "prøve å oppgradere til Evolution 2 for så å oppgradere til Evolution 3."
 
-#: ../shell/shell.error.xml.h:5
+#: ../shell/shell.error.xml.h:11
+msgid "Are you sure you want to forget all remembered passwords?"
+msgstr "Er du sikker på at du vil glemme alle lagrede passord?"
+
+#: ../shell/shell.error.xml.h:12
 msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed."
@@ -20480,30 +20535,10 @@ msgstr ""
 "Glemming av passord tømmer alle passord som huskes av programmet. Du vil bli "
 "spurt igjen neste gang de kreves."
 
-#: ../shell/shell.error.xml.h:7
-msgid "Quit Now"
-msgstr "Avslutt nå"
-
-#: ../shell/shell.error.xml.h:8
-msgid "Upgrade from previous version failed:"
-msgstr "Oppgradering fra forrige versjon feilet:"
-
-#: ../shell/shell.error.xml.h:9
+#: ../shell/shell.error.xml.h:13
 msgid "_Forget"
 msgstr "_Glem"
 
-#: ../shell/shell.error.xml.h:10
-msgid ""
-"{0}\n"
-"\n"
-"If you choose to continue, you may not have access to some of your old "
-"data.\n"
-msgstr ""
-"{0}\n"
-"\n"
-"Hvis du velger å fortsette vil du kanskje ikke få tilgang til alle dine "
-"gamle data.\n"
-
 #: ../shell/test/e-test-shell-backend.c:52
 msgctxt "New"
 msgid "_Test Item"
@@ -20611,7 +20646,7 @@ msgid "Issued To Organizational Unit"
 msgstr "Utstedt til organisasjonsenhet"
 
 #: ../smime/gui/certificate-manager.c:76 ../smime/gui/certificate-manager.c:96
-#: ../smime/gui/certificate-manager.c:114 ../smime/gui/smime-ui.ui.h:32
+#: ../smime/gui/certificate-manager.c:114 ../smime/gui/smime-ui.ui.h:12
 #: ../smime/lib/e-cert.c:565
 msgid "Serial Number"
 msgstr "Serienummer"
@@ -20622,7 +20657,7 @@ msgid "Purposes"
 msgstr "Hensikter"
 
 #: ../smime/gui/certificate-manager.c:78 ../smime/gui/certificate-manager.c:98
-#: ../smime/gui/certificate-manager.c:116 ../smime/gui/smime-ui.ui.h:23
+#: ../smime/gui/certificate-manager.c:116 ../smime/gui/smime-ui.ui.h:15
 msgid "Issued By"
 msgstr "Utstedt av"
 
@@ -20651,13 +20686,13 @@ msgstr "Utgår"
 
 #: ../smime/gui/certificate-manager.c:83
 #: ../smime/gui/certificate-manager.c:103
-#: ../smime/gui/certificate-manager.c:121 ../smime/gui/smime-ui.ui.h:29
+#: ../smime/gui/certificate-manager.c:121 ../smime/gui/smime-ui.ui.h:17
 msgid "SHA1 Fingerprint"
 msgstr "SHA1-fingeravtrykk"
 
 #: ../smime/gui/certificate-manager.c:84
 #: ../smime/gui/certificate-manager.c:104
-#: ../smime/gui/certificate-manager.c:122 ../smime/gui/smime-ui.ui.h:26
+#: ../smime/gui/certificate-manager.c:122 ../smime/gui/smime-ui.ui.h:18
 msgid "MD5 Fingerprint"
 msgstr "MD5-fingeravtrykk"
 
@@ -20752,159 +20787,159 @@ msgstr ""
 msgid "Select certificate"
 msgstr "Velg sertifikat"
 
-#: ../smime/gui/smime-ui.ui.h:1
-msgid "<Not Part of Certificate>"
-msgstr "<Ikke en del av sertifikatet>"
-
-#: ../smime/gui/smime-ui.ui.h:2
-msgid "Authorities"
-msgstr "Autoriteter"
-
-#: ../smime/gui/smime-ui.ui.h:3
-msgid "Backup _All"
-msgstr "Ta sikkerhetskopi av _alle"
+#: ../smime/gui/smime-ui.ui.h:3 ../smime/lib/e-cert.c:825
+msgid "SSL Client Certificate"
+msgstr "SSL-klientsertifikat"
 
-#: ../smime/gui/smime-ui.ui.h:4
-msgid ""
-"Before trusting this CA for any purpose, you should examine its certificate "
-"and its policy and procedures (if available)."
-msgstr ""
-"Før du stoler på denne CAen for noe formål bør du undersøke sertifikatet og "
-"dets regelsett og prosedyrer (hvis tilgjengelig)."
+#: ../smime/gui/smime-ui.ui.h:4 ../smime/lib/e-cert.c:829
+msgid "SSL Server Certificate"
+msgstr "SSL-tjenersertifikat"
 
-#: ../smime/gui/smime-ui.ui.h:5 ../smime/lib/e-cert.c:1093
-msgid "Certificate"
-msgstr "Sertifikat"
+#: ../smime/gui/smime-ui.ui.h:5
+msgid "Email Signer Certificate"
+msgstr "Sertifikat for signering av e-post"
 
 #: ../smime/gui/smime-ui.ui.h:6
-msgid "Certificate Authority Trust"
-msgstr "Tillit til sertifikatmyndighet"
+msgid "Email Recipient Certificate"
+msgstr "Sertifikat for e-postmottaker"
 
 #: ../smime/gui/smime-ui.ui.h:7
-msgid "Certificate Fields"
-msgstr "Sertifikatfelt"
+msgid "This certificate has been verified for the following uses:"
+msgstr "Dette sertifikatet er verifisert for følgende bruk:"
 
 #: ../smime/gui/smime-ui.ui.h:8
-msgid "Certificate Hierarchy"
-msgstr "Sertifikathierarki"
+msgid "Issued To"
+msgstr "Utstedt til"
 
 #: ../smime/gui/smime-ui.ui.h:9
-msgid "Certificate details"
-msgstr "Detaljer om sertifikat"
+msgid "Common Name (CN)"
+msgstr "Vanlig navn (CN)"
 
 #: ../smime/gui/smime-ui.ui.h:10
-msgid "Certificates Table"
-msgstr "Tabell med sertifikater"
+msgid "Organization (O)"
+msgstr "Organisasjon (O)"
 
 #: ../smime/gui/smime-ui.ui.h:11
-msgid "Common Name (CN)"
-msgstr "Vanlig navn (CN)"
+msgid "Organizational Unit (OU)"
+msgstr "Organisasjonsenhet (OU)"
 
-#: ../smime/gui/smime-ui.ui.h:12
-msgid "Contact Certificates"
-msgstr "Kontaktsertifikater"
+#: ../smime/gui/smime-ui.ui.h:13
+msgid "Issued On"
+msgstr "Utstedt"
 
 #: ../smime/gui/smime-ui.ui.h:14
-msgid "Do not trust the authenticity of this certificate"
-msgstr "Ikke stol på at dette sertifikatet er autentisk"
-
-#: ../smime/gui/smime-ui.ui.h:15
-msgid "Email Certificate Trust Settings"
-msgstr "Innstillinger for tillit til e-postsertifikater"
-
-#: ../smime/gui/smime-ui.ui.h:16
-msgid "Email Recipient Certificate"
-msgstr "Sertifikat for e-postmottaker"
-
-#: ../smime/gui/smime-ui.ui.h:17
-msgid "Email Signer Certificate"
-msgstr "Sertifikat for signering av e-post"
-
-#: ../smime/gui/smime-ui.ui.h:18
 msgid "Expires On"
 msgstr "Utgår"
 
+#: ../smime/gui/smime-ui.ui.h:16
+msgid "Fingerprints"
+msgstr "Fingeravtrykk"
+
 #: ../smime/gui/smime-ui.ui.h:19
-msgid "Field Value"
-msgstr "Feltverdi"
+msgid "<Not Part of Certificate>"
+msgstr "<Ikke en del av sertifikatet>"
 
 #: ../smime/gui/smime-ui.ui.h:20
-msgid "Fingerprints"
-msgstr "Fingeravtrykk"
+msgid "Validity"
+msgstr "Gyldighet"
+
+#: ../smime/gui/smime-ui.ui.h:22
+msgid "Certificate Hierarchy"
+msgstr "Sertifikathierarki"
+
+#: ../smime/gui/smime-ui.ui.h:23
+msgid "Certificate Fields"
+msgstr "Sertifikatfelt"
 
 #: ../smime/gui/smime-ui.ui.h:24
-msgid "Issued On"
-msgstr "Utstedt"
+msgid "Field Value"
+msgstr "Feltverdi"
 
-#: ../smime/gui/smime-ui.ui.h:25
-msgid "Issued To"
-msgstr "Utstedt til"
+#: ../smime/gui/smime-ui.ui.h:26
+msgid "You have certificates from these organizations that identify you:"
+msgstr "Du har sertifikater som identifiserer deg fra disse organisasjonene:"
 
 #: ../smime/gui/smime-ui.ui.h:27
-msgid "Organization (O)"
-msgstr "Organisasjon (O)"
-
-#: ../smime/gui/smime-ui.ui.h:28
-msgid "Organizational Unit (OU)"
-msgstr "Organisasjonsenhet (OU)"
+msgid "Certificates Table"
+msgstr "Tabell med sertifikater"
 
-#: ../smime/gui/smime-ui.ui.h:30 ../smime/lib/e-cert.c:825
-msgid "SSL Client Certificate"
-msgstr "SSL-klientsertifikat"
+#. This is a verb, as in "make a backup".
+#: ../smime/gui/smime-ui.ui.h:30
+msgid "_Backup"
+msgstr "_Sikkerhetskopier"
 
-#: ../smime/gui/smime-ui.ui.h:31 ../smime/lib/e-cert.c:829
-msgid "SSL Server Certificate"
-msgstr "SSL-tjenersertifikat"
+#: ../smime/gui/smime-ui.ui.h:31
+msgid "Backup _All"
+msgstr "Ta sikkerhetskopi av _alle"
 
 #: ../smime/gui/smime-ui.ui.h:33
-msgid "This certificate has been verified for the following uses:"
-msgstr "Dette sertifikatet er verifisert for følgende bruk:"
+msgid "Your Certificates"
+msgstr "Dine sertifikater"
 
 #: ../smime/gui/smime-ui.ui.h:34
-msgid "Trust the authenticity of this certificate"
-msgstr "Stol på at dette sertifikatet er autentisk"
+msgid "You have certificates on file that identify these people:"
+msgstr "Du har sertifikater som identifiserer disse menneskene på lager:"
 
 #: ../smime/gui/smime-ui.ui.h:35
-msgid "Trust this CA to identify _email users."
-msgstr "Stol på denne sertifikatautoriteten for å identifisere _e-postbrukere."
+msgid "Contact Certificates"
+msgstr "Kontaktsertifikater"
 
 #: ../smime/gui/smime-ui.ui.h:36
-msgid "Trust this CA to identify _software developers."
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
 msgstr ""
-"Stol på denne sertifikatautoriteten for å identifisere _programvareutviklere."
+"Du har sertifikater på lager som identifiserer disse sertifikatmyndighetene:"
 
 #: ../smime/gui/smime-ui.ui.h:37
-msgid "Trust this CA to identify _websites."
-msgstr "Stol på denne sertifikatautoriteten for identifisering av _nettsteder."
+msgid "Authorities"
+msgstr "Autoriteter"
 
 #: ../smime/gui/smime-ui.ui.h:38
-msgid "Validity"
-msgstr "Gyldighet"
+msgid "Certificate Authority Trust"
+msgstr "Tillit til sertifikatmyndighet"
 
 #: ../smime/gui/smime-ui.ui.h:39
-msgid "You have certificates from these organizations that identify you:"
-msgstr "Du har sertifikater som identifiserer deg fra disse organisasjonene:"
+msgid "Trust this CA to identify _websites."
+msgstr "Stol på denne sertifikatautoriteten for identifisering av _nettsteder."
 
 #: ../smime/gui/smime-ui.ui.h:40
-msgid ""
-"You have certificates on file that identify these certificate authorities:"
-msgstr ""
-"Du har sertifikater på lager som identifiserer disse sertifikatmyndighetene:"
+msgid "Trust this CA to identify _email users."
+msgstr "Stol på denne sertifikatautoriteten for å identifisere _e-postbrukere."
 
 #: ../smime/gui/smime-ui.ui.h:41
-msgid "You have certificates on file that identify these people:"
-msgstr "Du har sertifikater som identifiserer disse menneskene på lager:"
+msgid "Trust this CA to identify _software developers."
+msgstr ""
+"Stol på denne sertifikatautoriteten for å identifisere _programvareutviklere."
 
 #: ../smime/gui/smime-ui.ui.h:42
-msgid "Your Certificates"
-msgstr "Dine sertifikater"
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+"Før du stoler på denne CAen for noe formål bør du undersøke sertifikatet og "
+"dets regelsett og prosedyrer (hvis tilgjengelig)."
 
-#. This is a verb, as in "make a backup".
-#: ../smime/gui/smime-ui.ui.h:44
-msgid "_Backup"
-msgstr "_Sikkerhetskopier"
+#: ../smime/gui/smime-ui.ui.h:44 ../smime/lib/e-cert.c:1093
+msgid "Certificate"
+msgstr "Sertifikat"
 
 #: ../smime/gui/smime-ui.ui.h:45
+msgid "Certificate details"
+msgstr "Detaljer om sertifikat"
+
+#: ../smime/gui/smime-ui.ui.h:46
+msgid "Email Certificate Trust Settings"
+msgstr "Innstillinger for tillit til e-postsertifikater"
+
+#: ../smime/gui/smime-ui.ui.h:47
+msgid "Trust the authenticity of this certificate"
+msgstr "Stol på at dette sertifikatet er autentisk"
+
+#: ../smime/gui/smime-ui.ui.h:48
+msgid "Do not trust the authenticity of this certificate"
+msgstr "Ikke stol på at dette sertifikatet er autentisk"
+
+#: ../smime/gui/smime-ui.ui.h:49
 msgid "_Edit CA Trust"
 msgstr "R_ediger tillit til CA"
 
@@ -21108,52 +21143,52 @@ msgid "Imported Certificate"
 msgstr "Importert sertifikat"
 
 #: ../views/addressbook/galview.xml.h:1
-msgid "By _Company"
-msgstr "Etter _firma"
-
-#: ../views/addressbook/galview.xml.h:2
 msgid "_Address Cards"
 msgstr "_Adressekort"
 
-#: ../views/addressbook/galview.xml.h:3 ../views/calendar/galview.xml.h:3
+#: ../views/addressbook/galview.xml.h:2 ../views/calendar/galview.xml.h:5
 msgid "_List View"
 msgstr "_Listevisning"
 
-#: ../views/calendar/galview.xml.h:1
-msgid "W_eek View"
-msgstr "Uk_evisning"
+#: ../views/addressbook/galview.xml.h:3
+msgid "By _Company"
+msgstr "Etter _firma"
 
-#: ../views/calendar/galview.xml.h:2
+#: ../views/calendar/galview.xml.h:1
 msgid "_Day View"
 msgstr "_Dagvisning"
 
+#: ../views/calendar/galview.xml.h:2
+msgid "_Work Week View"
+msgstr "Ar_beidsukevisning"
+
+#: ../views/calendar/galview.xml.h:3
+msgid "W_eek View"
+msgstr "Uk_evisning"
+
 #: ../views/calendar/galview.xml.h:4
 msgid "_Month View"
 msgstr "_Månedsvisning"
 
-#: ../views/calendar/galview.xml.h:5
-msgid "_Work Week View"
-msgstr "Ar_beidsukevisning"
-
 #: ../views/mail/galview.xml.h:1
-msgid "As Sent Folder for Wi_de View"
-msgstr "Som sendt-mappe for _vertikal visning"
+msgid "_Messages"
+msgstr "_Meldinger"
 
 #: ../views/mail/galview.xml.h:2
 msgid "As _Sent Folder"
 msgstr "Som _Sendt-mappe"
 
 #: ../views/mail/galview.xml.h:3
-msgid "By S_tatus"
-msgstr "Etter s_tatus"
+msgid "By Su_bject"
+msgstr "Etter _emne"
 
 #: ../views/mail/galview.xml.h:4
 msgid "By Se_nder"
 msgstr "Etter avse_nder"
 
 #: ../views/mail/galview.xml.h:5
-msgid "By Su_bject"
-msgstr "Etter _emne"
+msgid "By S_tatus"
+msgstr "Etter s_tatus"
 
 #: ../views/mail/galview.xml.h:6
 msgid "By _Follow Up Flag"
@@ -21164,18 +21199,18 @@ msgid "For _Wide View"
 msgstr "For _vertikal visning"
 
 #: ../views/mail/galview.xml.h:8
-msgid "_Messages"
-msgstr "_Meldinger"
+msgid "As Sent Folder for Wi_de View"
+msgstr "Som sendt-mappe for _vertikal visning"
 
 #: ../views/memos/galview.xml.h:1
 msgid "_Memos"
 msgstr "_Notater"
 
-#: ../views/tasks/galview.xml.h:1
+#: ../views/tasks/galview.xml.h:2
 msgid "With _Due Date"
 msgstr "Med fer_dig-dato"
 
-#: ../views/tasks/galview.xml.h:2
+#: ../views/tasks/galview.xml.h:3
 msgid "With _Status"
 msgstr "Med _status"
 
@@ -21193,14 +21228,6 @@ msgid "Select a Time Zone"
 msgstr "Velg en tidssone"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:2
-msgid "Time Zones"
-msgstr "Tidssoner"
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:3
-msgid "Timezone drop-down combination box"
-msgstr "Kombinasjonsboks med nedtrekksvalg for tidssone"
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:4
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
 "zone.\n"
@@ -21210,10 +21237,18 @@ msgstr ""
 "tidssone.\n"
 "Bru høyre musknapp til å zoome ut."
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:6
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:4
+msgid "Time Zones"
+msgstr "Tidssoner"
+
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:5
 msgid "_Selection"
 msgstr "_Utvalg"
 
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:6
+msgid "Timezone drop-down combination box"
+msgstr "Kombinasjonsboks med nedtrekksvalg for tidssone"
+
 #: ../widgets/menus/gal-define-views-dialog.c:359
 #: ../widgets/menus/gal-define-views.ui.h:4
 #, no-c-format
@@ -21255,13 +21290,13 @@ msgid "Name of new view:"
 msgstr "Navn på ny visning:"
 
 #: ../widgets/menus/gal-view-new-dialog.ui.h:2
-msgid "Type of View"
-msgstr "Type visning"
-
-#: ../widgets/menus/gal-view-new-dialog.ui.h:3
 msgid "Type of view:"
 msgstr "Type visning:"
 
+#: ../widgets/menus/gal-view-new-dialog.ui.h:3
+msgid "Type of View"
+msgstr "Type visning"
+
 #: ../widgets/misc/ea-calendar-item.c:306
 #: ../widgets/misc/ea-calendar-item.c:315
 msgid "%d %B %Y"
@@ -21705,136 +21740,136 @@ msgstr "Nådde toppen av siden og fortsatte fra bunnen"
 msgid "When de_leted:"
 msgstr "Når s_lettet:"
 
-#: ../widgets/misc/e-send-options.ui.h:1
-msgid "A_uto-delete sent item"
-msgstr "Slett sendt-oppføring a_utomatisk"
-
 #: ../widgets/misc/e-send-options.ui.h:3
-msgid "Creat_e a sent item to track information"
-msgstr "Oppr_ett en sendt-oppføring for å spore informasjonen"
-
-#: ../widgets/misc/e-send-options.ui.h:4
-msgid "Deli_vered and opened"
-msgstr "Le_vert og åpnet"
-
-#: ../widgets/misc/e-send-options.ui.h:5
-msgid "Delivery Options"
-msgstr "Alternativer for levering"
+msgid "Standard"
+msgstr "Standard"
 
 #: ../widgets/misc/e-send-options.ui.h:6
-msgctxt "ESendOptions"
-msgid "_Until"
-msgstr "_Inntil"
-
-#: ../widgets/misc/e-send-options.ui.h:7
-msgctxt "ESendOptionsAfter"
-msgid "_After"
-msgstr "_Etter"
+msgid "Proprietary"
+msgstr "Proprietær"
 
 #: ../widgets/misc/e-send-options.ui.h:8
-msgctxt "ESendOptionsAfter"
-msgid "days"
-msgstr "dager"
+msgid "Secret"
+msgstr "Hemmelig"
 
 #: ../widgets/misc/e-send-options.ui.h:9
-msgctxt "ESendOptionsWithin"
-msgid "Wi_thin"
-msgstr "I_nnen"
+msgid "Top Secret"
+msgstr "Topphemmelig"
 
 #: ../widgets/misc/e-send-options.ui.h:10
-msgctxt "ESendOptionsWithin"
-msgid "days"
-msgstr "dager"
-
-#: ../widgets/misc/e-send-options.ui.h:11
 msgid "For Your Eyes Only"
 msgstr "Kun for dine øyne"
 
+#. Translators: Used in send options dialog
 #: ../widgets/misc/e-send-options.ui.h:12
-msgid "Gene_ral Options"
-msgstr "Gene_relle alternativer"
+msgctxt "send-options"
+msgid "None"
+msgstr "Ingen"
 
-#: ../widgets/misc/e-send-options.ui.h:15
+#: ../widgets/misc/e-send-options.ui.h:13
 msgid "Mail Receipt"
 msgstr "E-postkvittering"
 
+#: ../widgets/misc/e-send-options.ui.h:15
+msgid "R_eply requested"
+msgstr "Svar for_espurt"
+
+#: ../widgets/misc/e-send-options.ui.h:16
+msgctxt "ESendOptionsWithin"
+msgid "Wi_thin"
+msgstr "I_nnen"
+
 #: ../widgets/misc/e-send-options.ui.h:17
-msgid "Proprietary"
-msgstr "Proprietær"
+msgctxt "ESendOptionsWithin"
+msgid "days"
+msgstr "dager"
 
 #: ../widgets/misc/e-send-options.ui.h:18
-msgid "R_eply requested"
-msgstr "Svar for_espurt"
+msgid "_When convenient"
+msgstr "_Når det passer"
 
 #: ../widgets/misc/e-send-options.ui.h:20
-msgid "Return Notification"
-msgstr "Returvarsling"
+msgid "_Delay message delivery"
+msgstr "_Utsett meldingslevering"
 
 #: ../widgets/misc/e-send-options.ui.h:21
-msgid "Secret"
-msgstr "Hemmelig"
+msgctxt "ESendOptionsAfter"
+msgid "_After"
+msgstr "_Etter"
+
+#: ../widgets/misc/e-send-options.ui.h:22
+msgctxt "ESendOptionsAfter"
+msgid "days"
+msgstr "dager"
 
 #: ../widgets/misc/e-send-options.ui.h:23
-msgid "Sta_tus Tracking"
-msgstr "Sta_tusoppfølging"
+msgid "_Set expiration date"
+msgstr "_Sett utløpsdato"
 
 #: ../widgets/misc/e-send-options.ui.h:24
-msgid "Standard"
-msgstr "Standard"
+msgctxt "ESendOptions"
+msgid "_Until"
+msgstr "_Inntil"
 
 #: ../widgets/misc/e-send-options.ui.h:25
-msgid "Status Tracking"
-msgstr "Statusoppfølging"
+msgid "Delivery Options"
+msgstr "Alternativer for levering"
 
-#: ../widgets/misc/e-send-options.ui.h:26
-msgid "Top Secret"
-msgstr "Topphemmelig"
+#: ../widgets/misc/e-send-options.ui.h:27
+msgid "_Classification:"
+msgstr "_Klassifisering:"
 
 #: ../widgets/misc/e-send-options.ui.h:28
-msgid "When acce_pted:"
-msgstr "Ved go_dkjenning:"
+msgid "Gene_ral Options"
+msgstr "Gene_relle alternativer"
 
 #: ../widgets/misc/e-send-options.ui.h:29
-msgid "When co_mpleted:"
-msgstr "Ved full_føring:"
+msgid "Creat_e a sent item to track information"
+msgstr "Oppr_ett en sendt-oppføring for å spore informasjonen"
 
 #: ../widgets/misc/e-send-options.ui.h:30
-msgid "When decli_ned:"
-msgstr "Ved _avslag:"
+msgid "_Delivered"
+msgstr "_Levert"
 
 #: ../widgets/misc/e-send-options.ui.h:31
-msgid "_All information"
-msgstr "_All informasjon"
+msgid "Deli_vered and opened"
+msgstr "Le_vert og åpnet"
 
 #: ../widgets/misc/e-send-options.ui.h:32
-msgid "_Classification:"
-msgstr "_Klassifisering:"
+msgid "_All information"
+msgstr "_All informasjon"
 
 #: ../widgets/misc/e-send-options.ui.h:33
-msgid "_Delay message delivery"
-msgstr "_Utsett meldingslevering"
+msgid "A_uto-delete sent item"
+msgstr "Slett sendt-oppføring a_utomatisk"
 
 #: ../widgets/misc/e-send-options.ui.h:34
-msgid "_Delivered"
-msgstr "_Levert"
+msgid "Status Tracking"
+msgstr "Statusoppfølging"
+
+#: ../widgets/misc/e-send-options.ui.h:35
+msgid "_When opened:"
+msgstr "_Ved åpning:"
 
 #: ../widgets/misc/e-send-options.ui.h:36
-msgid "_Set expiration date"
-msgstr "_Sett utløpsdato"
+msgid "When decli_ned:"
+msgstr "Ved _avslag:"
 
 #: ../widgets/misc/e-send-options.ui.h:37
-msgid "_When convenient"
-msgstr "_Når det passer"
+msgid "When co_mpleted:"
+msgstr "Ved full_føring:"
 
 #: ../widgets/misc/e-send-options.ui.h:38
-msgid "_When opened:"
-msgstr "_Ved åpning:"
+msgid "When acce_pted:"
+msgstr "Ved go_dkjenning:"
+
+#: ../widgets/misc/e-send-options.ui.h:39
+msgid "Return Notification"
+msgstr "Returvarsling"
 
-#. Translators: Used in send options dialog
 #: ../widgets/misc/e-send-options.ui.h:40
-msgctxt "send-options"
-msgid "None"
-msgstr "Ingen"
+msgid "Sta_tus Tracking"
+msgstr "Sta_tusoppfølging"
 
 #: ../widgets/misc/e-signature-editor.c:138
 #: ../widgets/misc/e-signature-editor.c:564
@@ -21986,7 +22021,7 @@ msgid "No grouping"
 msgstr "Ingen gruppering"
 
 #: ../widgets/table/e-table-config.c:666
-#: ../widgets/table/e-table-config.ui.h:11
+#: ../widgets/table/e-table-config.ui.h:1
 msgid "Show Fields"
 msgstr "Vis felter"
 
@@ -21994,87 +22029,87 @@ msgstr "Vis felter"
 msgid "Available Fields"
 msgstr "Tilgjengelige felt"
 
-#: ../widgets/table/e-table-config.ui.h:1
+#: ../widgets/table/e-table-config.ui.h:2
 msgid "A_vailable Fields:"
 msgstr "T_ilgjengelige felter:"
 
-#: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1721
-msgid "Ascending"
-msgstr "Stigende"
-
 #: ../widgets/table/e-table-config.ui.h:3
-msgid "Clear All"
-msgstr "Fjern alt"
+msgid "_Show these fields in order:"
+msgstr "_Vis disse feltene i rekkefølge:"
 
 #: ../widgets/table/e-table-config.ui.h:4
-msgid "Clear _All"
-msgstr "Fjern _alt"
+msgid "Move _Up"
+msgstr "Flytt _opp"
 
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1721
-msgid "Descending"
-msgstr "Synkende"
+msgid "Move _Down"
+msgstr "Flytt _ned"
 
-#: ../widgets/table/e-table-config.ui.h:8
-msgid "Group Items By"
-msgstr "Grupper elementer etter"
+#: ../widgets/table/e-table-config.ui.h:7
+msgid "_Remove"
+msgstr "Fje_rn"
 
 #: ../widgets/table/e-table-config.ui.h:9
-msgid "Move _Down"
-msgstr "Flytt _ned"
+msgid "_Show field in View"
+msgstr "Vi_s felt i visning"
 
 #: ../widgets/table/e-table-config.ui.h:10
-msgid "Move _Up"
-msgstr "Flytt _opp"
+#: ../widgets/table/e-table-header-item.c:1721
+msgid "Ascending"
+msgstr "Stigende"
+
+#: ../widgets/table/e-table-config.ui.h:11
+#: ../widgets/table/e-table-header-item.c:1721
+msgid "Descending"
+msgstr "Synkende"
 
 #: ../widgets/table/e-table-config.ui.h:12
+msgid "Group Items By"
+msgstr "Grupper elementer etter"
+
+#: ../widgets/table/e-table-config.ui.h:13
 msgid "Show _field in View"
 msgstr "Vis _felt i visning"
 
-#: ../widgets/table/e-table-config.ui.h:13
+#: ../widgets/table/e-table-config.ui.h:14
+msgid "Then By"
+msgstr "Så etter"
+
+#: ../widgets/table/e-table-config.ui.h:15
 msgid "Show field i_n View"
 msgstr "Vis felt i vis_ning"
 
-#: ../widgets/table/e-table-config.ui.h:14
+#: ../widgets/table/e-table-config.ui.h:16
 msgid "Show field in _View"
 msgstr "Vis felt i _visning"
 
-#: ../widgets/table/e-table-config.ui.h:15
+#: ../widgets/table/e-table-config.ui.h:17
+msgid "Clear _All"
+msgstr "Fjern _alt"
+
+#: ../widgets/table/e-table-config.ui.h:18
 msgid "Sort"
 msgstr "Sorter"
 
-#: ../widgets/table/e-table-config.ui.h:16
+#: ../widgets/table/e-table-config.ui.h:19
 msgid "Sort Items By"
 msgstr "Sorter elementer etter"
 
-#: ../widgets/table/e-table-config.ui.h:17
-msgid "Then By"
-msgstr "Så etter"
-
-#: ../widgets/table/e-table-config.ui.h:19
-msgid "_Fields Shown..."
-msgstr "_Viste felt …"
-
 #: ../widgets/table/e-table-config.ui.h:20
-msgid "_Group By..."
-msgstr "_Grupper etter …"
+msgid "Clear All"
+msgstr "Fjern alt"
 
 #: ../widgets/table/e-table-config.ui.h:21
-msgid "_Remove"
-msgstr "Fje_rn"
+msgid "_Sort..."
+msgstr "_Sorter …"
 
 #: ../widgets/table/e-table-config.ui.h:22
-msgid "_Show field in View"
-msgstr "Vi_s felt i visning"
+msgid "_Group By..."
+msgstr "_Grupper etter …"
 
 #: ../widgets/table/e-table-config.ui.h:23
-msgid "_Show these fields in order:"
-msgstr "_Vis disse feltene i rekkefølge:"
-
-#: ../widgets/table/e-table-config.ui.h:24
-msgid "_Sort..."
-msgstr "_Sorter …"
+msgid "_Fields Shown..."
+msgstr "_Viste felt …"
 
 #: ../widgets/table/e-table-field-chooser.c:153
 msgid ""
author	Kjartan Maraas <kmaraas@gnome.org>	2012-01-07 03:46:35 +0800
committer	Kjartan Maraas <kmaraas@gnome.org>	2012-01-07 03:46:35 +0800
commit	d690aaea2687f9cc32571accb65a60e6b390acd9 (patch)
tree	87d0c7a4e06366836df142156cf634c1a450c601
parent	02bcba4fad4a8a9254b1179f3442d056098cf9a3 (diff)
download	gsoc2013-evolution-d690aaea2687f9cc32571accb65a60e6b390acd9.tar.gz gsoc2013-evolution-d690aaea2687f9cc32571accb65a60e6b390acd9.tar.zst gsoc2013-evolution-d690aaea2687f9cc32571accb65a60e6b390acd9.zip