[evolution] Updated Norwegian bokmål translation



commit 74b08151c54d574776800757a2c132e7e04ea73a
Author: Kjartan Maraas <kmaraas gnome org>
Date:   Mon Jul 31 10:30:05 2017 +0200

    Updated Norwegian bokmål translation

 po/nb.po | 3253 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 2052 insertions(+), 1201 deletions(-)
---
diff --git a/po/nb.po b/po/nb.po
index 2240a94..5e8e89e 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution 3.26.x\n"
 "Report-Msgid-Bugs-To: 
https://bugzilla.gnome.org/enter_bug.cgi?product=evolution&keywords=I18N+L10N&component=general\n";
-"POT-Creation-Date: 2017-06-08 07:54+0000\n"
-"PO-Revision-Date: 2017-06-11 17:37+0200\n"
+"POT-Creation-Date: 2017-07-27 20:03+0000\n"
+"PO-Revision-Date: 2017-07-31 10:30+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas gnome org>\n"
 "Language-Team: Norwegian bokmål <i18n-nb lister ping uio no>\n"
 "Language: nb\n"
@@ -81,13 +81,13 @@ msgstr "Skriv en melding"
 
 #: ../data/evolution.desktop.in.in.h:8
 #: ../src/e-util/e-name-selector-dialog.c:448
-#: ../src/modules/addressbook/e-book-shell-backend.c:303
+#: ../src/modules/addressbook/e-book-shell-backend.c:307
 #: ../src/modules/addressbook/e-book-shell-view.c:371
 msgid "Contacts"
 msgstr "Kontakter"
 
 #: ../data/evolution.desktop.in.in.h:9
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:833
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:845
 #: ../src/e-util/e-send-options.c:544
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:197
 #: ../src/modules/calendar/e-cal-shell-view.c:582
@@ -99,13 +99,13 @@ msgstr "Kalender"
 #: ../src/mail/importers/elm-importer.c:330
 #: ../src/mail/importers/kmail-importer.c:251
 #: ../src/mail/importers/pine-importer.c:423
-#: ../src/modules/mail/e-mail-shell-view.c:1240
+#: ../src/modules/mail/e-mail-shell-view.c:1247
 #: ../src/smime/gui/certificate-manager.c:1682
 msgid "Mail"
 msgstr "E-post"
 
 #: ../data/evolution.desktop.in.in.h:11 ../src/calendar/gui/e-memo-table.c:368
-#: ../src/modules/calendar/e-cal-shell-content.c:1707
+#: ../src/modules/calendar/e-cal-shell-content.c:1719
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:194
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:209
 #: ../src/modules/calendar/e-memo-shell-view.c:313
@@ -117,7 +117,7 @@ msgstr "Notater"
 #: ../src/calendar/importers/icalendar-importer.c:77
 #: ../src/calendar/importers/icalendar-importer.c:1114
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:65
-#: ../src/modules/calendar/e-cal-shell-content.c:1667
+#: ../src/modules/calendar/e-cal-shell-content.c:1679
 #: ../src/modules/calendar/e-task-shell-view-actions.c:218
 #: ../src/modules/calendar/e-task-shell-view-actions.c:233
 #: ../src/modules/calendar/e-task-shell-view.c:471
@@ -171,6 +171,14 @@ msgstr "URI for sist brukt mappe i dialogen for å velge navn."
 msgid "Contact layout style"
 msgstr "Stil for utforming av kontakt"
 
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.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
 msgid "Contact preview pane position (horizontal)"
 msgstr "Plassering av horisontalt felt for forhåndsvisning av kontakter"
@@ -266,6 +274,16 @@ msgstr "Hvorvidt notater skal vises ved redigering"
 msgid "Whether to show Certificates tab in the editor"
 msgstr "Hvorvidt sertifikatfanen skal vises ved redigering"
 
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:33
+msgid "Where to open contact locations"
+msgstr "Hvor kontaktlokasjoner skal åpnes"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:34
+msgid ""
+"Currently supported values are “openstreetmap” and “google”; if unknown set, "
+"uses “openstreetmap”"
+msgstr ""
+
 #: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:1
 msgid "Convert mail messages to Unicode"
 msgstr "Konverter meldinger til Unicode"
@@ -282,6 +300,13 @@ msgstr ""
 msgid "Full path command to run Bogofilter"
 msgstr "Full sti til kommando for å kjøre Bogofilter"
 
+#: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:4
+msgid ""
+"Full path to a Bogofilter command. If not set, then a compile-time path is "
+"used, usually /usr/bin/bogofilter. The command should not contain any other "
+"arguments."
+msgstr ""
+
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:1
 msgid "Save directory for reminder audio"
 msgstr "Lagre katalog for påminnelseslyd"
@@ -514,6 +539,14 @@ msgstr "Enhet for forvalgt påminnelse. «minutes», «hours», eller «days»"
 msgid "Default reminder snooze interval, in minutes"
 msgstr "Forvalgt verdi for utsettelse av påminnelse i minutter"
 
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:51
+#, fuzzy
+#| msgid "Default reminder snooze interval, in minutes"
+msgid ""
+"Default reminder snooze interval, in minutes, to be filled in the reminder "
+"notification dialog"
+msgstr "Forvalgt verdi for utsettelse av påminnelse i minutter"
+
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:52
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "Vis kategorifelt ved redigering av hendelse/møte/oppgave"
@@ -612,6 +645,11 @@ msgstr "Tid for forrige påminnelse, som time_t"
 msgid "Allow past reminders"
 msgstr "Tillat tidligere påminnelser"
 
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:75
+msgid ""
+"Whether can show reminders for events/tasks/memos which already happened"
+msgstr ""
+
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:76
 msgid "Marcus Bains Line Color — Day View"
 msgstr "Farge på Marcus Bains-linje - Dagsvisning"
@@ -651,6 +689,13 @@ msgstr ""
 msgid "Memo layout style"
 msgstr "Stil for utforming av notat"
 
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:85
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the memo list. “0” (Classic View) places the preview pane below the memo "
+"list. “1” (Vertical View) places the preview pane next to the memo list"
+msgstr ""
+
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:86
 msgid "Memo preview pane position (vertical)"
 msgstr "Plassering av vertikalt felt for forhåndsvisning"
@@ -700,10 +745,22 @@ msgstr "Hvorvidt varslingsfeltet skal brukes for påminnelser på skjermen"
 msgid "Show reminder notification dialog always on top"
 msgstr "Alltid vis dialog for påminnelser øverst"
 
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
+msgid ""
+"Whether or not to show reminder notification dialog always on top. Note this "
+"works only as a hint for the window manager, which may or may not obey it."
+msgstr ""
+
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
 msgid "Preferred New button item"
 msgstr "Foretrukket knappeoppførning for Ny"
 
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
+#, fuzzy
+#| msgid "Preferred New button item"
+msgid "Name of the preferred New toolbar button item"
+msgstr "Foretrukket knappeoppførning for Ny"
+
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
 msgid "Primary calendar"
 msgstr "Primær kalender"
@@ -765,6 +822,13 @@ msgstr ""
 msgid "Search range for time-based searching in years"
 msgstr "Søkeområde for tidsbaserte søk i år"
 
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
+msgid ""
+"How many years can the time-based search go forward or backward from "
+"currently selected day when searching for another occurrence; default is ten "
+"years"
+msgstr ""
+
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
 msgid "Show appointment end times in week and month views"
 msgstr "Vis tid for avtalers slutt i ukes- og månedsvisning"
@@ -814,6 +878,11 @@ msgstr "Vertikal posisjon for merkefelt"
 msgid "Highlight tasks due today"
 msgstr "Uthev oppgaver som går ut i dag"
 
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
+msgid ""
+"Whether highlight tasks due today with a special color (task-due-today-color)"
+msgstr ""
+
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
 msgid "Tasks due today color"
 msgstr "Farge for oppgaver som går ut i dag"
@@ -834,6 +903,13 @@ msgstr "Posisjon for forhåndsvisning av oppgaver (horisontal)"
 msgid "Task layout style"
 msgstr "Stil for utforming av oppgaver"
 
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
+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:131
 msgid "Task preview pane position (vertical)"
 msgstr "Posisjon for forhåndsvisning av oppgaver (vertikal)"
@@ -847,10 +923,21 @@ msgstr ""
 msgid "Show reminders for completed tasks"
 msgstr "Vis påminnelser for fullførte oppgaver"
 
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
+msgid ""
+"Whether to show reminders for completed tasks. When set to false, reminders "
+"for completed tasks are suppressed."
+msgstr ""
+
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
 msgid "Highlight overdue tasks"
 msgstr "Uthev utgåtte oppgaver"
 
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:136
+msgid ""
+"Whether highlight overdue tasks with a special color (task-overdue-color)"
+msgstr ""
+
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:137
 msgid "Overdue tasks color"
 msgstr "Farge for utgåtte oppgaver"
@@ -949,14 +1036,46 @@ msgstr "Lørdag er en arbeidsdag"
 msgid "Sunday is a work day"
 msgstr "Søndag er en arbeidsdag"
 
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:159
+#, fuzzy
+#| msgid "Create events, memos and tasks as _Private by default"
+msgid "Create events, memos and tasks as Private by default"
+msgstr "Lag hendelser, notater og oppgaver som _private som forvalg"
+
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:160
 msgid "(Deprecated) First day of the week, from Sunday (0) to Saturday (6)"
 msgstr "(Utfaset) Ukedag uken starter på. Fra søndag (0) til lørdag (6)"
 
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:161
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"“week-start-day-name” instead."
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:162
+#, fuzzy
+#| msgid "(Deprecated) Default forward style"
+msgid "(Deprecated) Work days"
+msgstr "Forvalgt videresendingsstil (utgått)"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:163
+msgid ""
+"Days on which the start and end of work hours should be indicated. (This key "
+"was deprecated in version 3.10 and should no longer be used. Use the “work-"
+"day-monday”, “work-day-tuesday”, etc. keys instead.)"
+msgstr ""
+
 #: ../data/org.gnome.evolution.gschema.xml.in.h:1
 msgid "Previous Evolution version"
 msgstr "Forrige versjon av Evolution"
 
+#: ../data/org.gnome.evolution.gschema.xml.in.h:2
+msgid ""
+"The most recently used version of Evolution, expressed as “major.minor."
+"micro”. This is used for data and settings migration from older to newer "
+"versions."
+msgstr ""
+
 #: ../data/org.gnome.evolution.gschema.xml.in.h:3
 msgid "List of disabled plugins"
 msgstr "Liste med tillegg som er slått av"
@@ -1035,6 +1154,13 @@ msgstr ""
 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:8
+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 ""
+
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:9
 msgid "Spell check inline"
 msgstr "Stavekontroll i meldingen"
@@ -1074,22 +1200,55 @@ msgstr "Bruk Unicode-tegn for smilefjes."
 msgid "Attribute message"
 msgstr "Attributtmelding"
 
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:18
+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:19
 msgid "Forward message"
 msgstr "Videresend melding"
 
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:20
+msgid ""
+"The text that is inserted when forwarding a message, saying that the "
+"forwarded message follows"
+msgstr ""
+
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:21
 msgid "Original message"
 msgstr "Opprinnelig melding"
 
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:22
+msgid ""
+"The text that is inserted when replying to a message (top posting), saying "
+"that the original message follows"
+msgstr ""
+
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:23
 msgid "Group Reply replies to list"
 msgstr "Gruppesvar svarer til listen"
 
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:24
+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:25
 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:26
+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:27
 msgid "Always request read receipt"
 msgstr "Alltid be om lesekvittering"
@@ -1204,73 +1363,152 @@ msgstr ""
 msgid "Encode filenames in an Outlook/GMail way"
 msgstr "Bruk samme koding for filnavn som Outlook/GMail"
 
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:48
+msgid ""
+"Encode filenames in the mail headers same as Outlook or GMail do, to let "
+"them display correctly filenames with UTF-8 letters sent by Evolution, "
+"because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
+"standard."
+msgstr ""
+
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:49
 msgid "Send messages through Outbox folder"
 msgstr "Send meldinger gjennom Utboks-mappen"
 
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:50
+msgid ""
+"Always save messages to Outbox folder when sending, to let a user choose "
+"when the messages should be sent."
+msgstr ""
+
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:51
+msgid "Include signature in new messages only"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:52
+msgid ""
+"Include selected signature only for new messages, but have no signature "
+"added for Replies or Forwards."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
 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:53
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
+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 ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
 msgid "Do not add signature delimiter"
 msgstr "Ikke legg til skillelinje for signatur"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
+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:57
 msgid "Ignore list Reply-To:"
 msgstr "Ignorer Reply-To: for lister"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
+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:59
 msgid "List of localized “Re”"
 msgstr "Liste med oversettelser av «Re»"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
 msgid ""
 "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 "SV"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
 msgid "List of localized “Re” separators"
 msgstr "Liste med separatorer for oversettelser av «Re»"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
 msgid ""
 "A list of localized “Re” separators, used to skip in a subject text when "
 "replying to a message, as an addition to the standard “:” and the Unicode "
 "“︰” separators."
 msgstr "SV"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
 msgid "Number of characters for wrapping"
 msgstr "Antall tegn for linjebryting"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
 msgid "Will autowrap lines after given number of characters."
 msgstr "Bryter linjer automatisk etter et gitt antall tegn."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
+msgid ""
+"Number of To and CC recipients to ask “prompt-on-many-to-cc-recips” from"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
+msgid ""
+"When to ask, when the number of To and CC recipients reaches this value."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
 msgid "Whether to always show Sign and Encrypt buttons on the toolbar"
 msgstr "Hvorvidt Signer- og Krypter-knappene skal vises på verktøylinjen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
+msgid ""
+"If set to “true”, the Sign and Encrypt buttons for either PGP or S/MIME are "
+"always shown in the composer’s toolbar. Otherwise they are shown only when "
+"being used."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
 msgid "Wrap quoted text in replies"
 msgstr "Bryt sitert tekst i svar"
 
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
+msgid "If set to “true” quoted text in replies will be wrapped."
+msgstr ""
+
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
+msgid "Whether to obey Content-Disposition:inline message header hint"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
+msgid ""
+"Set to “false” to block automatic display of attachments with Content-"
+"Disposition: inline."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
 msgid "Save file format for drag-and-drop operation"
 msgstr "Filformat for lagring ved dra-og-slipp operasjon"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
 msgid "Can be either “mbox” or “pdf”."
 msgstr "Kan være enten «mbox» eller «pdf»."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
 msgid "Show image animations"
 msgstr "Vis bildeanimasjoner"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
@@ -1278,11 +1516,11 @@ 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:75
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
 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:76
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
@@ -1290,11 +1528,11 @@ 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:77
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
 msgid "Enable or disable magic space bar"
 msgstr "Aktiver eller deaktiver magisk mellomrom"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -1302,143 +1540,193 @@ msgstr ""
 "Aktiver dette for å bruke mellomrom-tasten til å gå forover i "
 "meldingsvisning, meldingsliste og mapper."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr ""
 "Slå på for å bruke like innstillinger for meldingslistevisning i alle mapper"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
 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:81
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
 msgid "Mark citations in the message “Preview”"
 msgstr "Merk sitat in «Forhåndsvisning» av melding"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
 msgid "Mark citations in the message “Preview”."
 msgstr "Merk sitat in «Forhåndsvisning» av melding."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
 msgid "Citation highlight color"
 msgstr "Farge for utheving av sitattekst"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
 msgid "Citation highlight color."
 msgstr "Farge for utheving av sitattekst."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
 msgid "Enable/disable caret mode"
 msgstr "Aktiver/deaktiver markørmodus"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 "Slå på skrivemerkemodus slik at insettingspunktet vises når du leser e-post."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
 msgid "Default charset in which to display messages"
 msgstr "Forvalgt tegnsett for visning av meldinger"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
 msgid "Default charset in which to display messages."
 msgstr "Forvalgt tegnsett for visning av meldinger."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
 msgid "Automatically load images for HTML messages over HTTP"
 msgstr "Last bilder automatisk for HTML-meldinger over HTTP"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
+#, fuzzy
+#| msgid "Notify about _missing remote content in the message preview"
+msgid "Show notification about missing remote content"
+msgstr "Varsle om _manglende eksternt innhold ved forhåndsvisning av melding"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
+msgid ""
+"When the message preview shows a message which requires to download remote "
+"content, while the download is not allowed for the user or the site, then "
+"show a notification about it on top of the preview panel."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
 msgid "Show Animations"
 msgstr "Vis animasjoner"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
 msgid "Show animated images as animations."
 msgstr "Vis animerte bilder som animasjoner."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
 msgid "Show all message headers"
 msgstr "Vis alle meldingshoder"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
 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:96
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
 msgid "List of headers to show when viewing a message."
 msgstr "Liste med meldingshoder som skal vises når en melding vises."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+msgid ""
+"Each header is represented as a pair: the header name, and a boolean "
+"indicating whether the header is enabled. Disabled headers are not shown "
+"when viewing a message, but are still listed in Preferences."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
 msgid "Show photo of the sender"
 msgstr "Vis bilde av avsender"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
 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:100
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
 msgid "Search gravatar.com for photo of the sender"
 msgstr "Søk etter bilde av avsender på gravatar.com"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
+#, fuzzy
+#| msgid "Search gravatar.com for photo of the sender"
+msgid "Allow searching also at gravatar.com for photo of the sender."
+msgstr "Søk etter bilde av avsender på gravatar.com"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
 msgid "Mark as Seen after specified timeout"
 msgstr "Merk som «lest» etter spesifisert tidsgrense"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
 msgid "Mark as Seen after specified timeout."
 msgstr "Merk som «sett» etter spesifisert tidsgrense."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
 msgid "Mark as Seen always after specified timeout"
 msgstr "Alltid merk som lest etter spesifisert tidsgrense"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
+msgid ""
+"If set to true, the selected message will be set as unread after the timeout "
+"also after the folder change."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
 msgid "Timeout for marking messages as seen"
 msgstr "Tidsgrense for å merke e-post som sett."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
 msgid "Timeout in milliseconds for marking messages as seen."
 msgstr "Tidsavbrudd i millisekunder for å merke e-poster som sett."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
 msgid "Show Attachment Bar"
 msgstr "Vis vedleggsfelt"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
+#, fuzzy
+#| msgid ""
+#| "Show Attachment Bar below the message preview pane when the message has "
+#| "attachments"
+msgid ""
+"Show Attachment Bar below the message preview pane when the message has "
+"attachments."
+msgstr ""
+"Vis vedleggsfelt under under område for forhåndsvisning av meldinger når "
+"meldingen har vedlegg"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
 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:111
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
 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:112
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
 msgid "Show deleted messages in the message-list"
 msgstr "Vis slettede meldinger i meldingslisten"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
 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:114
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
 msgid "Show junk messages in the message-list"
 msgstr "Vis uønskede meldinger i meldingslisten"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
 msgid "Show junk messages (with a red strike-through) in the message-list."
 msgstr "Vis uønskede meldinger i meldingslisten (med rød gjennomstreking)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
 msgid "Enable Unmatched search folder"
 msgstr "Aktiver søkemapper uten treff"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
+msgid ""
+"Enable Unmatched search folder within Search Folders. It does nothing if "
+"Search Folders are disabled."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
 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:119
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
 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."
@@ -1447,55 +1735,67 @@ msgstr ""
 "Dette fjerner markering fra e-posten i listen og fjerner forhåndsvisning for "
 "den mappen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
 msgid "Height of the message-list pane"
 msgstr "Høyde på e-postlistefeltet"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
 msgid "Height of the message-list pane."
 msgstr "Høyde på e-postlistefeltet."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
+msgid "Whether message headers are collapsed in the user interface"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
 msgid "Width of the message-list pane"
 msgstr "Bredde på e-postlistefeltet"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
 msgid "Width of the message-list pane."
 msgstr "Bredde på e-postlistefeltet."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
 msgid "Layout style"
 msgstr "Stil for utforming"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
+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:129
 msgid "Variable width font"
 msgstr "Skrift for variabel bredde"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
 msgid "The variable width font for mail display."
 msgstr "Skrift med variabel bredde for meldingsvisning."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
 msgid "Terminal font"
 msgstr "Terminalskrift"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
 msgid "The terminal font for mail display."
 msgstr "Terminalskrift for meldingsvisning."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
 msgid "Use custom fonts"
 msgstr "Bruk egendefinerte skrifter"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
 msgid "Use custom fonts for displaying mail."
 msgstr "Bruk tilpassede skrifttyper for e-postvisning."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
 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:134
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -1503,11 +1803,11 @@ msgstr ""
 "Komprimer visning av adresser i Til/Cc/Bcc til antall oppgitt i "
 "address_count."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
 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:136
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a “...” is shown."
@@ -1515,11 +1815,11 @@ msgstr ""
 "Setter antall adresser som skal vises i forvalgt listevisning for meldinger. "
 "Etter dette vises «…»."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
 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:138
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -1527,11 +1827,11 @@ 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:139
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
 msgid "Default value for thread expand state"
 msgstr "Forvalgt verdi for trådutvidelsestilstand"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -1540,11 +1840,11 @@ msgstr ""
 "sammenslått tilstand som forvalg. Evolution må startes på nytt hvis denne "
 "endres."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
 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:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
 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 "
@@ -1554,7 +1854,11 @@ msgstr ""
 "melding i hver tråd i stedet for meldingens dato. Evolution må startes på "
 "nytt."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
+msgid "Whether sort thread children always ascending"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
 msgid ""
 "This setting specifies whether the thread children should be sorted always "
 "ascending, rather than using the same sort order as in the thread root level."
@@ -1563,75 +1867,110 @@ msgstr ""
 "melding i hver tråd i stedet for meldingens dato. Evolution må startes på "
 "nytt."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
 msgid "Sort accounts alphabetically in a folder tree"
 msgstr "Sorter kontoer alfabetisk i et mappetre"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
+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:149
 msgid "Log filter actions"
 msgstr "Loggfør filterhandlinger"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
 msgid "Log filter actions to the specified log file."
 msgstr "Logg filterhandlinger til oppgitt loggfil."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
 msgid "Logfile to log filter actions"
 msgstr "Loggfil med filterhandlinger"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
-msgid "Logfile to log filter actions."
-msgstr "Loggfil med filterhandlinger."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
+msgid ""
+"If not set, or being “stdout”, then the logging is done to stdout, instead "
+"to a file."
+msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
 msgid "Flush Outbox after filtering"
 msgstr "Tøm utboks etter filtrering"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+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:155
 msgid "Default forward style"
 msgstr "Forvalgt videresendingsstil"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
 msgid "Default reply style"
 msgstr "Forvalgt svarstil"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
+#, fuzzy
+#| msgid "Sending a message using _key accelerator (Ctrl+Enter)"
+msgid "Prompt on send when using key accelerator (Ctrl+Enter)"
+msgstr "Sender en melding med _tastatursnarvei (Ctrl+linjeskift)"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
 msgid ""
 "Prompt the user when he or she tries to send a message with a key "
 "accelerator."
 msgstr "Spør bruker når en en e-post blir sendt med tastatursnarvei."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
 msgid "Prompt on empty subject"
 msgstr "Stopp og spør ved tomt emne"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
 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:159
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
 msgid "Prompt when emptying the trash"
 msgstr "Spør ved tømming av papirkurven"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
 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:161
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
 msgid "Prompt when user expunges"
 msgstr "Stopp og spør før tømming"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
 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:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
+#, fuzzy
+#| msgid "Prompt when user expunges"
+msgid "Prompt when user calls Empty Junk"
+msgstr "Stopp og spør før tømming"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
+#, fuzzy
+#| msgid "Prompt the user when he or she tries to expunge a folder."
+msgid "Prompt the user when he or she tries to Empty a Junk folder."
+msgstr "Stopp og spør før en mappe blir tømt."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
 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:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying to send "
 "a message to recipients not entered as mail addresses"
@@ -1639,20 +1978,20 @@ 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:165
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
 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:166
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
 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:167
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
 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:168
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -1660,11 +1999,11 @@ 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:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
 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:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -1672,19 +2011,19 @@ msgstr ""
 "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:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
 msgid "Prompt while marking multiple messages"
 msgstr "Spør ved merking av flere meldinger"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
 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:173
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
 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:174
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
 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 "
@@ -1694,19 +2033,35 @@ msgstr ""
 "en søkemappe sletter meldingene permanent, og ikke bare fjerner dem fra "
 "søkeresultatene."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
 msgid "Asks whether to copy a folder by drag &amp; drop in the folder tree"
 msgstr "Spør om kopiering av en mappe med dra-og-slipp i mappetreet"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
+msgid ""
+"Possible values are: “never” — do not allow copy with drag &amp; drop of "
+"folders in folder tree, “always” — allow copy with drag &amp; drop of "
+"folders in folder tree without asking, or “ask” — (or any other value) will "
+"ask user."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
 msgid "Asks whether to move a folder by drag &amp; drop in the folder tree"
 msgstr "Spør om flytting av mappe med dra-og-slipp i mappetreet"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
+msgid ""
+"Possible values are: “never” — do not allow move with drag &amp; drop of "
+"folders in folder tree, “always” — allow move with drag &amp; drop of "
+"folders in folder tree without asking, or “ask” — (or any other value) will "
+"ask user."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
 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:180
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
 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."
@@ -1714,28 +2069,41 @@ 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:181
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
 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:183
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
+#, fuzzy
+#| 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."
+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 ""
+"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:187
 msgid "Prompt when replying to many recipients"
 msgstr "Spør ved svar til mange mottakere"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 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:185
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
 msgid ""
 "Prompt when switching composer format and the content needs to lose its "
 "formatting"
 msgstr ""
 "Spør når redigeringsformat byttes og innholdet må miste sin formattering"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
 msgid ""
 "It disables/enables the repeated prompts to warn that you are switching "
 "composer format and the content needs to lose its formatting."
@@ -1743,45 +2111,57 @@ msgstr ""
 "Aktiverer/deaktiverer gjentatte spørsmål om at du bytter redigeringsformat "
 "og at innholdet må miste sin formattering."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
 msgid "Prompt when sending to many To and CC recipients"
 msgstr "Spør ved sending til mange Til og CC mottakere"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
+msgid ""
+"Enable or disable the prompt when sending to many To and CC recipients. The "
+"“composer-many-to-cc-recips-num” defines the threshold."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
+msgid ""
+"Policy for automatically closing the message browser window when forwarding "
+"or replying to the displayed message."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
 msgid "Empty Trash folders on exit"
 msgstr "Tøm papirkurven når programmet avsluttes"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
 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:192
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
 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:193
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
 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:194
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
 msgid "Last time Empty Trash was run"
 msgstr "Siste gang papirkurven ble tømt"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
+#: ../data/org.gnome.evolution.mail.gschema.xml.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)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
 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:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
 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:198
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
 msgid ""
 "This can have three possible values. “0” for errors. “1” for warnings. “2” "
 "for debug messages."
@@ -1789,15 +2169,22 @@ 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:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
 msgid "Show original “Date” header value."
 msgstr "Vis opprinnelig verdi for «Date»-meldingshode."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
+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 ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
 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:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
 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."
@@ -1806,50 +2193,50 @@ msgstr ""
 "inneholder strenger som inneholder «name:color» hvor «color» bruker HTML hex "
 "koding."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
 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:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
 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:205
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
 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:206
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
 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:207
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
 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"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr ""
 "Minste tidsperiode mellom tømming av mapper for uønsket e-post ved "
 "avslutting, i dager."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
 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:210
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
 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:211
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
 msgid "The default plugin for Junk hook"
 msgstr "Forvalgt tillegg for uønsket e-post"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
 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 "
@@ -1859,19 +2246,23 @@ msgstr ""
 "tillegg er aktivert. Hvis forvalgt tillegg deaktiveres vil ikke de andre "
 "brukes."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
 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:214
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
 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 kontakten finnes 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."
+msgstr ""
+"Bestemmer om avsender skal slås opp i adresseboken. Hvis kontakten finnes "
+"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:215
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
@@ -1879,13 +2270,20 @@ 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:217
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
+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:221
 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:218
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
 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 "
@@ -1895,11 +2293,11 @@ msgstr ""
 "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:219
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
 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:220
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format “headername=value”."
@@ -1907,39 +2305,52 @@ 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:221
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
 msgid "UID string of the default account."
 msgstr "UID-streng for forvalgt konto."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:226
 msgid "Save directory"
 msgstr "Lagre katalog"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
 msgid "Directory for saving mail component files."
 msgstr "Katalog for å lagre komponentfiler for e-post."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:228
 msgid "Composer load/attach directory"
 msgstr "Katalog for vedlegg i redigering"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
 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:226
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:230
 msgid "Check for new messages on start"
 msgstr "Se etter nye meldinger ved oppstart"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:228
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
+msgid ""
+"Whether to 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:232
 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:230
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:233
+msgid ""
+"Whether to 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:234
 msgid "Server synchronization interval"
 msgstr "Intervall for serversynkronisering"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:235
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -1947,31 +2358,155 @@ msgstr ""
 "Kontrollerer hvor ofte lokale endringer synkroniseres med ekstern e-"
 "posttjener. Intervallet må være minst 30 sekunder."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:232
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:236
 msgid "Allow expunge in virtual folders"
 msgstr "Tillat tømming av virtuelle mapper"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:234
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:237
+msgid ""
+"Enables Expunge in virtual folders, which means that the Folder→Expunge will "
+"be callable in virtual folders, while the expunge itself will be done in all "
+"folders for all deleted messages within the virtual folder, not only for "
+"deleted messages belonging to the virtual folder."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:238
 #: ../src/mail/mail-config.ui.h:9
 msgid "Inherit theme colors in HTML format"
 msgstr "Arv farger fra tema i HTML-modus"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:236
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:239
+msgid ""
+"When enabled the theme colors for background, text and links are sent in "
+"resulting HTML formatted message."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:240
 msgid "An Archive folder for On This Computer folders."
 msgstr "En arkivmappe for mapper under «På denne datamaskinen»."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:238
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:241
+#, fuzzy
+#| msgid "An Archive folder for On This Computer folders."
+msgid ""
+"An Archive folder to use for Messages|Archive... feature when in an On This "
+"Computer folder."
+msgstr "En arkivmappe for mapper under «På denne datamaskinen»."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:242
+#, fuzzy
+#| msgid "Whether to show icons of events in the month view"
+msgid "Whether the To Do bar is visible in the main window"
+msgstr "Hvorvidt ikoner for hendelser skal vises i månedsvisning"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:243
+msgid "Stores whether the To Do bar is visible in the main window."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:244
+#, fuzzy
+#| msgid "If “true”, show the memo preview pane in the main window"
+msgid "Width of the To Do bar in the main window"
+msgstr "Vis forhåndsvisningsområdet for notater i hovedvinduet hvis «true»"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:245
+#, fuzzy
+#| msgid "Apply the given geometry to the main window"
+msgid "Holds the width of the To Do bar for the main window."
+msgstr "Bruk oppgitt geometri på hovedvinduet"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:246
+#, fuzzy
+#| msgid "Whether the toolbar should be visible."
+msgid "Whether the To Do bar is visible in a sub-window"
+msgstr "Om verktøylinjen skal være synlig."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:247
+msgid "Stores whether the To Do bar is visible in a sub-window."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:248
+msgid "Width of the To Do bar in a sub-window"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:249
+msgid "Holds the width of the To Do bar for a sub-window."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:250
+#, fuzzy
+#| msgid "Whether the toolbar should be visible."
+msgid "Whether the To Do bar should show also completed tasks"
+msgstr "Om verktøylinjen skal være synlig."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:251
+msgid "Stores whether the To Do bar should show also completed tasks."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:252
+#, fuzzy
+#| msgid "Show the status bar"
+msgid "Show start up wizard"
+msgstr "Vis statuslinjen"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:253
+msgid "Whether show start up wizard when there is no mail account configured."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:254
 msgid "(Deprecated) Default forward style"
 msgstr "Forvalgt videresendingsstil (utgått)"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:242
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:255
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"“forward-style-name” instead."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:256
+#, fuzzy
+#| msgid "(Deprecated) Default forward style"
+msgid "(Deprecated) Default reply style"
+msgstr "Forvalgt videresendingsstil (utgått)"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:257
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"“reply-style-name” instead."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:258
 msgid "(Deprecated) List of custom headers and whether they are enabled."
 msgstr "(Utfaset) Liste over tillpassede topptekster og om de er slått på."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:244
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:259
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"“show-headers” instead."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:260
 msgid "(Deprecated) Load images for HTML messages over HTTP"
 msgstr "Last bilder for HTML-meldinger over HTTP (utgått)"
 
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:261
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"“image-loading-policy” instead."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:262
+msgid ""
+"(Deprecated) 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:263
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"“browser-close-on-reply-policy” instead."
+msgstr ""
+
 #. Translators: This is the a list of words for the attach reminder plugin to look
 #. for in a message body. Please use any number of words here in your language that might
 #. indicate that an attachment should have been attached to the message.
@@ -2092,6 +2627,12 @@ msgstr ""
 msgid "Insert Face picture by default"
 msgstr "Sett inn ansiktsbilde som forvalg"
 
+#: ../data/org.gnome.evolution.plugin.face-picture.gschema.xml.in.h:2
+msgid ""
+"Whether insert Face picture to outgoing messages by default. The picture "
+"should be set before checking this, otherwise nothing happens."
+msgstr ""
+
 #: ../data/org.gnome.evolution.plugin.itip.gschema.xml.in.h:1
 msgid "Delete processed"
 msgstr "Slett prosesserte"
@@ -2136,6 +2677,13 @@ msgstr "Om meldingen skal vises over ikonet når nye meldinger ankommer."
 msgid "Enable audible notifications when new messages arrive."
 msgstr "Slå på varsling med lyd når nye meldinger ankommer."
 
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:10
+msgid ""
+"Whether to make a sound of any kind when new messages arrive. If “false”, "
+"the “notify-sound-beep”, “notify-sound-file”, “notify-sound-play-file” and "
+"“notify-sound-use-theme” keys are disregarded."
+msgstr ""
+
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:11
 msgid "Whether to emit a beep."
 msgstr "Hvorvidt pip skal brukes."
@@ -2160,6 +2708,12 @@ msgstr ""
 msgid "Whether to play a sound file."
 msgstr "Hvorvidt en lydfil skal spilles av."
 
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:16
+msgid ""
+"Whether to play a sound file when new messages arrive. The name of the sound "
+"file is given by the “notify-sound-file” key."
+msgstr ""
+
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:17
 msgid "Use sound theme"
 msgstr "Bruk lydtema"
@@ -2174,10 +2728,30 @@ msgstr ""
 msgid "Mode to use when displaying mails"
 msgstr "Modus for e-postvisning"
 
+#: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:2
+msgid ""
+"The mode to use for displaying mails. “normal” makes Evolution choose the "
+"best part to show, “prefer_plain” makes it use the text part, if present, "
+"“prefer_source” makes it use the text part, if present, otherwise shows HTML "
+"source, and “only_plain” forces Evolution to only show plain text"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:3
+#, fuzzy
+#| msgid "Whether to show IM addresses in the editor"
+msgid "Whether to show suppressed HTML output"
+msgstr "Hvorvidt lynmeldingsadresser skal vises ved redigering"
+
 #: ../data/org.gnome.evolution.plugin.publish-calendar.gschema.xml.in.h:1
 msgid "List of Destinations for publishing"
 msgstr "Liste med destinasjoner for publisering"
 
+#: ../data/org.gnome.evolution.plugin.publish-calendar.gschema.xml.in.h:2
+msgid ""
+"The key specifies the list of destinations to where publish calendars. Each "
+"values specifies an XML with setup for publishing to one destination."
+msgstr ""
+
 #: ../data/org.gnome.evolution.plugin.templates.gschema.xml.in.h:1
 msgid ""
 "List of keyword/value pairs for the Templates plugin to substitute in a "
@@ -2219,10 +2793,20 @@ msgstr "Startmappe for GtkFileChooser dialoger."
 msgid "Compression format used by autoar"
 msgstr "Komprimeringsformat som brukes av autoar"
 
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:8
+msgid ""
+"Compression format used when compressing attached directories with autoar."
+msgstr ""
+
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:9
 msgid "Compression filter used by autoar"
 msgstr "Komprimeringsfilter som brukes av autoar"
 
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:10
+msgid ""
+"Compression filter used when compressing attached directories with autoar."
+msgstr ""
+
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:11
 #: ../src/shell/main.c:320
 msgid "Start in offline mode"
@@ -2256,6 +2840,12 @@ msgstr "Flagg som slår på et forenklet brukergrensesnitt."
 msgid "List of button names to hide in the window switcher"
 msgstr "Liste med navn på knapper som skal skjules i vindubytteren"
 
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:18
+msgid ""
+"Valid values are “mail”, “addressbook”, “calendar”, “tasks” and “memos”. "
+"Change of this requires restart of the application."
+msgstr ""
+
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:19
 msgid "Window buttons are visible"
 msgstr "Vindusknapper er synlige"
@@ -2342,10 +2932,35 @@ msgstr "Bruk bare lokale tester for uønsket e-post (ingen DNS)."
 msgid "Full path command to run spamassassin"
 msgstr "Full sti til kommando som kjører spamassassin"
 
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:4
+msgid ""
+"Full path to a spamassassin command. If not set, then a compile-time path is "
+"used, usually /usr/bin/spamassassin. The command should not contain any "
+"other arguments."
+msgstr ""
+
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:5
 msgid "Full path command to run sa-learn"
 msgstr "Full sti for å kjøre sa-learn"
 
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:6
+msgid ""
+"Full path to a sa-learn command. If not set, then a compile-time path is "
+"used, usually /usr/bin/sa-learn. The command should not contain any other "
+"arguments."
+msgstr ""
+
+#: ../data/org.gnome.evolution.text-highlight.gschema.xml.in.h:1
+msgid "Theme name to use, defaults to “bclear”"
+msgstr ""
+
+#: ../data/org.gnome.evolution.text-highlight.gschema.xml.in.h:2
+msgid ""
+"Use “highlight --list-scripts=themes” to get the list of installed themes "
+"and then the value to one of them. The change requires only re-format of the "
+"message part to take into effect, like using right-click→Format As→...."
+msgstr ""
+
 #: ../data/views/addressbook/galview.xml.h:1
 msgid "_Address Cards"
 msgstr "_Adressekort"
@@ -2481,8 +3096,8 @@ msgid "Could not remove address book."
 msgstr "Kunne ikke fjerne adressebok."
 
 #: ../src/addressbook/addressbook.error.xml.h:11
-msgid "Delete address book “{0}”?"
-msgstr "Slett adressebok «{0}»?"
+msgid "Are you sure you want to delete address book “{0}”?"
+msgstr "Er du sikker på at du vil slette adressebok «{0}»?"
 
 #: ../src/addressbook/addressbook.error.xml.h:12
 msgid "This address book will be removed permanently."
@@ -2594,13 +3209,14 @@ msgstr ""
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:9
 #: ../src/addressbook/gui/widgets/eab-contact-merging.c:721
 #: ../src/calendar/gui/e-comp-editor-page-general.c:1355
+#: ../src/e-util/e-accounts-window.c:1540
 #: ../src/e-util/e-mail-signature-manager.c:328
 #: ../src/e-util/e-name-selector-dialog.c:1033 ../src/e-util/filter.ui.h:23
 #: ../src/mail/e-mail-account-manager.c:719
 #: ../src/mail/e-mail-label-manager.c:371
 #: ../src/mail/em-folder-properties.c:1031
 #: ../src/mail/em-vfolder-editor-rule.c:397
-#: ../src/mail/em-vfolder-editor-rule.c:626 ../src/mail/mail-config.ui.h:60
+#: ../src/mail/em-vfolder-editor-rule.c:626 ../src/mail/mail-config.ui.h:61
 #: ../src/modules/mail/em-composer-prefs.c:422
 #: ../src/plugins/attachment-reminder/attachment-reminder.c:543
 #: ../src/plugins/email-custom-header/email-custom-header.c:837
@@ -2743,7 +3359,7 @@ msgstr "Kontaktredigering"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:13
 #: ../src/calendar/gui/e-comp-editor-page-reminders.c:1996
-#: ../src/mail/mail-config.ui.h:37
+#: ../src/mail/mail-config.ui.h:38
 msgid "Options"
 msgstr "Alternativer"
 
@@ -2778,17 +3394,18 @@ msgstr "Alternativer"
 #: ../src/e-util/e-passwords.c:468 ../src/e-util/e-rule-context.c:813
 #: ../src/e-util/e-rule-editor.c:178 ../src/e-util/e-rule-editor.c:280
 #: ../src/e-util/e-rule-editor.c:789 ../src/e-util/e-send-options.ui.h:16
-#: ../src/e-util/e-source-config-dialog.c:377
+#: ../src/e-util/e-source-config-dialog.c:360
 #: ../src/e-util/e-source-selector-dialog.c:370
 #: ../src/e-util/e-table-config.c:548 ../src/e-util/e-table-config.ui.h:3
 #: ../src/e-util/e-timezone-dialog.ui.h:2
-#: ../src/e-util/evolution-source-viewer.c:835 ../src/e-util/e-web-view.c:4061
+#: ../src/e-util/evolution-source-viewer.c:835 ../src/e-util/e-web-view.c:4096
 #: ../src/e-util/gal-view-instance-save-as-dialog.c:267
-#: ../src/mail/e-mail-config-window.c:331 ../src/mail/e-mail-label-dialog.c:194
+#: ../src/mail/e-mail-config-window.c:334 ../src/mail/e-mail-label-dialog.c:194
 #: ../src/mail/e-mail-tag-editor.c:168 ../src/mail/em-folder-selector.c:318
 #: ../src/mail/mail-config.ui.h:2 ../src/mail/mail.error.xml.h:16
 #: ../src/mail/mail-send-recv.c:747 ../src/mail/mail-send-recv.c:829
 #: ../src/mail/mail-vfolder-ui.c:149 ../src/mail/mail-vfolder-ui.c:271
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:277
 #: ../src/modules/backup-restore/evolution-backup-tool.c:932
 #: ../src/modules/calendar/e-cal-attachment-handler.c:283
 #: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:3
@@ -2796,7 +3413,7 @@ msgstr "Alternativer"
 #: ../src/plugins/publish-calendar/publish-calendar.c:788
 #: ../src/plugins/publish-calendar/url-editor-dialog.c:419
 #: ../src/plugins/save-calendar/save-calendar.c:185
-#: ../src/shell/e-shell-content.c:657 ../src/shell/e-shell-content.c:764
+#: ../src/shell/e-shell-content.c:639 ../src/shell/e-shell-content.c:746
 #: ../src/shell/e-shell-utils.c:70 ../src/shell/e-shell-utils.c:139
 #: ../src/smime/gui/certificate-manager.c:665
 #: ../src/smime/gui/certificate-manager.c:742
@@ -2811,26 +3428,26 @@ msgstr "A_vbryt"
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
 #: ../src/addressbook/gui/widgets/eab-contact-merging.c:719
 #: ../src/calendar/calendar.error.xml.h:47
-#: ../src/calendar/gui/e-comp-editor.c:2116
+#: ../src/calendar/gui/e-comp-editor.c:2115
 #: ../src/composer/e-composer-actions.c:228
 #: ../src/composer/e-composer-actions.c:348
 #: ../src/e-util/e-attachment-store.c:833
 #: ../src/e-util/e-mail-signature-script-dialog.c:370
-#: ../src/e-util/e-web-view.c:4062
+#: ../src/e-util/e-web-view.c:4097
 #: ../src/e-util/gal-view-instance-save-as-dialog.c:268
-#: ../src/shell/e-shell-content.c:658 ../src/shell/e-shell-utils.c:140
+#: ../src/shell/e-shell-content.c:640 ../src/shell/e-shell-utils.c:140
 #: ../src/smime/gui/certificate-manager.c:666
 #: ../src/smime/gui/certificate-manager.c:743
 msgid "_Save"
 msgstr "_Lagre"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:16
-#: ../src/calendar/gui/e-comp-editor.c:2013
-#: ../src/calendar/gui/e-comp-editor.c:2085
-#: ../src/e-util/e-preferences-window.c:380
+#: ../src/calendar/gui/e-comp-editor.c:2012
+#: ../src/calendar/gui/e-comp-editor.c:2084
+#: ../src/e-util/e-preferences-window.c:390
 #: ../src/e-util/e-send-options.ui.h:15
 #: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:2
-#: ../src/shell/e-shell.c:1309 ../src/shell/e-shell-window-actions.c:964
+#: ../src/shell/e-shell.c:1309 ../src/shell/e-shell-window-actions.c:994
 msgid "_Help"
 msgstr "_Hjelp"
 
@@ -2860,8 +3477,8 @@ msgid "Full _Name..."
 msgstr "Fullt _navn …"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:23
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:750
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1169
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:762
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1181
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Email"
 msgstr "E-post"
@@ -2981,20 +3598,21 @@ msgid "_Anniversary:"
 msgstr "_Bryllupsdag:"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:52
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:881
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:893
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:47
 #: ../src/calendar/gui/e-calendar-view.c:2045
 msgid "Anniversary"
 msgstr "Bryllupsdag"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:53
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:880
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:892
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:46
 #: ../src/calendar/gui/e-calendar-view.c:2044
 msgid "Birthday"
 msgstr "Fødselsdag"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:54
+#: ../src/modules/addressbook/autocompletion-config.c:127
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:46
 msgid "Miscellaneous"
 msgstr "Forskjellig"
@@ -3036,16 +3654,16 @@ msgstr "Hjemme"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:63
 #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:82
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:848
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:860
 #: ../src/addressbook/gui/widgets/e-contact-map.c:380
 msgid "Work"
 msgstr "Arbeid"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:64
 #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:84
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:513
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:915
-#: ../src/calendar/gui/e-cal-model.c:3823
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:525
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:927
+#: ../src/calendar/gui/e-cal-model.c:3825
 msgid "Other"
 msgstr "Andre"
 
@@ -3074,9 +3692,10 @@ msgstr "Legg til _X.509"
 #: ../src/e-util/e-mail-signature-manager.c:368
 #: ../src/e-util/e-name-selector-dialog.c:1037
 #: ../src/e-util/filter.error.xml.h:18 ../src/e-util/filter.ui.h:25
+#: ../src/mail/e-mail-config-identity-page.c:870
 #: ../src/mail/e-mail-label-manager.c:389 ../src/mail/em-filter-rule.c:438
 #: ../src/mail/em-folder-properties.c:1037
-#: ../src/mail/em-vfolder-editor-rule.c:631 ../src/mail/mail-config.ui.h:61
+#: ../src/mail/em-vfolder-editor-rule.c:631 ../src/mail/mail-config.ui.h:62
 #: ../src/plugins/attachment-reminder/attachment-reminder.c:553
 #: ../src/plugins/email-custom-header/email-custom-header.c:847
 #: ../src/plugins/publish-calendar/publish-calendar.c:789
@@ -3094,29 +3713,29 @@ msgid "_Load X.509"
 msgstr "_Last X.509"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:72
-#: ../src/modules/addressbook/e-book-shell-backend.c:314
+#: ../src/modules/addressbook/e-book-shell-backend.c:318
 msgid "Certificates"
 msgstr "Sertifikater"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:260
-#: ../src/calendar/gui/e-comp-editor.c:2048
+#: ../src/calendar/gui/e-comp-editor.c:2047
 #: ../src/e-util/e-html-editor-actions.c:913
 msgid "_Undo"
 msgstr "A_ngre"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:262
-#: ../src/calendar/gui/e-comp-editor.c:2050 ../src/e-util/e-focus-tracker.c:120
+#: ../src/calendar/gui/e-comp-editor.c:2049 ../src/e-util/e-focus-tracker.c:120
 msgid "Undo"
 msgstr "Angre"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:267
-#: ../src/calendar/gui/e-comp-editor.c:2055
+#: ../src/calendar/gui/e-comp-editor.c:2054
 #: ../src/e-util/e-html-editor-actions.c:899
 msgid "_Redo"
 msgstr "G_jenta"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:269
-#: ../src/calendar/gui/e-comp-editor.c:2057 ../src/e-util/e-focus-tracker.c:136
+#: ../src/calendar/gui/e-comp-editor.c:2056 ../src/e-util/e-focus-tracker.c:136
 msgid "Redo"
 msgstr "Gjenta"
 
@@ -3259,17 +3878,18 @@ msgstr "Ugyldig kontakt."
 #: ../src/e-util/e-passwords.c:469 ../src/e-util/e-rule-context.c:814
 #: ../src/e-util/e-rule-editor.c:179 ../src/e-util/e-rule-editor.c:281
 #: ../src/e-util/e-rule-editor.c:790 ../src/e-util/e-send-options.ui.h:17
-#: ../src/e-util/e-source-config-dialog.c:378
+#: ../src/e-util/e-source-config-dialog.c:361
 #: ../src/e-util/e-source-selector-dialog.c:371
 #: ../src/e-util/e-table-config.c:549 ../src/e-util/e-table-config.ui.h:4
 #: ../src/e-util/e-timezone-dialog.ui.h:3
-#: ../src/mail/e-mail-config-window.c:332 ../src/mail/e-mail-tag-editor.c:169
+#: ../src/mail/e-mail-config-window.c:335 ../src/mail/e-mail-tag-editor.c:169
 #: ../src/mail/em-folder-selector.c:44 ../src/mail/mail-config.ui.h:3
 #: ../src/mail/mail-dialogs.ui.h:24 ../src/mail/mail-vfolder-ui.c:150
 #: ../src/mail/mail-vfolder-ui.c:272
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:278
 #: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:4
 #: ../src/plugins/publish-calendar/url-editor-dialog.c:420
-#: ../src/shell/e-shell-content.c:659 ../src/shell/e-shell-content.c:765
+#: ../src/shell/e-shell-content.c:641 ../src/shell/e-shell-content.c:747
 #: ../src/shell/main.c:180 ../src/smime/gui/certificate-manager.c:1349
 #: ../src/smime/gui/e-cert-selector.c:236 ../src/smime/gui/smime-ui.ui.h:18
 msgid "_OK"
@@ -3443,12 +4063,12 @@ msgid "Error removing list"
 msgstr "Feil under fjerning av liste"
 
 #: ../src/addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1222
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1225
 msgid "Name contains"
 msgstr "Navn inneholder"
 
 #: ../src/addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1215
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1218
 msgid "Email begins with"
 msgstr "E-post begynner med"
 
@@ -3456,7 +4076,7 @@ msgstr "E-post begynner med"
 #: ../src/calendar/gui/caltypes.xml.in.h:26
 #: ../src/calendar/gui/memotypes.xml.in.h:19
 #: ../src/calendar/gui/tasktypes.xml.in.h:30
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1208
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1211
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1713
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:782
 #: ../src/modules/calendar/e-task-shell-view-actions.c:983
@@ -3469,180 +4089,185 @@ msgstr "Et felt inneholder"
 msgid "evolution address book"
 msgstr "evolution adressebok"
 
-#: ../src/addressbook/gui/widgets/eab-contact-display.c:149
+#: ../src/addressbook/gui/widgets/eab-contact-display.c:185
 msgid "Copy _Email Address"
 msgstr "Kopier _e-postadresse"
 
-#: ../src/addressbook/gui/widgets/eab-contact-display.c:151
+#: ../src/addressbook/gui/widgets/eab-contact-display.c:187
 #: ../src/e-util/e-web-view.c:368
 msgid "Copy the email address to the clipboard"
 msgstr "Kopier e-postadresser til utklippstavlen"
 
-#: ../src/addressbook/gui/widgets/eab-contact-display.c:156
+#: ../src/addressbook/gui/widgets/eab-contact-display.c:192
 #: ../src/e-util/e-web-view.c:380
 msgid "_Send New Message To..."
 msgstr "_Send ny melding til …"
 
-#: ../src/addressbook/gui/widgets/eab-contact-display.c:158
+#: ../src/addressbook/gui/widgets/eab-contact-display.c:194
 #: ../src/e-util/e-web-view.c:382
 msgid "Send a mail message to this address"
 msgstr "Send en e-postmelding til denne adressen"
 
-#: ../src/addressbook/gui/widgets/eab-contact-display.c:290
-#: ../src/e-util/e-web-view.c:1317
+#: ../src/addressbook/gui/widgets/eab-contact-display.c:321
+#: ../src/e-util/e-web-view.c:1349
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klikk for å sende melding til %s"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:142
+#: ../src/addressbook/gui/widgets/eab-contact-display.c:335
+#, c-format
+msgid "Click to open map for %s"
+msgstr "Klikk for å åpne kart for %s"
+
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:154
 msgid "Open map"
 msgstr "Åpne kart"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:438
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:450
 msgid "SIP"
 msgstr "SIP"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:682
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:694
 msgid "List Members:"
 msgstr "Listemedlemmer:"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:754
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:766
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Nickname"
 msgstr "Kallenavn"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:755
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:767
 msgid "AIM"
 msgstr "AIM"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:756
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:768
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:757
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:769
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:758
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:770
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:759
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:771
 msgid "MSN"
 msgstr "MSN"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:760
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:772
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:761
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:773
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:762
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:774
 msgid "Skype"
 msgstr "Skype"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:763
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:775
 msgid "Twitter"
 msgstr "Twitter"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:825
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:837
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Company"
 msgstr "Firma"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:826
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:838
 msgid "Department"
 msgstr "Avdeling"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:827
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:839
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Office"
 msgstr "Kontor"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:828
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:840
 msgid "Profession"
 msgstr "Yrke"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:829
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:841
 msgid "Position"
 msgstr "Stilling"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:830
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:842
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Manager"
 msgstr "Leder"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:831
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:843
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Assistant"
 msgstr "Assistent"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:832
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:844
 msgid "Video Chat"
 msgstr "Videosamtale"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:834
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:846
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:2
 msgid "Free/Busy"
 msgstr "Ledig/opptatt"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:835
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:876
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:847
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:888
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:836
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:848
 msgid "Fax"
 msgstr "Faks"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:838
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:879
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:905
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:850
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:891
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:917
 msgid "Address"
 msgstr "Adresse"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:874
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:886
 msgid "Home Page"
 msgstr "Hjemmeside"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:875
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:887
 msgid "Web Log"
 msgstr "Nettdagbok"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:877
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:889
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:20
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:882
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:894
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:44
 msgid "Spouse"
 msgstr "Ektefelle"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:892
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:904
 msgid "Personal"
 msgstr "Personlig"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:937
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:949
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:45
 msgid "Note"
 msgstr "Kommentar"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1133
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1145
 msgid "List Members"
 msgstr "Listemedlemmer"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1154
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1166
 msgid "Job Title"
 msgstr "Jobbtittel"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1195
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1207
 msgid "Home page"
 msgstr "Hjemmeside"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1205
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1217
 msgid "Blog"
 msgstr "Weblogg"
 
@@ -3850,7 +4475,7 @@ msgid "Paste contacts from the clipboard"
 msgstr "Lim inn kontakter fra utklippstavlen"
 
 #: ../src/addressbook/gui/widgets/e-addressbook-view.c:698
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1018
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1021
 msgid "Delete selected contacts"
 msgstr "Slett valgte kontakter"
 
@@ -3885,15 +4510,16 @@ msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "Er du sikker på at du vil slette denne kontakten (%s)?"
 
 #: ../src/addressbook/gui/widgets/e-addressbook-view.c:1361
-#: ../src/calendar/gui/e-comp-editor.c:2006 ../src/e-util/e-focus-tracker.c:783
+#: ../src/calendar/gui/e-comp-editor.c:2005
+#: ../src/e-util/e-accounts-window.c:1727 ../src/e-util/e-focus-tracker.c:783
 #: ../src/e-util/evolution-source-viewer.c:806
 #: ../src/mail/e-mail-account-manager.c:737
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1090
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1093
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1524
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:676
 #: ../src/modules/calendar/e-task-shell-view-actions.c:830
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1626
-#: ../src/shell/e-shell-window-actions.c:822
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1680
+#: ../src/shell/e-shell-window-actions.c:852
 #: ../src/smime/gui/certificate-manager.c:1672 ../src/smime/gui/smime-ui.ui.h:8
 msgid "_Delete"
 msgstr "_Slett"
@@ -4100,7 +4726,7 @@ msgstr "Zoom _ut"
 #: ../src/addressbook/gui/widgets/e-contact-map-window.c:447
 #: ../src/e-util/e-html-editor-actions.c:1872
 #: ../src/e-util/e-html-editor-find-dialog.c:250
-#: ../src/shell/e-shell-window-actions.c:899
+#: ../src/shell/e-shell-window-actions.c:929
 msgid "_Find"
 msgstr "_Finn"
 
@@ -4383,17 +5009,18 @@ msgstr "_Utsett"
 #: ../src/calendar/alarm-notify/alarm-notify.ui.h:4
 #: ../src/calendar/gui/e-comp-editor-page-general.c:1363
 #: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2239
-#: ../src/calendar/gui/e-comp-editor.c:2071
+#: ../src/calendar/gui/e-comp-editor.c:2070
+#: ../src/e-util/e-accounts-window.c:1719
 #: ../src/e-util/e-html-editor-actions.c:922
 #: ../src/e-util/e-mail-signature-manager.c:358 ../src/e-util/filter.ui.h:24
 #: ../src/mail/e-mail-account-manager.c:728 ../src/mail/e-mail-browser.c:171
 #: ../src/mail/e-mail-label-manager.c:380
-#: ../src/mail/em-folder-properties.c:1034 ../src/mail/mail-config.ui.h:65
+#: ../src/mail/em-folder-properties.c:1034 ../src/mail/mail-config.ui.h:66
 #: ../src/plugins/attachment-reminder/attachment-reminder.c:548
 #: ../src/plugins/email-custom-header/email-custom-header.c:842
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:33
 #: ../src/plugins/templates/templates.c:468
-#: ../src/shell/e-shell-window-actions.c:950 ../src/smime/gui/smime-ui.ui.h:11
+#: ../src/shell/e-shell-window-actions.c:980 ../src/smime/gui/smime-ui.ui.h:11
 msgid "_Edit"
 msgstr "R_ediger"
 
@@ -4439,7 +5066,7 @@ msgstr "timer"
 
 #: ../src/calendar/alarm-notify/alarm-notify.ui.h:12
 #: ../src/e-util/e-interval-chooser.c:140 ../src/e-util/filter.ui.h:6
-#: ../src/mail/e-mail-config-provider-page.c:571
+#: ../src/mail/e-mail-config-provider-page.c:579
 msgid "minutes"
 msgstr "minutter"
 
@@ -4476,12 +5103,10 @@ msgstr "Advarsel"
 
 #: ../src/calendar/alarm-notify/alarm-queue.c:2097
 #: ../src/mail/mail-dialogs.ui.h:20
-#: ../src/modules/mailto-handler/evolution-mailto-handler.c:112
 msgid "_No"
 msgstr "_Nei"
 
 #: ../src/calendar/alarm-notify/alarm-queue.c:2098
-#: ../src/modules/mailto-handler/evolution-mailto-handler.c:113
 msgid "_Yes"
 msgstr "_Ja"
 
@@ -4827,32 +5452,32 @@ msgid "Editor could not be loaded."
 msgstr "Redigeringskomponenten kunne ikke lastes."
 
 #: ../src/calendar/calendar.error.xml.h:57
-msgid "Delete calendar “{0}”?"
-msgstr "Slett kalender «{0}»?"
+msgid "Are you sure you want to delete calendar “{0}”?"
+msgstr "Er du sikker på at du vil slette kalender «{0}»?"
 
 #: ../src/calendar/calendar.error.xml.h:58
 msgid "This calendar will be removed permanently."
 msgstr "Denne kalenderen vil bli fjernet permanent."
 
 #: ../src/calendar/calendar.error.xml.h:59
-msgid "Delete task list “{0}”?"
-msgstr "Slett oppgaveliste «{0}»?"
+msgid "Are you sure you want to delete task list “{0}”?"
+msgstr "Er du sikker på at du vil slette oppgaveliste «{0}»?"
 
 #: ../src/calendar/calendar.error.xml.h:60
 msgid "This task list will be removed permanently."
 msgstr "Denne oppgavelisten vil bli fjernet permanent."
 
 #: ../src/calendar/calendar.error.xml.h:61
-msgid "Delete memo list “{0}”?"
-msgstr "Slett notatliste «{0}»?"
+msgid "Are you sure you want to delete memo list “{0}”?"
+msgstr "Er du sikker på at du vil slette notatliste «{0}»?"
 
 #: ../src/calendar/calendar.error.xml.h:62
 msgid "This memo list will be removed permanently."
 msgstr "Denne notatlisten vil bli fjernet permanent."
 
 #: ../src/calendar/calendar.error.xml.h:63
-msgid "Delete remote calendar “{0}”?"
-msgstr "Slett ekstern kalender «{0}»?"
+msgid "Are you sure you want to delete remote calendar “{0}”?"
+msgstr "Er du sikker på at du vil slette ekstern kalender «{0}»?"
 
 #: ../src/calendar/calendar.error.xml.h:64
 msgid ""
@@ -4863,8 +5488,8 @@ msgstr ""
 "vil fortsette?"
 
 #: ../src/calendar/calendar.error.xml.h:66
-msgid "Delete remote task list “{0}”?"
-msgstr "Slett ekstern oppgaveliste «{0}»?"
+msgid "Are you sure you want to delete remote task list “{0}”?"
+msgstr "Er du sikker på at du vil slette ekstern oppgaveliste «{0}»?"
 
 #: ../src/calendar/calendar.error.xml.h:67
 msgid ""
@@ -4875,8 +5500,8 @@ msgstr ""
 "at du vil fortsette?"
 
 #: ../src/calendar/calendar.error.xml.h:68
-msgid "Delete remote memo list “{0}”?"
-msgstr "Slett ekstern notatliste «{0}»?"
+msgid "Are you sure you want to delete remote memo list “{0}”?"
+msgstr "Er du sikker på at du vil slette ekstern notatliste «{0}»?"
 
 #: ../src/calendar/calendar.error.xml.h:69
 msgid ""
@@ -5611,7 +6236,7 @@ msgid "calendar view for one or more weeks"
 msgstr "kalendervisning for en eller flere uker"
 
 #: ../src/calendar/gui/e-cal-component-preview.c:214
-#: ../src/e-util/e-filter-rule.c:770 ../src/mail/e-mail-config-page.c:127
+#: ../src/e-util/e-filter-rule.c:770 ../src/mail/e-mail-config-page.c:124
 msgid "Untitled"
 msgstr "Uten navn"
 
@@ -5686,7 +6311,7 @@ msgid "High"
 msgstr "Høy"
 
 #: ../src/calendar/gui/e-cal-component-preview.c:329
-#: ../src/calendar/gui/e-cal-model.c:1888
+#: ../src/calendar/gui/e-cal-model.c:1890
 #: ../src/calendar/gui/e-task-table.c:549
 #: ../src/calendar/gui/tasktypes.xml.in.h:20
 #: ../src/e-util/e-send-options.ui.h:5 ../src/mail/message-list.c:321
@@ -5701,7 +6326,7 @@ msgid "Low"
 msgstr "Lav"
 
 #: ../src/calendar/gui/e-cal-component-preview.c:350
-#: ../src/mail/e-mail-config-service-page.c:671
+#: ../src/mail/e-mail-config-service-page.c:536
 msgid "Description:"
 msgstr "Beskrivelse:"
 
@@ -5724,7 +6349,7 @@ msgstr "Lager visning for oppgaveliste «%s»"
 msgid "Creating view for memo list “%s”"
 msgstr "Lager visning for notatliste «%s»"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:219 ../src/calendar/gui/e-cal-ops.c:1955
+#: ../src/calendar/gui/e-cal-dialogs.c:219 ../src/calendar/gui/e-cal-ops.c:1966
 msgid "Destination is read only"
 msgstr "Destinasjonen er skrivebeskyttet"
 
@@ -5875,17 +6500,17 @@ msgid "Pasted text doesn’t contain valid iCalendar data"
 msgstr "Innlimt tekst inneholder ikke gyldige iCalendar-data"
 
 #: ../src/calendar/gui/e-calendar-view.c:864
-#: ../src/calendar/gui/e-cal-ops.c:1552
+#: ../src/calendar/gui/e-cal-ops.c:1556
 msgid "Default calendar not found"
 msgstr "Forvalgt kalender ble ikke funnet"
 
 #: ../src/calendar/gui/e-calendar-view.c:869
-#: ../src/calendar/gui/e-cal-ops.c:1555
+#: ../src/calendar/gui/e-cal-ops.c:1559
 msgid "Default memo list not found"
 msgstr "Forvalgt notatliste ble ikke funnet"
 
 #: ../src/calendar/gui/e-calendar-view.c:874
-#: ../src/calendar/gui/e-cal-ops.c:1558
+#: ../src/calendar/gui/e-cal-ops.c:1562
 msgid "Default task list not found"
 msgstr "Forvalgt oppgaveliste ble ikke funnet"
 
@@ -5920,15 +6545,18 @@ msgid "Organizer: %s"
 msgstr "Organisator: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
+#. Translators: It will display "Location: LocationOfTheAppointment"
 #: ../src/calendar/gui/e-calendar-view.c:1851
 #: ../src/calendar/gui/e-meeting-time-sel.c:2731
-#: ../src/calendar/gui/print.c:3531
+#: ../src/calendar/gui/e-to-do-pane.c:343 ../src/calendar/gui/print.c:3531
 #, c-format
 msgid "Location: %s"
 msgstr "Sted: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
+#. Translators: It will display "Time: StartDateAndTime (Duration)"
 #: ../src/calendar/gui/e-calendar-view.c:1891
+#: ../src/calendar/gui/e-to-do-pane.c:411
 #, c-format
 msgid "Time: %s %s"
 msgstr "Tidspunkt: %s %s"
@@ -6017,37 +6645,37 @@ msgstr "Kilde"
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: ../src/calendar/gui/e-cal-model.c:1402 ../src/calendar/gui/e-cal-ops.c:613
-#: ../src/calendar/gui/e-cal-ops.c:1249
+#: ../src/calendar/gui/e-cal-model.c:1402 ../src/calendar/gui/e-cal-ops.c:614
+#: ../src/calendar/gui/e-cal-ops.c:1250
 #: ../src/modules/calendar/e-cal-base-shell-backend.c:289
 #, c-format
 msgid "Source with UID “%s” not found"
 msgstr "Kilde med UID «%s» ble ikke funnet"
 
-#: ../src/calendar/gui/e-cal-model.c:1505 ../src/calendar/gui/e-cal-ops.c:185
-#: ../src/calendar/gui/e-cal-ops.c:1366
+#: ../src/calendar/gui/e-cal-model.c:1507 ../src/calendar/gui/e-cal-ops.c:186
+#: ../src/calendar/gui/e-cal-ops.c:1367
 msgid "Creating an event"
 msgstr "Lager en hendelse"
 
-#: ../src/calendar/gui/e-cal-model.c:1509 ../src/calendar/gui/e-cal-ops.c:189
-#: ../src/calendar/gui/e-cal-ops.c:1370
+#: ../src/calendar/gui/e-cal-model.c:1511 ../src/calendar/gui/e-cal-ops.c:190
+#: ../src/calendar/gui/e-cal-ops.c:1371
 msgid "Creating a memo"
 msgstr "Lager et notat"
 
-#: ../src/calendar/gui/e-cal-model.c:1513 ../src/calendar/gui/e-cal-ops.c:193
-#: ../src/calendar/gui/e-cal-ops.c:1374
+#: ../src/calendar/gui/e-cal-model.c:1515 ../src/calendar/gui/e-cal-ops.c:194
+#: ../src/calendar/gui/e-cal-ops.c:1375
 msgid "Creating a task"
 msgstr "Lager en oppgave"
 
-#: ../src/calendar/gui/e-cal-model.c:1890
+#: ../src/calendar/gui/e-cal-model.c:1892
 msgid "Recurring"
 msgstr "Gjeninntreffer"
 
-#: ../src/calendar/gui/e-cal-model.c:1892
+#: ../src/calendar/gui/e-cal-model.c:1894
 msgid "Assigned"
 msgstr "Tildelt"
 
-#: ../src/calendar/gui/e-cal-model.c:1894
+#: ../src/calendar/gui/e-cal-model.c:1896
 #: ../src/calendar/gui/e-cal-model-tasks.c:1136
 #: ../src/calendar/gui/e-meeting-list-view.c:207
 #: ../src/calendar/gui/e-meeting-store.c:174
@@ -6056,14 +6684,14 @@ msgstr "Tildelt"
 msgid "Yes"
 msgstr "Ja"
 
-#: ../src/calendar/gui/e-cal-model.c:1894
+#: ../src/calendar/gui/e-cal-model.c:1896
 #: ../src/calendar/gui/e-cal-model-tasks.c:1136
 #: ../src/calendar/gui/e-meeting-list-view.c:208
 #: ../src/calendar/gui/e-meeting-store.c:186
 msgid "No"
 msgstr "Nei"
 
-#: ../src/calendar/gui/e-cal-model.c:3818
+#: ../src/calendar/gui/e-cal-model.c:3820
 #: ../src/calendar/gui/e-meeting-list-view.c:219
 #: ../src/calendar/gui/e-meeting-store.c:194
 #: ../src/calendar/gui/e-meeting-store.c:217
@@ -6071,7 +6699,7 @@ msgstr "Nei"
 msgid "Accepted"
 msgstr "Godtatt"
 
-#: ../src/calendar/gui/e-cal-model.c:3819
+#: ../src/calendar/gui/e-cal-model.c:3821
 #: ../src/calendar/gui/e-meeting-list-view.c:220
 #: ../src/calendar/gui/e-meeting-store.c:196
 #: ../src/calendar/gui/e-meeting-store.c:219
@@ -6079,7 +6707,7 @@ msgstr "Godtatt"
 msgid "Declined"
 msgstr "Avslått"
 
-#: ../src/calendar/gui/e-cal-model.c:3820
+#: ../src/calendar/gui/e-cal-model.c:3822
 #: ../src/calendar/gui/e-meeting-list-view.c:221
 #: ../src/calendar/gui/e-meeting-store.c:198
 #: ../src/calendar/gui/e-meeting-store.c:221
@@ -6087,7 +6715,7 @@ msgstr "Avslått"
 msgid "Tentative"
 msgstr "Tentativ"
 
-#: ../src/calendar/gui/e-cal-model.c:3821
+#: ../src/calendar/gui/e-cal-model.c:3823
 #: ../src/calendar/gui/e-meeting-list-view.c:222
 #: ../src/calendar/gui/e-meeting-store.c:200
 #: ../src/calendar/gui/e-meeting-store.c:223
@@ -6095,13 +6723,13 @@ msgstr "Tentativ"
 msgid "Delegated"
 msgstr "Delegert"
 
-#: ../src/calendar/gui/e-cal-model.c:3822
+#: ../src/calendar/gui/e-cal-model.c:3824
 msgid "Needs action"
 msgstr "Krever handling"
 
 #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
 #. * Status: Accepted: X   Declined: Y   ...
-#: ../src/calendar/gui/e-cal-model.c:3877
+#: ../src/calendar/gui/e-cal-model.c:3879
 #: ../src/calendar/gui/e-meeting-list-view.c:687
 #: ../src/calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../src/calendar/gui/e-task-table.etspec.h:11
@@ -6138,166 +6766,166 @@ msgctxt "cal-task-status"
 msgid "None"
 msgstr "Ingen"
 
-#: ../src/calendar/gui/e-cal-ops.c:304
+#: ../src/calendar/gui/e-cal-ops.c:305
 msgid "Modifying an event"
 msgstr "Endrer en hendelse"
 
-#: ../src/calendar/gui/e-cal-ops.c:308
+#: ../src/calendar/gui/e-cal-ops.c:309
 msgid "Modifying a memo"
 msgstr "Endrer et notat"
 
-#: ../src/calendar/gui/e-cal-ops.c:312
+#: ../src/calendar/gui/e-cal-ops.c:313
 msgid "Modifying a task"
 msgstr "Endrer en oppgave"
 
-#: ../src/calendar/gui/e-cal-ops.c:411
+#: ../src/calendar/gui/e-cal-ops.c:412 ../src/calendar/gui/e-to-do-pane.c:1812
 msgid "Removing an event"
 msgstr "Fjerner en hendelse"
 
-#: ../src/calendar/gui/e-cal-ops.c:415
+#: ../src/calendar/gui/e-cal-ops.c:416 ../src/calendar/gui/e-to-do-pane.c:1816
 msgid "Removing a memo"
 msgstr "Fjerner et notat"
 
-#: ../src/calendar/gui/e-cal-ops.c:419
+#: ../src/calendar/gui/e-cal-ops.c:420 ../src/calendar/gui/e-to-do-pane.c:1820
 msgid "Removing a task"
 msgstr "Fjerner en oppgave"
 
-#: ../src/calendar/gui/e-cal-ops.c:510
+#: ../src/calendar/gui/e-cal-ops.c:511
 #, c-format
 msgid "Deleting an event"
 msgid_plural "Deleting %d events"
 msgstr[0] "Sletter en hendelse"
 msgstr[1] "Sletter %d hendelser"
 
-#: ../src/calendar/gui/e-cal-ops.c:514
+#: ../src/calendar/gui/e-cal-ops.c:515
 #, c-format
 msgid "Deleting a memo"
 msgid_plural "Deleting %d memos"
 msgstr[0] "Sletter et notat"
 msgstr[1] "Sletter %d notater"
 
-#: ../src/calendar/gui/e-cal-ops.c:518
+#: ../src/calendar/gui/e-cal-ops.c:519
 #, c-format
 msgid "Deleting a task"
 msgid_plural "Deleting %d tasks"
 msgstr[0] "Sletter en oppgave"
 msgstr[1] "Sletter %d oppgaver"
 
-#: ../src/calendar/gui/e-cal-ops.c:721
+#: ../src/calendar/gui/e-cal-ops.c:722
 #, c-format
 msgid "Pasting an event"
 msgid_plural "Pasting %d events"
 msgstr[0] "Limer inn en hendelse"
 msgstr[1] "Limer inn %d hendelser"
 
-#: ../src/calendar/gui/e-cal-ops.c:736
+#: ../src/calendar/gui/e-cal-ops.c:737
 #, c-format
 msgid "Pasting a memo"
 msgid_plural "Pasting %d memos"
 msgstr[0] "Limer inn et notat"
 msgstr[1] "Limer inn %d notater"
 
-#: ../src/calendar/gui/e-cal-ops.c:751
+#: ../src/calendar/gui/e-cal-ops.c:752
 #, c-format
 msgid "Pasting a task"
 msgid_plural "Pasting %d tasks"
 msgstr[0] "Skriver ut en oppgave"
 msgstr[1] "Skriver ut %d oppgaver"
 
-#: ../src/calendar/gui/e-cal-ops.c:850
+#: ../src/calendar/gui/e-cal-ops.c:851
 msgid "Updating an event"
 msgstr "Oppdaterer en hendelse"
 
-#: ../src/calendar/gui/e-cal-ops.c:854
+#: ../src/calendar/gui/e-cal-ops.c:855
 msgid "Updating a memo"
 msgstr "Oppdaterer et notat"
 
-#: ../src/calendar/gui/e-cal-ops.c:858
+#: ../src/calendar/gui/e-cal-ops.c:859
 msgid "Updating a task"
 msgstr "Oppdaterer en oppgave"
 
-#: ../src/calendar/gui/e-cal-ops.c:966
+#: ../src/calendar/gui/e-cal-ops.c:967
 #, c-format
 msgid "Getting events to purge in the calendar “%s”"
 msgstr "Henter hendelser som skal fjernes fra kalender «%s»"
 
-#: ../src/calendar/gui/e-cal-ops.c:970
+#: ../src/calendar/gui/e-cal-ops.c:971
 #, c-format
 msgid "Getting memos to purge in the memo list “%s”"
 msgstr "Henter notater som skal fjernes fra notatliste «%s»"
 
-#: ../src/calendar/gui/e-cal-ops.c:974
+#: ../src/calendar/gui/e-cal-ops.c:975
 #, c-format
 msgid "Getting tasks to purge in the task list “%s”"
 msgstr "Henter oppgaver som skal fjernes fra oppgaveliste «%s»"
 
-#: ../src/calendar/gui/e-cal-ops.c:1000
+#: ../src/calendar/gui/e-cal-ops.c:1001
 #, c-format
 msgid "Purging events in the calendar “%s”"
 msgstr "Fjerner hendelser fra kalender «%s»"
 
-#: ../src/calendar/gui/e-cal-ops.c:1004
+#: ../src/calendar/gui/e-cal-ops.c:1005
 #, c-format
 msgid "Purging memos in the memo list “%s”"
 msgstr "Fjerner notater fra notatliste «%s»"
 
-#: ../src/calendar/gui/e-cal-ops.c:1008
+#: ../src/calendar/gui/e-cal-ops.c:1009
 #, c-format
 msgid "Purging tasks in the task list “%s”"
 msgstr "Fjerner oppgaver fra oppgaveliste «%s»"
 
-#: ../src/calendar/gui/e-cal-ops.c:1108
+#: ../src/calendar/gui/e-cal-ops.c:1109
 msgid "Purging events"
 msgstr "Fjerner hendelser"
 
-#: ../src/calendar/gui/e-cal-ops.c:1112
+#: ../src/calendar/gui/e-cal-ops.c:1113
 msgid "Purging memos"
 msgstr "Fjerner notater"
 
-#: ../src/calendar/gui/e-cal-ops.c:1116
+#: ../src/calendar/gui/e-cal-ops.c:1117
 msgid "Purging tasks"
 msgstr "Fjerner oppgaver"
 
-#: ../src/calendar/gui/e-cal-ops.c:1218
+#: ../src/calendar/gui/e-cal-ops.c:1219
 msgid "Expunging completed tasks"
 msgstr "Tømmer fullførte oppgaver"
 
-#: ../src/calendar/gui/e-cal-ops.c:2049
+#: ../src/calendar/gui/e-cal-ops.c:2060
 #, c-format
 msgid "Moving an event"
 msgid_plural "Moving %d events"
 msgstr[0] "Flytter en hendelse"
 msgstr[1] "Flytter %d hendelser"
 
-#: ../src/calendar/gui/e-cal-ops.c:2050
+#: ../src/calendar/gui/e-cal-ops.c:2061
 #, c-format
 msgid "Copying an event"
 msgid_plural "Copying %d events"
 msgstr[0] "Kopierer en hendelse"
 msgstr[1] "Kopierer %d hendelser"
 
-#: ../src/calendar/gui/e-cal-ops.c:2056
+#: ../src/calendar/gui/e-cal-ops.c:2067
 #, c-format
 msgid "Moving a memo"
 msgid_plural "Moving %d memos"
 msgstr[0] "Flytter et notat"
 msgstr[1] "Flytter %d notater"
 
-#: ../src/calendar/gui/e-cal-ops.c:2057
+#: ../src/calendar/gui/e-cal-ops.c:2068
 #, c-format
 msgid "Copying a memo"
 msgid_plural "Copying %d memos"
 msgstr[0] "Kopierer et notat"
 msgstr[1] "Kopierer %d notater"
 
-#: ../src/calendar/gui/e-cal-ops.c:2063
+#: ../src/calendar/gui/e-cal-ops.c:2074
 #, c-format
 msgid "Moving a task"
 msgid_plural "Moving %d tasks"
 msgstr[0] "Flytter en oppgave"
 msgstr[1] "Flytter %d oppgaver"
 
-#: ../src/calendar/gui/e-cal-ops.c:2064
+#: ../src/calendar/gui/e-cal-ops.c:2075
 #, c-format
 msgid "Copying a task"
 msgid_plural "Copying %d tasks"
@@ -6354,8 +6982,9 @@ msgstr "Starttid er ikke en gyldig tid"
 #: ../src/calendar/gui/e-comp-editor-page-attachments.c:206
 #: ../src/calendar/gui/e-comp-editor.c:338
 #: ../src/em-format/e-mail-part-secure-button.c:93
-#: ../src/mail/e-mail-display.c:2116 ../src/mail/e-mail-reader-utils.c:646
+#: ../src/mail/e-mail-display.c:2116 ../src/mail/e-mail-reader-utils.c:806
 #: ../src/mail/mail-send-recv.c:490 ../src/mail/mail-send-recv.c:1288
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:172
 #: ../src/plugins/face/face.c:174 ../src/shell/e-shell.c:1073
 #: ../src/shell/e-shell.c:1097 ../src/smime/gui/certificate-manager.c:357
 msgid "Unknown error"
@@ -6921,13 +7550,14 @@ msgstr "Unntak"
 
 #: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2231
 #: ../src/calendar/gui/e-comp-editor-page-reminders.c:1777
-#: ../src/mail/mail-config.ui.h:64
+#: ../src/mail/e-mail-config-identity-page.c:852
+#: ../src/mail/mail-config.ui.h:65
 msgid "A_dd"
 msgstr "L_egg til"
 
 #: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2247
 #: ../src/calendar/gui/e-comp-editor-page-reminders.c:1785
-#: ../src/mail/mail-config.ui.h:66
+#: ../src/mail/mail-config.ui.h:67
 msgid "Re_move"
 msgstr "Fjer_n"
 
@@ -7295,169 +7925,172 @@ msgstr "vedlegg"
 msgid "Sending notifications to attendees..."
 msgstr "Sender oppdateringer til deltakere …"
 
-#: ../src/calendar/gui/e-comp-editor.c:998
+#: ../src/calendar/gui/e-comp-editor.c:997
 msgid "Saving changes..."
 msgstr "Lagre endringer …"
 
-#: ../src/calendar/gui/e-comp-editor.c:1258
+#: ../src/calendar/gui/e-comp-editor.c:1257
 msgid "No Summary"
 msgstr "Ingen sammendrag"
 
 #. == Button box ==
-#: ../src/calendar/gui/e-comp-editor.c:1985
+#: ../src/calendar/gui/e-comp-editor.c:1984
 #: ../src/composer/e-composer-actions.c:327
+#: ../src/e-util/e-accounts-window.c:1743
 #: ../src/e-util/e-html-editor-dialog.c:194
 #: ../src/e-util/e-mail-signature-editor.c:309
 #: ../src/e-util/e-name-selector-dialog.c:548
-#: ../src/e-util/e-preferences-window.c:389
+#: ../src/e-util/e-preferences-window.c:399
 #: ../src/e-util/e-table-field-chooser-dialog.c:205
 #: ../src/mail/e-mail-browser.c:127 ../src/mail/e-mail-notes.c:931
 #: ../src/mail/em-folder-properties.c:1158
 #: ../src/mail/em-subscription-editor.c:1765
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:254
-#: ../src/shell/e-shell-window-actions.c:278
-#: ../src/shell/e-shell-window-actions.c:787
+#: ../src/shell/e-shell-window-actions.c:296
+#: ../src/shell/e-shell-window-actions.c:817
 #: ../src/smime/gui/certificate-manager.c:2212
 msgid "_Close"
 msgstr "L_ukk"
 
-#: ../src/calendar/gui/e-comp-editor.c:1987
+#: ../src/calendar/gui/e-comp-editor.c:1986
 msgid "Close the current window"
 msgstr "Lukk aktiv vindu"
 
 #. copy menu item
-#: ../src/calendar/gui/e-comp-editor.c:1992 ../src/e-util/e-focus-tracker.c:773
+#: ../src/calendar/gui/e-comp-editor.c:1991 ../src/e-util/e-focus-tracker.c:773
 #: ../src/e-util/e-html-editor-actions.c:878 ../src/e-util/e-text.c:2110
 #: ../src/e-util/e-web-view.c:407 ../src/mail/e-mail-browser.c:134
-#: ../src/mail/mail.error.xml.h:146 ../src/shell/e-shell-window-actions.c:808
+#: ../src/mail/mail.error.xml.h:146 ../src/shell/e-shell-window-actions.c:838
 msgid "_Copy"
 msgstr "_Kopier"
 
-#: ../src/calendar/gui/e-comp-editor.c:1994 ../src/e-util/e-focus-tracker.c:173
+#: ../src/calendar/gui/e-comp-editor.c:1993 ../src/e-util/e-focus-tracker.c:173
 #: ../src/e-util/e-focus-tracker.c:229 ../src/e-util/e-focus-tracker.c:282
 #: ../src/e-util/e-focus-tracker.c:774 ../src/e-util/e-web-view.c:409
-#: ../src/e-util/e-web-view.c:1942 ../src/mail/e-mail-browser.c:136
-#: ../src/shell/e-shell-window-actions.c:810
+#: ../src/e-util/e-web-view.c:1977 ../src/mail/e-mail-browser.c:136
+#: ../src/shell/e-shell-window-actions.c:840
 msgid "Copy the selection"
 msgstr "Kopier utvalget"
 
 #. cut menu item
-#: ../src/calendar/gui/e-comp-editor.c:1999 ../src/e-util/e-focus-tracker.c:768
+#: ../src/calendar/gui/e-comp-editor.c:1998 ../src/e-util/e-focus-tracker.c:768
 #: ../src/e-util/e-html-editor-actions.c:885 ../src/e-util/e-text.c:2096
-#: ../src/mail/e-mail-browser.c:141 ../src/shell/e-shell-window-actions.c:815
+#: ../src/mail/e-mail-browser.c:141 ../src/shell/e-shell-window-actions.c:845
 msgid "Cu_t"
 msgstr "Klipp u_t"
 
-#: ../src/calendar/gui/e-comp-editor.c:2001 ../src/e-util/e-focus-tracker.c:166
+#: ../src/calendar/gui/e-comp-editor.c:2000 ../src/e-util/e-focus-tracker.c:166
 #: ../src/e-util/e-focus-tracker.c:222 ../src/e-util/e-focus-tracker.c:276
-#: ../src/e-util/e-focus-tracker.c:769 ../src/e-util/e-web-view.c:1951
-#: ../src/mail/e-mail-browser.c:143 ../src/shell/e-shell-window-actions.c:817
+#: ../src/e-util/e-focus-tracker.c:769 ../src/e-util/e-web-view.c:1986
+#: ../src/mail/e-mail-browser.c:143 ../src/shell/e-shell-window-actions.c:847
 msgid "Cut the selection"
 msgstr "Klipp ut utvalget"
 
-#: ../src/calendar/gui/e-comp-editor.c:2008 ../src/e-util/e-focus-tracker.c:187
+#: ../src/calendar/gui/e-comp-editor.c:2007 ../src/e-util/e-focus-tracker.c:187
 #: ../src/e-util/e-focus-tracker.c:243 ../src/e-util/e-focus-tracker.c:784
-#: ../src/shell/e-shell-window-actions.c:824
+#: ../src/shell/e-shell-window-actions.c:854
 msgid "Delete the selection"
 msgstr "Slett utvalget"
 
-#: ../src/calendar/gui/e-comp-editor.c:2015
+#: ../src/calendar/gui/e-comp-editor.c:2014
 msgid "View help"
 msgstr "Vis hjelp"
 
 #. paste menu item
-#: ../src/calendar/gui/e-comp-editor.c:2020 ../src/e-util/e-focus-tracker.c:778
+#: ../src/calendar/gui/e-comp-editor.c:2019 ../src/e-util/e-focus-tracker.c:778
 #: ../src/e-util/e-html-editor-actions.c:892 ../src/e-util/e-text.c:2122
-#: ../src/mail/e-mail-browser.c:148 ../src/shell/e-shell-window-actions.c:843
+#: ../src/mail/e-mail-browser.c:148 ../src/shell/e-shell-window-actions.c:873
 msgid "_Paste"
 msgstr "_Lim inn"
 
-#: ../src/calendar/gui/e-comp-editor.c:2022 ../src/e-util/e-focus-tracker.c:180
+#: ../src/calendar/gui/e-comp-editor.c:2021 ../src/e-util/e-focus-tracker.c:180
 #: ../src/e-util/e-focus-tracker.c:236 ../src/e-util/e-focus-tracker.c:288
-#: ../src/e-util/e-focus-tracker.c:779 ../src/e-util/e-web-view.c:1960
-#: ../src/mail/e-mail-browser.c:150 ../src/shell/e-shell-window-actions.c:845
+#: ../src/e-util/e-focus-tracker.c:779 ../src/e-util/e-web-view.c:1995
+#: ../src/mail/e-mail-browser.c:150 ../src/shell/e-shell-window-actions.c:875
 msgid "Paste the clipboard"
 msgstr "Lim inn fra utklippstavlen"
 
-#: ../src/calendar/gui/e-comp-editor.c:2027
+#: ../src/calendar/gui/e-comp-editor.c:2026
 #: ../src/composer/e-composer-actions.c:381 ../src/mail/e-mail-reader.c:2317
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1232
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1246
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1235
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1249
 msgid "_Print..."
 msgstr "S_kriv ut …"
 
-#: ../src/calendar/gui/e-comp-editor.c:2034 ../src/mail/e-mail-reader.c:2324
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1239
+#: ../src/calendar/gui/e-comp-editor.c:2033 ../src/mail/e-mail-reader.c:2324
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1242
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1744
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:813
 #: ../src/modules/calendar/e-task-shell-view-actions.c:1014
 msgid "Pre_view..."
 msgstr "Forhånds_vis …"
 
-#: ../src/calendar/gui/e-comp-editor.c:2041 ../src/e-util/e-focus-tracker.c:788
+#: ../src/calendar/gui/e-comp-editor.c:2040 ../src/e-util/e-focus-tracker.c:788
 #: ../src/e-util/e-html-editor-actions.c:906 ../src/e-util/e-web-view.c:417
-#: ../src/mail/e-mail-browser.c:155 ../src/shell/e-shell-window-actions.c:920
+#: ../src/mail/e-mail-browser.c:155 ../src/shell/e-shell-window-actions.c:950
 msgid "Select _All"
 msgstr "Velg _alle"
 
-#: ../src/calendar/gui/e-comp-editor.c:2043 ../src/e-util/e-focus-tracker.c:194
+#: ../src/calendar/gui/e-comp-editor.c:2042 ../src/e-util/e-focus-tracker.c:194
 #: ../src/e-util/e-focus-tracker.c:250 ../src/e-util/e-focus-tracker.c:789
-#: ../src/mail/e-mail-browser.c:157 ../src/shell/e-shell-window-actions.c:922
+#: ../src/mail/e-mail-browser.c:157 ../src/shell/e-shell-window-actions.c:952
 msgid "Select all text"
 msgstr "Velg all tekst"
 
-#: ../src/calendar/gui/e-comp-editor.c:2064
+#: ../src/calendar/gui/e-comp-editor.c:2063
 msgid "_Classification"
 msgstr "K_lassifisering"
 
-#: ../src/calendar/gui/e-comp-editor.c:2078
+#: ../src/calendar/gui/e-comp-editor.c:2077
 #: ../src/e-util/e-html-editor-actions.c:929
 #: ../src/e-util/e-mail-signature-editor.c:323 ../src/mail/e-mail-browser.c:164
-#: ../src/mail/e-mail-notes.c:945 ../src/shell/e-shell-window-actions.c:957
+#: ../src/mail/e-mail-notes.c:945 ../src/shell/e-shell-window-actions.c:987
 msgid "_File"
 msgstr "_Fil"
 
-#: ../src/calendar/gui/e-comp-editor.c:2092
+#: ../src/calendar/gui/e-comp-editor.c:2091
 #: ../src/e-util/e-html-editor-actions.c:950
 msgid "_Insert"
 msgstr "Sett _inn"
 
-#: ../src/calendar/gui/e-comp-editor.c:2099
+#: ../src/calendar/gui/e-comp-editor.c:2098
 #: ../src/composer/e-composer-actions.c:371
 msgid "_Options"
 msgstr "_Alternativer"
 
-#: ../src/calendar/gui/e-comp-editor.c:2106
+#: ../src/calendar/gui/e-comp-editor.c:2105
 #: ../src/e-util/e-html-editor-actions.c:971 ../src/mail/e-mail-browser.c:178
-#: ../src/shell/e-shell-window-actions.c:1000
+#: ../src/shell/e-shell-window-actions.c:1030
 #: ../src/smime/gui/certificate-manager.c:1662 ../src/smime/gui/smime-ui.ui.h:3
 msgid "_View"
 msgstr "_Vis"
 
-#: ../src/calendar/gui/e-comp-editor.c:2118
+#: ../src/calendar/gui/e-comp-editor.c:2117
 msgid "Save current changes"
 msgstr "Lagre endringer"
 
-#: ../src/calendar/gui/e-comp-editor.c:2123
+#: ../src/calendar/gui/e-comp-editor.c:2122
 #: ../src/e-util/e-mail-signature-editor.c:318 ../src/mail/e-mail-notes.c:940
 msgid "Save and Close"
 msgstr "Lagre og lukk"
 
-#: ../src/calendar/gui/e-comp-editor.c:2125
+#: ../src/calendar/gui/e-comp-editor.c:2124
 msgid "Save current changes and close editor"
 msgstr "Lagre endringer og lukk redigering"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../src/calendar/gui/e-day-view.c:2130 ../src/calendar/gui/e-week-view.c:1726
-#: ../src/calendar/gui/print.c:1070 ../src/calendar/gui/print.c:1089
-#: ../src/calendar/gui/print.c:2626 ../src/calendar/gui/print.c:2646
+#: ../src/calendar/gui/e-day-view.c:2130 ../src/calendar/gui/e-to-do-pane.c:239
+#: ../src/calendar/gui/e-week-view.c:1726 ../src/calendar/gui/print.c:1070
+#: ../src/calendar/gui/print.c:1089 ../src/calendar/gui/print.c:2626
+#: ../src/calendar/gui/print.c:2646
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../src/calendar/gui/e-day-view.c:2133 ../src/calendar/gui/e-week-view.c:1729
-#: ../src/calendar/gui/print.c:1075 ../src/calendar/gui/print.c:1091
-#: ../src/calendar/gui/print.c:2631 ../src/calendar/gui/print.c:2648
+#: ../src/calendar/gui/e-day-view.c:2133 ../src/calendar/gui/e-to-do-pane.c:243
+#: ../src/calendar/gui/e-week-view.c:1729 ../src/calendar/gui/print.c:1075
+#: ../src/calendar/gui/print.c:1091 ../src/calendar/gui/print.c:2631
+#: ../src/calendar/gui/print.c:2648
 msgid "pm"
 msgstr "pm"
 
@@ -7596,6 +8229,7 @@ msgstr "Deltaker                          "
 #: ../src/calendar/gui/e-meeting-time-sel.etspec.h:4
 #: ../src/calendar/gui/e-memo-table.etspec.h:3
 #: ../src/calendar/gui/e-task-table.etspec.h:3
+#: ../src/e-util/e-accounts-window.c:1370
 #: ../src/e-util/e-attachment-tree-view.c:205
 #: ../src/mail/e-mail-account-tree-view.c:158
 msgid "Type"
@@ -7846,6 +8480,71 @@ msgstr "Prioritet"
 msgid "Select Timezone"
 msgstr "Velg tidssone"
 
+#. Translators: It will display "Due: DueDateAndTime"
+#: ../src/calendar/gui/e-to-do-pane.c:365
+#, c-format
+msgid "Due: %s"
+msgstr "Frist: %s"
+
+#. Translators: It will display "Completed: DateAndTimeWhenCompleted"
+#: ../src/calendar/gui/e-to-do-pane.c:377
+#, c-format
+msgid "Completed: %s"
+msgstr "Fullført: %s"
+
+#. strftime format of a weekday and a date.
+#: ../src/calendar/gui/e-to-do-pane.c:1328 ../src/e-util/e-cell-date-edit.c:328
+#: ../src/e-util/e-datetime-format.c:206
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1842
+#: ../src/modules/itip-formatter/itip-view.c:253
+msgid "Today"
+msgstr "I dag"
+
+#. strftime format of a weekday and a date.
+#: ../src/calendar/gui/e-to-do-pane.c:1330
+#: ../src/e-util/e-datetime-format.c:217
+#: ../src/modules/itip-formatter/itip-view.c:281
+msgid "Tomorrow"
+msgstr "I morgen"
+
+#: ../src/calendar/gui/e-to-do-pane.c:1892
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1449
+msgid "New _Appointment..."
+msgstr "Ny _avtale …"
+
+#: ../src/calendar/gui/e-to-do-pane.c:1900
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1435
+msgid "New _Meeting..."
+msgstr "Nytt _møte …"
+
+#: ../src/calendar/gui/e-to-do-pane.c:1908
+msgid "New _Task..."
+msgstr "Ny _oppgave …"
+
+#: ../src/calendar/gui/e-to-do-pane.c:1916
+msgid "_New Assigned Task..."
+msgstr "_Ny tildelt oppgave …"
+
+#: ../src/calendar/gui/e-to-do-pane.c:1929
+msgid "_Open..."
+msgstr "_Åpne …"
+
+#: ../src/calendar/gui/e-to-do-pane.c:1943
+msgid "_Delete This Instance..."
+msgstr "Slett denne _hendelsen …"
+
+#: ../src/calendar/gui/e-to-do-pane.c:1951
+msgid "D_elete All Instances..."
+msgstr "Sl_ett alle instanser …"
+
+#: ../src/calendar/gui/e-to-do-pane.c:1959
+msgid "_Delete..."
+msgstr "_Slett …"
+
+#: ../src/calendar/gui/e-to-do-pane.c:2249
+msgid "To Do"
+msgstr "Oppgaver"
+
 #. strftime format %d = day of month, %B = full
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
@@ -7854,32 +8553,32 @@ msgstr "Velg tidssone"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../src/calendar/gui/itip-utils.c:789 ../src/calendar/gui/itip-utils.c:851
-#: ../src/calendar/gui/itip-utils.c:985
+#: ../src/calendar/gui/itip-utils.c:793 ../src/calendar/gui/itip-utils.c:855
+#: ../src/calendar/gui/itip-utils.c:989
 msgid "An organizer must be set."
 msgstr "En organisator må oppgis."
 
-#: ../src/calendar/gui/itip-utils.c:842
+#: ../src/calendar/gui/itip-utils.c:846
 msgid "At least one attendee is necessary"
 msgstr "Minst en deltaker kreves"
 
-#: ../src/calendar/gui/itip-utils.c:1073 ../src/calendar/gui/itip-utils.c:1234
+#: ../src/calendar/gui/itip-utils.c:1077 ../src/calendar/gui/itip-utils.c:1238
 msgid "Event information"
 msgstr "Hendelsesinformasjon"
 
-#: ../src/calendar/gui/itip-utils.c:1076 ../src/calendar/gui/itip-utils.c:1237
+#: ../src/calendar/gui/itip-utils.c:1080 ../src/calendar/gui/itip-utils.c:1241
 msgid "Task information"
 msgstr "Oppgaveinformasjon"
 
-#: ../src/calendar/gui/itip-utils.c:1079 ../src/calendar/gui/itip-utils.c:1240
+#: ../src/calendar/gui/itip-utils.c:1083 ../src/calendar/gui/itip-utils.c:1244
 msgid "Memo information"
 msgstr "Informasjon om notat"
 
-#: ../src/calendar/gui/itip-utils.c:1082 ../src/calendar/gui/itip-utils.c:1258
+#: ../src/calendar/gui/itip-utils.c:1086 ../src/calendar/gui/itip-utils.c:1262
 msgid "Free/Busy information"
 msgstr "Ledig/opptatt-informasjon"
 
-#: ../src/calendar/gui/itip-utils.c:1085
+#: ../src/calendar/gui/itip-utils.c:1089
 msgid "Calendar information"
 msgstr "Kalenderinformasjon"
 
@@ -7887,7 +8586,7 @@ msgstr "Kalenderinformasjon"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1122
+#: ../src/calendar/gui/itip-utils.c:1126
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Godtatt"
@@ -7896,7 +8595,7 @@ msgstr "Godtatt"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1129
+#: ../src/calendar/gui/itip-utils.c:1133
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Akseptert tentativt"
@@ -7908,7 +8607,7 @@ msgstr "Akseptert tentativt"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1136 ../src/calendar/gui/itip-utils.c:1184
+#: ../src/calendar/gui/itip-utils.c:1140 ../src/calendar/gui/itip-utils.c:1188
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Avslått"
@@ -7917,7 +8616,7 @@ msgstr "Avslått"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1143
+#: ../src/calendar/gui/itip-utils.c:1147
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Delegert"
@@ -7925,7 +8624,7 @@ msgstr "Delegert"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1156
+#: ../src/calendar/gui/itip-utils.c:1160
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Oppdatert"
@@ -7933,7 +8632,7 @@ msgstr "Oppdatert"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1163
+#: ../src/calendar/gui/itip-utils.c:1167
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Avbryt"
@@ -7941,7 +8640,7 @@ msgstr "Avbryt"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1170
+#: ../src/calendar/gui/itip-utils.c:1174
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Oppdater"
@@ -7949,44 +8648,44 @@ msgstr "Oppdater"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1177
+#: ../src/calendar/gui/itip-utils.c:1181
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Motforslag"
 
-#: ../src/calendar/gui/itip-utils.c:1255
+#: ../src/calendar/gui/itip-utils.c:1259
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Ledig/opptatt-informasjon (%s til %s)"
 
-#: ../src/calendar/gui/itip-utils.c:1263
+#: ../src/calendar/gui/itip-utils.c:1267
 msgid "iCalendar information"
 msgstr "iCalendar-informasjon"
 
-#: ../src/calendar/gui/itip-utils.c:1292
+#: ../src/calendar/gui/itip-utils.c:1296
 #, c-format
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr ""
 "Klarer ikke å bestille en ressurs. Den nye hendelsen er i konflikt med en "
 "annen."
 
-#: ../src/calendar/gui/itip-utils.c:1297
+#: ../src/calendar/gui/itip-utils.c:1301
 msgid "Unable to book a resource, error: "
 msgstr "Kan ikke bestille en ressurs. Feil: "
 
-#: ../src/calendar/gui/itip-utils.c:1468
+#: ../src/calendar/gui/itip-utils.c:1472
 msgid "You must be an attendee of the event."
 msgstr "Du må være en deltager i hendelsen."
 
-#: ../src/calendar/gui/itip-utils.c:2149
+#: ../src/calendar/gui/itip-utils.c:2153
 msgid "Sending an event"
 msgstr "Sender en hendelse"
 
-#: ../src/calendar/gui/itip-utils.c:2153
+#: ../src/calendar/gui/itip-utils.c:2157
 msgid "Sending a memo"
 msgstr "Sender et notat"
 
-#: ../src/calendar/gui/itip-utils.c:2157
+#: ../src/calendar/gui/itip-utils.c:2161
 msgid "Sending a task"
 msgstr "Sender en oppgave"
 
@@ -8255,12 +8954,14 @@ msgid "Appointments and Meetings"
 msgstr "Avtaler og møter"
 
 #: ../src/calendar/importers/icalendar-importer.c:306
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:432
 #: ../src/modules/calendar/e-cal-base-shell-backend.c:181
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:178
 msgid "New Calendar"
 msgstr "Ny kalender"
 
 #: ../src/calendar/importers/icalendar-importer.c:309
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:440
 #: ../src/modules/calendar/e-cal-base-shell-backend.c:189
 #: ../src/modules/calendar/e-task-shell-view-actions.c:202
 msgid "New Task List"
@@ -10020,12 +10721,12 @@ msgid "Open New Message window"
 msgstr "Åpne nytt meldingsvindu"
 
 #: ../src/composer/e-composer-actions.c:341 ../src/shell/e-shell.c:1302
-#: ../src/shell/e-shell-window-actions.c:857
+#: ../src/shell/e-shell-window-actions.c:887
 msgid "_Preferences"
 msgstr "_Brukervalg"
 
 #: ../src/composer/e-composer-actions.c:343
-#: ../src/shell/e-shell-window-actions.c:859
+#: ../src/shell/e-shell-window-actions.c:889
 msgid "Configure Evolution"
 msgstr "Konfigurer Evolution"
 
@@ -10168,8 +10869,9 @@ msgstr "Lagre utkast"
 #: ../src/composer/e-composer-from-header.c:108
 #: ../src/e-util/e-mail-signature-script-dialog.c:416
 #: ../src/e-util/gal-view-instance-save-as-dialog.ui.h:2
-#: ../src/mail/e-mail-config-identity-page.c:553
-#: ../src/mail/e-mail-config-summary-page.c:333
+#: ../src/mail/e-mail-config-identity-page.c:550
+#: ../src/mail/e-mail-config-summary-page.c:332
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:297
 msgid "_Name:"
 msgstr "_Navn:"
 
@@ -10218,7 +10920,7 @@ msgid "S_ubject:"
 msgstr "Em_ne:"
 
 #: ../src/composer/e-composer-header-table.c:883
-#: ../src/mail/e-mail-config-identity-page.c:746
+#: ../src/mail/e-mail-config-identity-page.c:743
 msgid "Si_gnature:"
 msgstr "Si_gnatur:"
 
@@ -10230,7 +10932,7 @@ msgstr "Klikk her for å få opp adresseboken"
 msgid "Click here to select folders to post to"
 msgstr "Klikk her for å velge mapper å poste til"
 
-#: ../src/composer/e-msg-composer.c:849
+#: ../src/composer/e-msg-composer.c:854
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
@@ -10238,7 +10940,7 @@ msgstr ""
 "Kan ikke signere utgående melding: Ingen sertifikat for signering satt for "
 "denne kontoen"
 
-#: ../src/composer/e-msg-composer.c:858
+#: ../src/composer/e-msg-composer.c:863
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -10247,11 +10949,11 @@ msgstr ""
 "Kan ikke kryptere utgående melding: Sertifikat for kryptering ikke satt for "
 "denne kontoen"
 
-#: ../src/composer/e-msg-composer.c:1611 ../src/composer/e-msg-composer.c:2235
+#: ../src/composer/e-msg-composer.c:1622 ../src/composer/e-msg-composer.c:2294
 msgid "Compose Message"
 msgstr "Skriv melding"
 
-#: ../src/composer/e-msg-composer.c:4576
+#: ../src/composer/e-msg-composer.c:4657
 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 "
@@ -10381,7 +11083,7 @@ msgid "An error occurred while sending. How do you want to proceed?"
 msgstr "En feil oppsto under sending. Hvordan vil du fortsette?"
 
 #: ../src/composer/mail-composer.error.xml.h:30
-#: ../src/mail/mail.error.xml.h:175
+#: ../src/mail/mail.error.xml.h:177
 msgid "The reported error was “{0}”."
 msgstr "Feilen som ble rapportert var «{0}»."
 
@@ -10590,7 +11292,7 @@ msgstr "Emne"
 #. pseudo-header
 #: ../src/em-format/e-mail-formatter-quote-headers.c:197
 #: ../src/em-format/e-mail-formatter-utils.c:341
-#: ../src/modules/mail/em-mailer-prefs.c:1488
+#: ../src/modules/mail/em-mailer-prefs.c:1494
 msgid "Mailer"
 msgstr "E-postprogram"
 
@@ -10925,6 +11627,73 @@ msgstr "Kalender (fra %s til %s)"
 msgid "evolution calendar item"
 msgstr "Evolution kalenderoppføring"
 
+#: ../src/e-util/e-accounts-window.c:509 ../src/e-util/e-accounts-window.c:624
+#: ../src/e-util/e-accounts-window.c:827
+#: ../src/modules/mail/e-mail-shell-backend.c:840
+msgid "Mail Accounts"
+msgstr "E-post-konti"
+
+#: ../src/e-util/e-accounts-window.c:516 ../src/e-util/e-accounts-window.c:653
+#: ../src/e-util/e-accounts-window.c:841
+msgid "Address Books"
+msgstr "Adressebøker"
+
+#: ../src/e-util/e-accounts-window.c:522 ../src/e-util/e-accounts-window.c:654
+#: ../src/e-util/e-accounts-window.c:842
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:81
+msgid "Calendars"
+msgstr "Kalendere"
+
+#: ../src/e-util/e-accounts-window.c:528 ../src/e-util/e-accounts-window.c:655
+#: ../src/e-util/e-accounts-window.c:843
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:82
+msgid "Memo Lists"
+msgstr "Notatlister"
+
+#: ../src/e-util/e-accounts-window.c:534 ../src/e-util/e-accounts-window.c:656
+#: ../src/e-util/e-accounts-window.c:844
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:83
+msgid "Task Lists"
+msgstr "Oppgavelister"
+
+#: ../src/e-util/e-accounts-window.c:1326
+#: ../src/mail/e-mail-account-tree-view.c:84
+#: ../src/modules/mail/em-composer-prefs.c:1305
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:355
+#: ../src/plugins/publish-calendar/publish-calendar.c:853
+msgid "Enabled"
+msgstr "Aktivert"
+
+#: ../src/e-util/e-accounts-window.c:1342
+#: ../src/mail/e-mail-account-tree-view.c:108
+msgid "Account Name"
+msgstr "Kontonavn"
+
+#. { "collection",     N_("Collection _Account"),      "evolution" },
+#: ../src/e-util/e-accounts-window.c:1463
+msgid "_Mail Account"
+msgstr "E-_postkonto"
+
+#: ../src/e-util/e-accounts-window.c:1464
+msgid "Address _Book"
+msgstr "Adresse_bok"
+
+#: ../src/e-util/e-accounts-window.c:1465
+msgid "_Calendar"
+msgstr "_Kalender"
+
+#: ../src/e-util/e-accounts-window.c:1466
+msgid "M_emo List"
+msgstr "Notatlist_e"
+
+#: ../src/e-util/e-accounts-window.c:1467
+msgid "_Task List"
+msgstr "Oppgavelis_te"
+
+#: ../src/e-util/e-accounts-window.c:1659
+msgid "Evolution Accounts"
+msgstr "Evolution kontoer"
+
 #. Translators: This is a cancelled activity.
 #: ../src/e-util/e-activity.c:256
 #, c-format
@@ -10965,12 +11734,12 @@ msgid "%s (%d%% complete)"
 msgstr "%s (%d%% fullført)"
 
 #: ../src/e-util/e-activity-proxy.c:350
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1797
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1851
 msgid "Cancel"
 msgstr "Avbryt"
 
 #. Translators: Escape is a keyboard binding.
-#: ../src/e-util/e-alert-bar.c:124
+#: ../src/e-util/e-alert-bar.c:125
 msgid "Close this message (Escape)"
 msgstr "Lukk denne meldingen (Escape)"
 
@@ -11134,12 +11903,12 @@ msgid "A_dd Attachment..."
 msgstr "Legg til ve_dlegg …"
 
 #: ../src/e-util/e-attachment-view.c:349
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1098
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1101
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1316
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:605
 #: ../src/modules/calendar/e-task-shell-view-actions.c:731
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1591
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1662
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1645
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1716
 msgid "_Properties"
 msgstr "Egenska_per …"
 
@@ -11310,13 +12079,6 @@ msgstr "?"
 msgid "Now"
 msgstr "Nå"
 
-#. strftime format of a weekday and a date.
-#: ../src/e-util/e-cell-date-edit.c:328 ../src/e-util/e-datetime-format.c:206
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1842
-#: ../src/modules/itip-formatter/itip-view.c:253
-msgid "Today"
-msgstr "I dag"
-
 #. Translators: "None" as a label of a button to unset date in a
 #. * date table cell.
 #: ../src/e-util/e-cell-date-edit.c:338
@@ -11328,7 +12090,7 @@ msgstr "Ingen"
 msgid "OK"
 msgstr "OK"
 
-#: ../src/e-util/e-cell-date-edit.c:897
+#: ../src/e-util/e-cell-date-edit.c:901
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Datoen må skrives inn på formatet: %s"
@@ -11597,9 +12359,9 @@ msgid "white"
 msgstr "hvit"
 
 #: ../src/e-util/e-color-combo.c:642 ../src/mail/e-mail-account-tree-view.c:135
-#: ../src/mail/e-mail-config-security-page.c:406
-#: ../src/mail/e-mail-config-security-page.c:570
-#: ../src/mail/e-mail-reader.c:4043 ../src/mail/mail-config.ui.h:75
+#: ../src/mail/e-mail-config-security-page.c:404
+#: ../src/mail/e-mail-config-security-page.c:568
+#: ../src/mail/e-mail-reader.c:4043 ../src/mail/mail-config.ui.h:76
 msgid "Default"
 msgstr "Forvalgt"
 
@@ -11653,12 +12415,6 @@ msgstr "Ugyldig datoverdi"
 msgid "Invalid Time Value"
 msgstr "Ugyldig verdi for tid"
 
-#. strftime format of a weekday and a date.
-#: ../src/e-util/e-datetime-format.c:217
-#: ../src/modules/itip-formatter/itip-view.c:281
-msgid "Tomorrow"
-msgstr "I morgen"
-
 #: ../src/e-util/e-datetime-format.c:219
 msgid "Yesterday"
 msgstr "I går"
@@ -12027,10 +12783,10 @@ msgstr "Finn oppføringer som møter følgende kriterier"
 #. name:
 #: ../src/e-util/e-filter-rule.c:858
 #: ../src/e-util/e-html-editor-page-dialog.c:59
-#: ../src/e-util/e-mail-identity-combo-box.c:597
+#: ../src/e-util/e-mail-identity-combo-box.c:694
 #: ../src/e-util/e-mail-signature-combo-box.c:422
-#: ../src/libemail-engine/camel-null-store.c:28
-#: ../src/mail/e-mail-config-summary-page.c:140
+#: ../src/libemail-engine/camel-null-store.c:29
+#: ../src/mail/e-mail-config-summary-page.c:141
 #: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:629
 msgid "None"
 msgstr "Ingen"
@@ -12565,19 +13321,19 @@ msgstr "_Regel"
 msgid "_Table"
 msgstr "_Tabell"
 
-#: ../src/e-util/e-html-editor.c:689
+#: ../src/e-util/e-html-editor.c:732
 msgid "Paragraph Style"
 msgstr "Avsnittstil"
 
-#: ../src/e-util/e-html-editor.c:703
+#: ../src/e-util/e-html-editor.c:746
 msgid "Editing Mode"
 msgstr "Redigeringsmodus"
 
-#: ../src/e-util/e-html-editor.c:715
+#: ../src/e-util/e-html-editor.c:758
 msgid "Font Color"
 msgstr "Skriftfarge"
 
-#: ../src/e-util/e-html-editor.c:725
+#: ../src/e-util/e-html-editor.c:768
 msgid "Font Size"
 msgstr "Skriftstørrelse"
 
@@ -12989,7 +13745,7 @@ msgid "Add word"
 msgstr "Legg til ord"
 
 #: ../src/e-util/e-html-editor-spell-check-dialog.c:505
-#: ../src/mail/mail-config.ui.h:39
+#: ../src/mail/mail-config.ui.h:40
 msgid "Spell Checking"
 msgstr "Stavekontroll"
 
@@ -13061,7 +13817,7 @@ msgid "Import a _single file"
 msgstr "Importer en en_kelt fil"
 
 #: ../src/e-util/e-import-assistant.c:406
-#: ../src/modules/startup-wizard/e-mail-config-import-page.c:211
+#: ../src/modules/startup-wizard/e-mail-config-import-page.c:209
 msgid "Please select the information that you would like to import:"
 msgstr "Vennligst velg informasjon du ønsker å importere:"
 
@@ -13076,7 +13832,7 @@ msgstr ""
 "importeres. Hvis du vil prøve igjen kan du klikke på «Tilbake»-knappen."
 
 #: ../src/e-util/e-import-assistant.c:562
-#: ../src/modules/startup-wizard/e-mail-config-import-page.c:240
+#: ../src/modules/startup-wizard/e-mail-config-import-page.c:238
 #, c-format
 msgid "From %s:"
 msgstr "Fra %s:"
@@ -13255,7 +14011,7 @@ msgstr "_Søk:"
 
 #: ../src/e-util/e-name-selector-dialog.c:363
 #: ../src/e-util/e-name-selector-dialog.c:1330
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1184
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1187
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1675
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:758
 #: ../src/modules/calendar/e-task-shell-view-actions.c:931
@@ -13263,6 +14019,7 @@ msgid "Any Category"
 msgstr "Enhver kategori"
 
 #: ../src/e-util/e-name-selector-dialog.c:365
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:338
 msgid "Co_ntacts"
 msgstr "Ko_ntakter"
 
@@ -13346,7 +14103,7 @@ msgstr "Husk dette passo_rdet"
 msgid "_Remember this password for the remainder of this session"
 msgstr "Husk dette passo_rdet for resten av denne økten"
 
-#: ../src/e-util/e-preferences-window.c:319
+#: ../src/e-util/e-preferences-window.c:329
 msgid "Evolution Preferences"
 msgstr "Evolution brukervalg"
 
@@ -14128,7 +14885,7 @@ msgid "Flags"
 msgstr "Flagg"
 
 #: ../src/e-util/evolution-source-viewer.c:729
-#: ../src/mail/e-mail-config-identity-page.c:1148
+#: ../src/mail/e-mail-config-identity-page.c:1229
 msgid "Identity"
 msgstr "Identitet"
 
@@ -14176,47 +14933,47 @@ msgstr "Lagre b_ilde …"
 msgid "Save the image to a file"
 msgstr "Lagre bildet til en fil"
 
-#: ../src/e-util/e-web-view.c:419 ../src/e-util/e-web-view.c:1964
+#: ../src/e-util/e-web-view.c:419 ../src/e-util/e-web-view.c:1999
 msgid "Select all text and images"
 msgstr "Velg all tekst og alle bilder"
 
-#: ../src/e-util/e-web-view.c:1322
+#: ../src/e-util/e-web-view.c:1354
 #, c-format
 msgid "Click to call %s"
 msgstr "Klikk for å ringe %s"
 
-#: ../src/e-util/e-web-view.c:1324
+#: ../src/e-util/e-web-view.c:1356
 msgid "Click to hide/unhide addresses"
 msgstr "Klikk for å skjule/vise adresser"
 
-#: ../src/e-util/e-web-view.c:1335
+#: ../src/e-util/e-web-view.c:1367
 #, c-format
 msgid "Go to the section %s of the message"
 msgstr "Gå til %s-del av meldingen"
 
-#: ../src/e-util/e-web-view.c:1337
+#: ../src/e-util/e-web-view.c:1369
 msgid "Go to the beginning of the message"
 msgstr "Gå til begynnelsen av meldingen"
 
-#: ../src/e-util/e-web-view.c:1341
+#: ../src/e-util/e-web-view.c:1373
 #, c-format
 msgid "Click to open %s"
 msgstr "Klikk for å åpne %s"
 
-#: ../src/e-util/e-web-view.c:3871
+#: ../src/e-util/e-web-view.c:3906
 msgid "Copying image to clipboard"
 msgstr "Kopierer bilde til utklippstavlen"
 
-#: ../src/e-util/e-web-view.c:4059
+#: ../src/e-util/e-web-view.c:4094
 msgid "Save Image"
 msgstr "Lagre bilde"
 
-#: ../src/e-util/e-web-view.c:4100
+#: ../src/e-util/e-web-view.c:4135
 #, c-format
 msgid "Saving image to “%s”"
 msgstr "Lagrer bilde til «%s»"
 
-#: ../src/e-util/e-web-view.c:4195
+#: ../src/e-util/e-web-view.c:4230
 #, c-format
 msgid "Cannot get URI “%s”, do not know how to download it."
 msgstr "Kan ikke hente URI «%s». Vet ikke hvordan den skal lastes ned."
@@ -14317,7 +15074,7 @@ msgstr "tiden du oppgir"
 msgid "a time relative to the current time"
 msgstr "et klokkeslett relativt til klokkeslettet nå"
 
-#: ../src/e-util/filter.ui.h:5 ../src/mail/mail-config.ui.h:92
+#: ../src/e-util/filter.ui.h:5 ../src/mail/mail-config.ui.h:93
 msgid "seconds"
 msgstr "sekunder"
 
@@ -14428,7 +15185,7 @@ msgstr "_Opprett en ny visning"
 msgid "_Replace existing view"
 msgstr "E_rstatt eksisterende visning"
 
-#: ../src/e-util/widgets.error.xml.h:1 ../src/mail/mail.error.xml.h:201
+#: ../src/e-util/widgets.error.xml.h:1 ../src/mail/mail.error.xml.h:203
 msgid "Do you wish to save your changes?"
 msgstr "Vil du lagre dine endringer?"
 
@@ -14436,7 +15193,7 @@ msgstr "Vil du lagre dine endringer?"
 msgid "This signature has been changed, but has not been saved."
 msgstr "Denne signaturen er endret, men er ikke lagret."
 
-#: ../src/e-util/widgets.error.xml.h:3 ../src/mail/mail.error.xml.h:203
+#: ../src/e-util/widgets.error.xml.h:3 ../src/mail/mail.error.xml.h:205
 msgid "_Discard changes"
 msgstr "_Forkast endringene"
 
@@ -14539,7 +15296,7 @@ msgstr "Ugyldig URI for mappe «%s»"
 #. Some local folders
 #: ../src/libemail-engine/e-mail-session.c:125
 #: ../src/mail/em-folder-properties.c:1150
-#: ../src/mail/em-folder-tree-model.c:1236
+#: ../src/mail/em-folder-tree-model.c:1237
 #: ../src/mail/importers/kmail-libs.c:139
 #: ../src/modules/mail/e-mail-shell-view-private.c:1026
 #: ../src/modules/mail/e-mail-shell-view-private.c:1037
@@ -14548,7 +15305,7 @@ msgstr "Innboks"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
 #: ../src/libemail-engine/e-mail-session.c:126
-#: ../src/mail/em-folder-tree-model.c:1229
+#: ../src/mail/em-folder-tree-model.c:1230
 #: ../src/mail/importers/kmail-libs.c:145
 #: ../src/modules/mail/e-mail-shell-view-private.c:1024
 msgid "Drafts"
@@ -14556,7 +15313,7 @@ msgstr "Skisser"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
 #: ../src/libemail-engine/e-mail-session.c:127
-#: ../src/mail/em-folder-tree-model.c:1240
+#: ../src/mail/em-folder-tree-model.c:1241
 #: ../src/mail/importers/kmail-libs.c:141
 #: ../src/modules/mail/e-mail-shell-view-private.c:1028
 msgid "Outbox"
@@ -14564,7 +15321,7 @@ msgstr "Utboks"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
 #: ../src/libemail-engine/e-mail-session.c:128
-#: ../src/mail/em-folder-tree-model.c:1244
+#: ../src/mail/em-folder-tree-model.c:1245
 #: ../src/mail/importers/kmail-libs.c:143
 #: ../src/modules/mail/e-mail-shell-view-private.c:1030
 msgid "Sent"
@@ -14572,7 +15329,7 @@ msgstr "Sendt"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
 #: ../src/libemail-engine/e-mail-session.c:129
-#: ../src/mail/em-folder-tree-model.c:1232
+#: ../src/mail/em-folder-tree-model.c:1233
 #: ../src/mail/importers/kmail-libs.c:147
 #: ../src/modules/mail/e-mail-shell-view-private.c:1032
 #: ../src/plugins/templates/e-templates-store.c:2212
@@ -14602,31 +15359,31 @@ msgstr "Fant ingen identitet å bruke. Videresending av meldingen ble avbrutt."
 msgid "Waiting for “%s”"
 msgstr "Venter på «%s»"
 
-#: ../src/libemail-engine/e-mail-session-utils.c:524
+#: ../src/libemail-engine/e-mail-session-utils.c:526
 msgid "No mail transport service available"
 msgstr "Tjeneste for transport av e-post er ikke tilgjengelig"
 
-#: ../src/libemail-engine/e-mail-session-utils.c:614
+#: ../src/libemail-engine/e-mail-session-utils.c:616
 #: ../src/libemail-engine/mail-ops.c:706
 #, c-format
 msgid "Posting message to “%s”"
 msgstr "Poster melding til «%s»"
 
-#: ../src/libemail-engine/e-mail-session-utils.c:651
+#: ../src/libemail-engine/e-mail-session-utils.c:653
 #: ../src/libemail-engine/mail-ops.c:742
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Feil under påføring av utgående filtre: %s"
 
-#: ../src/libemail-engine/e-mail-session-utils.c:681
-#: ../src/libemail-engine/e-mail-session-utils.c:716
-#: ../src/libemail-engine/mail-ops.c:766 ../src/libemail-engine/mail-ops.c:801
+#: ../src/libemail-engine/e-mail-session-utils.c:686
+#: ../src/libemail-engine/e-mail-session-utils.c:721
+#: ../src/libemail-engine/mail-ops.c:770 ../src/libemail-engine/mail-ops.c:805
 #, c-format
 msgid "Storing sent message to “%s”"
 msgstr "Lagrer sendt melding til «%s»"
 
-#: ../src/libemail-engine/e-mail-session-utils.c:705
-#: ../src/libemail-engine/mail-ops.c:790
+#: ../src/libemail-engine/e-mail-session-utils.c:710
+#: ../src/libemail-engine/mail-ops.c:794
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14635,14 +15392,14 @@ msgstr ""
 "Kunne ikke legge til i %s: %s\n"
 "Legger til i lokal «Sendt»-mappe i stedet."
 
-#: ../src/libemail-engine/e-mail-session-utils.c:735
-#: ../src/libemail-engine/mail-ops.c:818
+#: ../src/libemail-engine/e-mail-session-utils.c:740
+#: ../src/libemail-engine/mail-ops.c:822
 #, c-format
 msgid "Failed to append to local “Sent” folder: %s"
 msgstr "Kunne ikke legge til i lokal Sendt-mappe: %s"
 
-#: ../src/libemail-engine/e-mail-session-utils.c:923
-#: ../src/libemail-engine/mail-ops.c:978 ../src/libemail-engine/mail-ops.c:1080
+#: ../src/libemail-engine/e-mail-session-utils.c:928
+#: ../src/libemail-engine/mail-ops.c:983 ../src/libemail-engine/mail-ops.c:1085
 msgid "Sending message"
 msgstr "Sender melding"
 
@@ -14669,13 +15426,11 @@ msgstr "Filtrerer valgte meldinger"
 #, c-format
 msgid ""
 "Failed to filter selected messages. One reason can be that folder location "
-"set in one or more filters is invalid. Please check your filters in Edit-"
-">Message Filters.\n"
+"set in one or more filters is invalid. Please check your filters in "
+"Edit→Message Filters.\n"
 "Original error was: %s"
 msgstr ""
-"Klarte ikke å filtrere valgte meldinger. En årsak kan være at "
-"mappelokasjonen som er satt i ett eller flere filtre er ugyldig. Vennligst "
-"sjekk dine filtre i «Rediger->Meldingsfiltre».\n"
+"Klarte ikke å filtrere valgte meldinger. En årsak kan være at mappelokasjonen som er satt i ett eller flere 
filtre er ugyldig. Vennligst sjekk dine filtre i «Rediger→Meldingsfiltre».\n"
 "Opprinnelig feil var: %s"
 
 #: ../src/libemail-engine/mail-ops.c:226
@@ -14687,16 +15442,14 @@ msgstr "Henter e-post fra «%s»"
 #, c-format
 msgid ""
 "Failed to apply outgoing filters. One reason can be that folder location set "
-"in one or more filters is invalid. Please check your filters in Edit-"
-">Message Filters.\n"
+"in one or more filters is invalid. Please check your filters in Edit→Message "
+"Filters.\n"
 "Original error was: %s"
 msgstr ""
-"Klarte ikke å bruke utgående filtre. En årsak kan være at mappelokasjonen "
-"som er satt i ett eller flere filtre er ugyldig. Vennligst sjekk dine filtre "
-"i «Rediger->Meldingsfiltre».\n"
+"Klarte ikke å bruke utgående filtre. En årsak kan være at mappelokasjonen som er satt i ett eller flere 
filtre er ugyldig. Vennligst sjekk dine filtre i «Rediger→Meldingsfiltre».\n"
 "Opprinnelig feil var: %s"
 
-#: ../src/libemail-engine/mail-ops.c:989
+#: ../src/libemail-engine/mail-ops.c:994
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sender melding %d av %d"
@@ -14704,52 +15457,52 @@ msgstr "Sender melding %d av %d"
 #. Translators: The string is distinguished by total
 #. * count of messages to be sent.  Failed messages is
 #. * always more than zero.
-#: ../src/libemail-engine/mail-ops.c:1041
+#: ../src/libemail-engine/mail-ops.c:1046
 #, c-format
 msgid "Failed to send a message"
 msgid_plural "Failed to send %d of %d messages"
 msgstr[0] "Klarte ikke å sende en melding"
 msgstr[1] "Klarte ikke å sende %d av %d meldinger"
 
-#: ../src/libemail-engine/mail-ops.c:1047
+#: ../src/libemail-engine/mail-ops.c:1052
 msgid "Cancelled."
 msgstr "Avbrutt."
 
-#: ../src/libemail-engine/mail-ops.c:1049
+#: ../src/libemail-engine/mail-ops.c:1054
 msgid "Complete."
 msgstr "Fullført."
 
-#: ../src/libemail-engine/mail-ops.c:1164
+#: ../src/libemail-engine/mail-ops.c:1169
 #, c-format
 msgid "Moving messages to “%s”"
 msgstr "Flytter meldinger til «%s»"
 
-#: ../src/libemail-engine/mail-ops.c:1165
+#: ../src/libemail-engine/mail-ops.c:1170
 #, c-format
 msgid "Copying messages to “%s”"
 msgstr "Kopierer meldinger til «%s»"
 
-#: ../src/libemail-engine/mail-ops.c:1284
+#: ../src/libemail-engine/mail-ops.c:1289
 #, c-format
 msgid "Storing folder “%s”"
 msgstr "Lagrer mappe «%s»"
 
-#: ../src/libemail-engine/mail-ops.c:1412
+#: ../src/libemail-engine/mail-ops.c:1417
 #, c-format
 msgid "Expunging and storing account “%s”"
 msgstr "Tømmer og lagrer konto «%s»"
 
-#: ../src/libemail-engine/mail-ops.c:1413
+#: ../src/libemail-engine/mail-ops.c:1418
 #, c-format
 msgid "Storing account “%s”"
 msgstr "Lagrer konto «%s»"
 
-#: ../src/libemail-engine/mail-ops.c:1488
+#: ../src/libemail-engine/mail-ops.c:1493
 #, c-format
 msgid "Emptying trash in “%s”"
 msgstr "Tømmer søppel i «%s»"
 
-#: ../src/libemail-engine/mail-ops.c:1580
+#: ../src/libemail-engine/mail-ops.c:1585
 #, c-format
 msgid "Processing folder changes in “%s”"
 msgstr "Prosesserer endringer i mappe «%s»"
@@ -14764,12 +15517,24 @@ msgstr "Kan ikke opprette spool-katalog «%s»: %s"
 msgid "Trying to movemail a non-mbox source “%s”"
 msgstr "Prøver å bruke movemail på en kilde, «%s», som ikke er i mbox-format"
 
-#: ../src/libemail-engine/mail-tools.c:257
+#. Translators: This is a subject attribution for forwarded messages. The %s is replaced with subject of the 
original message.
+#: ../src/libemail-engine/mail-tools.c:193
+#, c-format
+msgid "[Fwd: %s]"
+msgstr "[Fwd: %s]"
+
+#. Translators: This is a subject attribution for forwarded messages, used when there could not be used any 
subject.
+#. It results in "[Fwd: No Subject]" being used as a subject of the forwarded message.
+#: ../src/libemail-engine/mail-tools.c:196
+msgid "No Subject"
+msgstr "Uten emne"
+
+#: ../src/libemail-engine/mail-tools.c:271
 #, c-format
 msgid "Forwarded message — %s"
 msgstr "Videresendt melding – %s"
 
-#: ../src/libemail-engine/mail-tools.c:259
+#: ../src/libemail-engine/mail-tools.c:273
 msgid "Forwarded message"
 msgstr "Videresendt melding"
 
@@ -14827,17 +15592,6 @@ msgstr "Du kan dra og slippe kontonavn for å endre rekkefølge."
 msgid "De_fault"
 msgstr "_Forvalgt"
 
-#: ../src/mail/e-mail-account-tree-view.c:84
-#: ../src/modules/mail/em-composer-prefs.c:1299
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:355
-#: ../src/plugins/publish-calendar/publish-calendar.c:853
-msgid "Enabled"
-msgstr "Aktivert"
-
-#: ../src/mail/e-mail-account-tree-view.c:108
-msgid "Account Name"
-msgstr "Kontonavn"
-
 #: ../src/mail/e-mail-autoconfig.c:620
 msgid "No email address provided"
 msgstr "Ingen e-postadresse ble oppgitt"
@@ -14846,9 +15600,9 @@ msgstr "Ingen e-postadresse ble oppgitt"
 msgid "Missing domain in email address"
 msgstr "Mangler domene i e-postadresse"
 
-#: ../src/mail/e-mail-browser.c:129 ../src/shell/e-shell-window-actions.c:782
-#: ../src/shell/e-shell-window-actions.c:789
-#: ../src/shell/e-shell-window-actions.c:796
+#: ../src/mail/e-mail-browser.c:129 ../src/shell/e-shell-window-actions.c:812
+#: ../src/shell/e-shell-window-actions.c:819
+#: ../src/shell/e-shell-window-actions.c:826
 msgid "Close this window"
 msgstr "Lukk dette vinduet"
 
@@ -14866,11 +15620,11 @@ msgstr "Gå til_bake"
 msgid "_Skip Lookup"
 msgstr "_Hopp over oppslag"
 
-#: ../src/mail/e-mail-config-assistant.c:661
+#: ../src/mail/e-mail-config-assistant.c:665
 msgid "Evolution Account Assistant"
 msgstr "Evolution kontoassistent"
 
-#: ../src/mail/e-mail-config-assistant.c:955
+#: ../src/mail/e-mail-config-assistant.c:972
 msgid "_Revise Details"
 msgstr "Gå gjennom detalje_r"
 
@@ -14882,163 +15636,174 @@ msgstr "Spør etter autentiseringstyper …"
 msgid "Check for Supported Types"
 msgstr "Sjekk støttede typer"
 
-#: ../src/mail/e-mail-config-confirm-page.c:156
-msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email using Evolution.\n"
-"\n"
-"Click “Apply” to save your settings."
-msgstr ""
-"Gratulerer, din e-post-konfigurasjon er nå fullført.\n"
-"\n"
-"Du kan nå sende og motta e-post med Evolution.\n"
-"\n"
-"Klikk «Bruk» for å lagre dine innstillinger."
-
-#: ../src/mail/e-mail-config-confirm-page.c:168
-msgid "Done"
-msgstr "Ferdig"
-
-#: ../src/mail/e-mail-config-defaults-page.c:378
-msgid "Checking server settings..."
-msgstr "Ser etter innstillinger for tjener …"
-
-#: ../src/mail/e-mail-config-defaults-page.c:496
+#: ../src/mail/e-mail-config-composing-page.c:116
 msgctxt "ReplyForward"
 msgid "Use global setting"
 msgstr "Bruk global innstilling"
 
-#: ../src/mail/e-mail-config-defaults-page.c:498
-#: ../src/mail/mail-config.ui.h:26
+#: ../src/mail/e-mail-config-composing-page.c:118
+#: ../src/mail/mail-config.ui.h:27
 msgctxt "ReplyForward"
 msgid "Attachment"
 msgstr "Vedlegg"
 
-#: ../src/mail/e-mail-config-defaults-page.c:500
-#: ../src/mail/mail-config.ui.h:27
+#: ../src/mail/e-mail-config-composing-page.c:120
+#: ../src/mail/mail-config.ui.h:28
 msgctxt "ReplyForward"
 msgid "Inline (Outlook style)"
 msgstr "I meldingen (som i Outlook)"
 
-#: ../src/mail/e-mail-config-defaults-page.c:502
-#: ../src/mail/mail-config.ui.h:28
+#: ../src/mail/e-mail-config-composing-page.c:122
+#: ../src/mail/mail-config.ui.h:29
 msgctxt "ReplyForward"
 msgid "Quoted"
 msgstr "Sitert"
 
-#: ../src/mail/e-mail-config-defaults-page.c:504
-#: ../src/mail/mail-config.ui.h:29
+#: ../src/mail/e-mail-config-composing-page.c:124
+#: ../src/mail/mail-config.ui.h:30
 msgctxt "ReplyForward"
 msgid "Do Not Quote"
 msgstr "Ikke siter"
 
-#: ../src/mail/e-mail-config-defaults-page.c:830
+#: ../src/mail/e-mail-config-composing-page.c:397
+#: ../src/mail/e-mail-config-composing-page.c:606
+msgid "Composing Messages"
+msgstr "Skriver meldinger"
+
+#: ../src/mail/e-mail-config-composing-page.c:406
+msgid "Alway_s carbon-copy (cc) to:"
+msgstr "All_tid _kopi (cc) til:"
+
+#: ../src/mail/e-mail-config-composing-page.c:431
+msgid "Always _blind carbon-copy (bcc) to:"
+msgstr "Alltid _blindkopi (bcc) til:"
+
+#: ../src/mail/e-mail-config-composing-page.c:462
+msgid "Re_ply style:"
+msgstr "S_varstil:"
+
+#: ../src/mail/e-mail-config-composing-page.c:488
+#: ../src/mail/mail-config.ui.h:20
+msgid "Start _typing at the bottom"
+msgstr "S_tart skriving under meldingen"
+
+#: ../src/mail/e-mail-config-composing-page.c:495
+#: ../src/mail/mail-config.ui.h:21
+msgid "_Keep signature above the original message"
+msgstr "_Plasser signaturen over opprinnelig melding"
+
+#: ../src/mail/e-mail-config-composing-page.c:512
+msgid "Message Receipts"
+msgstr "Meldingsmottakere"
+
+#: ../src/mail/e-mail-config-composing-page.c:521
+msgid "S_end message receipts:"
+msgstr "S_end kvittering for meldinger:"
+
+#: ../src/mail/e-mail-config-composing-page.c:546
+msgid "Never"
+msgstr "Aldri"
+
+#: ../src/mail/e-mail-config-composing-page.c:552
+msgid "Always"
+msgstr "Alltid"
+
+#: ../src/mail/e-mail-config-composing-page.c:558
+msgid "Ask for each message"
+msgstr "Spør for hver melding"
+
+#: ../src/mail/e-mail-config-confirm-page.c:154
+msgid ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email using Evolution.\n"
+"\n"
+"Click “Apply” to save your settings."
+msgstr ""
+"Gratulerer, din e-post-konfigurasjon er nå fullført.\n"
+"\n"
+"Du kan nå sende og motta e-post med Evolution.\n"
+"\n"
+"Klikk «Bruk» for å lagre dine innstillinger."
+
+#: ../src/mail/e-mail-config-confirm-page.c:166
+msgid "Done"
+msgstr "Ferdig"
+
+#: ../src/mail/e-mail-config-defaults-page.c:314
+msgid "Checking server settings..."
+msgstr "Ser etter innstillinger for tjener …"
+
+#: ../src/mail/e-mail-config-defaults-page.c:663
 msgid "Special Folders"
 msgstr "Spesielle mapper"
 
-#: ../src/mail/e-mail-config-defaults-page.c:839
+#: ../src/mail/e-mail-config-defaults-page.c:672
 msgid "Draft Messages _Folder:"
 msgstr "Mappe _for skisser:"
 
-#: ../src/mail/e-mail-config-defaults-page.c:849
+#: ../src/mail/e-mail-config-defaults-page.c:682
 msgid "Choose a folder for saving draft messages."
 msgstr "Velg en mappe for lagring av skisser."
 
-#: ../src/mail/e-mail-config-defaults-page.c:863
+#: ../src/mail/e-mail-config-defaults-page.c:698
 msgid "Sent _Messages Folder:"
 msgstr "Mappe for sendte _meldinger:"
 
-#: ../src/mail/e-mail-config-defaults-page.c:873
+#: ../src/mail/e-mail-config-defaults-page.c:726
 msgid "Choose a folder for saving sent messages."
 msgstr "Velg en mappe for lagring av sendte meldinger."
 
-#: ../src/mail/e-mail-config-defaults-page.c:892
+#: ../src/mail/e-mail-config-defaults-page.c:752
 msgid "S_ave replies in the folder of the message being replied to"
 msgstr "L_agre svar i samme mappe som meldingen som blir besvart"
 
-#: ../src/mail/e-mail-config-defaults-page.c:909
+#: ../src/mail/e-mail-config-defaults-page.c:775
 msgid "Archi_ve Folder:"
 msgstr "Arki_vmappe:"
 
-#: ../src/mail/e-mail-config-defaults-page.c:919
-#: ../src/modules/mail/em-mailer-prefs.c:1401
+#: ../src/mail/e-mail-config-defaults-page.c:785
+#: ../src/modules/mail/em-mailer-prefs.c:1407
 msgid "Choose a folder to archive messages to."
 msgstr "Velg en mappe å arkivere meldinger til."
 
-#: ../src/mail/e-mail-config-defaults-page.c:933
+#: ../src/mail/e-mail-config-defaults-page.c:799
 msgid "_Templates Folder:"
 msgstr "_Mappe for maler:"
 
-#: ../src/mail/e-mail-config-defaults-page.c:943
+#: ../src/mail/e-mail-config-defaults-page.c:809
 msgid "Choose a folder to use for template messages."
 msgstr "Velg en mappe som skal brukes for maler for meldinger."
 
-#: ../src/mail/e-mail-config-defaults-page.c:965
+#: ../src/mail/e-mail-config-defaults-page.c:831
 msgid "_Restore Defaults"
 msgstr "Gjenopp_rett forvalg"
 
-#: ../src/mail/e-mail-config-defaults-page.c:982
+#: ../src/mail/e-mail-config-defaults-page.c:848
 msgid "_Lookup Folders"
 msgstr "S_lå opp mapper"
 
-#: ../src/mail/e-mail-config-defaults-page.c:1000
+#: ../src/mail/e-mail-config-defaults-page.c:866
 msgid "Use a Real Folder for _Trash:"
 msgstr "Bruk en virkelig mappe som _papirkurv:"
 
-#: ../src/mail/e-mail-config-defaults-page.c:1001
+#: ../src/mail/e-mail-config-defaults-page.c:867
 msgid "Choose a folder for deleted messages."
 msgstr "Velg en mappe for slettede meldinger."
 
-#: ../src/mail/e-mail-config-defaults-page.c:1010
+#: ../src/mail/e-mail-config-defaults-page.c:876
 msgid "Use a Real Folder for _Junk:"
 msgstr "Bruk en virkelig mappe for uønskede _meldinger:"
 
-#: ../src/mail/e-mail-config-defaults-page.c:1011
+#: ../src/mail/e-mail-config-defaults-page.c:877
 msgid "Choose a folder for junk messages."
 msgstr "Velg en mappe for uønskede meldinger."
 
-#: ../src/mail/e-mail-config-defaults-page.c:1028
-msgid "Composing Messages"
-msgstr "Skriver meldinger"
-
-#: ../src/mail/e-mail-config-defaults-page.c:1037
-msgid "Alway_s carbon-copy (cc) to:"
-msgstr "All_tid _kopi (cc) til:"
-
-#: ../src/mail/e-mail-config-defaults-page.c:1062
-msgid "Always _blind carbon-copy (bcc) to:"
-msgstr "Alltid _blindkopi (bcc) til:"
-
-#: ../src/mail/e-mail-config-defaults-page.c:1093
-msgid "Re_ply style:"
-msgstr "S_varstil:"
-
-#: ../src/mail/e-mail-config-defaults-page.c:1129
-msgid "Message Receipts"
-msgstr "Meldingsmottakere"
-
-#: ../src/mail/e-mail-config-defaults-page.c:1138
-msgid "S_end message receipts:"
-msgstr "S_end kvittering for meldinger:"
-
-#: ../src/mail/e-mail-config-defaults-page.c:1163
-msgid "Never"
-msgstr "Aldri"
-
-#: ../src/mail/e-mail-config-defaults-page.c:1169
-msgid "Always"
-msgstr "Alltid"
-
-#: ../src/mail/e-mail-config-defaults-page.c:1175
-msgid "Ask for each message"
-msgstr "Spør for hver melding"
-
-#: ../src/mail/e-mail-config-defaults-page.c:1282
+#: ../src/mail/e-mail-config-defaults-page.c:981
 msgid "Defaults"
 msgstr "Forvalg"
 
-#: ../src/mail/e-mail-config-identity-page.c:516
+#: ../src/mail/e-mail-config-identity-page.c:513
 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 information in "
@@ -15048,13 +15813,13 @@ msgstr ""
 "under må ikke nødvendigvis fylles ut hvis du ikke ønsker å inkludere denne "
 "informasjonen i meldingene du sender."
 
-#: ../src/mail/e-mail-config-identity-page.c:544
-#: ../src/mail/e-mail-config-summary-page.c:324
+#: ../src/mail/e-mail-config-identity-page.c:541
+#: ../src/mail/e-mail-config-summary-page.c:323
 msgid "Account Information"
 msgstr "Kontoinformasjon"
 
-#: ../src/mail/e-mail-config-identity-page.c:582
-#: ../src/mail/e-mail-config-summary-page.c:354
+#: ../src/mail/e-mail-config-identity-page.c:579
+#: ../src/mail/e-mail-config-summary-page.c:353
 msgid ""
 "The above name will be used to identify this account.\n"
 "Use for example, “Work” or “Personal”."
@@ -15062,93 +15827,83 @@ msgstr ""
 "Navnet over vil brukes til å identifisere denne kontoen.\n"
 "For eksempel «Arbeid» eller «Personlig»."
 
-#: ../src/mail/e-mail-config-identity-page.c:599
+#: ../src/mail/e-mail-config-identity-page.c:596
 msgid "Required Information"
 msgstr "Nødvendig informasjon"
 
-#: ../src/mail/e-mail-config-identity-page.c:608
+#: ../src/mail/e-mail-config-identity-page.c:605
 msgid "Full Nam_e:"
 msgstr "_Fullt navn:"
 
-#: ../src/mail/e-mail-config-identity-page.c:637
+#: ../src/mail/e-mail-config-identity-page.c:634
 msgid "Email _Address:"
 msgstr "E-post_adresse:"
 
-#: ../src/mail/e-mail-config-identity-page.c:686
+#: ../src/mail/e-mail-config-identity-page.c:683
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "Optional Information"
 msgstr "Valgfri informasjon"
 
-#: ../src/mail/e-mail-config-identity-page.c:695
+#: ../src/mail/e-mail-config-identity-page.c:692
 msgid "Re_ply-To:"
 msgstr "S_var-til:"
 
-#: ../src/mail/e-mail-config-identity-page.c:724
+#: ../src/mail/e-mail-config-identity-page.c:721
 msgid "Or_ganization:"
 msgstr "Or_ganisasjon:"
 
-#: ../src/mail/e-mail-config-identity-page.c:779
+#: ../src/mail/e-mail-config-identity-page.c:776
 msgid "Add Ne_w Signature..."
 msgstr "Legg til n_y signatur …"
 
-#: ../src/mail/e-mail-config-identity-page.c:793
+#: ../src/mail/e-mail-config-identity-page.c:790
 msgid "A_liases:"
 msgstr "A_lias:"
 
-#: ../src/mail/e-mail-config-identity-page.c:855
-#: ../src/mail/mail-config.ui.h:113
-msgid "Add"
-msgstr "Legg til"
-
-#: ../src/mail/e-mail-config-identity-page.c:864
-msgid "Edit"
-msgstr "Rediger"
-
-#: ../src/mail/e-mail-config-identity-page.c:873
-#: ../src/mail/mail-config.ui.h:114
-msgid "Remove"
-msgstr "Fjern"
+#: ../src/mail/e-mail-config-identity-page.c:861
+msgid "Edi_t"
+msgstr "R_ediger"
 
-#: ../src/mail/e-mail-config-identity-page.c:887
+#: ../src/mail/e-mail-config-identity-page.c:884
 msgid "_Look up mail server details based on the entered e-mail address"
 msgstr "S_lå opp detaljer om e-posttjener basert på oppgitt e-postadresse"
 
 #. This is only a warning, not a blocker
 #. complete = complete && correct;
-#: ../src/mail/e-mail-config-identity-page.c:934
+#: ../src/mail/e-mail-config-identity-page.c:933
 msgid "Full Name should not be empty"
 msgstr "Fullt navn bør ikke være tomt"
 
-#: ../src/mail/e-mail-config-identity-page.c:941
+#: ../src/mail/e-mail-config-identity-page.c:940
 msgid "Email Address cannot be empty"
 msgstr "E-postadressen kan ikke være tomt"
 
-#: ../src/mail/e-mail-config-identity-page.c:946
+#: ../src/mail/e-mail-config-identity-page.c:945
 msgid "Email Address is not a valid email"
 msgstr "E-postadressen er ikke en gyldig e-postadresse"
 
-#: ../src/mail/e-mail-config-identity-page.c:958
+#: ../src/mail/e-mail-config-identity-page.c:957
 msgid "Reply To is not a valid email"
 msgstr "Svar til er ikke en e-postadresse"
 
-#: ../src/mail/e-mail-config-identity-page.c:969
-#: ../src/mail/e-mail-config-summary-page.c:633
+#: ../src/mail/e-mail-config-identity-page.c:968
+#: ../src/mail/e-mail-config-summary-page.c:638
 msgid "Account Name cannot be empty"
 msgstr "Navn på konto kan ikke være tomt"
 
-#: ../src/mail/e-mail-config-lookup-page.c:69
+#: ../src/mail/e-mail-config-lookup-page.c:65
 msgid "Looking up account details..."
 msgstr "Slår opp detaljer om konto …"
 
-#: ../src/mail/e-mail-config-provider-page.c:529
+#: ../src/mail/e-mail-config-provider-page.c:537
 msgid "Checking for New Mail"
 msgstr "Ser etter nye meldinger"
 
-#: ../src/mail/e-mail-config-provider-page.c:545
+#: ../src/mail/e-mail-config-provider-page.c:553
 msgid "Check for _new messages every"
 msgstr "Se etter _nye meldinger hver(t)"
 
-#: ../src/mail/e-mail-config-provider-page.c:753
+#: ../src/mail/e-mail-config-provider-page.c:763
 msgid "Receiving Options"
 msgstr "Alternativer for mottak"
 
@@ -15164,112 +15919,112 @@ msgctxt "PGPKeyDescription"
 msgid "%s — %s"
 msgstr "%s – %s"
 
-#: ../src/mail/e-mail-config-security-page.c:320
-#: ../src/mail/em-folder-properties.c:1070 ../src/mail/mail-config.ui.h:31
-#: ../src/modules/addressbook/autocompletion-config.c:114
+#: ../src/mail/e-mail-config-security-page.c:318
+#: ../src/mail/em-folder-properties.c:1070 ../src/mail/mail-config.ui.h:32
+#: ../src/modules/addressbook/autocompletion-config.c:115
 #: ../src/modules/calendar/e-calendar-preferences.c:644
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:48
-#: ../src/modules/mail/e-mail-shell-backend.c:729
+#: ../src/modules/mail/e-mail-shell-backend.c:737
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:16
 msgid "General"
 msgstr "Generelt"
 
-#: ../src/mail/e-mail-config-security-page.c:329
+#: ../src/mail/e-mail-config-security-page.c:327
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "Ikke signer _møteforespørsler (for kompatibilitet med Outlook)"
 
-#: ../src/mail/e-mail-config-security-page.c:351
+#: ../src/mail/e-mail-config-security-page.c:349
 msgid "Pretty Good Privacy (OpenPGP)"
 msgstr "Pretty Good Privacy (OpenPGP)"
 
-#: ../src/mail/e-mail-config-security-page.c:360
+#: ../src/mail/e-mail-config-security-page.c:358
 msgid "OpenPGP _Key ID:"
 msgstr "OpenPGP-nø_kkel ID:"
 
-#: ../src/mail/e-mail-config-security-page.c:393
+#: ../src/mail/e-mail-config-security-page.c:391
 msgid "Si_gning algorithm:"
 msgstr "Si_gneringsalgoritme:"
 
-#: ../src/mail/e-mail-config-security-page.c:409
-#: ../src/mail/e-mail-config-security-page.c:573
-#: ../src/mail/mail-config.ui.h:76
+#: ../src/mail/e-mail-config-security-page.c:407
+#: ../src/mail/e-mail-config-security-page.c:571
+#: ../src/mail/mail-config.ui.h:77
 msgid "SHA1"
 msgstr "SHA1"
 
-#: ../src/mail/e-mail-config-security-page.c:412
-#: ../src/mail/e-mail-config-security-page.c:576
-#: ../src/mail/mail-config.ui.h:77
+#: ../src/mail/e-mail-config-security-page.c:410
+#: ../src/mail/e-mail-config-security-page.c:574
+#: ../src/mail/mail-config.ui.h:78
 msgid "SHA256"
 msgstr "SHA256"
 
-#: ../src/mail/e-mail-config-security-page.c:415
-#: ../src/mail/e-mail-config-security-page.c:579
-#: ../src/mail/mail-config.ui.h:78
+#: ../src/mail/e-mail-config-security-page.c:413
+#: ../src/mail/e-mail-config-security-page.c:577
+#: ../src/mail/mail-config.ui.h:79
 msgid "SHA384"
 msgstr "SHA384"
 
-#: ../src/mail/e-mail-config-security-page.c:418
-#: ../src/mail/e-mail-config-security-page.c:582
-#: ../src/mail/mail-config.ui.h:79
+#: ../src/mail/e-mail-config-security-page.c:416
+#: ../src/mail/e-mail-config-security-page.c:580
+#: ../src/mail/mail-config.ui.h:80
 msgid "SHA512"
 msgstr "SHA512"
 
-#: ../src/mail/e-mail-config-security-page.c:434
+#: ../src/mail/e-mail-config-security-page.c:432
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "All_tid signer utgående meldinger når denne kontoen brukes"
 
-#: ../src/mail/e-mail-config-security-page.c:446
+#: ../src/mail/e-mail-config-security-page.c:444
 msgid "Always enc_rypt outgoing messages when using this account"
 msgstr "Alltid k_rypter utgående meldinger når denne kontoen brukes"
 
-#: ../src/mail/e-mail-config-security-page.c:458
+#: ../src/mail/e-mail-config-security-page.c:456
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Alltid krypter til _meg selv ved sending av krypterte meldinger"
 
-#: ../src/mail/e-mail-config-security-page.c:470
+#: ../src/mail/e-mail-config-security-page.c:468
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Alltid s_tol på nøkler i min nøkkelring ved kryptering"
 
-#: ../src/mail/e-mail-config-security-page.c:482
+#: ../src/mail/e-mail-config-security-page.c:480
 msgid "Prefer _inline sign/encrypt for plain text messages"
 msgstr "Foretrekk signering/kryptering i meldingen for rene tekstmeldinger"
 
-#: ../src/mail/e-mail-config-security-page.c:506
+#: ../src/mail/e-mail-config-security-page.c:504
 msgid "Secure MIME (S/MIME)"
 msgstr "Sikker MIME (S/MIME)"
 
-#: ../src/mail/e-mail-config-security-page.c:515
+#: ../src/mail/e-mail-config-security-page.c:513
 msgid "Sig_ning certificate:"
 msgstr "Sertifikat for sig_nering:"
 
-#: ../src/mail/e-mail-config-security-page.c:539
-#: ../src/mail/e-mail-config-security-page.c:637
+#: ../src/mail/e-mail-config-security-page.c:537
+#: ../src/mail/e-mail-config-security-page.c:635
 msgid "Select"
 msgstr "Velg"
 
-#: ../src/mail/e-mail-config-security-page.c:548
-#: ../src/mail/e-mail-config-security-page.c:646
-#: ../src/mail/mail-dialogs.ui.h:16 ../src/shell/e-shell-window-actions.c:885
+#: ../src/mail/e-mail-config-security-page.c:546
+#: ../src/mail/e-mail-config-security-page.c:644
+#: ../src/mail/mail-dialogs.ui.h:16 ../src/shell/e-shell-window-actions.c:915
 msgid "_Clear"
 msgstr "_Tøm"
 
-#: ../src/mail/e-mail-config-security-page.c:557
+#: ../src/mail/e-mail-config-security-page.c:555
 msgid "Signing _algorithm:"
 msgstr "Signerings_algoritme:"
 
-#: ../src/mail/e-mail-config-security-page.c:598
+#: ../src/mail/e-mail-config-security-page.c:596
 msgid "Always sign outgoing messages when using this account"
 msgstr "Alltid signer utgående meldinger når denne kontoen brukes"
 
-#: ../src/mail/e-mail-config-security-page.c:613
+#: ../src/mail/e-mail-config-security-page.c:611
 msgid "Encryption certificate:"
 msgstr "Sertifikat for kryptering:"
 
-#: ../src/mail/e-mail-config-security-page.c:655
+#: ../src/mail/e-mail-config-security-page.c:653
 msgid "Always encrypt outgoing messages when using this account"
 msgstr "Alltid krypter utgående meldinger når denne kontoen brukes"
 
-#: ../src/mail/e-mail-config-security-page.c:667
+#: ../src/mail/e-mail-config-security-page.c:665
 msgid "Always encrypt to myself when sending encrypted messages"
 msgstr "Alltid krypter til meg selv ved sending av krypterte meldinger"
 
@@ -15277,68 +16032,72 @@ msgstr "Alltid krypter til meg selv ved sending av krypterte meldinger"
 msgid "Sending Email"
 msgstr "Utgående e-post"
 
-#: ../src/mail/e-mail-config-service-page.c:639
+#: ../src/mail/e-mail-config-service-page.c:504
 msgid "Server _Type:"
 msgstr "Tjener_type:"
 
-#: ../src/mail/e-mail-config-summary-page.c:143
+#: ../src/mail/e-mail-config-summary-page.c:144
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/mail/e-mail-config-summary-page.c:146
+#: ../src/mail/e-mail-config-summary-page.c:147
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: ../src/mail/e-mail-config-summary-page.c:307
+#: ../src/mail/e-mail-config-summary-page.c:306
 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."
 
-#: ../src/mail/e-mail-config-summary-page.c:371
+#: ../src/mail/e-mail-config-summary-page.c:370
 msgid "Personal Details"
 msgstr "Personlige detaljer"
 
-#: ../src/mail/e-mail-config-summary-page.c:380
+#: ../src/mail/e-mail-config-summary-page.c:379
 msgid "Full Name:"
 msgstr "Fullt navn:"
 
-#: ../src/mail/e-mail-config-summary-page.c:394
+#: ../src/mail/e-mail-config-summary-page.c:393
 msgid "Email Address:"
 msgstr "E-postadresse:"
 
-#: ../src/mail/e-mail-config-summary-page.c:408
+#: ../src/mail/e-mail-config-summary-page.c:407
 msgid "Receiving"
 msgstr "Mottar"
 
-#: ../src/mail/e-mail-config-summary-page.c:420
+#: ../src/mail/e-mail-config-summary-page.c:419
 msgid "Sending"
 msgstr "Sender"
 
-#: ../src/mail/e-mail-config-summary-page.c:432
+#: ../src/mail/e-mail-config-summary-page.c:431
 msgid "Server Type:"
 msgstr "Tjenertype:"
 
-#: ../src/mail/e-mail-config-summary-page.c:453
+#: ../src/mail/e-mail-config-summary-page.c:452
 #: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:606
 msgid "Server:"
 msgstr "Tjener:"
 
-#: ../src/mail/e-mail-config-summary-page.c:474
+#: ../src/mail/e-mail-config-summary-page.c:473
 #: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:704
 msgid "Username:"
 msgstr "Brukernavn:"
 
-#: ../src/mail/e-mail-config-summary-page.c:495
+#: ../src/mail/e-mail-config-summary-page.c:494
 msgid "Security:"
 msgstr "Sikkerhet:"
 
-#: ../src/mail/e-mail-config-summary-page.c:788
+#: ../src/mail/e-mail-config-summary-page.c:651
+msgid "Cannot have both receiving and sending parts set to None"
+msgstr "Mottaks- og sendingsdelene kan ikke være tomme"
+
+#: ../src/mail/e-mail-config-summary-page.c:807
 msgid "Account Summary"
 msgstr "Kontosammendrag"
 
-#: ../src/mail/e-mail-config-welcome-page.c:157
+#: ../src/mail/e-mail-config-welcome-page.c:161
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -15348,12 +16107,12 @@ msgstr ""
 "\n"
 "Klikk «Neste» for å begynne."
 
-#: ../src/mail/e-mail-config-welcome-page.c:167
-#: ../src/modules/startup-wizard/e-startup-assistant.c:152
+#: ../src/mail/e-mail-config-welcome-page.c:171
+#: ../src/modules/startup-wizard/e-startup-assistant.c:154
 msgid "Welcome"
 msgstr "Velkommen"
 
-#: ../src/mail/e-mail-config-window.c:326
+#: ../src/mail/e-mail-config-window.c:329
 msgid "Account Editor"
 msgstr "Kontoredigering"
 
@@ -15501,7 +16260,7 @@ msgstr "_Senere"
 
 #: ../src/mail/e-mail-label-manager.c:169
 #: ../src/mail/em-folder-properties.c:842
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1198
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1245
 msgid "Add Label"
 msgstr "Legg til etikett"
 
@@ -15570,7 +16329,7 @@ msgstr "Navn på meldingshode"
 msgid "Header Value"
 msgstr "Verdi for meldingshode"
 
-#: ../src/mail/e-mail-printer.c:100 ../src/mail/mail-config.ui.h:125
+#: ../src/mail/e-mail-printer.c:100 ../src/mail/mail-config.ui.h:127
 msgid "Headers"
 msgstr "Meldingshoder"
 
@@ -16271,34 +17030,39 @@ msgstr "Last eksternt innhold"
 msgid "Do not warn me again"
 msgstr "Ikke varsle meg igjen"
 
-#: ../src/mail/e-mail-reader-utils.c:568
+#: ../src/mail/e-mail-reader-utils.c:633
+#, c-format
+msgid "Deleting messages in Junk folder “%s”…"
+msgstr "Sletter meldinger i søppelpostmappe «%s» …"
+
+#: ../src/mail/e-mail-reader-utils.c:728
 #, c-format
 msgid "Refreshing folder “%s”"
 msgstr "Oppdaterer mappe «%s»"
 
-#: ../src/mail/e-mail-reader-utils.c:1175
+#: ../src/mail/e-mail-reader-utils.c:1335
 msgid "Marking thread to be ignored"
 msgstr "Merker tråd som ignorert"
 
-#: ../src/mail/e-mail-reader-utils.c:1179
+#: ../src/mail/e-mail-reader-utils.c:1339
 msgid "Unmarking thread from being ignored"
 msgstr "Fjerner merking av tråd som ignorert"
 
-#: ../src/mail/e-mail-reader-utils.c:1183
+#: ../src/mail/e-mail-reader-utils.c:1343
 msgid "Marking subthread to be ignored"
 msgstr "Merker undertråd som ignorert"
 
-#: ../src/mail/e-mail-reader-utils.c:1187
+#: ../src/mail/e-mail-reader-utils.c:1347
 msgid "Unmarking subthread from being ignored"
 msgstr "Fjerner merking av undertråd som ignorert"
 
-#: ../src/mail/e-mail-reader-utils.c:1439
+#: ../src/mail/e-mail-reader-utils.c:1599
 msgid "Printing"
 msgstr "Skriver ut"
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../src/mail/e-mail-reader-utils.c:1676
+#: ../src/mail/e-mail-reader-utils.c:1836
 #, c-format
 msgid ""
 "Folder “%s” contains %u duplicate message. Are you sure you want to delete "
@@ -16313,7 +17077,7 @@ msgstr[1] ""
 "Mappen «%s» inneholder %u duplikatmeldinger. Er du sikker på at du vil "
 "slette dem?"
 
-#: ../src/mail/e-mail-reader-utils.c:2694
+#: ../src/mail/e-mail-reader-utils.c:2854
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Lagre melding"
@@ -16324,13 +17088,13 @@ 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".
-#: ../src/mail/e-mail-reader-utils.c:2715
+#: ../src/mail/e-mail-reader-utils.c:2875
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Melding"
 msgstr[1] "Meldinger"
 
-#: ../src/mail/e-mail-reader-utils.c:3088
+#: ../src/mail/e-mail-reader-utils.c:3248
 msgid "Parsing message"
 msgstr "Leser melding"
 
@@ -16342,12 +17106,12 @@ msgstr "Meldingen har ikke tekstinnhold."
 msgid "Flag to Follow Up"
 msgstr "Merk for oppfølging"
 
-#: ../src/mail/e-mail-ui-session.c:813
+#: ../src/mail/e-mail-ui-session.c:821
 #, c-format
 msgid "%s authentication failed"
 msgstr "%s autentisering feilet"
 
-#: ../src/mail/e-mail-ui-session.c:863
+#: ../src/mail/e-mail-ui-session.c:871
 #, c-format
 msgid "No data source found for UID “%s”"
 msgstr "Fant ingen datakilde for UID «%s»"
@@ -16393,7 +17157,7 @@ msgstr[1] ""
 
 #. This message is never removed from the camel operation, otherwise the GtkInfoBar
 #. hides itself and the user sees no feedback.
-#: ../src/mail/em-composer-utils.c:790
+#: ../src/mail/em-composer-utils.c:800
 msgid "Waiting for attachments to load..."
 msgstr "Venter på at vedlegg lastes …"
 
@@ -16401,7 +17165,7 @@ msgstr "Venter på at vedlegg lastes …"
 #. * when quoting messages.  Each ${Variable} gets replaced
 #. * with a value.  To see a full list of available variables,
 #. * see mail/em-composer-utils.c:attribvars array.
-#: ../src/mail/em-composer-utils.c:1745
+#: ../src/mail/em-composer-utils.c:1845
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -16409,24 +17173,30 @@ msgstr ""
 "${AbbrevWeekdayName}, ${Day}.${Month}.${Year} kl. ${24Hour}.${Minute} "
 "${TimeZone}, skrev ${Sender}:"
 
-#: ../src/mail/em-composer-utils.c:1751
+#: ../src/mail/em-composer-utils.c:1851
 msgid "-------- Forwarded Message --------"
 msgstr "---------Videresendt melding-------"
 
-#: ../src/mail/em-composer-utils.c:1756
+#: ../src/mail/em-composer-utils.c:1856
 msgid "-----Original Message-----"
 msgstr "-----Opprinnelig melding-----"
 
-#: ../src/mail/em-composer-utils.c:3092
+#. Translators: This is a reply attribution in the message reply subject. The %s is replaced with the 
subject of the original message.
+#: ../src/mail/em-composer-utils.c:2562
+#, c-format
+msgid "Re: %s"
+msgstr "Re: %s"
+
+#: ../src/mail/em-composer-utils.c:3103
 msgid "an unknown sender"
 msgstr "en ukjent avsender"
 
 #. FIXME GTK_WINDOW (composer)
-#: ../src/mail/em-composer-utils.c:3570
+#: ../src/mail/em-composer-utils.c:3581
 msgid "Posting destination"
 msgstr "Destinasjon for post"
 
-#: ../src/mail/em-composer-utils.c:3575
+#: ../src/mail/em-composer-utils.c:3586
 msgid "Choose folders to post the message to."
 msgstr "Velg mapper meldingen skal postes til."
 
@@ -16532,7 +17302,7 @@ msgstr "Etikett"
 msgid "AutoArchive"
 msgstr "Automatisk arkivering"
 
-#: ../src/mail/em-folder-properties.c:1076 ../src/mail/mail-config.ui.h:118
+#: ../src/mail/em-folder-properties.c:1076 ../src/mail/mail-config.ui.h:120
 #: ../src/mail/message-list.etspec.h:19
 msgid "Labels"
 msgstr "Etiketter"
@@ -16616,8 +17386,8 @@ msgstr "Kan ikke slippe melding(er) toppnivå for lageret"
 msgid "UNMATCHED"
 msgstr "UTEN TREFF"
 
-#: ../src/mail/em-folder-tree-model.c:1325
-#: ../src/mail/em-folder-tree-model.c:1701
+#: ../src/mail/em-folder-tree-model.c:1326
+#: ../src/mail/em-folder-tree-model.c:1702
 msgid "Loading..."
 msgstr "Laster …"
 
@@ -16643,7 +17413,7 @@ msgstr "Abonner på _alle"
 
 #: ../src/mail/em-subscription-editor.c:970
 #: ../src/mail/em-subscription-editor.c:1914 ../src/mail/mail.error.xml.h:73
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1697
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1751
 msgid "_Unsubscribe"
 msgstr "_Fjern abonnement"
 
@@ -16696,7 +17466,7 @@ msgid "Su_bscribe"
 msgstr "A_bonner"
 
 #: ../src/mail/em-subscription-editor.c:1913
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1699
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1753
 msgid "Unsubscribe from the selected folder"
 msgstr "Fjern abonnement på valgt mappe"
 
@@ -16721,8 +17491,8 @@ msgid "Refresh the folder list"
 msgstr "Oppdater mappelisten"
 
 #: ../src/mail/em-subscription-editor.c:1976
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1598
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1669
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1652
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1723
 msgid "_Refresh"
 msgstr "Oppdate_r"
 
@@ -16731,7 +17501,7 @@ msgid "Stop the current operation"
 msgstr "Stopp aktiv operasjon"
 
 #: ../src/mail/em-subscription-editor.c:1988
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1002
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1005
 msgid "_Stop"
 msgstr "_Stopp"
 
@@ -16946,7 +17716,7 @@ msgstr "Viktig"
 msgid "Read"
 msgstr "Les"
 
-#: ../src/mail/filtertypes.xml.in.h:41 ../src/mail/mail-config.ui.h:132
+#: ../src/mail/filtertypes.xml.in.h:41 ../src/mail/mail-config.ui.h:134
 #: ../src/mail/vfoldertypes.xml.in.h:44
 msgid "Junk"
 msgstr "Uønsket e-post"
@@ -17310,54 +18080,50 @@ msgstr "Sva_rstil:"
 msgid "_Forward style:"
 msgstr "_Videresendingsstil:"
 
-#: ../src/mail/mail-config.ui.h:20
-msgid "Start _typing at the bottom on replying"
-msgstr "S_tart skriving under meldingen ved svar"
-
-#: ../src/mail/mail-config.ui.h:21
-msgid "_Keep signature above the original message on replying"
-msgstr "_Plasser signaturen over opprinnelig melding ved svar"
-
 #: ../src/mail/mail-config.ui.h:22
+msgid "Include si_gnature in new messages only"
+msgstr "Ta kun med si_gnatur i nye meldinger"
+
+#: ../src/mail/mail-config.ui.h:23
 msgid "Ig_nore Reply-To: for mailing lists"
 msgstr "Ig_norer Reply-To: for e-postlister"
 
-#: ../src/mail/mail-config.ui.h:23
+#: ../src/mail/mail-config.ui.h:24
 msgid "Gro_up Reply goes only to mailing list, if possible"
 msgstr "Gr_uppesvar går kun til e-postliste hvis mulig"
 
-#: ../src/mail/mail-config.ui.h:24
+#: ../src/mail/mail-config.ui.h:25
 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)"
 
-#: ../src/mail/mail-config.ui.h:25
+#: ../src/mail/mail-config.ui.h:26
 msgid "_Wrap quoted text in replies"
 msgstr "_Bryt sitert tekst i svar"
 
-#: ../src/mail/mail-config.ui.h:30
+#: ../src/mail/mail-config.ui.h:31
 msgctxt "ReplyForward"
 msgid "Inline"
 msgstr "I meldingen"
 
-#: ../src/mail/mail-config.ui.h:32
+#: ../src/mail/mail-config.ui.h:33
 msgid "Sig_natures"
 msgstr "Sig_naturer"
 
-#: ../src/mail/mail-config.ui.h:33
+#: ../src/mail/mail-config.ui.h:34
 msgid "Signatures"
 msgstr "Signaturer"
 
-#: ../src/mail/mail-config.ui.h:34
+#: ../src/mail/mail-config.ui.h:35
 msgid "_Languages"
 msgstr "_Språk"
 
-#: ../src/mail/mail-config.ui.h:35
+#: ../src/mail/mail-config.ui.h:36
 msgid "Languages Table"
 msgstr "Språktabell"
 
-#: ../src/mail/mail-config.ui.h:36
+#: ../src/mail/mail-config.ui.h:37
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -17365,11 +18131,11 @@ msgstr ""
 "Språklisten som vises her reflekterer kun de språkene du har installert en "
 "ordbok for."
 
-#: ../src/mail/mail-config.ui.h:38
+#: ../src/mail/mail-config.ui.h:39
 msgid "Check spelling while I _type"
 msgstr "Sjekk s_taving mens jeg skriver"
 
-#: ../src/mail/mail-config.ui.h:40
+#: ../src/mail/mail-config.ui.h:41
 msgid ""
 "To help avoid email accidents and embarrassments, ask for confirmation "
 "before taking the following checkmarked actions:"
@@ -17378,74 +18144,74 @@ msgstr ""
 "hjelpe med å unngå uhell og flauser med e-post:"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../src/mail/mail-config.ui.h:42
+#: ../src/mail/mail-config.ui.h:43
 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...
-#: ../src/mail/mail-config.ui.h:44
+#: ../src/mail/mail-config.ui.h:45
 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...
-#: ../src/mail/mail-config.ui.h:46
+#: ../src/mail/mail-config.ui.h:47
 msgid "Sending a message to many _To and CC recipients"
 msgstr "Ved sending av en melding til mange _Til- og CC-mottakere"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../src/mail/mail-config.ui.h:48
+#: ../src/mail/mail-config.ui.h:49
 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...
-#: ../src/mail/mail-config.ui.h:50
+#: ../src/mail/mail-config.ui.h:51
 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...
-#: ../src/mail/mail-config.ui.h:52
+#: ../src/mail/mail-config.ui.h:53
 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...
-#: ../src/mail/mail-config.ui.h:54
+#: ../src/mail/mail-config.ui.h:55
 msgid "Sending a message with _recipients not entered as mail addresses"
 msgstr "Sender en melding med mottakere oppgitt uten e-postadresser"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../src/mail/mail-config.ui.h:56
+#: ../src/mail/mail-config.ui.h:57
 msgid "Sending a message using _key accelerator (Ctrl+Enter)"
 msgstr "Sender en melding med _tastatursnarvei (Ctrl+linjeskift)"
 
 #. Translators:
-#: ../src/mail/mail-config.ui.h:58
+#: ../src/mail/mail-config.ui.h:59
 msgid "Before composer _format changes from HTML to Plain Text"
 msgstr "Før redigerings_formatet byttes fra HTML til vanlig tekst"
 
-#: ../src/mail/mail-config.ui.h:59
+#: ../src/mail/mail-config.ui.h:60
 msgid "Confirmations"
 msgstr "Bekreftelser"
 
 #. Translators: Label of a frame with a list of folders for which to use selected account in Send account 
overrides
-#: ../src/mail/mail-config.ui.h:63
+#: ../src/mail/mail-config.ui.h:64
 msgid "Use for Folders"
 msgstr "Bruk for mapper"
 
 #. Translators: Label of a frame with a list of recipients for whom to use selected account in Send account 
overrides
-#: ../src/mail/mail-config.ui.h:68
+#: ../src/mail/mail-config.ui.h:69
 msgid "Use for Recipients"
 msgstr " Bruk for mottakere "
 
 #. Translators: Label of a frame with a list of configured accounts in Send account overrides
-#: ../src/mail/mail-config.ui.h:70 ../src/modules/mail/em-composer-prefs.c:875
+#: ../src/mail/mail-config.ui.h:71 ../src/modules/mail/em-composer-prefs.c:875
 msgid "Account"
 msgstr "Konto"
 
-#: ../src/mail/mail-config.ui.h:71
+#: ../src/mail/mail-config.ui.h:72
 msgid "Send account overrides"
 msgstr "Overstyring av avsenderkonto"
 
-#: ../src/mail/mail-config.ui.h:72
+#: ../src/mail/mail-config.ui.h:73
 msgid ""
 "Assign which account should be used as a send account for respective folders "
 "or recipients, an override for usual send account detection. List of "
@@ -17457,213 +18223,225 @@ msgstr ""
 "Lister med mottakere kan inneholde deler av adresser eller navn. Navn og "
 "adressedelene sammenlignes hver for seg."
 
-#: ../src/mail/mail-config.ui.h:73
+#: ../src/mail/mail-config.ui.h:74
 msgid "_Folder override has precedence over Recipient override"
 msgstr "_Mappeoverstyring har rang foran overstyring av mottaker"
 
-#: ../src/mail/mail-config.ui.h:74
+#: ../src/mail/mail-config.ui.h:75
 msgid "Send Account"
 msgstr "Avsenderkonto"
 
-#: ../src/mail/mail-config.ui.h:80 ../src/smime/gui/smime-ui.ui.h:27
+#: ../src/mail/mail-config.ui.h:81 ../src/smime/gui/smime-ui.ui.h:27
 msgid "a"
 msgstr "a"
 
-#: ../src/mail/mail-config.ui.h:81 ../src/smime/gui/smime-ui.ui.h:28
+#: ../src/mail/mail-config.ui.h:82 ../src/smime/gui/smime-ui.ui.h:28
 msgid "b"
 msgstr "b"
 
-#: ../src/mail/mail-config.ui.h:82
+#: ../src/mail/mail-config.ui.h:83
 msgid "Start up"
 msgstr "Oppstart"
 
-#: ../src/mail/mail-config.ui.h:83
+#: ../src/mail/mail-config.ui.h:84
 msgid "Check for new _messages on start"
 msgstr "Se etter nye _meldinger ved oppstart"
 
-#: ../src/mail/mail-config.ui.h:84
+#: ../src/mail/mail-config.ui.h:85
 msgid "Check for new messa_ges in all active accounts"
 msgstr "Se etter nye meldin_ger i alle aktive kontoer"
 
-#: ../src/mail/mail-config.ui.h:85
+#: ../src/mail/mail-config.ui.h:86
 msgid "Message Display"
 msgstr "Meldingsvisning"
 
-#: ../src/mail/mail-config.ui.h:86
+#: ../src/mail/mail-config.ui.h:87
 msgid "_Use the same fonts as other applications"
 msgstr "Br_uk samme skrifter som andre programmer"
 
-#: ../src/mail/mail-config.ui.h:87
+#: ../src/mail/mail-config.ui.h:88
 msgid "S_tandard Font:"
 msgstr "Forvalg_t skrift:"
 
-#: ../src/mail/mail-config.ui.h:88
+#: ../src/mail/mail-config.ui.h:89
 msgid "Select HTML fixed width font"
 msgstr "Velg skrift med fast bredde for HTML"
 
-#: ../src/mail/mail-config.ui.h:89
+#: ../src/mail/mail-config.ui.h:90
 msgid "Select HTML variable width font"
 msgstr "Velg skrift med variabel bredde for HTML"
 
-#: ../src/mail/mail-config.ui.h:90
+#: ../src/mail/mail-config.ui.h:91
 msgid "Fix_ed Width Font:"
 msgstr "Skrift med fast br_edde:"
 
-#: ../src/mail/mail-config.ui.h:91
+#: ../src/mail/mail-config.ui.h:92
 msgid "_Mark messages as read after"
 msgstr "_Merk meldinger som lest etter"
 
-#: ../src/mail/mail-config.ui.h:93
+#: ../src/mail/mail-config.ui.h:94
 msgid "Highlight _quotations with"
 msgstr "_Merk sitering med"
 
-#: ../src/mail/mail-config.ui.h:94
+#: ../src/mail/mail-config.ui.h:95
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:62
 msgid "Pick a color"
 msgstr "Velg en farge"
 
-#: ../src/mail/mail-config.ui.h:95
+#: ../src/mail/mail-config.ui.h:96
 msgid "color"
 msgstr "farge"
 
-#: ../src/mail/mail-config.ui.h:96
+#: ../src/mail/mail-config.ui.h:97
 msgid "Default character e_ncoding:"
 msgstr "Forvalgt teg_nkoding:"
 
-#: ../src/mail/mail-config.ui.h:97
+#: ../src/mail/mail-config.ui.h:98
 msgid "Apply the same _view settings to all folders"
 msgstr "Bruk samme _visningsinnstillinger for alle mapper"
 
-#: ../src/mail/mail-config.ui.h:98
+#: ../src/mail/mail-config.ui.h:99
 msgid "F_all back to threading messages by subject"
 msgstr "F_all tilbake til tråding av meldinger etter emne"
 
-#: ../src/mail/mail-config.ui.h:99
+#: ../src/mail/mail-config.ui.h:100
 msgid "Delete Mail"
 msgstr "Slett e-post"
 
-#: ../src/mail/mail-config.ui.h:100
+#: ../src/mail/mail-config.ui.h:101
 msgid "Empty _trash folders"
 msgstr "_Tøm papirkurvmapper"
 
-#: ../src/mail/mail-config.ui.h:101
+#: ../src/mail/mail-config.ui.h:102
 msgid "Confirm _when expunging a folder"
 msgstr "_Bekreft ved tømming av en mappe"
 
-#: ../src/mail/mail-config.ui.h:102
+#: ../src/mail/mail-config.ui.h:103
+msgid "Confirm when emptying a _Junk folder"
+msgstr "_Bekreft ved tømming av en søppelpostmappe"
+
+#: ../src/mail/mail-config.ui.h:104
 msgid "Archive Mail"
 msgstr "Arkiver e-post"
 
-#: ../src/mail/mail-config.ui.h:103
+#: ../src/mail/mail-config.ui.h:105
 msgid "Archive folder to use for On This Computer messages"
 msgstr "Arkivmappe som skal brukes for meldinger på denne datamaskinen"
 
-#: ../src/mail/mail-config.ui.h:104
+#: ../src/mail/mail-config.ui.h:106
 msgid "On This Computer A_rchive folder:"
 msgstr "A_rkivmappe på denne datamaskinen:"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../src/mail/mail-config.ui.h:106
+#: ../src/mail/mail-config.ui.h:108
 msgid "_Show animated images"
 msgstr "Vi_s animerte bilder"
 
-#: ../src/mail/mail-config.ui.h:107
+#: ../src/mail/mail-config.ui.h:109
 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"
 
-#: ../src/mail/mail-config.ui.h:108
+#: ../src/mail/mail-config.ui.h:110
 msgid "Loading Remote Content"
 msgstr "Laster eksternt innhold"
 
-#: ../src/mail/mail-config.ui.h:109
+#: ../src/mail/mail-config.ui.h:111
 msgid "_Never load remote content from the Internet"
 msgstr "Aldri last _ned eksternt innhold fra internett"
 
-#: ../src/mail/mail-config.ui.h:110
+#: ../src/mail/mail-config.ui.h:112
 msgid "_Load remote content only in messages from contacts"
 msgstr "_Last kun ned eksternt innhold i meldinger fra kontakter"
 
-#: ../src/mail/mail-config.ui.h:111
+#: ../src/mail/mail-config.ui.h:113
 msgid "_Always load remote content from the Internet"
 msgstr "_Alltid last ned eksternt innhold fra internett"
 
-#: ../src/mail/mail-config.ui.h:112
+#: ../src/mail/mail-config.ui.h:114
 msgid "Notify about _missing remote content in the message preview"
 msgstr "Varsle om _manglende eksternt innhold ved forhåndsvisning av melding"
 
 #: ../src/mail/mail-config.ui.h:115
+msgid "Add"
+msgstr "Legg til"
+
+#: ../src/mail/mail-config.ui.h:116
+msgid "Remove"
+msgstr "Fjern"
+
+#: ../src/mail/mail-config.ui.h:117
 msgid "Allow for sites:"
 msgstr "Tillat for nettsteder:"
 
-#: ../src/mail/mail-config.ui.h:116
+#: ../src/mail/mail-config.ui.h:118
 msgid "Allow for senders:"
 msgstr "Tillat for avsendere:"
 
-#: ../src/mail/mail-config.ui.h:117
+#: ../src/mail/mail-config.ui.h:119
 msgid "HTML Messages"
 msgstr "HTML-meldinger"
 
-#: ../src/mail/mail-config.ui.h:119
+#: ../src/mail/mail-config.ui.h:121
 msgid "Sender Photograph"
 msgstr "Bilde av avsender"
 
-#: ../src/mail/mail-config.ui.h:120
+#: ../src/mail/mail-config.ui.h:122
 msgid "_Show the photograph of sender in the message preview"
 msgstr "Vi_s bilde av avsender i forhåndsvisning av meldingen"
 
-#: ../src/mail/mail-config.ui.h:121
+#: ../src/mail/mail-config.ui.h:123
 msgid "Search gra_vatar.com for the photograph of sender"
 msgstr "Søk på gra_vatar.com for bilde av avsender"
 
-#: ../src/mail/mail-config.ui.h:122
+#: ../src/mail/mail-config.ui.h:124
 msgid "Displayed Message Headers"
 msgstr "Viste meldingshoder"
 
-#: ../src/mail/mail-config.ui.h:123
+#: ../src/mail/mail-config.ui.h:125
 msgid "Mail Headers Table"
 msgstr "Tabell med meldingshoder"
 
-#: ../src/mail/mail-config.ui.h:124
-#: ../src/modules/addressbook/autocompletion-config.c:117
+#: ../src/mail/mail-config.ui.h:126
+#: ../src/modules/addressbook/autocompletion-config.c:118
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:45
 msgid "Date/Time Format"
 msgstr "Fromat for dato ogklokkeslett"
 
-#: ../src/mail/mail-config.ui.h:126
+#: ../src/mail/mail-config.ui.h:128
 msgid "Check incoming _messages for junk"
 msgstr "Sjekk om innkommende _meldinger er uønsket"
 
-#: ../src/mail/mail-config.ui.h:127
+#: ../src/mail/mail-config.ui.h:129
 msgid "_Delete junk messages"
 msgstr "_Slett uønskede meldinger"
 
-#: ../src/mail/mail-config.ui.h:128
+#: ../src/mail/mail-config.ui.h:130
 msgid "Junk Test Options"
 msgstr "Alternativer for test av søppelpost"
 
-#: ../src/mail/mail-config.ui.h:129
+#: ../src/mail/mail-config.ui.h:131
 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"
 
-#: ../src/mail/mail-config.ui.h:130
+#: ../src/mail/mail-config.ui.h:132
 msgid "_Lookup in local address book only"
 msgstr "S_lå kun opp i lokale adressebokmapper"
 
-#: ../src/mail/mail-config.ui.h:131
+#: ../src/mail/mail-config.ui.h:133
 msgid "Check cu_stom headers for junk"
 msgstr "_Sjekk egendefinerte meldingshoder for uønsket e-post"
 
-#: ../src/mail/mail-config.ui.h:133
+#: ../src/mail/mail-config.ui.h:135
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:302
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:245
 msgid "No encryption"
 msgstr "Ingen kryptering"
 
-#: ../src/mail/mail-config.ui.h:134
+#: ../src/mail/mail-config.ui.h:136
 msgid "TLS encryption"
 msgstr "TLS-kryptering"
 
-#: ../src/mail/mail-config.ui.h:135
+#: ../src/mail/mail-config.ui.h:137
 msgid "SSL encryption"
 msgstr "SSL-kryptering"
 
@@ -17947,7 +18725,7 @@ msgstr ""
 "permanent?"
 
 #: ../src/mail/mail.error.xml.h:42
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1584
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1631
 msgid "_Empty Trash"
 msgstr "_Tøm papirkurven"
 
@@ -18141,8 +18919,8 @@ msgid "You may not create two accounts with the same name."
 msgstr "Du kan ikke opprette to kontoer med samme navn."
 
 #: ../src/mail/mail.error.xml.h:89
-msgid "Are you sure you want to delete this account?"
-msgstr "Er du sikker på at du vil slette denne kontoen?"
+msgid "Are you sure you want to delete account “{0}”?"
+msgstr "Er du sikker på at du vil slette konto «{0}»?"
 
 #: ../src/mail/mail.error.xml.h:90
 msgid "If you proceed, the account information will be deleted permanently."
@@ -18429,63 +19207,73 @@ msgid "Please enable the account or send using another account."
 msgstr "Vennligst sjekk kontoen eller send fra en annen konto."
 
 #: ../src/mail/mail.error.xml.h:158
+msgid "This message cannot be sent because there is no mail account configured"
+msgstr "Denne meldingen kan ikke sendes fordi du ikke har konfigurert en e-postkonto"
+
+#: ../src/mail/mail.error.xml.h:159
+msgid ""
+"There had not been found any active mail account to send the message. Create "
+"or enable one first, please."
+msgstr "Fant ingen aktive e-postkontoer å sende meldingen med. Lag eller aktiver en konto først er du snill."
+
+#: ../src/mail/mail.error.xml.h:160
 msgid "Mail Deletion Failed"
 msgstr "Sletting av e-post feilet"
 
-#: ../src/mail/mail.error.xml.h:159
+#: ../src/mail/mail.error.xml.h:161
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Du har ikke tilstrekkelige rettigheter til å slette denne meldingen."
 
-#: ../src/mail/mail.error.xml.h:160
+#: ../src/mail/mail.error.xml.h:162
 msgid "“Check Junk” Failed"
 msgstr "Sjekk etter uønsket e-post feilet"
 
-#: ../src/mail/mail.error.xml.h:161
+#: ../src/mail/mail.error.xml.h:163
 msgid "“Report Junk” Failed"
 msgstr "Feil under rapportering av uønsket e-post"
 
-#: ../src/mail/mail.error.xml.h:162
+#: ../src/mail/mail.error.xml.h:164
 msgid "“Report Not Junk” Failed"
 msgstr "Feil under rapportering av e-post som ønsket"
 
-#: ../src/mail/mail.error.xml.h:163
+#: ../src/mail/mail.error.xml.h:165
 msgid "Remove duplicate messages?"
 msgstr "Fjern duplikatmeldinger?"
 
-#: ../src/mail/mail.error.xml.h:164
+#: ../src/mail/mail.error.xml.h:166
 msgid "No duplicate messages found."
 msgstr "Ingen duplikatmeldinger funnet."
 
 #. Translators: {0} is replaced with a folder name
-#: ../src/mail/mail.error.xml.h:166
+#: ../src/mail/mail.error.xml.h:168
 msgid "Folder “{0}” doesn’t contain any duplicate message."
 msgstr "Mappe «{0}» inneholder ingen duplikatmeldinger."
 
-#: ../src/mail/mail.error.xml.h:167
+#: ../src/mail/mail.error.xml.h:169
 msgid "Failed to connect account “{0}”."
 msgstr "Klarte ikke å koble til e-postkonto «{0}»"
 
-#: ../src/mail/mail.error.xml.h:168
+#: ../src/mail/mail.error.xml.h:170
 msgid "Failed to disconnect account “{0}”."
 msgstr "Klarte ikke å koble fra konto «{0}»."
 
-#: ../src/mail/mail.error.xml.h:169
+#: ../src/mail/mail.error.xml.h:171
 msgid "Failed to unsubscribe from folder “{0}”."
 msgstr "Klarte ikke å fjerne abonnement på mappe «{0}»."
 
-#: ../src/mail/mail.error.xml.h:170
+#: ../src/mail/mail.error.xml.h:172
 msgid "Unable to retrieve message."
 msgstr "Kunne ikke hente melding."
 
-#: ../src/mail/mail.error.xml.h:171
+#: ../src/mail/mail.error.xml.h:173
 msgid "{0}"
 msgstr "{0}"
 
-#: ../src/mail/mail.error.xml.h:172
+#: ../src/mail/mail.error.xml.h:174
 msgid "Message is not available in offline mode."
 msgstr "Meldingen er ikke tilgjengelig i frakoblet modus."
 
-#: ../src/mail/mail.error.xml.h:173
+#: ../src/mail/mail.error.xml.h:175
 msgid ""
 "This can be due to the message not being downloaded yet. The folder, or the "
 "account, can be marked for offline synchronization. Then, once the account "
@@ -18498,39 +19286,39 @@ msgstr ""
 "igjen kan du gå til Fil->Last ned meldinger for frakoblet bruk mens denne "
 "mappen er valgt for å sikre at meldingene er tilgjengelig i frakoblet modus."
 
-#: ../src/mail/mail.error.xml.h:174
+#: ../src/mail/mail.error.xml.h:176
 msgid "Failed to open folder."
 msgstr "Klarte ikke å åpne mappe."
 
-#: ../src/mail/mail.error.xml.h:176
+#: ../src/mail/mail.error.xml.h:178
 msgid "Failed to find duplicate messages."
 msgstr "Klarte ikke å finne duplikatmeldinger."
 
-#: ../src/mail/mail.error.xml.h:177
+#: ../src/mail/mail.error.xml.h:179
 msgid "Failed to retrieve messages."
 msgstr "Klarte ikke å hente meldinger."
 
-#: ../src/mail/mail.error.xml.h:178
+#: ../src/mail/mail.error.xml.h:180
 msgid "Failed to mark messages as read."
 msgstr "Klarte ikke å markere meldinger som lest."
 
-#: ../src/mail/mail.error.xml.h:179
+#: ../src/mail/mail.error.xml.h:181
 msgid "Failed to remove attachments from messages."
 msgstr "Klarte ikke å fjerne vedlegg fra meldinger."
 
-#: ../src/mail/mail.error.xml.h:180
+#: ../src/mail/mail.error.xml.h:182
 msgid "Failed to download messages for offline viewing."
 msgstr "Klarte ikke å laste ned meldinger for frakoblet visning."
 
-#: ../src/mail/mail.error.xml.h:181
+#: ../src/mail/mail.error.xml.h:183
 msgid "Failed to save messages to disk."
 msgstr "Klarte ikke å lagre meldinger til disk."
 
-#: ../src/mail/mail.error.xml.h:182
+#: ../src/mail/mail.error.xml.h:184
 msgid "Hidden file is attached."
 msgstr "Skjult fil er vedlagt."
 
-#: ../src/mail/mail.error.xml.h:183
+#: ../src/mail/mail.error.xml.h:185
 msgid ""
 "The attachment named {0} is a hidden file and may contain sensitive data. "
 "Please review it before sending."
@@ -18538,47 +19326,47 @@ msgstr ""
 "Vedleg med navn {0} er en skjult fil og kan inneholde sensitive data. "
 "Vennlist se gjennom den før du sender meldingen."
 
-#: ../src/mail/mail.error.xml.h:184
+#: ../src/mail/mail.error.xml.h:186
 msgid "Printing failed."
 msgstr "Utskrift feilet."
 
-#: ../src/mail/mail.error.xml.h:185
+#: ../src/mail/mail.error.xml.h:187
 msgid "The printer replied “{0}”."
 msgstr "Skriveren svarte «{0}»."
 
-#: ../src/mail/mail.error.xml.h:186
+#: ../src/mail/mail.error.xml.h:188
 msgid "Could not perform this operation on {0}."
 msgstr "Kunne ikke utføre denne operasjonen på {0}."
 
-#: ../src/mail/mail.error.xml.h:187
+#: ../src/mail/mail.error.xml.h:189
 msgid "You must be working online to complete this operation."
 msgstr "Du må arbeide frakoblet for å fullføre denne operasjonen."
 
-#: ../src/mail/mail.error.xml.h:188
+#: ../src/mail/mail.error.xml.h:190
 msgid "Message from “{0}” account:"
 msgstr "Melding fra konto «{0}»:"
 
-#: ../src/mail/mail.error.xml.h:189
+#: ../src/mail/mail.error.xml.h:191
 msgid "Failed to mark thread to be ignored in folder “{0}”"
 msgstr "Klarte ikke å merke tråd som ignorert i mappe «{0}»"
 
-#: ../src/mail/mail.error.xml.h:190
+#: ../src/mail/mail.error.xml.h:192
 msgid "Failed to unmark thread from being ignored in folder “{0}”"
 msgstr "Klarte ikke å fjerne merking av tråd som ignorert i mappe «{0}»"
 
-#: ../src/mail/mail.error.xml.h:191
+#: ../src/mail/mail.error.xml.h:193
 msgid "Failed to mark subthread to be ignored in folder “{0}”"
 msgstr "Klarte ikke å merke undertråd som ignorert i mappe «{0}»"
 
-#: ../src/mail/mail.error.xml.h:192
+#: ../src/mail/mail.error.xml.h:194
 msgid "Failed to unmark subthread from being ignored in folder “{0}”"
 msgstr "Klarte ikke å fjerne merking av undertråd som ignorert i mappe «{0}»"
 
-#: ../src/mail/mail.error.xml.h:193
+#: ../src/mail/mail.error.xml.h:195
 msgid "Remote content download had been blocked for this message."
 msgstr "Nedlasting av eksternt innhold ble blokkert for denne meldingen."
 
-#: ../src/mail/mail.error.xml.h:194
+#: ../src/mail/mail.error.xml.h:196
 msgid ""
 "You can download remote content manually, or set to remember to download "
 "remote content for this sender or used sites."
@@ -18587,39 +19375,39 @@ msgstr ""
 "innhold for denne avsenderen eller brukte nettsteder."
 
 #. Translators: This constructs a string like "Follow-up, Completed on Tuesday, January 13, 2009"
-#: ../src/mail/mail.error.xml.h:196
+#: ../src/mail/mail.error.xml.h:198
 msgid "{0}, Completed on {1}"
 msgstr "{0}, fullført {1}"
 
 #. Translators: This constructs a string like "Follow-up by Tuesday, January 13, 2009"
-#: ../src/mail/mail.error.xml.h:198
+#: ../src/mail/mail.error.xml.h:200
 msgid "{0} by {1}"
 msgstr "{0} innen {1}"
 
 #. Translators: This constructs a string like "Overdue: Follow-up by Tuesday, January 13, 2009"
-#: ../src/mail/mail.error.xml.h:200
+#: ../src/mail/mail.error.xml.h:202
 msgid "Overdue: {0} by {1}"
 msgstr "Utgått: {0} innen {1}"
 
-#: ../src/mail/mail.error.xml.h:202
+#: ../src/mail/mail.error.xml.h:204
 msgid "This message note has been changed, but has not been saved."
 msgstr "Meldingsnotatet er endret, men er ikke lagret."
 
 #. Translators: {0} is the name of the folder where the delete of the message note failed.
-#: ../src/mail/mail.error.xml.h:205
+#: ../src/mail/mail.error.xml.h:207
 msgid "Failed to delete message note in folder “{0}”"
 msgstr "Klarte ikke å slette meldingsnotat i mappe «{0}»"
 
 #. Translators: {0} is the name of the folder where the store of the message note failed.
-#: ../src/mail/mail.error.xml.h:207
+#: ../src/mail/mail.error.xml.h:209
 msgid "Failed to store message note in folder “{0}”"
 msgstr "Klarte ikke å lagre meldingsnotat i mappe «{0}»"
 
-#: ../src/mail/mail.error.xml.h:208
+#: ../src/mail/mail.error.xml.h:210
 msgid "Something has gone wrong when displaying the message"
 msgstr "Noe har gått galt ved visning av meldingen"
 
-#: ../src/mail/mail.error.xml.h:209
+#: ../src/mail/mail.error.xml.h:211
 msgid ""
 "A WebKitWebProcess crashed when displaying the message. You can try again by "
 "moving to another message and back. If the issue persists, please file a bug "
@@ -18629,11 +19417,11 @@ msgstr ""
 "å gå til en annen melding og tilbake. Vennligst rapporter en feil i GNOME "
 "bugzilla hvis problemet vedvarer."
 
-#: ../src/mail/mail.error.xml.h:210
+#: ../src/mail/mail.error.xml.h:212
 msgid "Something has gone wrong when displaying the signature"
 msgstr "Noe har gått galt ved visning av signaturen"
 
-#: ../src/mail/mail.error.xml.h:211
+#: ../src/mail/mail.error.xml.h:213
 msgid ""
 "A WebKitWebProcess crashed when displaying the signature. You can try again "
 "by moving to another signature and back. If the issue persists, please file "
@@ -18643,6 +19431,24 @@ msgstr ""
 "ved å gå til en annen signatur og tilbake. Vennligst rapporter en feil i "
 "GNOME bugzilla hvis problemet vedvarer."
 
+#: ../src/mail/mail.error.xml.h:214
+msgid "Are you sure you want to delete all the messages in the Junk folder?"
+msgstr "Er du sikker på at du vil fjerne alle meldinger i søppelpostmappen?"
+
+#: ../src/mail/mail.error.xml.h:215
+msgid ""
+"These messages will be shown in the Trash folder, where they can be "
+"permanently deleted later."
+msgstr "Disse meldingene vil vises i papirkurven, hvor de kan slettes permanent senere."
+
+#: ../src/mail/mail.error.xml.h:216
+msgid "_Empty Junk"
+msgstr "_Tøm søppelpost"
+
+#: ../src/mail/mail.error.xml.h:217
+msgid "Failed to empty Junk folder “{0}”"
+msgstr "Klarte ikke å tømme søppelpostmappe «{0}»"
+
 #: ../src/mail/mail-send-recv.c:192
 msgid "Canceling..."
 msgstr "Avbryter …"
@@ -18833,54 +19639,117 @@ msgid "Subject or Addresses contains"
 msgstr "Emne eller adresser inneholder"
 
 #: ../src/mail/searchtypes.xml.in.h:58
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2113
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2179
 msgid "Recipients contain"
 msgstr "Mottakere inneholder"
 
 #: ../src/mail/searchtypes.xml.in.h:59
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2106
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2172
 msgid "Message contains"
 msgstr "Melding inneholder"
 
 #: ../src/mail/searchtypes.xml.in.h:60
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2127
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2193
 msgid "Subject contains"
 msgstr "Emne inneholder"
 
 #: ../src/mail/searchtypes.xml.in.h:61
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2120
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2186
 msgid "Sender contains"
 msgstr "Avsender inneholder"
 
 #: ../src/mail/searchtypes.xml.in.h:62
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2092
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2158
 msgid "Body contains"
 msgstr "Kropp inneholder"
 
 #: ../src/mail/searchtypes.xml.in.h:63
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2099
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2165
 msgid "Free form expression"
 msgstr "Fritt uttrykk"
 
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:275
+msgid "Edit Collection"
+msgstr "Rediger samling"
+
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:312
+msgid "Use for"
+msgstr "Bruk for"
+
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:316
+#: ../src/plugins/pst-import/pst-importer.c:522
+msgid "_Mail"
+msgstr "_E-post"
+
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:327
+msgid "C_alendar"
+msgstr "K_alender"
+
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:428
+#: ../src/modules/addressbook/e-book-shell-backend.c:262
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:137
+msgid "New Address Book"
+msgstr "Ny adressebok"
+
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:436
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:185
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:178
+msgid "New Memo List"
+msgstr "Ny notatliste"
+
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:480
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:210
+msgid "Address Book Properties"
+msgstr "Egenskaper for adressebok"
+
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:484
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:283
+msgid "Calendar Properties"
+msgstr "Kalenderegenskaper"
+
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:488
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:250
+msgid "Memo List Properties"
+msgstr "Egenskaper for notatliste"
+
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:492
+#: ../src/modules/calendar/e-task-shell-view-actions.c:274
+msgid "Task List Properties"
+msgstr "Egenskaper for oppgaveliste"
+
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a 
date in message list
-#: ../src/modules/addressbook/autocompletion-config.c:123
-#: ../src/modules/mail/em-mailer-prefs.c:1556
+#: ../src/modules/addressbook/autocompletion-config.c:124
+#: ../src/modules/mail/em-mailer-prefs.c:1562
 msgid "_Table column:"
 msgstr "Kolonne i _tabell:"
 
-#: ../src/modules/addressbook/autocompletion-config.c:126
-msgid "Address formatting"
-msgstr "Adresseformattering"
-
-#: ../src/modules/addressbook/autocompletion-config.c:129
+#: ../src/modules/addressbook/autocompletion-config.c:130
 msgid "_Format address according to standard of its destination country"
 msgstr "_Formatter adresser i henhold til standard for opphavslandet"
 
-#: ../src/modules/addressbook/autocompletion-config.c:137
+#. Translators: This is part of a sentence "Open maps with OpenStreetMap" and "Open maps with Google"
+#: ../src/modules/addressbook/autocompletion-config.c:143
+msgctxt "OpenMap"
+msgid "Open _maps with"
+msgstr "Åpne kart _med"
+
+#. Translators: This is part of "Open maps with OpenStreetMap"
+#: ../src/modules/addressbook/autocompletion-config.c:150
+msgctxt "OpenMap"
+msgid "OpenStreetMap"
+msgstr "OpenStreetMap"
+
+#. Translators: This is part of "Open maps with Google"
+#: ../src/modules/addressbook/autocompletion-config.c:153
+msgctxt "OpenMap"
+msgid "Google"
+msgstr "Google"
+
+#: ../src/modules/addressbook/autocompletion-config.c:169
 msgid "Autocompletion"
 msgstr "Autofullføring"
 
-#: ../src/modules/addressbook/autocompletion-config.c:140
+#: ../src/modules/addressbook/autocompletion-config.c:172
 msgid "Always _show address of the autocompleted contact"
 msgstr "Alltid vi_s adresse for automatisk fullført kontakt"
 
@@ -18904,296 +19773,287 @@ msgstr "Kontaktinformasjon"
 msgid "Contact information for %s"
 msgstr "Kontaktinformasjon for %s"
 
-#: ../src/modules/addressbook/e-book-shell-backend.c:258
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:137
-msgid "New Address Book"
-msgstr "Ny adressebok"
-
-#: ../src/modules/addressbook/e-book-shell-backend.c:267
+#: ../src/modules/addressbook/e-book-shell-backend.c:271
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: ../src/modules/addressbook/e-book-shell-backend.c:269
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1046
+#: ../src/modules/addressbook/e-book-shell-backend.c:273
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1049
 msgid "Create a new contact"
 msgstr "Opprett en ny kontakt"
 
-#: ../src/modules/addressbook/e-book-shell-backend.c:274
+#: ../src/modules/addressbook/e-book-shell-backend.c:278
 msgctxt "New"
 msgid "Contact _List"
 msgstr "Kontakt_liste"
 
-#: ../src/modules/addressbook/e-book-shell-backend.c:276
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1053
+#: ../src/modules/addressbook/e-book-shell-backend.c:280
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1056
 msgid "Create a new contact list"
 msgstr "Opprett en ny kontaktliste"
 
-#: ../src/modules/addressbook/e-book-shell-backend.c:284
+#: ../src/modules/addressbook/e-book-shell-backend.c:288
 msgctxt "New"
 msgid "Address _Book"
 msgstr "Adresse_bok"
 
-#: ../src/modules/addressbook/e-book-shell-backend.c:286
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:969
+#: ../src/modules/addressbook/e-book-shell-backend.c:290
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:972
 msgid "Create a new address book"
 msgstr "Opprett en ny adressebok"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:210
-msgid "Address Book Properties"
-msgstr "Egenskaper for adressebok"
-
 #. Translators: This is a save dialog title
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:534
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:832
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:835
 msgid "Save as vCard"
 msgstr "Lagre som vCard"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:939
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:942
 msgid "Co_py All Contacts To..."
 msgstr "Ko_pier alle kontakter til …"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:941
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:944
 msgid "Copy the contacts of the selected address book to another"
 msgstr "Kopier kontakter fra valgt adressebok til en annen"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:946
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:949
 msgid "D_elete Address Book"
 msgstr "Sl_ett adressebok"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:948
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:951
 msgid "Delete the selected address book"
 msgstr "Slett valgt adressebok"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:953
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:956
 msgid "_Manage Address Book groups..."
 msgstr "_Håndter grupper i adressebok …"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:955
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:958
 #: ../src/modules/calendar/e-task-shell-view-actions.c:719
 msgid "Manage task list groups order and visibility"
 msgstr "Håndter rekkefølge og synlighet for oppgavelistegrupper"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:960
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:963
 msgid "Mo_ve All Contacts To..."
 msgstr "Fl_ytt alle kontakter til …"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:962
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:965
 msgid "Move the contacts of the selected address book to another"
 msgstr "Flytt kontakter fra valgt adressebok til en annen"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:967
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:970
 msgid "_New Address Book"
 msgstr "_Ny adressebok"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:974
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:977
 msgid "Address _Book Properties"
 msgstr "Egenskaper for adresse_bok"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:976
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:979
 msgid "Show properties of the selected address book"
 msgstr "Vis egenskaper for valgt adressebok"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:981
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:984
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1330
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:612
 #: ../src/modules/calendar/e-task-shell-view-actions.c:738
 msgid "Re_fresh"
 msgstr "O_ppdater"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:983
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:986
 msgid "Refresh the selected address book"
 msgstr "Oppdater valgt adressebok"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:988
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:991
 msgid "Address Book _Map"
 msgstr "Adressebok_kart"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:990
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:993
 msgid "Show map with all contacts from selected address book"
 msgstr "Vis kart med alle kontakter fra valgt adressebok"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:995
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:998
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1337
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:619
 #: ../src/modules/calendar/e-task-shell-view-actions.c:745
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1676
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1730
 msgid "_Rename..."
 msgstr "End_re navn …"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:997
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1000
 msgid "Rename the selected address book"
 msgstr "Endre navn på valgt adressebok"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1004
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1007
 msgid "Stop loading"
 msgstr "Stopp lasting"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1009
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1012
 msgid "_Copy Contact To..."
 msgstr "_Kopier kontakt til …"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1011
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1014
 msgid "Copy selected contacts to another address book"
 msgstr "Kopier valgte kontakter til en annen adressebok"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1016
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1019
 msgid "_Delete Contact"
 msgstr "_Slett kontakt"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1023
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1026
 msgid "_Find in Contact..."
 msgstr "_Finn i kontakt …"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1025
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1028
 msgid "Search for text in the displayed contact"
 msgstr "Søk etter tekst i innholdet av vist kontakt"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1030
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1033
 msgid "_Forward Contact..."
 msgstr "_Videresend kontakt …"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1032
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1035
 msgid "Send selected contacts to another person"
 msgstr "Send valgte kontakter til en annen person"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1037
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1040
 msgid "_Move Contact To..."
 msgstr "_Flytt kontakt til …"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1039
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1042
 msgid "Move selected contacts to another address book"
 msgstr "Flytt valgte kontakter til en annen adressebok"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1044
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1047
 msgid "_New Contact..."
 msgstr "_Ny kontakt …"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1051
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1054
 msgid "New Contact _List..."
 msgstr "Ny kontakt_liste …"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1058
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1061
 msgid "_Open Contact"
 msgstr "_Åpne kontakt"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1060
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1063
 msgid "View the current contact"
 msgstr "Vis aktiv kontakt"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1065
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1068
 msgid "_Send Message to Contact..."
 msgstr "_Send melding til kontakt …"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1067
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1070
 msgid "Send a message to the selected contacts"
 msgstr "Send en melding til valgte kontakter"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1074
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1077
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1507
 #: ../src/modules/calendar/e-task-shell-view-actions.c:810
 msgid "_Actions"
 msgstr "H_andlinger"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1081
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1084
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:663
 #: ../src/modules/calendar/e-task-shell-view-actions.c:817
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1848
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1902
 msgid "_Preview"
 msgstr "_Forhåndsvis"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1094
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1097
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1536
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:680
 #: ../src/modules/calendar/e-task-shell-view-actions.c:834
 msgid "_Manage groups..."
 msgstr "_Håndter grupper …"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1106
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1109
 msgid "Address Book Map"
 msgstr "Adressebokkart"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1138
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1141
 msgid "Contact _Preview"
 msgstr "_Forhåndsvisning av kontakt"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1140
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1143
 msgid "Show contact preview window"
 msgstr "Vis vindu for forhåndsvisning av kontakter"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1146
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1149
 msgid "Show _Maps"
 msgstr "Vis _kart"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1148
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1151
 msgid "Show maps in contact preview window"
 msgstr "Vis kart i forhåndsvisning av kontakter"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1167
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1170
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:741
 #: ../src/modules/calendar/e-task-shell-view-actions.c:907
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1994
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2060
 msgid "_Classic View"
 msgstr "_Klassisk visning"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1169
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1172
 msgid "Show contact preview below the contact list"
 msgstr "Vis forhåndsvisning av kontakt under kontaktlisten"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1174
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1177
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:748
 #: ../src/modules/calendar/e-task-shell-view-actions.c:914
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2001
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2067
 msgid "_Vertical View"
 msgstr "_Vertikal visning"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1176
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1179
 msgid "Show contact preview alongside the contact list"
 msgstr "Vis forhåndsvisning av kontakt ved siden av kontaktlisten"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1191
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1194
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1696
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:765
 #: ../src/modules/calendar/e-task-shell-view-actions.c:966
 msgid "Unmatched"
 msgstr "Ingen treff"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1201
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1204
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1706
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:775
 #: ../src/modules/calendar/e-task-shell-view-actions.c:976
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2085
-#: ../src/shell/e-shell-content.c:655
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2151
+#: ../src/shell/e-shell-content.c:637
 msgid "Advanced Search"
 msgstr "Avansert søk"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1234
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1237
 msgid "Print all shown contacts"
 msgstr "Skriv ut alle viste kontakter"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1241
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1244
 msgid "Preview the contacts to be printed"
 msgstr "Forhåndsvis kontaktene som skal skrives ut"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1248
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1251
 msgid "Print selected contacts"
 msgstr "Skriv ut valgte kontakter"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1263
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1266
 msgid "S_ave Address Book as vCard"
 msgstr "L_agre adressebok som vCard"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1265
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1268
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr "Lagre kontakter i valgt adressebok som vCard"
 
 #. Translators: This is an action label
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1271
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1281
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1274
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1284
 msgid "_Save as vCard..."
 msgstr "Lagre _som vCard …"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1273
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1276
 msgid "Save selected contacts as a vCard"
 msgstr "Lagre valgte kontakter som et vCard"
 
@@ -19217,7 +20077,7 @@ msgstr "_Send melding til liste"
 msgid "_Send Message to Contact"
 msgstr "_Send melding til kontakt"
 
-#: ../src/modules/backup-restore/e-mail-config-restore-page.c:164
+#: ../src/modules/backup-restore/e-mail-config-restore-page.c:162
 msgid ""
 "You can restore Evolution from a backup file.\n"
 "\n"
@@ -19227,17 +20087,17 @@ msgstr ""
 "Dette vil gjenopprette alle dine personlige data, innstillinger, e-"
 "postfiltre osv.."
 
-#: ../src/modules/backup-restore/e-mail-config-restore-page.c:179
+#: ../src/modules/backup-restore/e-mail-config-restore-page.c:177
 msgid "_Restore from a backup file:"
 msgstr "Gjenopp_rett fra sikkerhetskopi:"
 
-#: ../src/modules/backup-restore/e-mail-config-restore-page.c:190
+#: ../src/modules/backup-restore/e-mail-config-restore-page.c:188
 msgid "Choose a backup file to restore"
 msgstr "Velg en fil som skal gjenopprettes"
 
 #. Keep the title identical to EMailConfigRestorePage
 #. * so it's only shown once in the assistant sidebar.
-#: ../src/modules/backup-restore/e-mail-config-restore-page.c:310
+#: ../src/modules/backup-restore/e-mail-config-restore-page.c:291
 #: ../src/modules/backup-restore/e-mail-config-restore-ready-page.c:57
 msgid "Restore from Backup"
 msgstr "Gjenopprett fra sikkerhetskopi"
@@ -19789,11 +20649,6 @@ msgstr "I_mporter til notatliste"
 msgid "I_mport to Task List"
 msgstr "I_mporter til oppgaveliste"
 
-#: ../src/modules/calendar/e-cal-base-shell-backend.c:185
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:178
-msgid "New Memo List"
-msgstr "Ny notatliste"
-
 #: ../src/modules/calendar/e-cal-base-shell-sidebar.c:563
 #, c-format
 msgid "Copying an event into the calendar “%s”"
@@ -20127,18 +20982,6 @@ msgstr "Forvalgt _utsettelsestid (i minutter)"
 msgid "Select the sources for reminder notification:"
 msgstr "Velg kilder for varsling av påminnelser:"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:81
-msgid "Calendars"
-msgstr "Kalendere"
-
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:82
-msgid "Memo Lists"
-msgstr "Notatlister"
-
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:83
-msgid "Task Lists"
-msgstr "Oppgavelister"
-
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:84
 msgid "Default Free/Busy Server"
 msgstr "Forvalgt ledig/opptatt-tjener"
@@ -20152,45 +20995,45 @@ msgstr "%u og %d vil bli erstattet av brukernavn og domene fra e-postadressen."
 msgid "Publishing Information"
 msgstr "Publiserer informasjon"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:112
+#: ../src/modules/calendar/e-cal-shell-backend.c:113
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Avtale"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:114
+#: ../src/modules/calendar/e-cal-shell-backend.c:115
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1451
 msgid "Create a new appointment"
 msgstr "Opprett en ny avtale"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:119
+#: ../src/modules/calendar/e-cal-shell-backend.c:120
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Avtale for hele _dagen"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:121
+#: ../src/modules/calendar/e-cal-shell-backend.c:122
 msgid "Create a new all-day appointment"
 msgstr "Opprett en ny avtale for hele dagen"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:126
+#: ../src/modules/calendar/e-cal-shell-backend.c:127
 msgctxt "New"
 msgid "M_eeting"
 msgstr "Møt_e"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:128
+#: ../src/modules/calendar/e-cal-shell-backend.c:129
 msgid "Create a new meeting request"
 msgstr "Opprett en ny møteforespørsel"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:136
+#: ../src/modules/calendar/e-cal-shell-backend.c:137
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Kale_nder"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:138
+#: ../src/modules/calendar/e-cal-shell-backend.c:139
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1311
 msgid "Create a new calendar"
 msgstr "Opprett en ny kalender"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:255
+#: ../src/modules/calendar/e-cal-shell-backend.c:256
 msgid "Calendar and Tasks"
 msgstr "Kalender og oppgaver"
 
@@ -20198,10 +21041,6 @@ msgstr "Kalender og oppgaver"
 msgid "Print"
 msgstr "Skriv ut"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:283
-msgid "Calendar Properties"
-msgstr "Kalenderegenskaper"
-
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:312
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -20386,10 +21225,6 @@ msgstr "Opprett en ny avtale for hele dagen"
 msgid "_Forward as iCalendar..."
 msgstr "_Videresend som iCalendar …"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1435
-msgid "New _Meeting..."
-msgstr "Nytt _møte …"
-
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1437
 msgid "Create a new meeting"
 msgstr "Lag et nytt møte"
@@ -20398,10 +21233,6 @@ msgstr "Lag et nytt møte"
 msgid "Mo_ve to Calendar..."
 msgstr "Fl_ytt til kalender …"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1449
-msgid "New _Appointment..."
-msgstr "Ny _avtale …"
-
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1456
 msgid "Make this Occurrence _Movable"
 msgstr "Gjør denne hendelsen _flyttbar"
@@ -20683,10 +21514,6 @@ msgstr "Lag en ny notatliste"
 msgid "Print Memos"
 msgstr "Skriv ut notater"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:250
-msgid "Memo List Properties"
-msgstr "Egenskaper for notatliste"
-
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:556
 msgid "_Delete Memo"
 msgstr "_Slett notat"
@@ -20809,10 +21636,6 @@ msgstr "Opprett en ny oppgaveliste"
 msgid "Print Tasks"
 msgstr "Skriv ut oppgaver"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:274
-msgid "Task List Properties"
-msgstr "Egenskaper for oppgaveliste"
-
 #: ../src/modules/calendar/e-task-shell-view-actions.c:557
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
@@ -21859,343 +22682,347 @@ msgid_plural "%d attached messages"
 msgstr[0] "%d vedlagt melding"
 msgstr[1] "%d vedlagte meldinger"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:375
+#: ../src/modules/mail/e-mail-shell-backend.c:383
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "E-post_melding"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:377
+#: ../src/modules/mail/e-mail-shell-backend.c:385
 msgid "Compose a new mail message"
 msgstr "Skriv en ny e-postmelding"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:385
+#: ../src/modules/mail/e-mail-shell-backend.c:393
 msgctxt "New"
 msgid "Mail Acco_unt"
 msgstr "E-post-k_onto"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:387
+#: ../src/modules/mail/e-mail-shell-backend.c:395
 msgid "Create a new mail account"
 msgstr "Lag en ny e-postkonto"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:392
+#: ../src/modules/mail/e-mail-shell-backend.c:400
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "E-post_mappe"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:394
+#: ../src/modules/mail/e-mail-shell-backend.c:402
 msgid "Create a new mail folder"
 msgstr "Opprett en ny e-postmappe"
 
 #. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
 #. it to some user-frienly form, or keep it as is.
-#: ../src/modules/mail/e-mail-shell-backend.c:709
+#: ../src/modules/mail/e-mail-shell-backend.c:717
 msgctxt "NetworkMonitor"
 msgid "base"
 msgstr "grunnleggende"
 
 #. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
 #. it to some user-frienly form, or keep it as is.
-#: ../src/modules/mail/e-mail-shell-backend.c:712
+#: ../src/modules/mail/e-mail-shell-backend.c:720
 msgctxt "NetworkMonitor"
 msgid "netlink"
 msgstr "netlink"
 
 #. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
 #. it to some user-frienly form, or keep it as is.
-#: ../src/modules/mail/e-mail-shell-backend.c:715
+#: ../src/modules/mail/e-mail-shell-backend.c:723
 msgctxt "NetworkMonitor"
 msgid "networkmanager"
 msgstr "networkmanager"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:749
+#: ../src/modules/mail/e-mail-shell-backend.c:757
 msgctxt "NetworkMonitor"
 msgid "Method to detect _online state:"
 msgstr "Metode for å avdekke tilk_oblingsstatus:"
 
 #. Always as the first
-#: ../src/modules/mail/e-mail-shell-backend.c:758
+#: ../src/modules/mail/e-mail-shell-backend.c:766
 msgctxt "NetworkMonitor"
 msgid "Default"
 msgstr "Forvalgt"
 
 #. Always as the last
-#: ../src/modules/mail/e-mail-shell-backend.c:772
+#: ../src/modules/mail/e-mail-shell-backend.c:780
 msgctxt "NetworkMonitor"
 msgid "Always Online"
 msgstr "Alltid tilkoblet"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:832
-msgid "Mail Accounts"
-msgstr "E-post-konti"
-
-#: ../src/modules/mail/e-mail-shell-backend.c:841
+#: ../src/modules/mail/e-mail-shell-backend.c:849
 msgid "Mail Preferences"
 msgstr "Brukervalg for e-post"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:850
+#: ../src/modules/mail/e-mail-shell-backend.c:858
 msgid "Composer Preferences"
 msgstr "Brukervalg for redigering"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:859
+#: ../src/modules/mail/e-mail-shell-backend.c:867
 msgid "Network Preferences"
 msgstr "Brukervalg for nettverk"
 
 #. Translators: The first item in the list, to be
 #. * able to set rule: [Label] [is/is-not] [None]
-#: ../src/modules/mail/e-mail-shell-backend.c:1151
+#: ../src/modules/mail/e-mail-shell-backend.c:1220
 msgctxt "label"
 msgid "None"
 msgstr "Ingen"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:734
+#: ../src/modules/mail/e-mail-shell-view-actions.c:781
 msgid "Marking messages as read..."
 msgstr "Merker meldinger _som lest …"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1093
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1140
 msgid "Go to Folder"
 msgstr "Gå til mappe"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1097
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1144
 msgid "_Select"
 msgstr "_Velg"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1577
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1624
 msgid "_Disable Account"
 msgstr "_Deaktiver konto"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1579
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1626
 msgid "Disable this account"
 msgstr "Deaktiver denne kontoen"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1586
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1633
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "Fjern alle slettede meldinger fra alle mapper permanent"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1593
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1638
+msgid "Empty _Junk"
+msgstr "Tøm søppel_post"
+
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1640
+msgid "Delete all Junk messages from all folders"
+msgstr "Fjern alle søppelpostmeldinger fra alle mapper"
+
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1647
 msgid "Edit properties of this account"
 msgstr "Rediger egenskaper for denne kontoen"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1600
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1654
 msgid "Refresh list of folders of this account"
 msgstr "Oppdater mappelisten for denne kontoen"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1605
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1659
 msgid "_Download Messages for Offline Usage"
 msgstr "Last ne_d meldinger for frakoblet bruk"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1607
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1661
 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"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1612
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1666
 msgid "Fl_ush Outbox"
 msgstr "T_øm utboks"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1619
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1673
 msgid "_Copy Folder To..."
 msgstr "_Kopier mappe til …"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1621
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1675
 msgid "Copy the selected folder into another folder"
 msgstr "Kopier valgt mappe til en annen mappe"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1628
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1682
 msgid "Permanently remove this folder"
 msgstr "Fjern denne mappen permanent"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1633
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1687
 msgid "E_xpunge"
 msgstr "T_øm"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1635
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1689
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Fjern alle slettede meldinger fra denne mappen permanent"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1640
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1748
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1694
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1802
 msgid "Mar_k All Messages as Read"
 msgstr "Mer_k alle meldinger som lest"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1642
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1750
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1696
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1804
 msgid "Mark all messages in the folder as read"
 msgstr "Merk alle meldinger i en mappe som lest"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1647
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1701
 msgid "_Move Folder To..."
 msgstr "Flytt _mappe til …"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1649
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1703
 msgid "Move the selected folder into another folder"
 msgstr "Flytt valgt mappe til en annen mappe"
 
 #. Translators: An action caption to create a new mail folder
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1655
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1709
 msgid "_New..."
 msgstr "_Ny …"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1657
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1711
 msgid "Create a new folder for storing mail"
 msgstr "Lag en ny mappe for lagring av meldinger"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1664
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1718
 msgid "Change the properties of this folder"
 msgstr "Endre egenskaper for denne mappen"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1671
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1725
 msgid "Refresh the folder"
 msgstr "Oppdater mappen"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1678
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1732
 msgid "Change the name of this folder"
 msgstr "Endre navn på denne mappen"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1683
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1737
 msgid "Select Message _Thread"
 msgstr "Velg meldings_tråd"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1685
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1739
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Velg alle meldinger i samme tråd som den valgte meldingen"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1690
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1744
 msgid "Select Message S_ubthread"
 msgstr "Velg _undertråd for melding"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1692
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1746
 msgid "Select all replies to the currently selected message"
 msgstr "Velg alle svar til den valgt melding"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1704
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1758
 msgid "Empty _Trash"
 msgstr "Tøm _papirkurven"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1706
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1760
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "Fjern alle slettede meldinger fra alle kontoer permanent"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1711
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1765
 msgid "Go to _Folder"
 msgstr "Gå til _mappe"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1713
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1767
 msgid "Opens a dialog to select a folder to go to"
 msgstr "Åpner en dialog for å velge en mappe å gå til"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1718
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1772
 msgid "_New Label"
 msgstr "_Ny etikett"
 
 #. Translators: "None" is used in the message label context menu.
 #. *              It removes all labels from the selected messages.
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1727
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1781
 msgid "N_one"
 msgstr "_Ingen"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1741
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1795
 msgid "_Manage Subscriptions"
 msgstr "_Håndter abonnement"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1743
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1827
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1797
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1881
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Abonner eller fjern abonnement på mapper på eksterne tjenere"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1755
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1776
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1809
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1830
 msgid "Send / _Receive"
 msgstr "Send / _motta"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1757
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1811
 msgid "Send queued items and retrieve new items"
 msgstr "Send kølagte oppføringer og hent nye oppføringer"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1762
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1816
 msgid "R_eceive All"
 msgstr "Motta all_e"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1764
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1818
 msgid "Receive new items from all accounts"
 msgstr "Motta nye oppføringer fra alle kontoer"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1769
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1823
 msgid "_Send All"
 msgstr "_Send alle"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1771
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1825
 msgid "Send queued items in all accounts"
 msgstr "Send kølagte oppføringer i alle kontoer"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1799
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1853
 msgid "Cancel the current mail operation"
 msgstr "Avbryt aktiv e-postoperasjon"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1804
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1858
 msgid "Collapse All _Threads"
 msgstr "Slå sammen alle _tråder"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1806
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1860
 msgid "Collapse all message threads"
 msgstr "Slå sammen alle meldingstråder"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1811
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1865
 msgid "E_xpand All Threads"
 msgstr "Ut_vid alle tråder"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1813
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1867
 msgid "Expand all message threads"
 msgstr "Utvid alle meldingstråder"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1818
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1872
 msgid "_Message Filters"
 msgstr "_Meldingsfiltre"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1820
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1874
 msgid "Create or edit rules for filtering new mail"
 msgstr "Opprett eller rediger regler for filtrering av ny e-post"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1825
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1879
 msgid "_Subscriptions..."
 msgstr "_Abonnement …"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1834
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1888
 msgid "F_older"
 msgstr "M_appe"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1841
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1895
 msgid "_Label"
 msgstr "_Etikett"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1858
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1912
 msgid "C_reate Search Folder From Search..."
 msgstr "Opp_rett søkemappe fra søk …"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1865
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1919
 msgid "Search F_olders"
 msgstr "Søk i _mapper"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1867
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1921
 msgid "Create or edit search folder definitions"
 msgstr "Opprett eller rediger søkemappedefinisjoner"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1906
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1964
 msgid "_New Folder..."
 msgstr "_Ny mappe …"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1934
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1992
 msgid "Show Message _Preview"
 msgstr "Vis _forhåndsvisning av melding"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1936
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1994
 msgid "Show message preview pane"
 msgstr "Vis område for forhåndsvisning av melding"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1942
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2000
 msgid "Show _Attachment Bar"
 msgstr "Vis ve_dleggsfelt"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1944
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2002
 msgid ""
 "Show Attachment Bar below the message preview pane when the message has "
 "attachments"
@@ -22203,99 +23030,107 @@ msgstr ""
 "Vis vedleggsfelt under under område for forhåndsvisning av meldinger når "
 "meldingen har vedlegg"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1950
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2008
 msgid "Show _Deleted Messages"
 msgstr "Vis slette_de meldinger"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1952
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2010
 msgid "Show deleted messages with a line through them"
 msgstr "Vis slettede meldinger som gjennomstreket i meldingslisten."
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1958
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2016
 msgid "Show _Junk Messages"
 msgstr "Vis _uønskede meldinger"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1960
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2018
 msgid "Show junk messages with a red line through them"
 msgstr "Vis uønskeded meldinger som gjennomstreket i rødt"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1966
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2024
 msgid "_Group By Threads"
 msgstr "_Grupper etter tråder"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1968
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2026
 msgid "Threaded message list"
 msgstr "Meldingsliste med tråder"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1974
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2032
+msgid "Show To _Do Bar"
+msgstr "Vis opp_gavelinjen"
+
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2034
+msgid "Show To Do bar with appointments and tasks"
+msgstr "Vis oppgavelinjen med avtaler og oppgaver"
+
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2040
 msgid "_Unmatched Folder Enabled"
 msgstr "Mapper _uten treff er aktivert"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1976
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2042
 msgid "Toggles whether Unmatched search folder is enabled"
 msgstr "Slår av/på søkemapper for oppføringer uten treff"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1996
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2062
 msgid "Show message preview below the message list"
 msgstr "Vis meldingen under meldingslisten"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2003
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2069
 msgid "Show message preview alongside the message list"
 msgstr "Vis meldingen ved siden av meldingslisten"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2011
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2077
 msgid "All Messages"
 msgstr "Alle meldinger"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2018
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2084
 msgid "Important Messages"
 msgstr "Viktige meldinger"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2025
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2091
 msgid "Last 5 Days’ Messages"
 msgstr "Meldinger fra de siste 5 dagene"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2032
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2098
 msgid "Messages Not Junk"
 msgstr "Meldinger som ikke er uønsket e-post"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2039
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2105
 msgid "Messages with Attachments"
 msgstr "Meldinger med vedlegg"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2046
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2112
 msgid "Messages with Notes"
 msgstr "Meldinger med notater"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2053
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2119
 msgid "No Label"
 msgstr "Ingen etikett"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2060
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2126
 msgid "Read Messages"
 msgstr "Leste meldinger"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2067
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2133
 msgid "Unread Messages"
 msgstr "Uleste meldinger"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2074
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2140
 msgid "Message Thread"
 msgstr "Meldingstråd"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2134
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2200
 msgid "Subject or Addresses contain"
 msgstr "Emne eller adresser inneholder"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2144
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2210
 msgid "All Accounts"
 msgstr "Alle konti"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2151
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2217
 msgid "Current Account"
 msgstr "Denne kontoen"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2158
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2224
 msgid "Current Folder"
 msgstr "Denne mappen"
 
@@ -22386,7 +23221,7 @@ msgstr "Send med det samme"
 msgid "Send after 5 minutes"
 msgstr "Send etter 5 minutter"
 
-#: ../src/modules/mail/em-composer-prefs.c:1303
+#: ../src/modules/mail/em-composer-prefs.c:1309
 msgid "Language(s)"
 msgstr "Språk"
 
@@ -22419,14 +23254,22 @@ 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
-#: ../src/modules/mail/em-mailer-prefs.c:1558
+#: ../src/modules/mail/em-mailer-prefs.c:1564
 msgid "_Date header:"
 msgstr "_Datohode:"
 
-#: ../src/modules/mail/em-mailer-prefs.c:1559
+#: ../src/modules/mail/em-mailer-prefs.c:1565
 msgid "Show _original header value"
 msgstr "Vis _opprinnelig verdi for hode"
 
+#: ../src/modules/mailto-handler/evolution-mailto-handler.c:112
+msgid "Do _not change settings"
+msgstr "Ikke e_ndre innstillingene"
+
+#: ../src/modules/mailto-handler/evolution-mailto-handler.c:113
+msgid "_Set as default email client"
+msgstr "Merk _som forvalgt e-postprogram"
+
 #: ../src/modules/mailto-handler/evolution-mailto-handler.c:138
 msgid "Do you want to make Evolution your default email client?"
 msgstr "Vil du sette Evolution som forvalgt e-postprogram?"
@@ -22647,15 +23490,15 @@ msgstr "Søppelfilter bruker SpamAssassin"
 msgid "Importing Files"
 msgstr "Importerer filer"
 
-#: ../src/modules/startup-wizard/e-mail-config-import-progress-page.c:259
+#: ../src/modules/startup-wizard/e-mail-config-import-progress-page.c:257
 msgid "Import cancelled."
 msgstr "Import avbrutt."
 
-#: ../src/modules/startup-wizard/e-mail-config-import-progress-page.c:276
+#: ../src/modules/startup-wizard/e-mail-config-import-progress-page.c:274
 msgid "Import complete."
 msgstr "Import fullført."
 
-#: ../src/modules/startup-wizard/e-startup-assistant.c:156
+#: ../src/modules/startup-wizard/e-startup-assistant.c:158
 msgid ""
 "Welcome to Evolution.\n"
 "\n"
@@ -22667,7 +23510,11 @@ msgstr ""
 "De neste skjermene lar deg konfigurere Evolution til å koble til dine e-post "
 "kontoer, og importere filer fra andre programmer."
 
-#: ../src/modules/startup-wizard/evolution-startup-wizard.c:226
+#: ../src/modules/startup-wizard/e-startup-assistant.c:165
+msgid "Do not _show this wizard again"
+msgstr "Ikke vi_s denne veiviseren igjen"
+
+#: ../src/modules/startup-wizard/evolution-startup-wizard.c:212
 msgid "Loading accounts..."
 msgstr "Laster kontoer …"
 
@@ -22679,11 +23526,11 @@ msgstr "_Formater som …"
 msgid "_Other languages"
 msgstr "_Andre språk"
 
-#: ../src/modules/text-highlight/e-mail-formatter-text-highlight.c:436
+#: ../src/modules/text-highlight/e-mail-formatter-text-highlight.c:453
 msgid "Text Highlight"
 msgstr "Tekstutheving"
 
-#: ../src/modules/text-highlight/e-mail-formatter-text-highlight.c:437
+#: ../src/modules/text-highlight/e-mail-formatter-text-highlight.c:454
 msgid "Syntax highlighting of mail parts"
 msgstr "Syntaksutheving for e-postdeler"
 
@@ -23424,36 +24271,36 @@ msgstr "Ny e-post i Evolution"
 
 #. Translators: The '%s' is a mail
 #. * folder name.  (e.g. "Show Inbox")
-#: ../src/plugins/mail-notification/mail-notification.c:484
+#: ../src/plugins/mail-notification/mail-notification.c:483
 #, c-format
 msgid "Show %s"
 msgstr "Vis %s"
 
-#: ../src/plugins/mail-notification/mail-notification.c:688
+#: ../src/plugins/mail-notification/mail-notification.c:687
 msgid "_Play sound when a new message arrives"
 msgstr "S_pill en lyd når nye meldinger ankommer"
 
-#: ../src/plugins/mail-notification/mail-notification.c:720
+#: ../src/plugins/mail-notification/mail-notification.c:719
 msgid "_Beep"
 msgstr "_Pip"
 
-#: ../src/plugins/mail-notification/mail-notification.c:733
+#: ../src/plugins/mail-notification/mail-notification.c:732
 msgid "Use sound _theme"
 msgstr "Bruk lyd_tema"
 
-#: ../src/plugins/mail-notification/mail-notification.c:752
+#: ../src/plugins/mail-notification/mail-notification.c:751
 msgid "Play _file:"
 msgstr "Spill av lyd_fil:"
 
-#: ../src/plugins/mail-notification/mail-notification.c:761
+#: ../src/plugins/mail-notification/mail-notification.c:760
 msgid "Select sound file"
 msgstr "Velg en lydfil"
 
-#: ../src/plugins/mail-notification/mail-notification.c:838
+#: ../src/plugins/mail-notification/mail-notification.c:837
 msgid "Notify new messages for _Inbox only"
 msgstr "Varslingsmelding kun for _innboks"
 
-#: ../src/plugins/mail-notification/mail-notification.c:854
+#: ../src/plugins/mail-notification/mail-notification.c:853
 msgid "Show _notification when a new message arrives"
 msgstr "Vis varsli_ng når en ny melding ankommer"
 
@@ -23660,10 +24507,6 @@ msgstr "Importer Outlook-meldinger fra PST-fil"
 msgid "Outlook personal folders (.pst)"
 msgstr "Outlook personlige mapper (.pst)"
 
-#: ../src/plugins/pst-import/pst-importer.c:522
-msgid "_Mail"
-msgstr "_E-post"
-
 #: ../src/plugins/pst-import/pst-importer.c:551
 msgid "Destination folder:"
 msgstr "Målmappe:"
@@ -24012,7 +24855,7 @@ msgstr "Åpne inn_stillinger"
 msgid "Credentials are required to connect to the destination host."
 msgstr "Påloggingsinformasjon kreves for å koble til målverten."
 
-#: ../src/shell/e-shell.c:1297 ../src/shell/e-shell-window-actions.c:836
+#: ../src/shell/e-shell.c:1297 ../src/shell/e-shell-window-actions.c:866
 msgid "New _Window"
 msgstr "Nytt _vindu"
 
@@ -24020,19 +24863,19 @@ msgstr "Nytt _vindu"
 msgid "Quick _Reference"
 msgstr "Hu_rtigreferanse"
 
-#: ../src/shell/e-shell.c:1310 ../src/shell/e-shell-window-actions.c:773
+#: ../src/shell/e-shell.c:1310 ../src/shell/e-shell-window-actions.c:796
 msgid "_About"
 msgstr "_Om"
 
-#: ../src/shell/e-shell.c:1311 ../src/shell/e-shell-window-actions.c:871
+#: ../src/shell/e-shell.c:1311 ../src/shell/e-shell-window-actions.c:901
 msgid "_Quit"
 msgstr "A_vslutt"
 
-#: ../src/shell/e-shell-content.c:718 ../src/shell/e-shell-content.c:719
+#: ../src/shell/e-shell-content.c:700 ../src/shell/e-shell-content.c:701
 msgid "Searches"
 msgstr "Søk"
 
-#: ../src/shell/e-shell-content.c:762
+#: ../src/shell/e-shell-content.c:744
 msgid "Save Search"
 msgstr "Lagre søk"
 
@@ -24079,273 +24922,281 @@ msgstr "Evolution nettsted"
 msgid "Saving user interface state"
 msgstr "Lagrer tilstand for brukergrensesnitt"
 
-#: ../src/shell/e-shell-window-actions.c:275
+#: ../src/shell/e-shell-window-actions.c:293
 msgid "Categories Editor"
 msgstr "Redigering av kategorier"
 
-#: ../src/shell/e-shell-window-actions.c:594
+#: ../src/shell/e-shell-window-actions.c:612
 msgid "Bug Buddy is not installed."
 msgstr "Bug Buddy er ikke installert."
 
-#: ../src/shell/e-shell-window-actions.c:595
+#: ../src/shell/e-shell-window-actions.c:613
 msgid "Bug Buddy could not be run."
 msgstr "Bug Buddy kunne ikke kjøres."
 
-#: ../src/shell/e-shell-window-actions.c:775
+#: ../src/shell/e-shell-window-actions.c:798
 msgid "Show information about Evolution"
 msgstr "Vis informasjon om Evolution"
 
-#: ../src/shell/e-shell-window-actions.c:780
-#: ../src/shell/e-shell-window-actions.c:794
+#: ../src/shell/e-shell-window-actions.c:803
+msgid "_Accounts"
+msgstr "K_ontoer:"
+
+#: ../src/shell/e-shell-window-actions.c:805
+msgid "Configure Evolution Accounts"
+msgstr "Konfigurer Evolution-kontoer"
+
+#: ../src/shell/e-shell-window-actions.c:810
+#: ../src/shell/e-shell-window-actions.c:824
 msgid "_Close Window"
 msgstr "_Lukk vindu"
 
-#: ../src/shell/e-shell-window-actions.c:801
+#: ../src/shell/e-shell-window-actions.c:831
 msgid "_Contents"
 msgstr "_Innhold"
 
-#: ../src/shell/e-shell-window-actions.c:803
+#: ../src/shell/e-shell-window-actions.c:833
 msgid "Open the Evolution User Guide"
 msgstr "Åpne Evolutions brukermanual"
 
-#: ../src/shell/e-shell-window-actions.c:829
+#: ../src/shell/e-shell-window-actions.c:859
 msgid "I_mport..."
 msgstr "I_mporter …"
 
-#: ../src/shell/e-shell-window-actions.c:831
+#: ../src/shell/e-shell-window-actions.c:861
 msgid "Import data from other programs"
 msgstr "Importer data fra andre programmer"
 
-#: ../src/shell/e-shell-window-actions.c:838
+#: ../src/shell/e-shell-window-actions.c:868
 msgid "Create a new window displaying this view"
 msgstr "Opprett et nytt vindu med denne visningen"
 
-#: ../src/shell/e-shell-window-actions.c:850
+#: ../src/shell/e-shell-window-actions.c:880
 msgid "Available Cate_gories"
 msgstr "Tilgjengelige kate_gorier"
 
-#: ../src/shell/e-shell-window-actions.c:852
+#: ../src/shell/e-shell-window-actions.c:882
 msgid "Manage available categories"
 msgstr "Håndter tilgjengelige kategorier"
 
-#: ../src/shell/e-shell-window-actions.c:864
+#: ../src/shell/e-shell-window-actions.c:894
 msgid "_Quick Reference"
 msgstr "_Hurtigreferanse"
 
-#: ../src/shell/e-shell-window-actions.c:866
+#: ../src/shell/e-shell-window-actions.c:896
 msgid "Show Evolution’s shortcut keys"
 msgstr "Vis snarveitaster for Evolution"
 
-#: ../src/shell/e-shell-window-actions.c:873
+#: ../src/shell/e-shell-window-actions.c:903
 msgid "Exit the program"
 msgstr "Avslutt programmet"
 
-#: ../src/shell/e-shell-window-actions.c:878
+#: ../src/shell/e-shell-window-actions.c:908
 msgid "_Advanced Search..."
 msgstr "_Avansert søk …"
 
-#: ../src/shell/e-shell-window-actions.c:880
+#: ../src/shell/e-shell-window-actions.c:910
 msgid "Construct a more advanced search"
 msgstr "Sett sammen et mer avansert søk"
 
-#: ../src/shell/e-shell-window-actions.c:887
+#: ../src/shell/e-shell-window-actions.c:917
 msgid "Clear the current search parameters"
 msgstr "Tøm aktive søkeparametere"
 
-#: ../src/shell/e-shell-window-actions.c:892
+#: ../src/shell/e-shell-window-actions.c:922
 msgid "_Edit Saved Searches..."
 msgstr "R_ediger lagrede søk …"
 
-#: ../src/shell/e-shell-window-actions.c:894
+#: ../src/shell/e-shell-window-actions.c:924
 msgid "Manage your saved searches"
 msgstr "Håndter dine lagrede søk"
 
-#: ../src/shell/e-shell-window-actions.c:901
+#: ../src/shell/e-shell-window-actions.c:931
 msgid "Click here to change the search type"
 msgstr "Klikk her for å endre søketype"
 
-#: ../src/shell/e-shell-window-actions.c:906
+#: ../src/shell/e-shell-window-actions.c:936
 msgid "_Find Now"
 msgstr "_Finn nå "
 
-#: ../src/shell/e-shell-window-actions.c:908
+#: ../src/shell/e-shell-window-actions.c:938
 msgid "Execute the current search parameters"
 msgstr "Kjør aktive søkeparametere"
 
-#: ../src/shell/e-shell-window-actions.c:913
+#: ../src/shell/e-shell-window-actions.c:943
 msgid "_Save Search..."
 msgstr "_Lagre søk …"
 
-#: ../src/shell/e-shell-window-actions.c:915
+#: ../src/shell/e-shell-window-actions.c:945
 msgid "Save the current search parameters"
 msgstr "Lagre aktive søkeparametere"
 
-#: ../src/shell/e-shell-window-actions.c:927
+#: ../src/shell/e-shell-window-actions.c:957
 msgid "Submit _Bug Report..."
 msgstr "Sen_d inn feilrapport …"
 
-#: ../src/shell/e-shell-window-actions.c:929
+#: ../src/shell/e-shell-window-actions.c:959
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Send inn en feilrapport med Bug Buddy"
 
-#: ../src/shell/e-shell-window-actions.c:934
+#: ../src/shell/e-shell-window-actions.c:964
 msgid "_Work Offline"
 msgstr "Ar_beid frakoblet"
 
-#: ../src/shell/e-shell-window-actions.c:936
+#: ../src/shell/e-shell-window-actions.c:966
 msgid "Put Evolution into offline mode"
 msgstr "Sett Evolution i frakoblet modus"
 
-#: ../src/shell/e-shell-window-actions.c:941
+#: ../src/shell/e-shell-window-actions.c:971
 msgid "_Work Online"
 msgstr "Ar_beid tilkoblet"
 
-#: ../src/shell/e-shell-window-actions.c:943
+#: ../src/shell/e-shell-window-actions.c:973
 msgid "Put Evolution into online mode"
 msgstr "Sett Evolution i tilkoblet modus"
 
-#: ../src/shell/e-shell-window-actions.c:971
+#: ../src/shell/e-shell-window-actions.c:1001
 msgid "Lay_out"
 msgstr "Utf_orming"
 
 #. Translators: This is a New menu item caption, under File->New
-#: ../src/shell/e-shell-window-actions.c:979
+#: ../src/shell/e-shell-window-actions.c:1009
 msgid "_New"
 msgstr "_Ny"
 
-#: ../src/shell/e-shell-window-actions.c:986
+#: ../src/shell/e-shell-window-actions.c:1016
 msgid "_Search"
 msgstr "_Søk"
 
-#: ../src/shell/e-shell-window-actions.c:993
+#: ../src/shell/e-shell-window-actions.c:1023
 msgid "_Switcher Appearance"
 msgstr "Ut_seende for bytter"
 
-#: ../src/shell/e-shell-window-actions.c:1007
+#: ../src/shell/e-shell-window-actions.c:1037
 msgid "_Window"
 msgstr "_Vindu"
 
-#: ../src/shell/e-shell-window-actions.c:1036
+#: ../src/shell/e-shell-window-actions.c:1066
 msgid "Show _Menu Bar"
 msgstr "Vis _menylinje"
 
-#: ../src/shell/e-shell-window-actions.c:1038
+#: ../src/shell/e-shell-window-actions.c:1068
 msgid "Show the menu bar"
 msgstr "Vis menylinjen"
 
-#: ../src/shell/e-shell-window-actions.c:1044
+#: ../src/shell/e-shell-window-actions.c:1074
 msgid "Show Side _Bar"
 msgstr "Vis si_delinje"
 
-#: ../src/shell/e-shell-window-actions.c:1046
+#: ../src/shell/e-shell-window-actions.c:1076
 msgid "Show the side bar"
 msgstr "Vis sidelinjen"
 
-#: ../src/shell/e-shell-window-actions.c:1052
+#: ../src/shell/e-shell-window-actions.c:1082
 msgid "Show _Buttons"
 msgstr "Vis _knapper"
 
-#: ../src/shell/e-shell-window-actions.c:1054
+#: ../src/shell/e-shell-window-actions.c:1084
 msgid "Show the switcher buttons"
 msgstr "Vis knapper for bytter"
 
-#: ../src/shell/e-shell-window-actions.c:1060
+#: ../src/shell/e-shell-window-actions.c:1090
 msgid "Show _Status Bar"
 msgstr "Vis _statuslinje"
 
-#: ../src/shell/e-shell-window-actions.c:1062
+#: ../src/shell/e-shell-window-actions.c:1092
 msgid "Show the status bar"
 msgstr "Vis statuslinjen"
 
-#: ../src/shell/e-shell-window-actions.c:1068
+#: ../src/shell/e-shell-window-actions.c:1098
 msgid "Show _Tool Bar"
 msgstr "Vis verk_tøylinjen"
 
-#: ../src/shell/e-shell-window-actions.c:1070
+#: ../src/shell/e-shell-window-actions.c:1100
 msgid "Show the tool bar"
 msgstr "Vis verktøylinjen"
 
-#: ../src/shell/e-shell-window-actions.c:1092
+#: ../src/shell/e-shell-window-actions.c:1122
 msgid "_Icons Only"
 msgstr "Kun _ikoner"
 
-#: ../src/shell/e-shell-window-actions.c:1094
+#: ../src/shell/e-shell-window-actions.c:1124
 msgid "Display window buttons with icons only"
 msgstr "Vis bare ikoner på vinduknapper"
 
-#: ../src/shell/e-shell-window-actions.c:1099
+#: ../src/shell/e-shell-window-actions.c:1129
 msgid "_Text Only"
 msgstr "Kun _tekst"
 
-#: ../src/shell/e-shell-window-actions.c:1101
+#: ../src/shell/e-shell-window-actions.c:1131
 msgid "Display window buttons with text only"
 msgstr "Vis bare tekst på vinduknapper"
 
-#: ../src/shell/e-shell-window-actions.c:1106
+#: ../src/shell/e-shell-window-actions.c:1136
 msgid "Icons _and Text"
 msgstr "Ikoner _og tekst"
 
-#: ../src/shell/e-shell-window-actions.c:1108
+#: ../src/shell/e-shell-window-actions.c:1138
 msgid "Display window buttons with icons and text"
 msgstr "Vis tekst og ikoner på vinduknapper"
 
-#: ../src/shell/e-shell-window-actions.c:1113
+#: ../src/shell/e-shell-window-actions.c:1143
 msgid "Tool_bar Style"
 msgstr "S_til for verktøylinje"
 
-#: ../src/shell/e-shell-window-actions.c:1115
+#: ../src/shell/e-shell-window-actions.c:1145
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr ""
 "Vis vinduknapper ved å bruke instillinger for verktøylinjen på skrivebordet"
 
-#: ../src/shell/e-shell-window-actions.c:1123
+#: ../src/shell/e-shell-window-actions.c:1153
 msgid "Delete Current View"
 msgstr "Slett aktiv visning"
 
-#: ../src/shell/e-shell-window-actions.c:1130
+#: ../src/shell/e-shell-window-actions.c:1160
 msgid "Save Custom View..."
 msgstr "Lagre egendefinert visning …"
 
-#: ../src/shell/e-shell-window-actions.c:1132
+#: ../src/shell/e-shell-window-actions.c:1162
 msgid "Save current custom view"
 msgstr "Lagre aktiv egendefinert visning"
 
-#: ../src/shell/e-shell-window-actions.c:1139
+#: ../src/shell/e-shell-window-actions.c:1169
 msgid "C_urrent View"
 msgstr "A_ktiv visning"
 
-#: ../src/shell/e-shell-window-actions.c:1149
+#: ../src/shell/e-shell-window-actions.c:1179
 msgid "Custom View"
 msgstr "Egendefinert visning"
 
-#: ../src/shell/e-shell-window-actions.c:1151
+#: ../src/shell/e-shell-window-actions.c:1181
 msgid "Current view is a customized view"
 msgstr "Aktiv visning er en egendefinert visning"
 
-#: ../src/shell/e-shell-window-actions.c:1159
+#: ../src/shell/e-shell-window-actions.c:1189
 msgid "Page Set_up..."
 msgstr "Side_oppsett …"
 
-#: ../src/shell/e-shell-window-actions.c:1161
+#: ../src/shell/e-shell-window-actions.c:1191
 msgid "Change the page settings for your current printer"
 msgstr "Endre sideinnstillingene for din skriver"
 
-#: ../src/shell/e-shell-window-actions.c:1530
+#: ../src/shell/e-shell-window-actions.c:1560
 #, c-format
 msgid "Switch to %s"
 msgstr "Bytt til %s"
 
-#: ../src/shell/e-shell-window-actions.c:1653
+#: ../src/shell/e-shell-window-actions.c:1683
 #, c-format
 msgid "Select view: %s"
 msgstr "Velg visning: %s"
 
-#: ../src/shell/e-shell-window-actions.c:1670
+#: ../src/shell/e-shell-window-actions.c:1700
 #, c-format
 msgid "Delete view: %s"
 msgstr "Slett visning: %s"
 
-#: ../src/shell/e-shell-window-actions.c:1771
+#: ../src/shell/e-shell-window-actions.c:1801
 msgid "Execute these search parameters"
 msgstr "Kjør disse søkeparameterene"
 
@@ -24357,7 +25208,7 @@ msgid "New"
 msgstr "Ny"
 
 #. Translators: This is used for the main window title.
-#: ../src/shell/e-shell-window-private.c:720
+#: ../src/shell/e-shell-window-private.c:721
 #, c-format
 msgid "%s — Evolution"
 msgstr "%s – Evolution"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]