[evolution] Updated Norwegian bokmål translation.



commit 280ce34b2394707e43be577dbb39f67c7faf6b57
Author: Kjartan Maraas <kmaraas gnome org>
Date:   Thu Nov 9 19:48:23 2017 +0100

    Updated Norwegian bokmål translation.

 po/nb.po | 2528 +++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 1445 insertions(+), 1083 deletions(-)
---
diff --git a/po/nb.po b/po/nb.po
index e679a01..28e439e 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,11 +7,10 @@
 #: ../src/shell/main.c:516
 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-10-23 10:08+0000\n"
-"PO-Revision-Date: 2017-11-05 12:49+0100\n"
+"Project-Id-Version: evolution 3.27.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-11-09 17:14+0000\n"
+"PO-Revision-Date: 2017-11-09 19:48+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas gnome org>\n"
 "Language-Team: Norwegian bokmål <i18n-nb lister ping uio no>\n"
 "Language: nb\n"
@@ -21,112 +20,6 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-DamnedLies-Scope: partial\n"
 
-#: ../evolution.appdata.xml.in.h:1 ../data/evolution.desktop.in.in.h:1
-#: ../src/mail/e-mail-browser.c:1098
-#: ../src/modules/mailto-handler/evolution-mailto-handler.c:208
-#: ../src/shell/e-shell-window-private.c:240
-msgid "Evolution"
-msgstr "Evolution"
-
-#: ../evolution.appdata.xml.in.h:2 ../data/evolution.desktop.in.in.h:4
-msgid "Manage your email, contacts and schedule"
-msgstr "Håndter e-post, kontakter og kalender"
-
-#: ../evolution.appdata.xml.in.h:3
-msgid ""
-"Evolution is a personal information management application that provides "
-"integrated mail, calendaring and address book functionality."
-msgstr ""
-"Evolution er et program for håndtering av personlig informasjon som gir deg "
-"integrert e-post, kalender og adressebokfunksjonalitet."
-
-#: ../evolution.appdata.xml.in.h:4
-msgid ""
-"Evolution supports a wide range of industry standard data formats and "
-"network protocols for information exchange, with an emphasis on standards "
-"compliance and security. Evolution can also integrate smoothly with "
-"Microsoft Exchange by way of the “Exchange Web Services” (EWS) extension."
-msgstr ""
-"Evolution støtter en rekke forskjellige industristandarder for dataformater "
-"og nettverksprotokoller for utveksling av informasjon med fokus på "
-"standarder og sikkerhet. Evolution kan også integreres med Microsoft "
-"Exchange via «Exchange Web Services» (EWS) utvidelsen."
-
-#: ../data/evolution-alarm-notify.desktop.in.in.h:1
-msgid "Evolution Alarm Notify"
-msgstr "Evolution varslingstjeneste"
-
-#: ../data/evolution-alarm-notify.desktop.in.in.h:2
-msgid "Calendar event notifications"
-msgstr "Varsling om kalenderhendelser"
-
-#: ../data/evolution.desktop.in.in.h:2 ../src/shell/e-shell-utils.c:428
-msgid "Groupware Suite"
-msgstr "Gruppevareløsning"
-
-#: ../data/evolution.desktop.in.in.h:3
-msgid "Evolution Mail and Calendar"
-msgstr "Evolution e-post og kalender"
-
-#: ../data/evolution.desktop.in.in.h:5
-msgid "email;calendar;contact;addressbook;task;"
-msgstr "e-post;kalender;kontakt;adressebok;oppgave;"
-
-#: ../data/evolution.desktop.in.in.h:6
-msgid "New Window"
-msgstr "Nytt vindu"
-
-#: ../data/evolution.desktop.in.in.h:7
-msgid "Compose a Message"
-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: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:845
-#: ../src/e-util/e-send-options.c:544 ../src/e-util/e-webdav-browser.c:469
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:197
-#: ../src/modules/calendar/e-cal-shell-view.c:582
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:21
-msgid "Calendar"
-msgstr "Kalender"
-
-#: ../data/evolution.desktop.in.in.h:10 ../src/e-util/e-send-options.c:536
-#: ../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:1249
-#: ../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/e-util/e-webdav-browser.c:459
-#: ../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
-msgid "Memos"
-msgstr "Notater"
-
-#: ../data/evolution.desktop.in.in.h:12 ../src/calendar/gui/e-task-table.c:696
-#: ../src/calendar/gui/print.c:2418
-#: ../src/calendar/importers/icalendar-importer.c:77
-#: ../src/calendar/importers/icalendar-importer.c:1110
-#: ../src/e-util/e-webdav-browser.c:460
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:65
-#: ../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
-msgid "Tasks"
-msgstr "Oppgaver"
-
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:1
 msgid "Enable address formatting"
 msgstr "Slå på formattering av adresser"
@@ -1046,22 +939,32 @@ 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 "Draw events as flat, not shaded."
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:161
+msgid ""
+"Whether to order days in the Week View from left to right, rather than from "
+"top to bottom."
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:162
 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
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:163
 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
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:164
 #, 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
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:165
 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-"
@@ -1453,65 +1356,76 @@ msgid ""
 msgstr "SV"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
+msgid "Use localized “Fwd”/“Re” in message Subject"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
+msgid ""
+"When set to true, uses localized “Fwd”/“Re” in message Subject on reply and "
+"forward as provided by current locale translation, otherwise uses "
+"unlocalized version."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
 msgid "Number of characters for wrapping"
 msgstr "Antall tegn for linjebryting"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
 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
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
 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
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
 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
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
 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:68
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
 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
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
 msgid "Wrap quoted text in replies"
 msgstr "Bryt sitert tekst i svar"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
 msgid "If set to “true” quoted text in replies will be wrapped."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
 msgid "Whether to obey Content-Disposition:inline message header hint"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
 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
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
 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:74
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
 msgid "Can be either “mbox” or “pdf”."
 msgstr "Kan være enten «mbox» eller «pdf»."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
 msgid "Show image animations"
 msgstr "Vis bildeanimasjoner"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
@@ -1519,11 +1433,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:77
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
 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:78
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
@@ -1531,11 +1445,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:79
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
 msgid "Enable or disable magic space bar"
 msgstr "Aktiver eller deaktiver magisk mellomrom"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -1543,141 +1457,141 @@ msgstr ""
 "Aktiver dette for å bruke mellomrom-tasten til å gå forover i "
 "meldingsvisning, meldingsliste og mapper."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
 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:82
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
 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:83
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
 msgid "Mark citations in the message “Preview”"
 msgstr "Merk sitat in «Forhåndsvisning» av melding"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
 msgid "Mark citations in the message “Preview”."
 msgstr "Merk sitat in «Forhåndsvisning» av melding."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
 msgid "Citation highlight color"
 msgstr "Farge for utheving av sitattekst"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
 msgid "Citation highlight color."
 msgstr "Farge for utheving av sitattekst."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
 msgid "Enable/disable caret mode"
 msgstr "Aktiver/deaktiver markørmodus"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
 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:89
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
 msgid "Default charset in which to display messages"
 msgstr "Forvalgt tegnsett for visning av meldinger"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
 msgid "Default charset in which to display messages."
 msgstr "Forvalgt tegnsett for visning av meldinger."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
 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
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
 #, 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
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
 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
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
 msgid "Show Animations"
 msgstr "Vis animasjoner"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
 msgid "Show animated images as animations."
 msgstr "Vis animerte bilder som animasjoner."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
 msgid "Show all message headers"
 msgstr "Vis alle meldingshoder"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
 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:98
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
 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:99
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
 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
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
 msgid "Show photo of the sender"
 msgstr "Vis bilde av avsender"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
 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:102
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
 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:103
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
 #, 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
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
 msgid "Mark as Seen after specified timeout"
 msgstr "Merk som «lest» etter spesifisert tidsgrense"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
 msgid "Mark as Seen after specified timeout."
 msgstr "Merk som «sett» etter spesifisert tidsgrense."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
 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:107
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
 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
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
 msgid "Timeout for marking messages as seen"
 msgstr "Tidsgrense for å merke e-post som sett."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
 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:110
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
 msgid "Show Attachment Bar"
 msgstr "Vis vedleggsfelt"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
 #, fuzzy
 #| msgid ""
 #| "Show Attachment Bar below the message preview pane when the message has "
@@ -1689,47 +1603,47 @@ 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
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
 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:113
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
 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:114
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
 msgid "Show deleted messages in the message-list"
 msgstr "Vis slettede 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 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:116
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
 msgid "Show junk messages in the message-list"
 msgstr "Vis uønskede meldinger i meldingslisten"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
 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:118
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
 msgid "Enable Unmatched search folder"
 msgstr "Aktiver søkemapper uten treff"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
 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
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
 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:121
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
 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."
@@ -1738,31 +1652,31 @@ 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:122
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
 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:125
 msgid "Height of the message-list pane."
 msgstr "Høyde på e-postlistefeltet."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
 msgid "Whether message headers are collapsed in the user interface"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
 msgid "Width of the message-list pane"
 msgstr "Bredde på e-postlistefeltet"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
 msgid "Width of the message-list pane."
 msgstr "Bredde på e-postlistefeltet."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
 msgid "Layout style"
 msgstr "Stil for utforming"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
 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 "
@@ -1770,35 +1684,35 @@ msgid ""
 "message list."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
 msgid "Variable width font"
 msgstr "Skrift for variabel bredde"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
 msgid "The variable width font for mail display."
 msgstr "Skrift med variabel bredde for meldingsvisning."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
 msgid "Terminal font"
 msgstr "Terminalskrift"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
 msgid "The terminal font for mail display."
 msgstr "Terminalskrift for meldingsvisning."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
 msgid "Use custom fonts"
 msgstr "Bruk egendefinerte skrifter"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
 msgid "Use custom fonts for displaying mail."
 msgstr "Bruk tilpassede skrifttyper for e-postvisning."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
 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:136
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -1806,11 +1720,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:137
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
 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:138
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a “...” is shown."
@@ -1818,11 +1732,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:139
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
 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:140
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -1830,11 +1744,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:141
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
 msgid "Default value for thread expand state"
 msgstr "Forvalgt verdi for trådutvidelsestilstand"
 
-#: ../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 in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -1843,11 +1757,11 @@ msgstr ""
 "sammenslått tilstand som forvalg. Evolution må startes på nytt hvis denne "
 "endres."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
 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:144
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
 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 "
@@ -1857,11 +1771,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:145
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
 msgid "Whether sort thread children always ascending"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
 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."
@@ -1870,11 +1784,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:147
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
 msgid "Sort accounts alphabetically in a folder tree"
 msgstr "Sorter kontoer alfabetisk i et mappetre"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
 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 "
@@ -1882,98 +1796,98 @@ msgid ""
 "given by a user"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
 msgid "Log filter actions"
 msgstr "Loggfør filterhandlinger"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
 msgid "Log filter actions to the specified log file."
 msgstr "Logg filterhandlinger til oppgitt loggfil."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
 msgid "Logfile to log filter actions"
 msgstr "Loggfil med filterhandlinger"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
 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:153
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
 msgid "Flush Outbox after filtering"
 msgstr "Tøm utboks etter filtrering"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
 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
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
 msgid "Default forward style"
 msgstr "Forvalgt videresendingsstil"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
 msgid "Default reply style"
 msgstr "Forvalgt svarstil"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
 #, 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
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
 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:159
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
 msgid "Prompt on empty subject"
 msgstr "Stopp og spør ved tomt emne"
 
-#: ../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 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:161
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
 msgid "Prompt when emptying the trash"
 msgstr "Spør ved tømming av papirkurven"
 
-#: ../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 empty the trash."
 msgstr "Spør bruker ved forsøk på å tømme papirkurven."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
 msgid "Prompt when user expunges"
 msgstr "Stopp og spør før tømming"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
 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:165
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
 #, 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
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
 #, 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
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
 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:168
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying to send "
 "a message to recipients not entered as mail addresses"
@@ -1981,20 +1895,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:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
 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:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
 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:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
 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:172
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -2002,11 +1916,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:173
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
 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:174
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -2014,19 +1928,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:175
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
 msgid "Prompt while marking multiple messages"
 msgstr "Spør ved merking av flere meldinger"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
 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:177
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
 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:178
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
 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 "
@@ -2036,11 +1950,11 @@ msgstr ""
 "en søkemappe sletter meldingene permanent, og ikke bare fjerner dem fra "
 "søkeresultatene."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
 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:180
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
 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 "
@@ -2048,11 +1962,11 @@ msgid ""
 "ask user."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
 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:182
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
 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 "
@@ -2060,11 +1974,11 @@ msgid ""
 "ask user."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
 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:184
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
 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."
@@ -2072,11 +1986,11 @@ 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:185
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
 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:186
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 #, fuzzy
 #| msgid ""
 #| "It disables/enables the repeated prompts to warn that you are sending a "
@@ -2089,24 +2003,24 @@ 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
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
 msgid "Prompt when replying to many recipients"
 msgstr "Spør ved svar til mange mottakere"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
 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:189
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
 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:190
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
 msgid ""
 "It disables/enables the repeated prompts to warn that you are switching "
 "composer format and the content needs to lose its formatting."
@@ -2114,57 +2028,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:191
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
 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:192
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
 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
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
 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
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
 msgid "Empty Trash folders on exit"
 msgstr "Tøm papirkurven når programmet avsluttes"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
 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:196
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
 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:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
 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:198
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
 msgid "Last time Empty Trash was run"
 msgstr "Siste gang papirkurven ble tømt"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
 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:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
 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:201
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
 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:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
 msgid ""
 "This can have three possible values. “0” for errors. “1” for warnings. “2” "
 "for debug messages."
@@ -2172,22 +2086,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:203
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
 msgid "Show original “Date” header value."
 msgstr "Vis opprinnelig verdi for «Date»-meldingshode."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
 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
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
 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:206
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
 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."
@@ -2196,50 +2110,50 @@ msgstr ""
 "inneholder strenger som inneholder «name:color» hvor «color» bruker HTML hex "
 "koding."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
 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:208
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
 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:209
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
 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:210
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
 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:211
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
 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:212
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
 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:213
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
 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:214
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
 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:215
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
 msgid "The default plugin for Junk hook"
 msgstr "Forvalgt tillegg for uønsket e-post"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
 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 "
@@ -2249,11 +2163,11 @@ msgstr ""
 "tillegg er aktivert. Hvis forvalgt tillegg deaktiveres vil ikke de andre "
 "brukes."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
 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:218
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
 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 "
@@ -2265,7 +2179,7 @@ msgstr ""
 "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:219
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
@@ -2273,20 +2187,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:220
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
 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
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
 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:222
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
 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 "
@@ -2296,11 +2210,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:223
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
 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:224
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:226
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format “headername=value”."
@@ -2308,52 +2222,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:225
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
 msgid "UID string of the default account."
 msgstr "UID-streng for forvalgt konto."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:226
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:228
 msgid "Save directory"
 msgstr "Lagre katalog"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
 msgid "Directory for saving mail component files."
 msgstr "Katalog for å lagre komponentfiler for e-post."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:228
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:230
 msgid "Composer load/attach directory"
 msgstr "Katalog for vedlegg i redigering"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
 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:230
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:232
 msgid "Check for new messages on start"
 msgstr "Se etter nye meldinger ved oppstart"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:233
 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
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:234
 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:233
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:235
 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
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:236
 msgid "Server synchronization interval"
 msgstr "Intervall for serversynkronisering"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:235
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:237
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -2361,11 +2275,11 @@ 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:236
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:238
 msgid "Allow expunge in virtual folders"
 msgstr "Tillat tømming av virtuelle mapper"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:237
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:239
 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 "
@@ -2373,22 +2287,22 @@ msgid ""
 "deleted messages belonging to the virtual folder."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:238
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:240
 #: ../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:239
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:241
 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
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:242
 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:241
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:243
 #, fuzzy
 #| msgid "An Archive folder for On This Computer folders."
 msgid ""
@@ -2396,115 +2310,147 @@ msgid ""
 "Computer folder."
 msgstr "En arkivmappe for mapper under «På denne datamaskinen»."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:242
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:244
 #, 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
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:245
 msgid "Stores whether the To Do bar is visible in the main window."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:244
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:246
 #, 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
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:247
 #, 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
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:248
 #, 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
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:249
 msgid "Stores whether the To Do bar is visible in a sub-window."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:248
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:250
 msgid "Width of the To Do bar in a sub-window"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:249
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:251
 msgid "Holds the width of the To Do bar for a sub-window."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:250
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:252
 #, 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
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:253
 msgid "Stores whether the To Do bar should show also completed tasks."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:252
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:254
+#, fuzzy
+#| msgid "Whether the toolbar should be visible."
+msgid "Whether the To Do bar should show also tasks without Due date"
+msgstr "Om verktøylinjen skal være synlig."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:255
+#, fuzzy
+#| msgid "Whether the toolbar should be visible."
+msgid "Stores whether the To Do bar should show also tasks without Due date."
+msgstr "Om verktøylinjen skal være synlig."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:256
 #, fuzzy
 #| msgid "Show the status bar"
 msgid "Show start up wizard"
 msgstr "Vis statuslinjen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:253
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:257
 msgid "Whether show start up wizard when there is no mail account configured."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:254
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:258
+msgid "Whether go to the previous message after message deletion"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:259
+msgid ""
+"If set to true, goes to the previous message when the selected is deleted; "
+"or to the next message, when it’s set to false."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:260
+msgid "Show Subject above Sender in Messages column"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:261
+msgid ""
+"Whether to show Subject above Sender (From/To) in the Messages column, "
+"usually shown in the Vertical/Wide view of the message list"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:262
 msgid "(Deprecated) Default forward style"
 msgstr "Forvalgt videresendingsstil (utgått)"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:255
+#: ../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 "
 "“forward-style-name” instead."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:256
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:264
 #, 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
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:265
 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
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:266
 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:259
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:267
 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
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:268
 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
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:269
 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
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:270
 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
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:271
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "“browser-close-on-reply-policy” instead."
@@ -2923,6 +2869,16 @@ msgstr "Slå på spesielle funksjoner i WebKit for utviklere"
 msgid "Any change of this option requires restart of Evolution."
 msgstr "Hvis du endrer på dette valget må Evolution startes på nytt."
 
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:36
+msgid "The last extension being used when backing up Evolution data."
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:37
+msgid ""
+"It can be either “.gz” or “.xz” and it influences what extension will be "
+"preselected in the file chooser."
+msgstr ""
+
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:1
 msgid "Use only local spam tests."
 msgstr "Bruk bare lokale tester for uønsket e-post."
@@ -2964,6 +2920,116 @@ msgid ""
 "message part to take into effect, like using right-click→Format As→...."
 msgstr ""
 
+#: ../data/org.gnome.Evolution.appdata.xml.in.h:1
+#: ../data/org.gnome.Evolution.desktop.in.in.h:1
+#: ../src/mail/e-mail-browser.c:1112
+#: ../src/modules/mailto-handler/evolution-mailto-handler.c:208
+#: ../src/shell/e-shell-window-private.c:240
+msgid "Evolution"
+msgstr "Evolution"
+
+#: ../data/org.gnome.Evolution.appdata.xml.in.h:2
+#: ../data/org.gnome.Evolution.desktop.in.in.h:4
+msgid "Manage your email, contacts and schedule"
+msgstr "Håndter e-post, kontakter og kalender"
+
+#: ../data/org.gnome.Evolution.appdata.xml.in.h:3
+msgid ""
+"Evolution is a personal information management application that provides "
+"integrated mail, calendaring and address book functionality."
+msgstr ""
+"Evolution er et program for håndtering av personlig informasjon som gir deg "
+"integrert e-post, kalender og adressebokfunksjonalitet."
+
+#: ../data/org.gnome.Evolution.appdata.xml.in.h:4
+msgid ""
+"Evolution supports a wide range of industry standard data formats and "
+"network protocols for information exchange, with an emphasis on standards "
+"compliance and security. Evolution can also integrate smoothly with "
+"Microsoft Exchange by way of the “Exchange Web Services” (EWS) extension."
+msgstr ""
+"Evolution støtter en rekke forskjellige industristandarder for dataformater "
+"og nettverksprotokoller for utveksling av informasjon med fokus på "
+"standarder og sikkerhet. Evolution kan også integreres med Microsoft "
+"Exchange via «Exchange Web Services» (EWS) utvidelsen."
+
+#: ../data/org.gnome.Evolution.desktop.in.in.h:2
+#: ../src/shell/e-shell-utils.c:428
+msgid "Groupware Suite"
+msgstr "Gruppevareløsning"
+
+#: ../data/org.gnome.Evolution.desktop.in.in.h:3
+msgid "Evolution Mail and Calendar"
+msgstr "Evolution e-post og kalender"
+
+#: ../data/org.gnome.Evolution.desktop.in.in.h:5
+msgid "email;calendar;contact;addressbook;task;"
+msgstr "e-post;kalender;kontakt;adressebok;oppgave;"
+
+#: ../data/org.gnome.Evolution.desktop.in.in.h:6
+msgid "New Window"
+msgstr "Nytt vindu"
+
+#: ../data/org.gnome.Evolution.desktop.in.in.h:7
+msgid "Compose a Message"
+msgstr "Skriv en melding"
+
+#: ../data/org.gnome.Evolution.desktop.in.in.h:8
+#: ../src/e-util/e-name-selector-dialog.c:448
+#: ../src/modules/addressbook/e-book-shell-backend.c:307
+#: ../src/modules/addressbook/e-book-shell-view.c:371
+msgid "Contacts"
+msgstr "Kontakter"
+
+#: ../data/org.gnome.Evolution.desktop.in.in.h:9
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:845
+#: ../src/e-util/e-collection-account-wizard.c:559
+#: ../src/e-util/e-send-options.c:544 ../src/e-util/e-webdav-browser.c:469
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:197
+#: ../src/modules/calendar/e-cal-shell-view.c:582
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:21
+msgid "Calendar"
+msgstr "Kalender"
+
+#: ../data/org.gnome.Evolution.desktop.in.in.h:10
+#: ../src/e-util/e-send-options.c:536 ../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:1249
+#: ../src/smime/gui/certificate-manager.c:1682
+msgid "Mail"
+msgstr "E-post"
+
+#: ../data/org.gnome.Evolution.desktop.in.in.h:11
+#: ../src/calendar/gui/e-memo-table.c:368 ../src/e-util/e-webdav-browser.c:459
+#: ../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
+msgid "Memos"
+msgstr "Notater"
+
+#: ../data/org.gnome.Evolution.desktop.in.in.h:12
+#: ../src/calendar/gui/e-task-table.c:696 ../src/calendar/gui/print.c:2418
+#: ../src/calendar/importers/icalendar-importer.c:77
+#: ../src/calendar/importers/icalendar-importer.c:1110
+#: ../src/e-util/e-webdav-browser.c:460
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:68
+#: ../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
+msgid "Tasks"
+msgstr "Oppgaver"
+
+#: ../data/org.gnome.Evolution-alarm-notify.desktop.in.in.h:1
+msgid "Evolution Alarm Notify"
+msgstr "Evolution varslingstjeneste"
+
+#: ../data/org.gnome.Evolution-alarm-notify.desktop.in.in.h:2
+msgid "Calendar event notifications"
+msgstr "Varsling om kalenderhendelser"
+
 #: ../data/views/addressbook/galview.xml.h:1
 msgid "_Address Cards"
 msgstr "_Adressekort"
@@ -3047,76 +3113,48 @@ msgid "This address book could not be opened."
 msgstr "Denne adresseboken kunne ikke åpnes."
 
 #: ../src/addressbook/addressbook.error.xml.h:2
-msgid ""
-"This address book server might be unreachable or the server name may be "
-"misspelled or your network connection could be down."
-msgstr ""
-"Adresseboktjeneren din er ikke tilgjengelig eller tjenernavnet er kanskje "
-"stavet feil. Eller så kan nettverkstilkoblingen din være slått av."
+msgid "Failed to communicate with LDAP server."
+msgstr "Klarte ikke å kommunisere med LDAP-tjener."
 
 #: ../src/addressbook/addressbook.error.xml.h:3
-msgid "Failed to authenticate with LDAP server."
-msgstr "Kunne ikke autentisere mot LDAP-tjener."
-
-#: ../src/addressbook/addressbook.error.xml.h:4
-msgid ""
-"Check to make sure your password is spelled correctly and that you are using "
-"a supported login method. Remember that many passwords are case sensitive; "
-"your caps lock might be on."
-msgstr ""
-"Sjekk at passordet er stavet riktig og at bruker en støttet "
-"innloggingsmetode. Husk at mange passord skiller mellom små og store "
-"bokstaver, pass på at «Caps Lock»-knappen ikke er på."
-
-#: ../src/addressbook/addressbook.error.xml.h:5
 msgid "This address book server does not have any suggested search bases."
 msgstr "Denne adresseboktjeneren har ingen foreslått søkebase."
 
-#: ../src/addressbook/addressbook.error.xml.h:6
-msgid ""
-"This LDAP server may use an older version of LDAP, which does not support "
-"this functionality or it may be misconfigured. Ask your administrator for "
-"supported search bases."
-msgstr ""
-"Denne LDAP-tjeneren bruker kanskje en gammel versjon av LDAP som ikke "
-"støtter denne funksjonaliteten eller så er den satt opp feil. Spør din "
-"administrator for støttede søkebaser."
-
-#: ../src/addressbook/addressbook.error.xml.h:7
+#: ../src/addressbook/addressbook.error.xml.h:4
 msgid "This server does not support LDAPv3 schema information."
 msgstr "Denne tjeneren støtter ikke LDAPv3 schema-informasjon."
 
-#: ../src/addressbook/addressbook.error.xml.h:8
+#: ../src/addressbook/addressbook.error.xml.h:5
 msgid "Could not get schema information for LDAP server."
 msgstr "Kunne ikke hente schema-informasjon fra LDAP-tjener."
 
-#: ../src/addressbook/addressbook.error.xml.h:9
+#: ../src/addressbook/addressbook.error.xml.h:6
 msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP-tjener svarte ikke med gyldig schema-informasjon."
 
-#: ../src/addressbook/addressbook.error.xml.h:10
+#: ../src/addressbook/addressbook.error.xml.h:7
 msgid "Could not remove address book."
 msgstr "Kunne ikke fjerne adressebok."
 
-#: ../src/addressbook/addressbook.error.xml.h:11
+#: ../src/addressbook/addressbook.error.xml.h:8
 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
+#: ../src/addressbook/addressbook.error.xml.h:9
 msgid "This address book will be removed permanently."
 msgstr "Denne adresseboken vil bli slettet for godt."
 
-#: ../src/addressbook/addressbook.error.xml.h:13
+#: ../src/addressbook/addressbook.error.xml.h:10
 #: ../src/calendar/calendar.error.xml.h:7 ../src/e-util/e-system.error.xml.h:27
 #: ../src/mail/mail.error.xml.h:69
 msgid "Do _Not Delete"
 msgstr "Ikke s_lett"
 
-#: ../src/addressbook/addressbook.error.xml.h:14
+#: ../src/addressbook/addressbook.error.xml.h:11
 msgid "Delete remote address book “{0}”?"
 msgstr "Slett ekstern adressebok «{0}»?"
 
-#: ../src/addressbook/addressbook.error.xml.h:15
+#: ../src/addressbook/addressbook.error.xml.h:12
 msgid ""
 "This will permanently remove the address book “{0}” from the server. Are you "
 "sure you want to proceed?"
@@ -3124,48 +3162,48 @@ msgstr ""
 "Dette vil fjerne adressebok «{0}» fra tjeneren. Er du sikker på at du vil "
 "fortsette?"
 
-#: ../src/addressbook/addressbook.error.xml.h:16
+#: ../src/addressbook/addressbook.error.xml.h:13
 #: ../src/calendar/calendar.error.xml.h:65
 #: ../src/e-util/e-system.error.xml.h:28
 msgid "_Delete From Server"
 msgstr "_Slett fra tjener"
 
-#: ../src/addressbook/addressbook.error.xml.h:17
+#: ../src/addressbook/addressbook.error.xml.h:14
 msgid "Category editor not available."
 msgstr "Kategori editor ikke tilgjengelig."
 
-#: ../src/addressbook/addressbook.error.xml.h:18
+#: ../src/addressbook/addressbook.error.xml.h:15
 msgid "Unable to open address book “{0}”"
 msgstr "Kan ikke åpne adressebok «{0}»"
 
-#: ../src/addressbook/addressbook.error.xml.h:19
+#: ../src/addressbook/addressbook.error.xml.h:16
 msgid "Unable to perform search."
 msgstr "Kan ikke utføre søk."
 
-#: ../src/addressbook/addressbook.error.xml.h:20
+#: ../src/addressbook/addressbook.error.xml.h:17
 msgid "Failed to refresh address book “{0}”"
 msgstr "Klarte ikke å oppdatere adressebok «{0}»"
 
-#: ../src/addressbook/addressbook.error.xml.h:21
+#: ../src/addressbook/addressbook.error.xml.h:18
 msgid "Would you like to save your changes?"
 msgstr "Vil du lagre dine endringer?"
 
-#: ../src/addressbook/addressbook.error.xml.h:22
+#: ../src/addressbook/addressbook.error.xml.h:19
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 msgstr ""
 "Du har gjort endringer for denne kontakten. Vil du lagre disse endringene?"
 
-#: ../src/addressbook/addressbook.error.xml.h:23
+#: ../src/addressbook/addressbook.error.xml.h:20
 msgid "_Discard"
 msgstr "_Forkast"
 
-#: ../src/addressbook/addressbook.error.xml.h:24
+#: ../src/addressbook/addressbook.error.xml.h:21
 msgid "Cannot move contact."
 msgstr "Kan ikke flytte kontakt."
 
-#: ../src/addressbook/addressbook.error.xml.h:25
+#: ../src/addressbook/addressbook.error.xml.h:22
 msgid ""
 "You are attempting to move a contact from one address book to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
@@ -3173,36 +3211,36 @@ msgstr ""
 "Du prøver å flytte en kontakt fra en adressebok til en annen men den kan "
 "ikke bli fjernet fra kilden. Vil du lagre en kopi i stedet?"
 
-#: ../src/addressbook/addressbook.error.xml.h:26
+#: ../src/addressbook/addressbook.error.xml.h:23
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr "Bildet du valgte er stort. Endre størrelse og lagre?"
 
-#: ../src/addressbook/addressbook.error.xml.h:27
+#: ../src/addressbook/addressbook.error.xml.h:24
 msgid "_Resize"
 msgstr "End_re størrelse"
 
-#: ../src/addressbook/addressbook.error.xml.h:28
+#: ../src/addressbook/addressbook.error.xml.h:25
 msgid "_Use as it is"
 msgstr "Br_uk som den er"
 
-#: ../src/addressbook/addressbook.error.xml.h:29
+#: ../src/addressbook/addressbook.error.xml.h:26
 msgid "_Do not save"
 msgstr "_Ikke lagre"
 
-#: ../src/addressbook/addressbook.error.xml.h:30
+#: ../src/addressbook/addressbook.error.xml.h:27
 msgid "Unable to save {0}."
 msgstr "Kan ikke lagre {0}."
 
-#: ../src/addressbook/addressbook.error.xml.h:31
+#: ../src/addressbook/addressbook.error.xml.h:28
 msgid "Error saving {0} to {1}: {2}"
 msgstr "Feil under lagring av {0} til {1}: {2}"
 
-#: ../src/addressbook/addressbook.error.xml.h:32
+#: ../src/addressbook/addressbook.error.xml.h:29
 msgid "Address “{0}” already exists."
 msgstr "Adressen «{0}» eksisterer allerede."
 
-#: ../src/addressbook/addressbook.error.xml.h:33
+#: ../src/addressbook/addressbook.error.xml.h:30
 msgid ""
 "A contact already exists with this address. Would you like to add a new card "
 "with the same address anyway?"
@@ -3210,13 +3248,13 @@ msgstr ""
 "En kontakt med denne adressen eksisterer allerede. Vil du legge til en ny "
 "kontakt med samme adresse likevel?"
 
-#: ../src/addressbook/addressbook.error.xml.h:34
+#: ../src/addressbook/addressbook.error.xml.h:31
 #: ../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-accounts-window.c:1526
 #: ../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/e-util/e-name-selector-dialog.c:1033 ../src/e-util/filter.ui.h:25
 #: ../src/mail/e-mail-account-manager.c:719
 #: ../src/mail/e-mail-label-manager.c:371
 #: ../src/mail/em-folder-properties.c:1031
@@ -3230,11 +3268,11 @@ msgstr ""
 msgid "_Add"
 msgstr "_Legg til"
 
-#: ../src/addressbook/addressbook.error.xml.h:35
+#: ../src/addressbook/addressbook.error.xml.h:32
 msgid "Some addresses already exist in this contact list."
 msgstr "Noen adresser eksisterer allerede i denne kontaktlisten."
 
-#: ../src/addressbook/addressbook.error.xml.h:36
+#: ../src/addressbook/addressbook.error.xml.h:33
 msgid ""
 "You are trying to add addresses that are part of this list already. Would "
 "you like to add them anyway?"
@@ -3242,19 +3280,19 @@ msgstr ""
 "Du prøver å legge til adresser som allerede er en del av denne listen. Vil "
 "du legge dem til likevel?"
 
-#: ../src/addressbook/addressbook.error.xml.h:37
+#: ../src/addressbook/addressbook.error.xml.h:34
 msgid "Skip duplicates"
 msgstr "Hopp over duplikater"
 
-#: ../src/addressbook/addressbook.error.xml.h:38
+#: ../src/addressbook/addressbook.error.xml.h:35
 msgid "Add with duplicates"
 msgstr "Legg til med duplikater"
 
-#: ../src/addressbook/addressbook.error.xml.h:39
+#: ../src/addressbook/addressbook.error.xml.h:36
 msgid "List “{0}” is already in this contact list."
 msgstr "Liste «{0}» er allerede i kontaktlisten."
 
-#: ../src/addressbook/addressbook.error.xml.h:40
+#: ../src/addressbook/addressbook.error.xml.h:37
 msgid ""
 "A contact list named “{0}” is already in this contact list. Would you like "
 "to add it anyway?"
@@ -3262,21 +3300,21 @@ msgstr ""
 "En kontaktliste med navn «{0}» eksisterer allerede i denne kontaktlisten. "
 "Vil du legge den til likevel?"
 
-#: ../src/addressbook/addressbook.error.xml.h:41
+#: ../src/addressbook/addressbook.error.xml.h:38
 #: ../src/addressbook/gui/widgets/e-addressbook-view.c:1280
 msgid "Failed to delete contact"
 msgstr "Klarte ikke å slette kontakt"
 
-#: ../src/addressbook/addressbook.error.xml.h:42
+#: ../src/addressbook/addressbook.error.xml.h:39
 msgid "You do not have permission to delete contacts in this address book."
 msgstr "Du har ikke rettigheter til å slette kontakter i denne adresseboken."
 
-#: ../src/addressbook/addressbook.error.xml.h:43
+#: ../src/addressbook/addressbook.error.xml.h:40
 msgid "Cannot add new contact"
 msgstr "Kan ikke legge til ny kontakt"
 
 #. For Translators: {0} is the name of the address book source
-#: ../src/addressbook/addressbook.error.xml.h:45
+#: ../src/addressbook/addressbook.error.xml.h:42
 msgid ""
 "“{0}” is a read-only address book and cannot be modified. Please select a "
 "different address book from the side bar in the Contacts view."
@@ -3284,12 +3322,12 @@ msgstr ""
 "«{0}» er en skrivebeskyttet adressebok og kan ikke endres. Velg en annen "
 "adressebok fra sidelinjen i kontaktvisning."
 
-#: ../src/addressbook/addressbook.error.xml.h:46
+#: ../src/addressbook/addressbook.error.xml.h:43
 msgid "Cannot save a contact, address book is still opening"
 msgstr "Kan ikke lagre en kontakt. Adresseboken holder fortsatt på å åpne"
 
 #. For Translators: {0} is the name of the address book source
-#: ../src/addressbook/addressbook.error.xml.h:48
+#: ../src/addressbook/addressbook.error.xml.h:45
 msgid ""
 "Cannot save a contact to the address book “{0}”, because it is still "
 "opening. Either wait till it’s opened, or select a different address book."
@@ -3297,11 +3335,11 @@ msgstr ""
 "Kan ikke lagre en kontakt til adressebok «{0} fordi den fortsatt holder på å "
 "åpnes. Vent til den er åpnet eller velg en annen adressebok."
 
-#: ../src/addressbook/addressbook.error.xml.h:49
+#: ../src/addressbook/addressbook.error.xml.h:46
 msgid "Something has gone wrong when displaying the contact"
 msgstr "Noe har gått galt ved visning av kontakten"
 
-#: ../src/addressbook/addressbook.error.xml.h:50
+#: ../src/addressbook/addressbook.error.xml.h:47
 msgid ""
 "A WebKitWebProcess crashed when displaying the contact. You can try again by "
 "moving to another contact and back. If the issue persists, please file a bug "
@@ -3363,7 +3401,7 @@ msgid "Contact Editor"
 msgstr "Kontaktredigering"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:13
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1996
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1976
 #: ../src/mail/mail-config.ui.h:38
 msgid "Options"
 msgstr "Alternativer"
@@ -3390,6 +3428,8 @@ msgstr "Alternativer"
 #: ../src/e-util/e-attachment-store.c:832 ../src/e-util/e-attachment-view.c:302
 #: ../src/e-util/e-categories-dialog.c:80 ../src/e-util/e-category-editor.c:140
 #: ../src/e-util/e-category-editor.c:211 ../src/e-util/e-charset-combo-box.c:99
+#: ../src/e-util/e-collection-account-wizard.c:1562
+#: ../src/e-util/e-collection-account-wizard.c:1797
 #: ../src/e-util/e-color-chooser-widget.c:125
 #: ../src/e-util/e-filter-datespec.c:289
 #: ../src/e-util/e-html-editor-actions.c:321
@@ -3397,21 +3437,22 @@ msgstr "Alternativer"
 #: ../src/e-util/e-image-chooser-dialog.c:169
 #: ../src/e-util/e-mail-signature-script-dialog.c:366
 #: ../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-rule-editor.c:186 ../src/e-util/e-rule-editor.c:297
+#: ../src/e-util/e-rule-editor.c:810 ../src/e-util/e-send-options.ui.h:16
 #: ../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:4132
+#: ../src/e-util/evolution-source-viewer.c:835 ../src/e-util/e-web-view.c:4118
 #: ../src/e-util/gal-view-instance-save-as-dialog.c:267
 #: ../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-send-recv.c:867 ../src/mail/mail-send-recv.c:949
 #: ../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/book-config-ldap/evolution-book-config-ldap.c:409
 #: ../src/modules/calendar/e-cal-attachment-handler.c:283
 #: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:3
 #: ../src/plugins/face/face.c:295
@@ -3438,7 +3479,7 @@ msgstr "A_vbryt"
 #: ../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-webdav-browser.c:2467 ../src/e-util/e-web-view.c:4133
+#: ../src/e-util/e-webdav-browser.c:2467 ../src/e-util/e-web-view.c:4119
 #: ../src/e-util/gal-view-instance-save-as-dialog.c:268
 #: ../src/shell/e-shell-content.c:640 ../src/shell/e-shell-utils.c:140
 #: ../src/smime/gui/certificate-manager.c:666
@@ -3696,7 +3737,7 @@ msgstr "Legg til _X.509"
 #: ../src/e-util/e-attachment-view.c:356 ../src/e-util/e-filter-rule.c:223
 #: ../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/e-util/filter.error.xml.h:18 ../src/e-util/filter.ui.h:27
 #: ../src/mail/e-mail-config-identity-page.c:871
 #: ../src/mail/e-mail-label-manager.c:389 ../src/mail/em-filter-rule.c:438
 #: ../src/mail/em-folder-properties.c:1037
@@ -3881,8 +3922,8 @@ msgstr "Ugyldig kontakt."
 #: ../src/e-util/e-filter-datespec.c:290
 #: ../src/e-util/e-html-editor-link-dialog.c:255
 #: ../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-rule-editor.c:187 ../src/e-util/e-rule-editor.c:298
+#: ../src/e-util/e-rule-editor.c:811 ../src/e-util/e-send-options.ui.h:17
 #: ../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
@@ -4028,22 +4069,22 @@ msgid "Insert email addresses from Address Book"
 msgstr "Sett inn e-postadresser fra adresseboken"
 
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:15
-#: ../src/e-util/filter.ui.h:26
+#: ../src/e-util/filter.ui.h:28
 msgid "_Top"
 msgstr "_Topp"
 
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:16
-#: ../src/e-util/e-source-selector.c:3469 ../src/e-util/filter.ui.h:27
+#: ../src/e-util/e-source-selector.c:3469 ../src/e-util/filter.ui.h:29
 msgid "_Up"
 msgstr "_Opp_"
 
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:17
-#: ../src/e-util/e-source-selector.c:3470 ../src/e-util/filter.ui.h:28
+#: ../src/e-util/e-source-selector.c:3470 ../src/e-util/filter.ui.h:30
 msgid "_Down"
 msgstr "Ne_d"
 
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:18
-#: ../src/e-util/filter.ui.h:29
+#: ../src/e-util/filter.ui.h:31
 msgid "_Bottom"
 msgstr "_Bunn"
 
@@ -4283,7 +4324,7 @@ msgstr "Weblogg"
 #: ../src/calendar/gui/e-task-table.c:209
 #: ../src/calendar/gui/e-task-table.c:224
 #: ../src/calendar/gui/e-task-table.c:634 ../src/calendar/gui/print.c:3596
-#: ../src/calendar/gui/tasktypes.xml.in.h:14 ../src/mail/mail-send-recv.c:966
+#: ../src/calendar/gui/tasktypes.xml.in.h:14 ../src/mail/mail-send-recv.c:1086
 msgid "Cancelled"
 msgstr "Avbrutt"
 
@@ -4516,7 +4557,7 @@ 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:2005
-#: ../src/e-util/e-accounts-window.c:1727 ../src/e-util/e-focus-tracker.c:783
+#: ../src/e-util/e-accounts-window.c:1714 ../src/e-util/e-focus-tracker.c:783
 #: ../src/e-util/evolution-source-viewer.c:806
 #: ../src/e-util/e-webdav-browser.c:2688
 #: ../src/mail/e-mail-account-manager.c:737
@@ -4724,7 +4765,7 @@ msgstr "Zoom _inn"
 
 #. Zoom-out button
 #: ../src/addressbook/gui/widgets/e-contact-map-window.c:417
-#: ../src/mail/e-mail-reader.c:2465
+#: ../src/mail/e-mail-reader.c:2470
 msgid "Zoom _Out"
 msgstr "Zoom _ut"
 
@@ -5014,13 +5055,13 @@ 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:2238
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2222
 #: ../src/calendar/gui/e-comp-editor.c:2070
-#: ../src/e-util/e-accounts-window.c:1719
+#: ../src/e-util/e-accounts-window.c:1706
 #: ../src/e-util/e-html-editor-actions.c:922
 #: ../src/e-util/e-mail-signature-manager.c:358
-#: ../src/e-util/e-webdav-browser.c:2681 ../src/e-util/filter.ui.h:24
-#: ../src/mail/e-mail-account-manager.c:728 ../src/mail/e-mail-browser.c:171
+#: ../src/e-util/e-webdav-browser.c:2681 ../src/e-util/filter.ui.h:26
+#: ../src/mail/e-mail-account-manager.c:728 ../src/mail/e-mail-browser.c:172
 #: ../src/mail/e-mail-label-manager.c:380
 #: ../src/mail/em-folder-properties.c:1034 ../src/mail/mail-config.ui.h:66
 #: ../src/plugins/attachment-reminder/attachment-reminder.c:548
@@ -5877,6 +5918,7 @@ msgstr "inneholder ikke"
 #: ../src/calendar/gui/memotypes.xml.in.h:4
 #: ../src/calendar/gui/tasktypes.xml.in.h:4
 #: ../src/e-util/e-attachment-tree-view.c:147
+#: ../src/e-util/e-collection-account-wizard.c:1654
 #: ../src/e-util/e-table-config.ui.h:20
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:66
 msgid "Description"
@@ -6129,28 +6171,28 @@ msgstr[1] "%d uker"
 
 #. Translators: Part of: [ Play a sound ] [ x ] [ minute(s) ] [ before ] [ start ]
 #: ../src/calendar/gui/e-alarm-list.c:419
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1827
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1811
 msgctxt "cal-reminders"
 msgid "Play a sound"
 msgstr "Spill en lyd"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
 #: ../src/calendar/gui/e-alarm-list.c:423
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1825
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1809
 msgctxt "cal-reminders"
 msgid "Pop up an alert"
 msgstr "Vis varsling"
 
 #. Translators: Part of: [ Send an email ] [ x ] [ minute(s) ] [ before ] [ start ]
 #: ../src/calendar/gui/e-alarm-list.c:427
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1831
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1815
 msgctxt "cal-reminders"
 msgid "Send an email"
 msgstr "Send en e-post"
 
 #. Translators: Part of: [ Run a program ] [ x ] [ minute(s) ] [ before ] [ start ]
 #: ../src/calendar/gui/e-alarm-list.c:431
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1829
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1813
 msgctxt "cal-reminders"
 msgid "Run a program"
 msgstr "Kjør et program"
@@ -6313,7 +6355,7 @@ msgstr "Prioritet:"
 #: ../src/calendar/gui/e-cal-component-preview.c:327
 #: ../src/calendar/gui/e-task-table.c:548
 #: ../src/calendar/gui/tasktypes.xml.in.h:19
-#: ../src/e-util/e-send-options.ui.h:2 ../src/mail/message-list.c:323
+#: ../src/e-util/e-send-options.ui.h:2 ../src/mail/message-list.c:325
 msgid "High"
 msgstr "Høy"
 
@@ -6321,14 +6363,14 @@ msgstr "Høy"
 #: ../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:322
+#: ../src/e-util/e-send-options.ui.h:5 ../src/mail/message-list.c:324
 msgid "Normal"
 msgstr "Normal"
 
 #: ../src/calendar/gui/e-cal-component-preview.c:331
 #: ../src/calendar/gui/e-task-table.c:550
 #: ../src/calendar/gui/tasktypes.xml.in.h:21
-#: ../src/e-util/e-send-options.ui.h:4 ../src/mail/message-list.c:321
+#: ../src/e-util/e-send-options.ui.h:4 ../src/mail/message-list.c:323
 msgid "Low"
 msgstr "Lav"
 
@@ -6554,8 +6596,8 @@ 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/e-to-do-pane.c:343 ../src/calendar/gui/print.c:3541
+#: ../src/calendar/gui/e-meeting-time-sel.c:2671
+#: ../src/calendar/gui/e-to-do-pane.c:346 ../src/calendar/gui/print.c:3541
 #, c-format
 msgid "Location: %s"
 msgstr "Sted: %s"
@@ -6563,7 +6605,7 @@ 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
+#: ../src/calendar/gui/e-to-do-pane.c:438
 #, c-format
 msgid "Time: %s %s"
 msgstr "Tidspunkt: %s %s"
@@ -6581,8 +6623,8 @@ msgstr "%d %b %Y"
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
 #: ../src/calendar/gui/e-calendar-view.c:2282
-#: ../src/calendar/gui/e-day-view.c:3078
-#: ../src/calendar/gui/e-day-view-top-item.c:849
+#: ../src/calendar/gui/e-day-view.c:3104
+#: ../src/calendar/gui/e-day-view-top-item.c:865
 #: ../src/calendar/gui/e-week-view-main-item.c:228
 msgid "%d %b"
 msgstr "%d %b"
@@ -6598,8 +6640,8 @@ msgstr "%A %d %b %Y"
 #. * You can change the order but don't change the
 #. * specifiers or add anything.
 #: ../src/calendar/gui/e-calendar-view.c:2308
-#: ../src/calendar/gui/e-day-view.c:3062
-#: ../src/calendar/gui/e-day-view-top-item.c:845
+#: ../src/calendar/gui/e-day-view.c:3088
+#: ../src/calendar/gui/e-day-view-top-item.c:861
 #: ../src/calendar/gui/e-week-view-main-item.c:214
 msgid "%a %d %b"
 msgstr "%a %d %b"
@@ -6718,7 +6760,7 @@ msgstr "Avslått"
 #: ../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
-#: ../src/calendar/gui/e-meeting-time-sel.c:533
+#: ../src/calendar/gui/e-meeting-time-sel.c:523
 msgid "Tentative"
 msgstr "Tentativ"
 
@@ -6752,7 +6794,7 @@ msgid "Free"
 msgstr "Ledig"
 
 #: ../src/calendar/gui/e-cal-model-calendar.c:151
-#: ../src/calendar/gui/e-meeting-time-sel.c:534
+#: ../src/calendar/gui/e-meeting-time-sel.c:524
 #: ../src/calendar/gui/e-task-table.c:607
 msgid "Busy"
 msgstr "Opptatt"
@@ -6785,15 +6827,15 @@ msgstr "Endrer et notat"
 msgid "Modifying a task"
 msgstr "Endrer en oppgave"
 
-#: ../src/calendar/gui/e-cal-ops.c:412 ../src/calendar/gui/e-to-do-pane.c:1813
+#: ../src/calendar/gui/e-cal-ops.c:412 ../src/calendar/gui/e-to-do-pane.c:1918
 msgid "Removing an event"
 msgstr "Fjerner en hendelse"
 
-#: ../src/calendar/gui/e-cal-ops.c:416 ../src/calendar/gui/e-to-do-pane.c:1817
+#: ../src/calendar/gui/e-cal-ops.c:416 ../src/calendar/gui/e-to-do-pane.c:1922
 msgid "Removing a memo"
 msgstr "Fjerner et notat"
 
-#: ../src/calendar/gui/e-cal-ops.c:420 ../src/calendar/gui/e-to-do-pane.c:1821
+#: ../src/calendar/gui/e-cal-ops.c:420 ../src/calendar/gui/e-to-do-pane.c:1926
 msgid "Removing a task"
 msgstr "Fjerner en oppgave"
 
@@ -6989,8 +7031,10 @@ 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:806
-#: ../src/mail/mail-send-recv.c:490 ../src/mail/mail-send-recv.c:1288
+#: ../src/e-util/e-misc-utils.c:4130 ../src/e-util/e-misc-utils.c:4142
+#: ../src/e-util/e-misc-utils.c:4156 ../src/mail/e-mail-display.c:2081
+#: ../src/mail/e-mail-reader-utils.c:806 ../src/mail/mail-send-recv.c:569
+#: ../src/mail/mail-send-recv.c:1422
 #: ../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
@@ -7215,12 +7259,12 @@ msgid "Show attachments"
 msgstr "Vis vedlegg"
 
 #: ../src/calendar/gui/e-comp-editor-page-attachments.c:811
-#: ../src/e-util/e-attachment-bar.c:766 ../src/e-util/e-attachment-paned.c:725
+#: ../src/e-util/e-attachment-bar.c:764 ../src/e-util/e-attachment-paned.c:725
 msgid "Icon View"
 msgstr "Ikonvisning"
 
 #: ../src/calendar/gui/e-comp-editor-page-attachments.c:813
-#: ../src/e-util/e-attachment-bar.c:768 ../src/e-util/e-attachment-paned.c:727
+#: ../src/e-util/e-attachment-bar.c:766 ../src/e-util/e-attachment-paned.c:727
 msgid "List View"
 msgstr "Listevisning"
 
@@ -7499,76 +7543,76 @@ msgid "Set or unset recurrence"
 msgstr "Sett eller fjern gjeninntreffelse"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2054
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2046
 msgctxt "ECompEditorPageRecur"
 msgid "Every"
 msgstr "Hver"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2089
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2081
 msgctxt "ECompEditorPageRecur"
 msgid "day(s)"
 msgstr "dag(er)"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2091
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2083
 msgctxt "ECompEditorPageRecur"
 msgid "week(s)"
 msgstr "uke(r)"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2093
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2085
 msgctxt "ECompEditorPageRecur"
 msgid "month(s)"
 msgstr "måned(er)"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2095
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2087
 msgctxt "ECompEditorPageRecur"
 msgid "year(s)"
 msgstr "år"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2124
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2116
 msgctxt "ECompEditorPageRecur"
 msgid "for"
 msgstr "i"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2126
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2118
 msgctxt "ECompEditorPageRecur"
 msgid "until"
 msgstr "til"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2128
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2120
 msgctxt "ECompEditorPageRecur"
 msgid "forever"
 msgstr "alltid"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2144
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2136
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Denne avtalen har gjeninntreffelser som ikke kan redigeres av Evolution."
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2161
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2149
 msgid "Exceptions"
 msgstr "Unntak"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2230
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1777
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2214
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1765
 #: ../src/mail/e-mail-config-identity-page.c:853
 #: ../src/mail/mail-config.ui.h:65
 msgid "A_dd"
 msgstr "L_egg til"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2246
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1785
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2230
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1773
 #: ../src/mail/mail-config.ui.h:67
 msgid "Re_move"
 msgstr "Fjer_n"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2254
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2238
 msgid "Preview"
 msgstr "Forhåndsvis"
 
@@ -7576,38 +7620,38 @@ msgstr "Forhåndsvis"
 msgid "Send To"
 msgstr "Send til"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1554
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1550
 msgid "_Reminders"
 msgstr "_Påminnelser"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1556
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1552
 msgid "Set or unset reminders"
 msgstr "Sett eller fjern påminnelser"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1609
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:66
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1605
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:69
 msgid "Reminders"
 msgstr "Påminnelser"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1638
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1630
 msgid "_Reminder"
 msgstr "_Påminnelse"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1671
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1663
 #, c-format
 msgid "%d day before"
 msgid_plural "%d days before"
 msgstr[0] "%d dag før"
 msgstr[1] "%d dager før"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1678
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1670
 #, c-format
 msgid "%d hour before"
 msgid_plural "%d hours before"
 msgstr[0] "%d time før"
 msgstr[1] "%d timer før"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1685
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1677
 #, c-format
 msgid "%d minute before"
 msgid_plural "%d minutes before"
@@ -7615,131 +7659,131 @@ msgstr[0] "%d minutt før"
 msgstr[1] "%d minutter før"
 
 #. Translators: "None" for "No reminder set"
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1693
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1685
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "Ingen"
 
 #. Translators: Predefined reminder's description
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1695
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1687
 msgctxt "cal-reminders"
 msgid "15 minutes before"
 msgstr "15 minutter før"
 
 #. Translators: Predefined reminder's description
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1697
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1689
 msgctxt "cal-reminders"
 msgid "1 hour before"
 msgstr "1 time før"
 
 #. Translators: Predefined reminder's description
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1699
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1691
 msgctxt "cal-reminders"
 msgid "1 day before"
 msgstr "1 dag før"
 
 #. Translators: "Custom" for "Custom reminder set"
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1711
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1703
 msgctxt "cal-reminders"
 msgid "Custom"
 msgstr "Egendefinert"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1862
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1846
 msgctxt "cal-reminders"
 msgid "minute(s)"
 msgstr "minutt(er)"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ hour(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1864
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1848
 msgctxt "cal-reminders"
 msgid "hour(s)"
 msgstr "time(r)"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ day(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1866
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1850
 msgctxt "cal-reminders"
 msgid "day(s)"
 msgstr "dag(er)"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1883
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1867
 msgctxt "cal-reminders"
 msgid "before"
 msgstr "før"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ after ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1885
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1869
 msgctxt "cal-reminders"
 msgid "after"
 msgstr "etter"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1901
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1885
 msgctxt "cal-reminders"
 msgid "start"
 msgstr "Start"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ end ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1903
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1887
 msgctxt "cal-reminders"
 msgid "end"
 msgstr "slutt"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1926
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1906
 msgid "Re_peat the reminder"
 msgstr "Gjenta _påminnelse"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1951
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1931
 msgctxt "cal-reminders"
 msgid "extra times every"
 msgstr "ekstra ganger hver"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1988
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1968
 msgctxt "cal-reminders"
 msgid "minutes"
 msgstr "minutter"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ hours ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1990
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1970
 msgctxt "cal-reminders"
 msgid "hours"
 msgstr "timer"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ days ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1992
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1972
 msgctxt "cal-reminders"
 msgid "days"
 msgstr "dager"
 
 #. page_reminders->priv->custom_email_entry is initialized on demand
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2033
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2190
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2009
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2166
 msgctxt "cal-reminders"
 msgid "Custom _message"
 msgstr "Egendefinert _beskjed"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2077
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2053
 msgctxt "cal-reminders"
 msgid "Custom reminder _sound"
 msgstr "Egendefinert lyd for påminnelse"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2088
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2064
 msgid "Select a sound file"
 msgstr "Velg en lydfil"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2116
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2092
 msgid "_Program:"
 msgstr "_Program:"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2141
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2117
 msgid "_Arguments:"
 msgstr "_Argumenter:"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2173
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2149
 msgid "_Send To:"
 msgstr "_Send til:"
 
@@ -7943,15 +7987,15 @@ msgstr "Ingen sammendrag"
 #. == Button box ==
 #: ../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-accounts-window.c:1730
 #: ../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: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/e-mail-browser.c:128 ../src/mail/e-mail-notes.c:931
 #: ../src/mail/em-folder-properties.c:1158
-#: ../src/mail/em-subscription-editor.c:1765
+#: ../src/mail/em-subscription-editor.c:1737
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:254
 #: ../src/shell/e-shell-window-actions.c:296
 #: ../src/shell/e-shell-window-actions.c:817
@@ -7965,8 +8009,8 @@ msgstr "Lukk aktiv vindu"
 
 #. copy menu item
 #: ../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:409 ../src/mail/e-mail-browser.c:134
+#: ../src/e-util/e-html-editor-actions.c:878 ../src/e-util/e-text.c:2086
+#: ../src/e-util/e-web-view.c:409 ../src/mail/e-mail-browser.c:135
 #: ../src/mail/mail.error.xml.h:146 ../src/shell/e-shell-window-actions.c:838
 msgid "_Copy"
 msgstr "_Kopier"
@@ -7974,22 +8018,22 @@ msgstr "_Kopier"
 #: ../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:411
-#: ../src/e-util/e-web-view.c:2003 ../src/mail/e-mail-browser.c:136
+#: ../src/e-util/e-web-view.c:2003 ../src/mail/e-mail-browser.c:137
 #: ../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: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:845
+#: ../src/e-util/e-html-editor-actions.c:885 ../src/e-util/e-text.c:2072
+#: ../src/mail/e-mail-browser.c:142 ../src/shell/e-shell-window-actions.c:845
 msgid "Cu_t"
 msgstr "Klipp u_t"
 
 #: ../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:2012
-#: ../src/mail/e-mail-browser.c:143 ../src/shell/e-shell-window-actions.c:847
+#: ../src/mail/e-mail-browser.c:144 ../src/shell/e-shell-window-actions.c:847
 msgid "Cut the selection"
 msgstr "Klipp ut utvalget"
 
@@ -8005,26 +8049,26 @@ msgstr "Vis hjelp"
 
 #. paste menu item
 #: ../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:873
+#: ../src/e-util/e-html-editor-actions.c:892 ../src/e-util/e-text.c:2098
+#: ../src/mail/e-mail-browser.c:149 ../src/shell/e-shell-window-actions.c:873
 msgid "_Paste"
 msgstr "_Lim inn"
 
 #: ../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:2021
-#: ../src/mail/e-mail-browser.c:150 ../src/shell/e-shell-window-actions.c:875
+#: ../src/mail/e-mail-browser.c:151 ../src/shell/e-shell-window-actions.c:875
 msgid "Paste the clipboard"
 msgstr "Lim inn fra utklippstavlen"
 
 #: ../src/calendar/gui/e-comp-editor.c:2026
-#: ../src/composer/e-composer-actions.c:381 ../src/mail/e-mail-reader.c:2367
+#: ../src/composer/e-composer-actions.c:381 ../src/mail/e-mail-reader.c:2372
 #: ../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:2033 ../src/mail/e-mail-reader.c:2374
+#: ../src/calendar/gui/e-comp-editor.c:2033 ../src/mail/e-mail-reader.c:2379
 #: ../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
@@ -8034,13 +8078,13 @@ msgstr "Forhånds_vis …"
 
 #: ../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:419
-#: ../src/mail/e-mail-browser.c:155 ../src/shell/e-shell-window-actions.c:950
+#: ../src/mail/e-mail-browser.c:156 ../src/shell/e-shell-window-actions.c:950
 msgid "Select _All"
 msgstr "Velg _alle"
 
 #: ../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:952
+#: ../src/mail/e-mail-browser.c:158 ../src/shell/e-shell-window-actions.c:952
 msgid "Select all text"
 msgstr "Velg all tekst"
 
@@ -8050,7 +8094,7 @@ msgstr "K_lassifisering"
 
 #: ../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/e-util/e-mail-signature-editor.c:323 ../src/mail/e-mail-browser.c:165
 #: ../src/mail/e-mail-notes.c:945 ../src/shell/e-shell-window-actions.c:987
 msgid "_File"
 msgstr "_Fil"
@@ -8066,7 +8110,7 @@ msgid "_Options"
 msgstr "_Alternativer"
 
 #: ../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/e-util/e-html-editor-actions.c:971 ../src/mail/e-mail-browser.c:179
 #: ../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"
@@ -8086,16 +8130,16 @@ 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-to-do-pane.c:239
-#: ../src/calendar/gui/e-week-view.c:1726 ../src/calendar/gui/print.c:1080
+#: ../src/calendar/gui/e-day-view.c:2156 ../src/calendar/gui/e-to-do-pane.c:241
+#: ../src/calendar/gui/e-week-view.c:1781 ../src/calendar/gui/print.c:1080
 #: ../src/calendar/gui/print.c:1099 ../src/calendar/gui/print.c:2636
 #: ../src/calendar/gui/print.c:2656
 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-to-do-pane.c:243
-#: ../src/calendar/gui/e-week-view.c:1729 ../src/calendar/gui/print.c:1085
+#: ../src/calendar/gui/e-day-view.c:2159 ../src/calendar/gui/e-to-do-pane.c:245
+#: ../src/calendar/gui/e-week-view.c:1784 ../src/calendar/gui/print.c:1085
 #: ../src/calendar/gui/print.c:1101 ../src/calendar/gui/print.c:2641
 #: ../src/calendar/gui/print.c:2658
 msgid "pm"
@@ -8107,15 +8151,15 @@ msgstr "pm"
 #. * month, %B = full month name. You can change the
 #. * order but don't change the specifiers or add
 #. * anything.
-#: ../src/calendar/gui/e-day-view.c:3045
-#: ../src/calendar/gui/e-day-view-top-item.c:841
+#: ../src/calendar/gui/e-day-view.c:3071
+#: ../src/calendar/gui/e-day-view-top-item.c:857
 #: ../src/calendar/gui/e-week-view-main-item.c:205
 #: ../src/calendar/gui/print.c:2103
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../src/calendar/gui/e-day-view.c:3770
+#: ../src/calendar/gui/e-day-view.c:3792
 #, c-format
 msgid "Week %d"
 msgstr "Uke %d"
@@ -8236,8 +8280,9 @@ 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-accounts-window.c:1407
 #: ../src/e-util/e-attachment-tree-view.c:205
+#: ../src/e-util/e-collection-account-wizard.c:1695
 #: ../src/e-util/e-webdav-browser.c:2381
 #: ../src/mail/e-mail-account-tree-view.c:158
 msgid "Type"
@@ -8267,76 +8312,77 @@ msgid "Failure reason: %s"
 msgstr "Feilårsak: %s"
 
 #: ../src/calendar/gui/e-meeting-store.c:1914
+#: ../src/e-util/e-collection-account-wizard.c:268
 #: ../src/plugins/publish-calendar/publish-calendar.c:349
 #: ../src/smime/gui/component.c:61
 msgid "Enter password"
 msgstr "Oppgi passord"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:535
+#: ../src/calendar/gui/e-meeting-time-sel.c:525
 msgid "Out of Office"
 msgstr "Borte fra kontoret"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:537
+#: ../src/calendar/gui/e-meeting-time-sel.c:527
 msgid "No Information"
 msgstr "Ingen informasjon"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:553
+#: ../src/calendar/gui/e-meeting-time-sel.c:543
 msgid "Atte_ndees..."
 msgstr "De_ltakere …"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:572
+#: ../src/calendar/gui/e-meeting-time-sel.c:562
 msgid "O_ptions"
 msgstr "Al_ternativer"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:593
+#: ../src/calendar/gui/e-meeting-time-sel.c:583
 msgid "Show _only working hours"
 msgstr "K_un vis arbeidstid"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:606
+#: ../src/calendar/gui/e-meeting-time-sel.c:596
 msgid "Show _zoomed out"
 msgstr "Vis _zoomet ut"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:624
+#: ../src/calendar/gui/e-meeting-time-sel.c:614
 msgid "_Update free/busy"
 msgstr "_Oppdater ledig/opptatt"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:641
+#: ../src/calendar/gui/e-meeting-time-sel.c:631
 msgid "_<<"
 msgstr "_<<"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:661
+#: ../src/calendar/gui/e-meeting-time-sel.c:651
 msgid "_Autopick"
 msgstr "_Autovelg"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:678
+#: ../src/calendar/gui/e-meeting-time-sel.c:668
 msgid ">_>"
 msgstr ">_>"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:700
+#: ../src/calendar/gui/e-meeting-time-sel.c:690
 msgid "_All people and resources"
 msgstr "_Alle personer og ressurser"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:711
+#: ../src/calendar/gui/e-meeting-time-sel.c:701
 msgid "All _people and one resource"
 msgstr "Alle _personer og en ressurs"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:722
+#: ../src/calendar/gui/e-meeting-time-sel.c:712
 msgid "_Required people"
 msgstr "_Obligatoriske personer"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:732
+#: ../src/calendar/gui/e-meeting-time-sel.c:722
 msgid "Required people and _one resource"
 msgstr "Obligatoriske personer _og en ressurs"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:771
+#: ../src/calendar/gui/e-meeting-time-sel.c:761
 msgid "_Start time:"
 msgstr "_Start-tid:"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:800
+#: ../src/calendar/gui/e-meeting-time-sel.c:790
 msgid "_End time:"
 msgstr "S_lutt-tid:"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:2727
+#: ../src/calendar/gui/e-meeting-time-sel.c:2667
 #, c-format
 msgid ""
 "Summary: %s\n"
@@ -8345,7 +8391,7 @@ msgstr ""
 "Sammendrag: %s\n"
 "Sted: %s"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:2729
+#: ../src/calendar/gui/e-meeting-time-sel.c:2669
 #: ../src/calendar/gui/print.c:3530
 #, c-format
 msgid "Summary: %s"
@@ -8465,7 +8511,8 @@ msgstr "Startdato"
 msgid "Completion date"
 msgstr "Ferdigstillingsdato"
 
-#: ../src/calendar/gui/e-task-table.etspec.h:6 ../src/mail/mail-send-recv.c:968
+#: ../src/calendar/gui/e-task-table.etspec.h:6
+#: ../src/mail/mail-send-recv.c:1088
 msgid "Complete"
 msgstr "Fullført"
 
@@ -8488,20 +8535,26 @@ msgstr "Prioritet"
 msgid "Select Timezone"
 msgstr "Velg tidssone"
 
+#. Translators: It will display "Start: StartDateAndTime"
+#: ../src/calendar/gui/e-to-do-pane.c:370
+#, c-format
+msgid "Start: %s"
+msgstr "Start: %s"
+
 #. Translators: It will display "Due: DueDateAndTime"
-#: ../src/calendar/gui/e-to-do-pane.c:365
+#: ../src/calendar/gui/e-to-do-pane.c:390
 #, c-format
 msgid "Due: %s"
 msgstr "Frist: %s"
 
 #. Translators: It will display "Completed: DateAndTimeWhenCompleted"
-#: ../src/calendar/gui/e-to-do-pane.c:377
+#: ../src/calendar/gui/e-to-do-pane.c:404
 #, 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:1329 ../src/e-util/e-cell-date-edit.c:328
+#: ../src/calendar/gui/e-to-do-pane.c:1424 ../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
@@ -8509,47 +8562,55 @@ msgid "Today"
 msgstr "I dag"
 
 #. strftime format of a weekday and a date.
-#: ../src/calendar/gui/e-to-do-pane.c:1331
+#: ../src/calendar/gui/e-to-do-pane.c:1426
 #: ../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:1893
+#: ../src/calendar/gui/e-to-do-pane.c:1436
+msgid "Tasks without Due date"
+msgstr "Oppgaver uten ferdig-dato"
+
+#: ../src/calendar/gui/e-to-do-pane.c:2009
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1449
 msgid "New _Appointment..."
 msgstr "Ny _avtale …"
 
-#: ../src/calendar/gui/e-to-do-pane.c:1901
+#: ../src/calendar/gui/e-to-do-pane.c:2017
 #: ../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:1909
+#: ../src/calendar/gui/e-to-do-pane.c:2025
 msgid "New _Task..."
 msgstr "Ny _oppgave …"
 
-#: ../src/calendar/gui/e-to-do-pane.c:1917
+#: ../src/calendar/gui/e-to-do-pane.c:2033
 msgid "_New Assigned Task..."
 msgstr "_Ny tildelt oppgave …"
 
-#: ../src/calendar/gui/e-to-do-pane.c:1930
+#: ../src/calendar/gui/e-to-do-pane.c:2046
 msgid "_Open..."
 msgstr "_Åpne …"
 
-#: ../src/calendar/gui/e-to-do-pane.c:1944
+#: ../src/calendar/gui/e-to-do-pane.c:2060
 msgid "_Delete This Instance..."
 msgstr "Slett denne _hendelsen …"
 
-#: ../src/calendar/gui/e-to-do-pane.c:1952
+#: ../src/calendar/gui/e-to-do-pane.c:2068
 msgid "D_elete All Instances..."
 msgstr "Sl_ett alle instanser …"
 
-#: ../src/calendar/gui/e-to-do-pane.c:1960
+#: ../src/calendar/gui/e-to-do-pane.c:2076
 msgid "_Delete..."
 msgstr "_Slett …"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2250
+#: ../src/calendar/gui/e-to-do-pane.c:2093
+msgid "_Show Tasks without Due date"
+msgstr "Vi_s oppgaver uten ferdig-dato"
+
+#: ../src/calendar/gui/e-to-do-pane.c:2379
 msgid "To Do"
 msgstr "Oppgaver"
 
@@ -8962,14 +9023,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/accounts-window/e-accounts-window-editors.c:480
 #: ../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/accounts-window/e-accounts-window-editors.c:488
 #: ../src/modules/calendar/e-cal-base-shell-backend.c:189
 #: ../src/modules/calendar/e-task-shell-view-actions.c:202
 msgid "New Task List"
@@ -10875,6 +10936,7 @@ msgid "Save Draft"
 msgstr "Lagre utkast"
 
 #: ../src/composer/e-composer-from-header.c:108
+#: ../src/e-util/e-collection-account-wizard.c:1727
 #: ../src/e-util/e-mail-signature-script-dialog.c:416
 #: ../src/e-util/e-webdav-browser.c:2408
 #: ../src/e-util/gal-view-instance-save-as-dialog.ui.h:2
@@ -11101,6 +11163,7 @@ msgid "_Save to Outbox"
 msgstr "_Lagre til Utboks"
 
 #: ../src/composer/mail-composer.error.xml.h:32
+#: ../src/e-util/e-collection-account-wizard.c:440
 msgid "_Try Again"
 msgstr "_Prøv igjen"
 
@@ -11302,7 +11365,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:1494
+#: ../src/modules/mail/em-mailer-prefs.c:1500
 msgid "Mailer"
 msgstr "E-postprogram"
 
@@ -11511,7 +11574,7 @@ msgstr "Kryptert med S/MIME"
 msgid "Security"
 msgstr "Sikkerhet"
 
-#: ../src/em-format/e-mail-parser-application-mbox.c:85
+#: ../src/em-format/e-mail-parser-application-mbox.c:125
 #, c-format
 msgid "Error parsing MBOX part: %s"
 msgstr "Feil ved lesing av MBOX-del: %s"
@@ -11637,36 +11700,36 @@ 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
+#: ../src/e-util/e-accounts-window.c:523 ../src/e-util/e-accounts-window.c:640
+#: ../src/e-util/e-accounts-window.c:860
+#: ../src/modules/mail/e-mail-shell-backend.c:836
 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
+#: ../src/e-util/e-accounts-window.c:530 ../src/e-util/e-accounts-window.c:669
+#: ../src/e-util/e-accounts-window.c:874
 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
+#: ../src/e-util/e-accounts-window.c:536 ../src/e-util/e-accounts-window.c:670
+#: ../src/e-util/e-accounts-window.c:875
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:84
 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
+#: ../src/e-util/e-accounts-window.c:542 ../src/e-util/e-accounts-window.c:671
+#: ../src/e-util/e-accounts-window.c:876
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:85
 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
+#: ../src/e-util/e-accounts-window.c:548 ../src/e-util/e-accounts-window.c:672
+#: ../src/e-util/e-accounts-window.c:877
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:86
 msgid "Task Lists"
 msgstr "Oppgavelister"
 
-#: ../src/e-util/e-accounts-window.c:1326
+#: ../src/e-util/e-accounts-window.c:1363 ../src/e-util/filter.ui.h:23
 #: ../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
@@ -11674,33 +11737,36 @@ msgstr "Oppgavelister"
 msgid "Enabled"
 msgstr "Aktivert"
 
-#: ../src/e-util/e-accounts-window.c:1342
+#: ../src/e-util/e-accounts-window.c:1379
 #: ../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
+#: ../src/e-util/e-accounts-window.c:1446
+msgid "Collection _Account"
+msgstr "Konto for s_amlinger"
+
+#: ../src/e-util/e-accounts-window.c:1447
 msgid "_Mail Account"
 msgstr "E-_postkonto"
 
-#: ../src/e-util/e-accounts-window.c:1464
+#: ../src/e-util/e-accounts-window.c:1448
 msgid "Address _Book"
 msgstr "Adresse_bok"
 
-#: ../src/e-util/e-accounts-window.c:1465
+#: ../src/e-util/e-accounts-window.c:1449
 msgid "_Calendar"
 msgstr "_Kalender"
 
-#: ../src/e-util/e-accounts-window.c:1466
+#: ../src/e-util/e-accounts-window.c:1450
 msgid "M_emo List"
 msgstr "Notatlist_e"
 
-#: ../src/e-util/e-accounts-window.c:1467
+#: ../src/e-util/e-accounts-window.c:1451
 msgid "_Task List"
 msgstr "Oppgavelis_te"
 
-#: ../src/e-util/e-accounts-window.c:1659
+#: ../src/e-util/e-accounts-window.c:1646
 msgid "Evolution Accounts"
 msgstr "Evolution kontoer"
 
@@ -11950,40 +12016,40 @@ msgstr "Kopier innhold i boken lokalt for frakoblet operasjon"
 msgid "Ctrl-click to open a link"
 msgstr "Ctrl-klikk for å åpne en lenke"
 
-#: ../src/e-util/e-calendar.c:272
+#: ../src/e-util/e-calendar.c:267
 msgid "Previous month"
 msgstr "Forrige måned"
 
-#: ../src/e-util/e-calendar.c:291
+#: ../src/e-util/e-calendar.c:286
 msgid "Next month"
 msgstr "Neste måned"
 
-#: ../src/e-util/e-calendar.c:311
+#: ../src/e-util/e-calendar.c:306
 msgid "Previous year"
 msgstr "Forrige år"
 
-#: ../src/e-util/e-calendar.c:330
+#: ../src/e-util/e-calendar.c:325
 msgid "Next year"
 msgstr "Neste år"
 
-#: ../src/e-util/e-calendar.c:354
+#: ../src/e-util/e-calendar.c:349
 msgid "Month Calendar"
 msgstr "Månedskalender"
 
 #. This is a strftime() format. %B = Month name.
-#: ../src/e-util/e-calendar-item.c:1338 ../src/e-util/e-calendar-item.c:2221
+#: ../src/e-util/e-calendar-item.c:1333 ../src/e-util/e-calendar-item.c:2216
 msgctxt "CalItem"
 msgid "%B"
 msgstr "%B"
 
 #. This is a strftime() format. %Y = Year.
-#: ../src/e-util/e-calendar-item.c:1340
+#: ../src/e-util/e-calendar-item.c:1335
 msgctxt "CalItem"
 msgid "%Y"
 msgstr "%Y"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../src/e-util/e-calendar-item.c:1377
+#: ../src/e-util/e-calendar-item.c:1372
 msgctxt "CalItem"
 msgid "%B %Y"
 msgstr "%B %Y"
@@ -12082,7 +12148,7 @@ msgid "popup list"
 msgstr "oppsprettliste"
 
 #: ../src/e-util/e-cell-date.c:49 ../src/e-util/e-cell-date.c:137
-#: ../src/e-util/e-cell-date.c:157 ../src/mail/message-list.c:2067
+#: ../src/e-util/e-cell-date.c:157 ../src/mail/message-list.c:2069
 msgid "?"
 msgstr "?"
 
@@ -12205,6 +12271,124 @@ msgstr "Andre …"
 msgid "Cannot create a client object from extension name “%s”"
 msgstr "Kan ikke lage et klientobjekt fra utvidelsesnavn «%s»"
 
+#: ../src/e-util/e-collection-account-wizard.c:214
+msgid "Looking up details, please wait…"
+msgstr "Slår opp detaljer. Vennligst vent …"
+
+#. Translators: The %s is replaced with a clickable text "Enter password", thus it'll be "Requires password 
to continue. Enter password." at the end.
+#: ../src/e-util/e-collection-account-wizard.c:271
+#, c-format
+msgid "Requires password to continue. %s."
+msgstr "Krever passord for å fortsette. %s."
+
+#: ../src/e-util/e-collection-account-wizard.c:284
+msgid "View certificate"
+msgstr "Vis sertifikat"
+
+#. Translators: The first %s is replaced with actual error message about site certificate invalidity,
+#. like "The signing certificate authority is not known.", the second %s is replaced with a link "View 
certificate".
+#: ../src/e-util/e-collection-account-wizard.c:288
+#, c-format
+msgctxt "collection-account-wizard"
+msgid "%s %s."
+msgstr "%s %s."
+
+#: ../src/e-util/e-collection-account-wizard.c:326
+msgid ""
+"Found no candidates. It can also mean that the server doesn’t provide any "
+"information about its configuration using the selected lookup methods. Enter "
+"the account manually instead or change above settings."
+msgstr "Fant ingen kandidater. Dette kan også bety at tjeneren ikke tilbyr informasjon om konfigurasjonen 
med valgt oppslagsmetode. Skriv inn kontoinformasjonen manuelt i stedet eller endre innstillingene over."
+
+#: ../src/e-util/e-collection-account-wizard.c:328
+#, c-format
+msgid "Found one candidate"
+msgid_plural "Found %d candidates"
+msgstr[0] "Fant en kandidat"
+msgstr[1] "Fant %d kandidater"
+
+#: ../src/e-util/e-collection-account-wizard.c:423
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:29
+#: ../src/smime/gui/certificate-manager.c:785
+msgid "_Password:"
+msgstr "_Passord:"
+
+#: ../src/e-util/e-collection-account-wizard.c:434
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:30
+msgid "_Remember password"
+msgstr "Hu_sk passord"
+
+#: ../src/e-util/e-collection-account-wizard.c:555
+#: ../src/e-util/e-webdav-browser.c:473
+msgid "Collection"
+msgstr "Samling"
+
+#: ../src/e-util/e-collection-account-wizard.c:556
+msgid "Mail Receive"
+msgstr "E-postmottak"
+
+#: ../src/e-util/e-collection-account-wizard.c:557
+msgid "Mail Send"
+msgstr "E-postsending"
+
+#: ../src/e-util/e-collection-account-wizard.c:558
+#: ../src/e-util/e-name-selector-dialog.c:445
+#: ../src/mail/importers/pine-importer.c:430
+msgid "Address Book"
+msgstr "Adressebok"
+
+#: ../src/e-util/e-collection-account-wizard.c:560
+msgid "Memo List"
+msgstr "Notatliste"
+
+#: ../src/e-util/e-collection-account-wizard.c:561
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:61
+msgid "Task List"
+msgstr "Oppgaveliste"
+
+#: ../src/e-util/e-collection-account-wizard.c:896
+msgid "Looking up LDAP server’s search base…"
+msgstr "Slår opp LDAP-tjeners søkebase …"
+
+#: ../src/e-util/e-collection-account-wizard.c:1193
+msgid "Saving account settings, please wait…"
+msgstr "Lagrer kontoinnstillinger. Vennligst vent …"
+
+#: ../src/e-util/e-collection-account-wizard.c:1337
+msgid "User details"
+msgstr "Brukerdetaljer"
+
+#: ../src/e-util/e-collection-account-wizard.c:1350
+msgid "_Email Address or User name:"
+msgstr "_E-postadresse eller brukernavn:"
+
+#: ../src/e-util/e-collection-account-wizard.c:1380
+msgid "_Advanced Options"
+msgstr "_Avanserte alternativer"
+
+#: ../src/e-util/e-collection-account-wizard.c:1385
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:216
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:172
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:24
+msgid "_Server:"
+msgstr "Tj_ener:"
+
+#: ../src/e-util/e-collection-account-wizard.c:1403
+msgid ""
+"Semicolon (“;”) separated list of servers to look up information for, in "
+"addition to the domain of the e-mail address."
+msgstr "Semikolonseparert liste med tjenere som skal brukes til å slå opp informasjon ut over domenet for 
e-postadressen."
+
+#: ../src/e-util/e-collection-account-wizard.c:1594
+msgid "Select which parts should be configured:"
+msgstr "Velg hvilke deler som skal konfigureres:"
+
+#: ../src/e-util/e-collection-account-wizard.c:1718
+#: ../src/mail/e-mail-config-identity-page.c:541
+#: ../src/mail/e-mail-config-summary-page.c:323
+msgid "Account Information"
+msgstr "Kontoinformasjon"
+
 #: ../src/e-util/e-color-chooser-widget.c:122
 msgid "Choose custom color"
 msgstr "Velg egendefinert farge"
@@ -12372,10 +12556,14 @@ 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:404
 #: ../src/mail/e-mail-config-security-page.c:568
-#: ../src/mail/e-mail-reader.c:4093 ../src/mail/mail-config.ui.h:76
+#: ../src/mail/e-mail-reader.c:4098 ../src/mail/mail-config.ui.h:76
 msgid "Default"
 msgstr "Forvalgt"
 
+#: ../src/e-util/e-config-lookup.c:817
+msgid "Running…"
+msgstr "Kjører …"
+
 #: ../src/e-util/e-dateedit.c:524
 msgid "Date and Time"
 msgstr "Dato og klokkeslett"
@@ -12797,9 +12985,9 @@ msgstr "Finn oppføringer som møter følgende kriterier"
 #: ../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:29
-#: ../src/mail/e-mail-autoconfig.c:644
+#: ../src/mail/e-mail-autoconfig.c:658
 #: ../src/mail/e-mail-config-summary-page.c:141
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:629
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:680
 msgid "None"
 msgstr "Ingen"
 
@@ -12828,11 +13016,12 @@ msgid "A_dd Condition"
 msgstr "Legg til _kriterie"
 
 #: ../src/e-util/e-filter-rule.c:1258 ../src/e-util/filter.ui.h:1
-#: ../src/mail/em-utils.c:166
+#: ../src/mail/em-filter-rule.c:615 ../src/mail/em-utils.c:166
 msgid "Incoming"
 msgstr "Innkommende"
 
-#: ../src/e-util/e-filter-rule.c:1258 ../src/mail/em-utils.c:167
+#: ../src/e-util/e-filter-rule.c:1258 ../src/mail/em-filter-rule.c:616
+#: ../src/mail/em-utils.c:167
 msgid "Outgoing"
 msgstr "Utgående"
 
@@ -13333,19 +13522,19 @@ msgstr "_Regel"
 msgid "_Table"
 msgstr "_Tabell"
 
-#: ../src/e-util/e-html-editor.c:732
+#: ../src/e-util/e-html-editor.c:727
 msgid "Paragraph Style"
 msgstr "Avsnittstil"
 
-#: ../src/e-util/e-html-editor.c:746
+#: ../src/e-util/e-html-editor.c:741
 msgid "Editing Mode"
 msgstr "Redigeringsmodus"
 
-#: ../src/e-util/e-html-editor.c:758
+#: ../src/e-util/e-html-editor.c:753
 msgid "Font Color"
 msgstr "Skriftfarge"
 
-#: ../src/e-util/e-html-editor.c:768
+#: ../src/e-util/e-html-editor.c:763
 msgid "Font Size"
 msgstr "Skriftstørrelse"
 
@@ -13642,7 +13831,7 @@ msgid "<b>Background Image</b>"
 msgstr "<b>Bakgrunnsbilde</b>"
 
 #: ../src/e-util/e-html-editor-page-dialog.c:473
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:85
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:88
 msgid "_Template:"
 msgstr "_Mal:"
 
@@ -13973,39 +14162,84 @@ msgstr ""
 "Mus-basert interaktivt kartfelt for å velge tidssone. Tastaturbrukere må "
 "velge tiddsone fra kombinasjonsboksen nedenfor."
 
-#: ../src/e-util/e-misc-utils.c:253
+#: ../src/e-util/e-misc-utils.c:260
 msgid "Could not open the link."
 msgstr "Kunne ikke åpne lenken."
 
-#: ../src/e-util/e-misc-utils.c:336
+#: ../src/e-util/e-misc-utils.c:343
 msgid "Could not display help for Evolution."
 msgstr "Kunne ikke vise hjelp for Evolution."
 
-#: ../src/e-util/e-misc-utils.c:2501
+#: ../src/e-util/e-misc-utils.c:2508
 #, c-format
 msgid "Opening calendar “%s”"
 msgstr "Åpner kalender «%s»"
 
-#: ../src/e-util/e-misc-utils.c:2504
+#: ../src/e-util/e-misc-utils.c:2511
 #, c-format
 msgid "Opening memo list “%s”"
 msgstr "Åpner notatliste «%s»"
 
-#: ../src/e-util/e-misc-utils.c:2507
+#: ../src/e-util/e-misc-utils.c:2514
 #, c-format
 msgid "Opening task list “%s”"
 msgstr "Åpner oppgaveliste «%s»"
 
-#: ../src/e-util/e-misc-utils.c:2510
+#: ../src/e-util/e-misc-utils.c:2517
 #, c-format
 msgid "Opening address book “%s”"
 msgstr "Åpner adressebok «%s»"
 
-#: ../src/e-util/e-misc-utils.c:3290
+#: ../src/e-util/e-misc-utils.c:3297
 #: ../src/modules/mailto-handler/evolution-mailto-handler.c:146
 msgid "_Do not show this message again"
 msgstr "Ikke vis _denne meldingen igjen"
 
+#: ../src/e-util/e-misc-utils.c:4117
+msgid ""
+"This address book server might be unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+"Adresseboktjeneren din er ikke tilgjengelig eller tjenernavnet er kanskje "
+"stavet feil. Eller så kan nettverkstilkoblingen din være slått av."
+
+#: ../src/e-util/e-misc-utils.c:4129
+#, c-format
+msgid "Failed to set protocol version to LDAPv3 (%d): %s"
+msgstr "Klarte ikke å sette protokollversjon til LDAPv3 (%d): %s"
+
+#: ../src/e-util/e-misc-utils.c:4141
+#, c-format
+msgid "Failed to authenticate with LDAP server (%d): %s"
+msgstr "Klarte ikke å autentisere mot LDAP-tjener (%d): %s"
+
+#: ../src/e-util/e-misc-utils.c:4155
+#, c-format
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases.\n"
+"\n"
+"Detailed error (%d): %s"
+msgstr ""
+"Denne LDAP-tjeneren bruker kanskje en gammel versjon av LDAP som ikke støtter denne funksjonaliteten eller 
så er den satt opp feil. Spør din administrator for støttede søkebaser.\n"
+"\n"
+"Detaljert feil (%d): %s"
+
+#: ../src/e-util/e-misc-utils.c:4166
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+"Denne LDAP-tjeneren bruker kanskje en gammel versjon av LDAP som ikke "
+"støtter denne funksjonaliteten eller så er den satt opp feil. Spør din "
+"administrator for støttede søkebaser."
+
+#: ../src/e-util/e-misc-utils.c:4199
+msgid "Evolution had not been compiled with LDAP support"
+msgstr "Evolution er kompilert uten støtte for LDAP"
+
 #: ../src/e-util/e-name-selector-dialog.c:274
 msgid "Show Contacts"
 msgstr "Vis kontakter"
@@ -14040,11 +14274,6 @@ msgstr "Ko_ntakter"
 msgid "Search"
 msgstr "Søk"
 
-#: ../src/e-util/e-name-selector-dialog.c:445
-#: ../src/mail/importers/pine-importer.c:430
-msgid "Address Book"
-msgstr "Adressebok"
-
 #: ../src/e-util/e-name-selector-dialog.c:573
 msgid "Select Contacts from Address Book"
 msgstr "Velg kontakter fra adresseboken"
@@ -14213,11 +14442,11 @@ msgstr "Lag en ny proxyprofil"
 msgid "Delete the selected proxy profile"
 msgstr "Slett valgt proxyprofil"
 
-#: ../src/e-util/e-rule-editor.c:182
+#: ../src/e-util/e-rule-editor.c:190
 msgid "Add Rule"
 msgstr "Legg til regel"
 
-#: ../src/e-util/e-rule-editor.c:284
+#: ../src/e-util/e-rule-editor.c:301
 msgid "Edit Rule"
 msgstr "Rediger regel"
 
@@ -14239,6 +14468,7 @@ msgid "Clear the search"
 msgstr "Tøm søket"
 
 #: ../src/e-util/e-search-bar.c:653
+#: ../src/modules/accounts-window/e-collection-wizard-page.c:73
 msgid "_Previous"
 msgstr "_Forrige"
 
@@ -14247,6 +14477,8 @@ msgid "Find the previous occurrence of the phrase"
 msgstr "Finn forrige oppføring av teksten"
 
 #: ../src/e-util/e-search-bar.c:665
+#: ../src/modules/accounts-window/e-collection-wizard-page.c:80
+#: ../src/modules/accounts-window/e-collection-wizard-page.c:224
 msgid "_Next"
 msgstr "_Neste"
 
@@ -14442,8 +14674,8 @@ msgid "Unset _trust for SSL/TLS certificate"
 msgstr "Fjern _tillit til SSL/TLS-sertifikat"
 
 #: ../src/e-util/e-source-config.c:1476
-msgid "User"
-msgstr "Bruker"
+msgid "User:"
+msgstr "Bruker:"
 
 #: ../src/e-util/e-source-selector.c:3212
 msgid "Show"
@@ -14453,7 +14685,7 @@ msgstr "Vis"
 msgid "Group name"
 msgstr "Gruppenavn"
 
-#: ../src/e-util/e-source-selector.c:3374 ../src/mail/e-mail-display.c:796
+#: ../src/e-util/e-source-selector.c:3374 ../src/mail/e-mail-display.c:794
 msgid "_Hide"
 msgstr "_Skjul"
 
@@ -14633,7 +14865,9 @@ msgstr "Er du sikker på at du vil slette ekstern samling «{0}»?"
 msgid ""
 "This will permanently remove the collection “{0}” from the server. Are you "
 "sure you want to proceed?"
-msgstr "Dette vil fjerne kalender «{0}» fra samlingen permanent. Er du sikker på at du vil fortsette?"
+msgstr ""
+"Dette vil fjerne kalender «{0}» fra samlingen permanent. Er du sikker på at "
+"du vil fortsette?"
 
 #: ../src/e-util/e-table-click-to-add.c:687
 #: ../src/e-util/gal-a11y-e-table-click-to-add.c:59
@@ -14693,11 +14927,11 @@ msgstr "Fjern _alt"
 msgid "_Show field in View"
 msgstr "Vi_s felt i visning"
 
-#: ../src/e-util/e-table-config.ui.h:6 ../src/e-util/e-table-header-item.c:1783
+#: ../src/e-util/e-table-config.ui.h:6 ../src/e-util/e-table-header-item.c:1779
 msgid "Ascending"
 msgstr "Stigende"
 
-#: ../src/e-util/e-table-config.ui.h:7 ../src/e-util/e-table-header-item.c:1783
+#: ../src/e-util/e-table-config.ui.h:7 ../src/e-util/e-table-header-item.c:1779
 msgid "Descending"
 msgstr "Synkende"
 
@@ -14836,20 +15070,20 @@ msgstr "For_mater kolonner …"
 msgid "Custo_mize Current View..."
 msgstr "T_ilpass aktiv visning …"
 
-#: ../src/e-util/e-table-header-item.c:1733
+#: ../src/e-util/e-table-header-item.c:1729
 msgid "_Sort By"
 msgstr "_Sorter etter"
 
 #. Custom
-#: ../src/e-util/e-table-header-item.c:1756
+#: ../src/e-util/e-table-header-item.c:1752
 msgid "_Custom"
 msgstr "E_gendefinert"
 
-#: ../src/e-util/e-text.c:2135
+#: ../src/e-util/e-text.c:2111
 msgid "Select All"
 msgstr "Velg alle"
 
-#: ../src/e-util/e-text.c:2148
+#: ../src/e-util/e-text.c:2124
 msgid "Input Methods"
 msgstr "Inndatametoder"
 
@@ -14920,10 +15154,6 @@ msgstr "Adressebok"
 msgid "Events"
 msgstr "Hendelser"
 
-#: ../src/e-util/e-webdav-browser.c:473
-msgid "Collection"
-msgstr "Samling"
-
 #: ../src/e-util/e-webdav-browser.c:514
 msgid "Loading…"
 msgstr "Laster …"
@@ -14991,7 +15221,8 @@ msgstr "Det er ikke tillatt å lage en bok under en annen bok eller kalender"
 #. if (button == webdav_browser->priv->create_calendar_button)
 #: ../src/e-util/e-webdav-browser.c:1963
 msgid "It is not allowed to create calendar under another book or calendar"
-msgstr "Det er ikke tillatt å lage en kalender under en annen bok eller kalender"
+msgstr ""
+"Det er ikke tillatt å lage en kalender under en annen bok eller kalender"
 
 #: ../src/e-util/e-webdav-browser.c:2189
 msgid "Deleting book…"
@@ -15045,7 +15276,7 @@ msgstr "Lag samli_ng"
 #. gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
 #. webdav_browser->priv->permissions_button = widget;
 #: ../src/e-util/e-webdav-browser.c:2699
-#: ../src/mail/em-subscription-editor.c:1976
+#: ../src/mail/em-subscription-editor.c:1948
 #: ../src/modules/mail/e-mail-shell-view-actions.c:1652
 #: ../src/modules/mail/e-mail-shell-view-actions.c:1723
 msgid "_Refresh"
@@ -15122,20 +15353,20 @@ msgstr "Gå til begynnelsen av meldingen"
 msgid "Click to open %s"
 msgstr "Klikk for å åpne %s"
 
-#: ../src/e-util/e-web-view.c:3942
+#: ../src/e-util/e-web-view.c:3928
 msgid "Copying image to clipboard"
 msgstr "Kopierer bilde til utklippstavlen"
 
-#: ../src/e-util/e-web-view.c:4130
+#: ../src/e-util/e-web-view.c:4116
 msgid "Save Image"
 msgstr "Lagre bilde"
 
-#: ../src/e-util/e-web-view.c:4171
+#: ../src/e-util/e-web-view.c:4157
 #, c-format
 msgid "Saving image to “%s”"
 msgstr "Lagrer bilde til «%s»"
 
-#: ../src/e-util/e-web-view.c:4266
+#: ../src/e-util/e-web-view.c:4252
 #, 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."
@@ -15277,10 +15508,10 @@ msgstr ""
 #: ../src/e-util/filter.ui.h:17
 msgid ""
 "The message’s date will be compared against\n"
-"12:00am of the date specified."
+"the beginning of the specified day."
 msgstr ""
 "Meldingens dato vil bli sammenlignet med\n"
-"12:00 på spesifiserert dato."
+"start på spesifiserert dato."
 
 #: ../src/e-util/filter.ui.h:19
 msgid ""
@@ -15298,6 +15529,10 @@ msgstr "Vis filtre for e-post:"
 msgid "_Filter Rules"
 msgstr "_Filterregler"
 
+#: ../src/e-util/filter.ui.h:24
+msgid "Rule Name"
+msgstr "Regelnavn"
+
 #: ../src/e-util/gal-a11y-e-cell.c:128
 msgid "Table Cell"
 msgstr "Celle i tabell"
@@ -15460,8 +15695,8 @@ msgstr "Ugyldig URI for mappe «%s»"
 #: ../src/mail/em-folder-properties.c:1150
 #: ../src/mail/em-folder-tree-model.c:1237
 #: ../src/mail/importers/kmail-libs.c:139
-#: ../src/modules/mail/e-mail-shell-view-private.c:1041
-#: ../src/modules/mail/e-mail-shell-view-private.c:1052
+#: ../src/modules/mail/e-mail-shell-view-private.c:1035
+#: ../src/modules/mail/e-mail-shell-view-private.c:1046
 msgid "Inbox"
 msgstr "Innboks"
 
@@ -15469,7 +15704,7 @@ msgstr "Innboks"
 #: ../src/libemail-engine/e-mail-session.c:126
 #: ../src/mail/em-folder-tree-model.c:1230
 #: ../src/mail/importers/kmail-libs.c:145
-#: ../src/modules/mail/e-mail-shell-view-private.c:1039
+#: ../src/modules/mail/e-mail-shell-view-private.c:1033
 msgid "Drafts"
 msgstr "Skisser"
 
@@ -15477,7 +15712,7 @@ msgstr "Skisser"
 #: ../src/libemail-engine/e-mail-session.c:127
 #: ../src/mail/em-folder-tree-model.c:1241
 #: ../src/mail/importers/kmail-libs.c:141
-#: ../src/modules/mail/e-mail-shell-view-private.c:1043
+#: ../src/modules/mail/e-mail-shell-view-private.c:1037
 msgid "Outbox"
 msgstr "Utboks"
 
@@ -15485,7 +15720,7 @@ msgstr "Utboks"
 #: ../src/libemail-engine/e-mail-session.c:128
 #: ../src/mail/em-folder-tree-model.c:1245
 #: ../src/mail/importers/kmail-libs.c:143
-#: ../src/modules/mail/e-mail-shell-view-private.c:1045
+#: ../src/modules/mail/e-mail-shell-view-private.c:1039
 msgid "Sent"
 msgstr "Sendt"
 
@@ -15493,7 +15728,7 @@ msgstr "Sendt"
 #: ../src/libemail-engine/e-mail-session.c:129
 #: ../src/mail/em-folder-tree-model.c:1233
 #: ../src/mail/importers/kmail-libs.c:147
-#: ../src/modules/mail/e-mail-shell-view-private.c:1047
+#: ../src/modules/mail/e-mail-shell-view-private.c:1041
 #: ../src/plugins/templates/e-templates-store.c:2212
 #: ../src/plugins/templates/org-gnome-templates.eplug.xml.h:1
 msgid "Templates"
@@ -15526,26 +15761,26 @@ msgid "No mail transport service available"
 msgstr "Tjeneste for transport av e-post er ikke tilgjengelig"
 
 #: ../src/libemail-engine/e-mail-session-utils.c:616
-#: ../src/libemail-engine/mail-ops.c:706
+#: ../src/libemail-engine/mail-ops.c:708
 #, c-format
 msgid "Posting message to “%s”"
 msgstr "Poster melding til «%s»"
 
 #: ../src/libemail-engine/e-mail-session-utils.c:653
-#: ../src/libemail-engine/mail-ops.c:742
+#: ../src/libemail-engine/mail-ops.c:744
 #, 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:686
 #: ../src/libemail-engine/e-mail-session-utils.c:721
-#: ../src/libemail-engine/mail-ops.c:770 ../src/libemail-engine/mail-ops.c:805
+#: ../src/libemail-engine/mail-ops.c:772 ../src/libemail-engine/mail-ops.c:807
 #, c-format
 msgid "Storing sent message to “%s”"
 msgstr "Lagrer sendt melding til «%s»"
 
 #: ../src/libemail-engine/e-mail-session-utils.c:710
-#: ../src/libemail-engine/mail-ops.c:794
+#: ../src/libemail-engine/mail-ops.c:796
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -15555,13 +15790,14 @@ msgstr ""
 "Legger til i lokal «Sendt»-mappe i stedet."
 
 #: ../src/libemail-engine/e-mail-session-utils.c:740
-#: ../src/libemail-engine/mail-ops.c:822
+#: ../src/libemail-engine/mail-ops.c:824
 #, 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:928
-#: ../src/libemail-engine/mail-ops.c:983 ../src/libemail-engine/mail-ops.c:1085
+#: ../src/libemail-engine/mail-ops.c:985 ../src/libemail-engine/mail-ops.c:1098
+#: ../src/mail/mail-send-recv.c:636
 msgid "Sending message"
 msgstr "Sender melding"
 
@@ -15602,7 +15838,7 @@ msgstr ""
 msgid "Fetching mail from “%s”"
 msgstr "Henter e-post fra «%s»"
 
-#: ../src/libemail-engine/mail-ops.c:736
+#: ../src/libemail-engine/mail-ops.c:738
 #, c-format
 msgid ""
 "Failed to apply outgoing filters. One reason can be that folder location set "
@@ -15615,7 +15851,7 @@ msgstr ""
 "i «Rediger→Meldingsfiltre».\n"
 "Opprinnelig feil var: %s"
 
-#: ../src/libemail-engine/mail-ops.c:994
+#: ../src/libemail-engine/mail-ops.c:996
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sender melding %d av %d"
@@ -15623,78 +15859,84 @@ 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:1046
+#: ../src/libemail-engine/mail-ops.c:1054
 #, 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:1052
+#: ../src/libemail-engine/mail-ops.c:1060
 msgid "Cancelled."
 msgstr "Avbrutt."
 
-#: ../src/libemail-engine/mail-ops.c:1054
+#: ../src/libemail-engine/mail-ops.c:1062
 msgid "Complete."
 msgstr "Fullført."
 
-#: ../src/libemail-engine/mail-ops.c:1169
+#: ../src/libemail-engine/mail-ops.c:1184
 #, c-format
 msgid "Moving messages to “%s”"
 msgstr "Flytter meldinger til «%s»"
 
-#: ../src/libemail-engine/mail-ops.c:1170
+#: ../src/libemail-engine/mail-ops.c:1185
 #, c-format
 msgid "Copying messages to “%s”"
 msgstr "Kopierer meldinger til «%s»"
 
-#: ../src/libemail-engine/mail-ops.c:1289
+#: ../src/libemail-engine/mail-ops.c:1304
 #, c-format
 msgid "Storing folder “%s”"
 msgstr "Lagrer mappe «%s»"
 
-#: ../src/libemail-engine/mail-ops.c:1417
+#: ../src/libemail-engine/mail-ops.c:1432
 #, c-format
 msgid "Expunging and storing account “%s”"
 msgstr "Tømmer og lagrer konto «%s»"
 
-#: ../src/libemail-engine/mail-ops.c:1418
+#: ../src/libemail-engine/mail-ops.c:1433
 #, c-format
 msgid "Storing account “%s”"
 msgstr "Lagrer konto «%s»"
 
-#: ../src/libemail-engine/mail-ops.c:1493
+#: ../src/libemail-engine/mail-ops.c:1508
 #, c-format
 msgid "Emptying trash in “%s”"
 msgstr "Tømmer søppel i «%s»"
 
-#: ../src/libemail-engine/mail-ops.c:1585
+#: ../src/libemail-engine/mail-ops.c:1600
 #, c-format
 msgid "Processing folder changes in “%s”"
 msgstr "Prosesserer endringer i mappe «%s»"
 
-#: ../src/libemail-engine/mail-tools.c:68
+#: ../src/libemail-engine/mail-tools.c:69
 #, c-format
 msgid "Could not create spool directory “%s”: %s"
 msgstr "Kan ikke opprette spool-katalog «%s»: %s"
 
-#: ../src/libemail-engine/mail-tools.c:108
+#: ../src/libemail-engine/mail-tools.c:109
 #, c-format
 msgid "Trying to movemail a non-mbox source “%s”"
 msgstr "Prøver å bruke movemail på en kilde, «%s», som ikke er i mbox-format"
 
+#. 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:198
+#, 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:195
+#: ../src/libemail-engine/mail-tools.c:208
 msgid "No Subject"
 msgstr "Uten emne"
 
-#: ../src/libemail-engine/mail-tools.c:270
+#: ../src/libemail-engine/mail-tools.c:283
 #, c-format
 msgid "Forwarded message — %s"
 msgstr "Videresendt melding – %s"
 
-#: ../src/libemail-engine/mail-tools.c:272
+#: ../src/libemail-engine/mail-tools.c:285
 msgid "Forwarded message"
 msgstr "Videresendt melding"
 
@@ -15752,68 +15994,68 @@ msgstr "Du kan dra og slippe kontonavn for å endre rekkefølge."
 msgid "De_fault"
 msgstr "_Forvalgt"
 
-#: ../src/mail/e-mail-autoconfig.c:634
+#: ../src/mail/e-mail-autoconfig.c:648
 #, c-format
 msgid "Host: %s:%d"
 msgstr "Vert: %s:%d"
 
-#: ../src/mail/e-mail-autoconfig.c:638
+#: ../src/mail/e-mail-autoconfig.c:652
 #, c-format
 msgid "User: %s"
 msgstr "Bruker: %s"
 
-#: ../src/mail/e-mail-autoconfig.c:642
+#: ../src/mail/e-mail-autoconfig.c:656
 #, c-format
 msgid "Security method: %s"
 msgstr "Sikkerhetsmetode: %s"
 
-#: ../src/mail/e-mail-autoconfig.c:643
+#: ../src/mail/e-mail-autoconfig.c:657
 #: ../src/mail/e-mail-config-summary-page.c:144
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/mail/e-mail-autoconfig.c:644
+#: ../src/mail/e-mail-autoconfig.c:658
 #: ../src/mail/e-mail-config-summary-page.c:147
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: ../src/mail/e-mail-autoconfig.c:648
+#: ../src/mail/e-mail-autoconfig.c:662
 #, c-format
 msgid "Authentication mechanism: %s"
 msgstr "Autentiseringsmekanisme: %s"
 
-#: ../src/mail/e-mail-autoconfig.c:783
+#: ../src/mail/e-mail-autoconfig.c:821
 msgid "No email address provided"
 msgstr "Ingen e-postadresse ble oppgitt"
 
-#: ../src/mail/e-mail-autoconfig.c:792
+#: ../src/mail/e-mail-autoconfig.c:830
 msgid "Missing domain in email address"
 msgstr "Mangler domene i e-postadresse"
 
-#: ../src/mail/e-mail-autoconfig.c:1097
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:78
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:79
+#: ../src/mail/e-mail-autoconfig.c:1167
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:82
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:83
 msgid "IMAP server"
 msgstr "IMAP-tjener"
 
-#: ../src/mail/e-mail-autoconfig.c:1104
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:80
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:81
+#: ../src/mail/e-mail-autoconfig.c:1174
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:84
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:85
 msgid "POP3 server"
 msgstr "POP3-tjener"
 
-#: ../src/mail/e-mail-autoconfig.c:1111
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:82
+#: ../src/mail/e-mail-autoconfig.c:1181
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:86
 msgid "SMTP server"
 msgstr "SMTP-tjener"
 
-#: ../src/mail/e-mail-browser.c:129 ../src/shell/e-shell-window-actions.c:812
+#: ../src/mail/e-mail-browser.c:130 ../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"
 
-#: ../src/mail/e-mail-browser.c:287
+#: ../src/mail/e-mail-browser.c:288
 msgid "(No Subject)"
 msgstr "(Uten emne)"
 
@@ -15823,15 +16065,15 @@ msgid "Go _Back"
 msgstr "Gå til_bake"
 
 #. GtkAssistant sinks the floating button reference.
-#: ../src/mail/e-mail-config-assistant.c:123
+#: ../src/mail/e-mail-config-assistant.c:130
 msgid "_Skip Lookup"
 msgstr "_Hopp over oppslag"
 
-#: ../src/mail/e-mail-config-assistant.c:718
+#: ../src/mail/e-mail-config-assistant.c:725
 msgid "Evolution Account Assistant"
 msgstr "Evolution kontoassistent"
 
-#: ../src/mail/e-mail-config-assistant.c:1025
+#: ../src/mail/e-mail-config-assistant.c:1032
 msgid "_Revise Details"
 msgstr "Gå gjennom detalje_r"
 
@@ -15970,7 +16212,7 @@ msgid "Archi_ve Folder:"
 msgstr "Arki_vmappe:"
 
 #: ../src/mail/e-mail-config-defaults-page.c:785
-#: ../src/modules/mail/em-mailer-prefs.c:1407
+#: ../src/modules/mail/em-mailer-prefs.c:1413
 msgid "Choose a folder to archive messages to."
 msgstr "Velg en mappe å arkivere meldinger til."
 
@@ -16020,11 +16262,6 @@ 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:541
-#: ../src/mail/e-mail-config-summary-page.c:323
-msgid "Account Information"
-msgstr "Kontoinformasjon"
-
 #: ../src/mail/e-mail-config-identity-page.c:579
 #: ../src/mail/e-mail-config-summary-page.c:353
 msgid ""
@@ -16129,7 +16366,7 @@ msgstr "%s – %s"
 #: ../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.c:642
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:48
 #: ../src/modules/mail/e-mail-shell-backend.c:737
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:16
@@ -16275,12 +16512,12 @@ msgid "Server Type:"
 msgstr "Tjenertype:"
 
 #: ../src/mail/e-mail-config-summary-page.c:452
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:606
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:657
 msgid "Server:"
 msgstr "Tjener:"
 
 #: ../src/mail/e-mail-config-summary-page.c:473
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:704
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:755
 msgid "Username:"
 msgstr "Brukernavn:"
 
@@ -16315,55 +16552,55 @@ msgstr "Velkommen"
 msgid "Account Editor"
 msgstr "Kontoredigering"
 
-#: ../src/mail/e-mail-display.c:128
+#: ../src/mail/e-mail-display.c:126
 msgid "_Add to Address Book..."
 msgstr "Legg til i _adressebok …"
 
-#: ../src/mail/e-mail-display.c:135
+#: ../src/mail/e-mail-display.c:133
 msgid "_To This Address"
 msgstr "_Til denne adressen"
 
-#: ../src/mail/e-mail-display.c:142
+#: ../src/mail/e-mail-display.c:140
 msgid "_From This Address"
 msgstr "_Fra denne adressen"
 
-#: ../src/mail/e-mail-display.c:149
+#: ../src/mail/e-mail-display.c:147
 msgid "Send _Reply To..."
 msgstr "Send sva_r til …"
 
-#: ../src/mail/e-mail-display.c:151
+#: ../src/mail/e-mail-display.c:149
 msgid "Send a reply message to this address"
 msgstr "Send svarmelding til denne adressen"
 
-#: ../src/mail/e-mail-display.c:158
+#: ../src/mail/e-mail-display.c:156
 msgid "Create Search _Folder"
 msgstr "Opprett _søkemappe"
 
-#: ../src/mail/e-mail-display.c:803
+#: ../src/mail/e-mail-display.c:801
 msgid "Hid_e All"
 msgstr "Skj_ul alle"
 
-#: ../src/mail/e-mail-display.c:810
+#: ../src/mail/e-mail-display.c:808
 msgid "_View Inline"
 msgstr "_Vis i meldingsteksten"
 
-#: ../src/mail/e-mail-display.c:817
+#: ../src/mail/e-mail-display.c:815
 msgid "Vie_w All Inline"
 msgstr "_Vis alle i meldingsteksten"
 
-#: ../src/mail/e-mail-display.c:824
+#: ../src/mail/e-mail-display.c:822
 msgid "_Zoom to 100%"
 msgstr "_Zoom til 100%"
 
-#: ../src/mail/e-mail-display.c:826
+#: ../src/mail/e-mail-display.c:824
 msgid "Zoom the image to its natural size"
 msgstr "Zoom bildet til sin opprinnelige størrelse"
 
-#: ../src/mail/e-mail-display.c:831
+#: ../src/mail/e-mail-display.c:829
 msgid "_Zoom to window"
 msgstr "_Zoom tilpasset vinduet"
 
-#: ../src/mail/e-mail-display.c:833
+#: ../src/mail/e-mail-display.c:831
 msgid "Zoom large images to not be wider than the window width"
 msgstr "Zoom store bilder slik at de ikke er bredere enn vinduet"
 
@@ -16528,7 +16765,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:127
+#: ../src/mail/e-mail-printer.c:100 ../src/mail/mail-config.ui.h:128
 msgid "Headers"
 msgstr "Meldingshoder"
 
@@ -16537,637 +16774,637 @@ msgstr "Meldingshoder"
 msgid "Page %d of %d"
 msgstr "Side %d av %d"
 
-#: ../src/mail/e-mail-reader.c:349 ../src/mail/filtertypes.xml.in.h:65
+#: ../src/mail/e-mail-reader.c:350 ../src/mail/filtertypes.xml.in.h:65
 msgid "Move to Folder"
 msgstr "Flytt til mappe"
 
-#: ../src/mail/e-mail-reader.c:349 ../src/mail/filtertypes.xml.in.h:66
+#: ../src/mail/e-mail-reader.c:350 ../src/mail/filtertypes.xml.in.h:66
 msgid "Copy to Folder"
 msgstr "Kopier til mappe"
 
-#: ../src/mail/e-mail-reader.c:353 ../src/mail/em-folder-utils.c:501
+#: ../src/mail/e-mail-reader.c:354 ../src/mail/em-folder-utils.c:568
 #: ../src/mail/mail.error.xml.h:152
 msgid "_Move"
 msgstr "_Flytt"
 
-#: ../src/mail/e-mail-reader.c:353 ../src/mail/em-folder-utils.c:501
+#: ../src/mail/e-mail-reader.c:354 ../src/mail/em-folder-utils.c:568
 msgid "C_opy"
 msgstr "K_opier"
 
-#: ../src/mail/e-mail-reader.c:528
+#: ../src/mail/e-mail-reader.c:529
 msgid "Deleting message note..."
 msgstr "Sletter meldingsnotat …"
 
-#: ../src/mail/e-mail-reader.c:1351 ../src/mail/e-mail-reader.c:1563
-#: ../src/mail/e-mail-reader.c:1603
+#: ../src/mail/e-mail-reader.c:1356 ../src/mail/e-mail-reader.c:1568
+#: ../src/mail/e-mail-reader.c:1608
 msgid "_Do not ask me again."
 msgstr "_Ikke spør meg igjen."
 
-#: ../src/mail/e-mail-reader.c:1609
+#: ../src/mail/e-mail-reader.c:1614
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Alltid ignorer Reply-To: for e-postlister."
 
-#: ../src/mail/e-mail-reader.c:1812
+#: ../src/mail/e-mail-reader.c:1817
 msgid "Failed to retrieve message:"
 msgstr "Klarte ikke å hente melding:"
 
-#: ../src/mail/e-mail-reader.c:1857 ../src/mail/e-mail-reader.c:3216
+#: ../src/mail/e-mail-reader.c:1862 ../src/mail/e-mail-reader.c:3221
 #, c-format
 msgid "Retrieving message “%s”"
 msgstr "Henter melding «%s»"
 
-#: ../src/mail/e-mail-reader.c:2045
+#: ../src/mail/e-mail-reader.c:2050
 msgid "A_dd Sender to Address Book"
 msgstr "L_egg til avsender i adressebok"
 
-#: ../src/mail/e-mail-reader.c:2047
+#: ../src/mail/e-mail-reader.c:2052
 msgid "Add sender to address book"
 msgstr "Legg til avsender i adressebok"
 
-#: ../src/mail/e-mail-reader.c:2052
+#: ../src/mail/e-mail-reader.c:2057
 msgid "_Archive..."
 msgstr "_Arkiv …"
 
-#: ../src/mail/e-mail-reader.c:2054
+#: ../src/mail/e-mail-reader.c:2059
 msgid "Move selected messages to the Archive folder for the account"
 msgstr "Flytt valgte meldinger til arkivmappen for kontoen"
 
-#: ../src/mail/e-mail-reader.c:2059
+#: ../src/mail/e-mail-reader.c:2064
 msgid "Check for _Junk"
 msgstr "Sjekk etter _uønsket e-post"
 
-#: ../src/mail/e-mail-reader.c:2061
+#: ../src/mail/e-mail-reader.c:2066
 msgid "Filter the selected messages for junk status"
 msgstr "Filtrer valgte meldinger etter uønsket e-poststatus"
 
-#: ../src/mail/e-mail-reader.c:2066
+#: ../src/mail/e-mail-reader.c:2071
 msgid "_Copy to Folder..."
 msgstr "K_opier til mappe …"
 
-#: ../src/mail/e-mail-reader.c:2068
+#: ../src/mail/e-mail-reader.c:2073
 msgid "Copy selected messages to another folder"
 msgstr "Kopier valgte meldinger til en annen mappe"
 
-#: ../src/mail/e-mail-reader.c:2073
+#: ../src/mail/e-mail-reader.c:2078
 msgid "_Delete Message"
 msgstr "_Slett melding"
 
-#: ../src/mail/e-mail-reader.c:2075
+#: ../src/mail/e-mail-reader.c:2080
 msgid "Mark the selected messages for deletion"
 msgstr "Merk valgte meldinger for sletting"
 
-#: ../src/mail/e-mail-reader.c:2080
+#: ../src/mail/e-mail-reader.c:2085
 msgid "_Add note..."
 msgstr "L_egg til notat …"
 
-#: ../src/mail/e-mail-reader.c:2082
+#: ../src/mail/e-mail-reader.c:2087
 msgid "Add a note for the selected message"
 msgstr "Legg til et notat fra valgt melding"
 
-#: ../src/mail/e-mail-reader.c:2087
+#: ../src/mail/e-mail-reader.c:2092
 msgid "Delete no_te"
 msgstr "Slett no_tat"
 
-#: ../src/mail/e-mail-reader.c:2089
+#: ../src/mail/e-mail-reader.c:2094
 msgid "Delete the note for the selected message"
 msgstr " Slett notat for valgt melding"
 
-#: ../src/mail/e-mail-reader.c:2094
+#: ../src/mail/e-mail-reader.c:2099
 msgid "_Edit note..."
 msgstr "R_ediger notat …"
 
-#: ../src/mail/e-mail-reader.c:2096
+#: ../src/mail/e-mail-reader.c:2101
 msgid "Edit a note for the selected message"
 msgstr "Rediger et notat for valgt melding"
 
-#: ../src/mail/e-mail-reader.c:2101
+#: ../src/mail/e-mail-reader.c:2106
 msgid "Create a Filter Rule for Mailing _List..."
 msgstr "Lag filterregel for e-post_liste …"
 
-#: ../src/mail/e-mail-reader.c:2103
+#: ../src/mail/e-mail-reader.c:2108
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Lag en regel for å filtrere meldinger til denne meldingslisten"
 
-#: ../src/mail/e-mail-reader.c:2108
+#: ../src/mail/e-mail-reader.c:2113
 msgid "Create a Filter Rule for _Recipients..."
 msgstr "Lag en filterregel for mottake_re …"
 
-#: ../src/mail/e-mail-reader.c:2110
+#: ../src/mail/e-mail-reader.c:2115
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Lag en regel for å filtrere meldinger til disse mottakerene"
 
-#: ../src/mail/e-mail-reader.c:2115
+#: ../src/mail/e-mail-reader.c:2120
 msgid "Create a Filter Rule for Se_nder..."
 msgstr "Lag en filterregel for avse_nder …"
 
-#: ../src/mail/e-mail-reader.c:2117
+#: ../src/mail/e-mail-reader.c:2122
 msgid "Create a rule to filter messages from this sender"
 msgstr "Lag en regel for å filtrere meldinger fra denne avsenderen"
 
-#: ../src/mail/e-mail-reader.c:2122
+#: ../src/mail/e-mail-reader.c:2127
 msgid "Create a Filter Rule for _Subject..."
 msgstr "Lag en filterregel for e_mne …"
 
-#: ../src/mail/e-mail-reader.c:2124
+#: ../src/mail/e-mail-reader.c:2129
 msgid "Create a rule to filter messages with this subject"
 msgstr "Lag en regel for filtrering av meldinger med dette emnet"
 
-#: ../src/mail/e-mail-reader.c:2129
+#: ../src/mail/e-mail-reader.c:2134
 msgid "A_pply Filters"
 msgstr "_Påfør filtre"
 
-#: ../src/mail/e-mail-reader.c:2131
+#: ../src/mail/e-mail-reader.c:2136
 msgid "Apply filter rules to the selected messages"
 msgstr "Aktiver filterregler på de valgte meldingene"
 
-#: ../src/mail/e-mail-reader.c:2136
+#: ../src/mail/e-mail-reader.c:2141
 msgid "_Find in Message..."
 msgstr "_Finn i melding …"
 
-#: ../src/mail/e-mail-reader.c:2138
+#: ../src/mail/e-mail-reader.c:2143
 msgid "Search for text in the body of the displayed message"
 msgstr "Søk etter tekst i kroppen av vist melding"
 
-#: ../src/mail/e-mail-reader.c:2143
+#: ../src/mail/e-mail-reader.c:2148
 msgid "_Clear Flag"
 msgstr "F_jern flagg"
 
-#: ../src/mail/e-mail-reader.c:2145
+#: ../src/mail/e-mail-reader.c:2150
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Fjern flagg for oppfølging fra valgte meldinger"
 
-#: ../src/mail/e-mail-reader.c:2150
+#: ../src/mail/e-mail-reader.c:2155
 msgid "_Flag Completed"
 msgstr "Merk som _fullført"
 
-#: ../src/mail/e-mail-reader.c:2152
+#: ../src/mail/e-mail-reader.c:2157
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "Sett flagg for oppfølging til fullført på valgte meldinger"
 
-#: ../src/mail/e-mail-reader.c:2157
+#: ../src/mail/e-mail-reader.c:2162
 msgid "Follow _Up..."
 msgstr "Følg _opp …"
 
-#: ../src/mail/e-mail-reader.c:2159
+#: ../src/mail/e-mail-reader.c:2164
 msgid "Flag the selected messages for follow-up"
 msgstr "Merk valgte meldinger for oppfølging"
 
-#: ../src/mail/e-mail-reader.c:2164
+#: ../src/mail/e-mail-reader.c:2169
 #: ../src/modules/mail/e-mail-attachment-handler.c:430
 msgid "_Attached"
 msgstr "L_agt ved"
 
-#: ../src/mail/e-mail-reader.c:2166 ../src/mail/e-mail-reader.c:2173
+#: ../src/mail/e-mail-reader.c:2171 ../src/mail/e-mail-reader.c:2178
 #: ../src/modules/mail/e-mail-attachment-handler.c:432
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Videresend den valgte meldingen til noen som et vedlegg"
 
-#: ../src/mail/e-mail-reader.c:2171
+#: ../src/mail/e-mail-reader.c:2176
 msgid "Forward As _Attached"
 msgstr "Videresend s_om vedlegg"
 
-#: ../src/mail/e-mail-reader.c:2178
+#: ../src/mail/e-mail-reader.c:2183
 #: ../src/modules/mail/e-mail-attachment-handler.c:437
 msgid "_Inline"
 msgstr "_I meldingen"
 
-#: ../src/mail/e-mail-reader.c:2180 ../src/mail/e-mail-reader.c:2187
+#: ../src/mail/e-mail-reader.c:2185 ../src/mail/e-mail-reader.c:2192
 #: ../src/modules/mail/e-mail-attachment-handler.c:439
 msgid "Forward the selected message in the body of a new message"
 msgstr "Videresend den valgte meldingen i kroppen av en ny melding"
 
-#: ../src/mail/e-mail-reader.c:2185
+#: ../src/mail/e-mail-reader.c:2190
 msgid "Forward As _Inline"
 msgstr "V_ideresend som vedlegg"
 
-#: ../src/mail/e-mail-reader.c:2192
+#: ../src/mail/e-mail-reader.c:2197
 #: ../src/modules/mail/e-mail-attachment-handler.c:444
 msgid "_Quoted"
 msgstr "_Sitert"
 
-#: ../src/mail/e-mail-reader.c:2194 ../src/mail/e-mail-reader.c:2201
+#: ../src/mail/e-mail-reader.c:2199 ../src/mail/e-mail-reader.c:2206
 #: ../src/modules/mail/e-mail-attachment-handler.c:446
 msgid "Forward the selected message quoted like a reply"
 msgstr "Videresend den valgte meldingen sitert som et svar"
 
-#: ../src/mail/e-mail-reader.c:2199
+#: ../src/mail/e-mail-reader.c:2204
 msgid "Forward As _Quoted"
 msgstr "Videresend s_om sitat"
 
-#: ../src/mail/e-mail-reader.c:2206
+#: ../src/mail/e-mail-reader.c:2211
 msgid "_Load Images"
 msgstr "_Last bilder"
 
-#: ../src/mail/e-mail-reader.c:2208
+#: ../src/mail/e-mail-reader.c:2213
 msgid "Force images in HTML mail to be loaded"
 msgstr "Tvungen lasting av bilder i HTML e-post"
 
-#: ../src/mail/e-mail-reader.c:2213 ../src/mail/e-mail-reader.c:2603
+#: ../src/mail/e-mail-reader.c:2218 ../src/mail/e-mail-reader.c:2608
 msgid "_Ignore Subthread"
 msgstr "_Ignorer undertråd"
 
-#: ../src/mail/e-mail-reader.c:2215
+#: ../src/mail/e-mail-reader.c:2220
 msgid "Mark new mails in a subthread as read automatically"
 msgstr "Merk nye meldinger i en undertråd som lest automatisk"
 
-#: ../src/mail/e-mail-reader.c:2220 ../src/mail/e-mail-reader.c:2607
+#: ../src/mail/e-mail-reader.c:2225 ../src/mail/e-mail-reader.c:2612
 msgid "_Ignore Thread"
 msgstr "Overse _tråd"
 
-#: ../src/mail/e-mail-reader.c:2222
+#: ../src/mail/e-mail-reader.c:2227
 msgid "Mark new mails in this thread as read automatically"
 msgstr "Merk nye meldinger i denne tråden som lest automatisk"
 
-#: ../src/mail/e-mail-reader.c:2227
+#: ../src/mail/e-mail-reader.c:2232
 msgid "_Important"
 msgstr "V_iktig"
 
-#: ../src/mail/e-mail-reader.c:2229
+#: ../src/mail/e-mail-reader.c:2234
 msgid "Mark the selected messages as important"
 msgstr "Merk valgte meldinger som viktige"
 
-#: ../src/mail/e-mail-reader.c:2234
+#: ../src/mail/e-mail-reader.c:2239
 msgid "_Junk"
 msgstr "_Uønsket e-post"
 
-#: ../src/mail/e-mail-reader.c:2236
+#: ../src/mail/e-mail-reader.c:2241
 msgid "Mark the selected messages as junk"
 msgstr "Merk valgte meldinger som uønsket e-post"
 
-#: ../src/mail/e-mail-reader.c:2241
+#: ../src/mail/e-mail-reader.c:2246
 msgid "_Not Junk"
 msgstr "_Ikke uønsket e-post"
 
-#: ../src/mail/e-mail-reader.c:2243
+#: ../src/mail/e-mail-reader.c:2248
 msgid "Mark the selected messages as not being junk"
 msgstr "Merk valgte meldinger som ønsket e-post"
 
-#: ../src/mail/e-mail-reader.c:2248
+#: ../src/mail/e-mail-reader.c:2253
 msgid "_Read"
 msgstr "_Lest"
 
-#: ../src/mail/e-mail-reader.c:2250
+#: ../src/mail/e-mail-reader.c:2255
 msgid "Mark the selected messages as having been read"
 msgstr "Merk valgte meldinger som lest"
 
-#: ../src/mail/e-mail-reader.c:2255 ../src/mail/e-mail-reader.c:2627
+#: ../src/mail/e-mail-reader.c:2260 ../src/mail/e-mail-reader.c:2632
 msgid "Do not _Ignore Subthread"
 msgstr "Ikke _ignorer undertråd"
 
-#: ../src/mail/e-mail-reader.c:2257
+#: ../src/mail/e-mail-reader.c:2262
 msgid "Do not mark new mails in a subthread as read automatically"
 msgstr "Ikke merk nye meldinger i en undertråd som lest automatisk"
 
-#: ../src/mail/e-mail-reader.c:2262 ../src/mail/e-mail-reader.c:2631
+#: ../src/mail/e-mail-reader.c:2267 ../src/mail/e-mail-reader.c:2636
 msgid "Do not _Ignore Thread"
 msgstr "_Ikke ignorter tråd"
 
-#: ../src/mail/e-mail-reader.c:2264
+#: ../src/mail/e-mail-reader.c:2269
 msgid "Do not mark new mails in this thread as read automatically"
 msgstr "Ikke merk nye meldinger i denne tråden som lest automatisk"
 
-#: ../src/mail/e-mail-reader.c:2269
+#: ../src/mail/e-mail-reader.c:2274
 msgid "Uni_mportant"
 msgstr "_Ikke viktig"
 
-#: ../src/mail/e-mail-reader.c:2271
+#: ../src/mail/e-mail-reader.c:2276
 msgid "Mark the selected messages as unimportant"
 msgstr "Merk valgte meldinger som uviktige"
 
-#: ../src/mail/e-mail-reader.c:2276
+#: ../src/mail/e-mail-reader.c:2281
 msgid "_Unread"
 msgstr "_Ulest"
 
-#: ../src/mail/e-mail-reader.c:2278
+#: ../src/mail/e-mail-reader.c:2283
 msgid "Mark the selected messages as not having been read"
 msgstr "Merk valgte meldinger som ulest"
 
-#: ../src/mail/e-mail-reader.c:2283
+#: ../src/mail/e-mail-reader.c:2288
 #: ../src/modules/mail/e-mail-attachment-handler.c:416
 msgid "_Edit as New Message..."
 msgstr "R_ediger som ny melding …"
 
-#: ../src/mail/e-mail-reader.c:2285
+#: ../src/mail/e-mail-reader.c:2290
 #: ../src/modules/mail/e-mail-attachment-handler.c:418
 msgid "Open the selected messages in the composer for editing"
 msgstr "Åpne valgte meldinger i redigeringskomponenten"
 
-#: ../src/mail/e-mail-reader.c:2290
+#: ../src/mail/e-mail-reader.c:2295
 msgid "Compose _New Message"
 msgstr "Skriv _ny melding"
 
-#: ../src/mail/e-mail-reader.c:2292
+#: ../src/mail/e-mail-reader.c:2297
 msgid "Open a window for composing a mail message"
 msgstr "Åpne et vindu for å skrive en e-post melding"
 
-#: ../src/mail/e-mail-reader.c:2297
+#: ../src/mail/e-mail-reader.c:2302
 msgid "_Open in New Window"
 msgstr "_Åpne i _nytt vindu"
 
-#: ../src/mail/e-mail-reader.c:2299
+#: ../src/mail/e-mail-reader.c:2304
 msgid "Open the selected messages in a new window"
 msgstr "Åpne valgte meldinger i et nytt vindu"
 
-#: ../src/mail/e-mail-reader.c:2304
+#: ../src/mail/e-mail-reader.c:2309
 msgid "_Move to Folder..."
 msgstr "Fl_ytt til mappe …"
 
-#: ../src/mail/e-mail-reader.c:2306
+#: ../src/mail/e-mail-reader.c:2311
 msgid "Move selected messages to another folder"
 msgstr "Flytt valgte meldinger til en annen mappe"
 
-#: ../src/mail/e-mail-reader.c:2311
+#: ../src/mail/e-mail-reader.c:2316
 msgid "_Next Message"
 msgstr "_Neste melding"
 
-#: ../src/mail/e-mail-reader.c:2313
+#: ../src/mail/e-mail-reader.c:2318
 msgid "Display the next message"
 msgstr "Vis neste melding"
 
-#: ../src/mail/e-mail-reader.c:2318
+#: ../src/mail/e-mail-reader.c:2323
 msgid "Next _Important Message"
 msgstr "Neste v_iktige melding"
 
-#: ../src/mail/e-mail-reader.c:2320
+#: ../src/mail/e-mail-reader.c:2325
 msgid "Display the next important message"
 msgstr "Vis neste viktige melding"
 
-#: ../src/mail/e-mail-reader.c:2325
+#: ../src/mail/e-mail-reader.c:2330
 msgid "Next _Thread"
 msgstr "Neste _tråd"
 
-#: ../src/mail/e-mail-reader.c:2327
+#: ../src/mail/e-mail-reader.c:2332
 msgid "Display the next thread"
 msgstr "Vis neste tråd"
 
-#: ../src/mail/e-mail-reader.c:2332
+#: ../src/mail/e-mail-reader.c:2337
 msgid "Next _Unread Message"
 msgstr "Neste _uleste melding"
 
-#: ../src/mail/e-mail-reader.c:2334
+#: ../src/mail/e-mail-reader.c:2339
 msgid "Display the next unread message"
 msgstr "Vis neste uleste melding"
 
-#: ../src/mail/e-mail-reader.c:2339
+#: ../src/mail/e-mail-reader.c:2344
 msgid "_Previous Message"
 msgstr "_Forrige melding"
 
-#: ../src/mail/e-mail-reader.c:2341
+#: ../src/mail/e-mail-reader.c:2346
 msgid "Display the previous message"
 msgstr "Vis forrige melding"
 
-#: ../src/mail/e-mail-reader.c:2346
+#: ../src/mail/e-mail-reader.c:2351
 msgid "Pr_evious Important Message"
 msgstr "Forrig_e viktige melding"
 
-#: ../src/mail/e-mail-reader.c:2348
+#: ../src/mail/e-mail-reader.c:2353
 msgid "Display the previous important message"
 msgstr "Vis forrige viktige melding"
 
-#: ../src/mail/e-mail-reader.c:2353
+#: ../src/mail/e-mail-reader.c:2358
 msgid "Previous T_hread"
 msgstr "Forrige trå_d"
 
-#: ../src/mail/e-mail-reader.c:2355
+#: ../src/mail/e-mail-reader.c:2360
 msgid "Display the previous thread"
 msgstr "Vis forrige tråd"
 
-#: ../src/mail/e-mail-reader.c:2360
+#: ../src/mail/e-mail-reader.c:2365
 msgid "P_revious Unread Message"
 msgstr "Fo_rrige uleste melding"
 
-#: ../src/mail/e-mail-reader.c:2362
+#: ../src/mail/e-mail-reader.c:2367
 msgid "Display the previous unread message"
 msgstr "Vis forrige uleste melding"
 
-#: ../src/mail/e-mail-reader.c:2369
+#: ../src/mail/e-mail-reader.c:2374
 msgid "Print this message"
 msgstr "Skriv ut denne meldingen"
 
-#: ../src/mail/e-mail-reader.c:2376
+#: ../src/mail/e-mail-reader.c:2381
 msgid "Preview the message to be printed"
 msgstr "Forhåndsvis meldingen som skal skrives ut"
 
-#: ../src/mail/e-mail-reader.c:2381
+#: ../src/mail/e-mail-reader.c:2386
 #: ../src/modules/mail/e-mail-attachment-handler.c:451
 msgid "Re_direct"
 msgstr "Om_diriger"
 
-#: ../src/mail/e-mail-reader.c:2383
+#: ../src/mail/e-mail-reader.c:2388
 #: ../src/modules/mail/e-mail-attachment-handler.c:453
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Omdiriger (bounce) den valgte meldingen til noen"
 
-#: ../src/mail/e-mail-reader.c:2388
+#: ../src/mail/e-mail-reader.c:2393
 msgid "Remo_ve Attachments"
 msgstr "Fjern _vedlegg"
 
-#: ../src/mail/e-mail-reader.c:2390
+#: ../src/mail/e-mail-reader.c:2395
 msgid "Remove attachments"
 msgstr "Fjern vedlegg"
 
-#: ../src/mail/e-mail-reader.c:2395
+#: ../src/mail/e-mail-reader.c:2400
 msgid "Remove Du_plicate Messages"
 msgstr "Fjern du_plikatmeldinger"
 
-#: ../src/mail/e-mail-reader.c:2397
+#: ../src/mail/e-mail-reader.c:2402
 msgid "Checks selected messages for duplicates"
 msgstr "Sjekk valgte meldinger for duplikater"
 
-#: ../src/mail/e-mail-reader.c:2402 ../src/mail/mail.error.xml.h:28
+#: ../src/mail/e-mail-reader.c:2407 ../src/mail/mail.error.xml.h:28
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1477
 #: ../src/modules/mail/e-mail-attachment-handler.c:395
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: ../src/mail/e-mail-reader.c:2404
+#: ../src/mail/e-mail-reader.c:2409
 #: ../src/modules/mail/e-mail-attachment-handler.c:397
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "Skriv et svar til alle mottakere av den valgte meldingen"
 
-#: ../src/mail/e-mail-reader.c:2409 ../src/mail/mail.error.xml.h:26
+#: ../src/mail/e-mail-reader.c:2414 ../src/mail/mail.error.xml.h:26
 #: ../src/modules/mail/e-mail-attachment-handler.c:402
 msgid "Reply to _List"
 msgstr "Svar til _listen"
 
-#: ../src/mail/e-mail-reader.c:2411
+#: ../src/mail/e-mail-reader.c:2416
 #: ../src/modules/mail/e-mail-attachment-handler.c:404
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Skriv et svar til e-postlisten for den valgte meldingen"
 
-#: ../src/mail/e-mail-reader.c:2416
+#: ../src/mail/e-mail-reader.c:2421
 #: ../src/modules/mail/e-mail-attachment-handler.c:409
 msgid "_Reply to Sender"
 msgstr "Sva_r til avsender"
 
-#: ../src/mail/e-mail-reader.c:2418
+#: ../src/mail/e-mail-reader.c:2423
 #: ../src/modules/mail/e-mail-attachment-handler.c:411
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Skriv et svar til avsender av den valgte meldingen"
 
-#: ../src/mail/e-mail-reader.c:2423
+#: ../src/mail/e-mail-reader.c:2428
 msgid "_Save as mbox..."
 msgstr "Lagre _som mbox …"
 
-#: ../src/mail/e-mail-reader.c:2425
+#: ../src/mail/e-mail-reader.c:2430
 msgid "Save selected messages as an mbox file"
 msgstr "Lagre valgte meldinger som en mbox-fil"
 
-#: ../src/mail/e-mail-reader.c:2430
+#: ../src/mail/e-mail-reader.c:2435
 msgid "_Message Source"
 msgstr "_Meldingskilde"
 
-#: ../src/mail/e-mail-reader.c:2432
+#: ../src/mail/e-mail-reader.c:2437
 msgid "Show the raw email source of the message"
 msgstr "Vis e-post meldingen i sin råe form"
 
-#: ../src/mail/e-mail-reader.c:2444
+#: ../src/mail/e-mail-reader.c:2449
 msgid "_Undelete Message"
 msgstr "_Angre sletting av melding"
 
-#: ../src/mail/e-mail-reader.c:2446
+#: ../src/mail/e-mail-reader.c:2451
 msgid "Undelete the selected messages"
 msgstr "Angre sletting av valgte meldinger"
 
-#: ../src/mail/e-mail-reader.c:2451
+#: ../src/mail/e-mail-reader.c:2456
 msgid "_Normal Size"
 msgstr "_Normal størrelse"
 
-#: ../src/mail/e-mail-reader.c:2453
+#: ../src/mail/e-mail-reader.c:2458
 msgid "Reset the text to its original size"
 msgstr "Ta teksten tilbake til sin opprinnelige størrelse"
 
-#: ../src/mail/e-mail-reader.c:2458
+#: ../src/mail/e-mail-reader.c:2463
 msgid "_Zoom In"
 msgstr "_Zoom inn"
 
-#: ../src/mail/e-mail-reader.c:2460
+#: ../src/mail/e-mail-reader.c:2465
 msgid "Increase the text size"
 msgstr "Større tekst"
 
-#: ../src/mail/e-mail-reader.c:2467
+#: ../src/mail/e-mail-reader.c:2472
 msgid "Decrease the text size"
 msgstr "Mindre skrift"
 
-#: ../src/mail/e-mail-reader.c:2474
+#: ../src/mail/e-mail-reader.c:2479
 msgid "Cre_ate"
 msgstr "L_ag"
 
-#: ../src/mail/e-mail-reader.c:2481
+#: ../src/mail/e-mail-reader.c:2486
 msgid "Ch_aracter Encoding"
 msgstr "Tegn_koding"
 
-#: ../src/mail/e-mail-reader.c:2488
+#: ../src/mail/e-mail-reader.c:2493
 #: ../src/modules/mail/e-mail-attachment-handler.c:423
 msgid "F_orward As"
 msgstr "Videresend s_om"
 
-#: ../src/mail/e-mail-reader.c:2495
+#: ../src/mail/e-mail-reader.c:2500
 msgid "_Group Reply"
 msgstr "_Gruppesvar"
 
-#: ../src/mail/e-mail-reader.c:2502
+#: ../src/mail/e-mail-reader.c:2507
 msgid "_Go To"
 msgstr "_Gå til"
 
-#: ../src/mail/e-mail-reader.c:2509
+#: ../src/mail/e-mail-reader.c:2514
 msgid "Mar_k As"
 msgstr "Mer_k som"
 
-#: ../src/mail/e-mail-reader.c:2516
+#: ../src/mail/e-mail-reader.c:2521
 msgid "_Message"
 msgstr "_Melding"
 
-#: ../src/mail/e-mail-reader.c:2523
+#: ../src/mail/e-mail-reader.c:2528
 msgid "_Zoom"
 msgstr "_Zoom"
 
-#: ../src/mail/e-mail-reader.c:2533
+#: ../src/mail/e-mail-reader.c:2538
 msgid "Create a Search Folder from Mailing _List..."
 msgstr "Lag en søkemappe fra e-post_liste …"
 
-#: ../src/mail/e-mail-reader.c:2535
+#: ../src/mail/e-mail-reader.c:2540
 msgid "Create a search folder for this mailing list"
 msgstr "Lag en søkemappe for denne e-postlisten"
 
-#: ../src/mail/e-mail-reader.c:2540
+#: ../src/mail/e-mail-reader.c:2545
 msgid "Create a Search Folder from Recipien_ts..."
 msgstr "Lag en søkemappe fra mo_ttakere …"
 
-#: ../src/mail/e-mail-reader.c:2542
+#: ../src/mail/e-mail-reader.c:2547
 msgid "Create a search folder for these recipients"
 msgstr "Lag en søkemappe for disse mottakerene"
 
-#: ../src/mail/e-mail-reader.c:2547
+#: ../src/mail/e-mail-reader.c:2552
 msgid "Create a Search Folder from Sen_der..."
 msgstr "Lag en søkemappe fra avsen_der …"
 
-#: ../src/mail/e-mail-reader.c:2549
+#: ../src/mail/e-mail-reader.c:2554
 msgid "Create a search folder for this sender"
 msgstr "Lag en søkemappe for denne avsenderen"
 
-#: ../src/mail/e-mail-reader.c:2554
+#: ../src/mail/e-mail-reader.c:2559
 msgid "Create a Search Folder from S_ubject..."
 msgstr "Lag en søkemappe fra _emne …"
 
-#: ../src/mail/e-mail-reader.c:2556
+#: ../src/mail/e-mail-reader.c:2561
 msgid "Create a search folder for this subject"
 msgstr "Lag en søkemappe for dette emnet"
 
-#: ../src/mail/e-mail-reader.c:2595
+#: ../src/mail/e-mail-reader.c:2600
 msgid "Mark for Follo_w Up..."
 msgstr "Merk for oppføl_ging …"
 
-#: ../src/mail/e-mail-reader.c:2611
+#: ../src/mail/e-mail-reader.c:2616
 msgid "Mark as _Important"
 msgstr "Merk som v_iktig"
 
-#: ../src/mail/e-mail-reader.c:2615
+#: ../src/mail/e-mail-reader.c:2620
 msgid "Mark as _Junk"
 msgstr "Merk som _uønsket e-post"
 
-#: ../src/mail/e-mail-reader.c:2619
+#: ../src/mail/e-mail-reader.c:2624
 msgid "Mark as _Not Junk"
 msgstr "Merk som _gyldig melding"
 
-#: ../src/mail/e-mail-reader.c:2623
+#: ../src/mail/e-mail-reader.c:2628
 msgid "Mar_k as Read"
 msgstr "Mer_k som lest"
 
-#: ../src/mail/e-mail-reader.c:2635
+#: ../src/mail/e-mail-reader.c:2640
 msgid "Mark as Uni_mportant"
 msgstr "_Merk som uviktig"
 
-#: ../src/mail/e-mail-reader.c:2639
+#: ../src/mail/e-mail-reader.c:2644
 msgid "Mark as _Unread"
 msgstr "Merk som _ulest"
 
-#: ../src/mail/e-mail-reader.c:2683
+#: ../src/mail/e-mail-reader.c:2688
 msgid "_Caret Mode"
 msgstr "Markør_modus"
 
-#: ../src/mail/e-mail-reader.c:2685
+#: ../src/mail/e-mail-reader.c:2690
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Vis en blinkende markør i kroppen av meldinger som vises"
 
-#: ../src/mail/e-mail-reader.c:2691
+#: ../src/mail/e-mail-reader.c:2696
 msgid "All Message _Headers"
 msgstr "Alle meldings_hoder"
 
-#: ../src/mail/e-mail-reader.c:2693
+#: ../src/mail/e-mail-reader.c:2698
 msgid "Show messages with all email headers"
 msgstr "Vis meldinger med alle meldingshoder"
 
-#: ../src/mail/e-mail-reader.c:3222
+#: ../src/mail/e-mail-reader.c:3227
 msgid "Retrieving message"
 msgstr "Henter melding"
 
-#: ../src/mail/e-mail-reader.c:4272
+#: ../src/mail/e-mail-reader.c:4286
 #: ../src/modules/mail/e-mail-attachment-handler.c:388
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: ../src/mail/e-mail-reader.c:4273
+#: ../src/mail/e-mail-reader.c:4287
 #: ../src/modules/mail/e-mail-attachment-handler.c:390
 msgid "Forward the selected message to someone"
 msgstr "Videresend den valgte meldingen til noen"
@@ -17176,52 +17413,52 @@ msgstr "Videresend den valgte meldingen til noen"
 #. * (if possible and if that configuration option is enabled), or else
 #. * it will reply to all. The word "Group" was chosen because it covers
 #. * either of those, without too strongly implying one or the other.
-#: ../src/mail/e-mail-reader.c:4292
+#: ../src/mail/e-mail-reader.c:4306
 msgid "Group Reply"
 msgstr "Gruppesvar"
 
-#: ../src/mail/e-mail-reader.c:4293
+#: ../src/mail/e-mail-reader.c:4307
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "Svar til e-postlisten eller til alle mottakere"
 
-#: ../src/mail/e-mail-reader.c:4359 ../src/mail/filtertypes.xml.in.h:67
+#: ../src/mail/e-mail-reader.c:4373 ../src/mail/filtertypes.xml.in.h:67
 msgid "Delete"
 msgstr "Slett"
 
-#: ../src/mail/e-mail-reader.c:4371
+#: ../src/mail/e-mail-reader.c:4385
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1281
 msgid "Next"
 msgstr "Neste"
 
-#: ../src/mail/e-mail-reader.c:4375
+#: ../src/mail/e-mail-reader.c:4389
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1274
 msgid "Previous"
 msgstr "Forrige"
 
-#: ../src/mail/e-mail-reader.c:4384 ../src/mail/mail-dialogs.ui.h:9
+#: ../src/mail/e-mail-reader.c:4398 ../src/mail/mail-dialogs.ui.h:9
 msgid "Reply"
 msgstr "Svar"
 
-#: ../src/mail/e-mail-reader.c:5457
+#: ../src/mail/e-mail-reader.c:5448
 #, c-format
 msgid "Allow remote content for anyone from %s"
 msgstr "Tillat eksternt innhold for alle fra %s"
 
-#: ../src/mail/e-mail-reader.c:5459
+#: ../src/mail/e-mail-reader.c:5450
 #, c-format
 msgid "Allow remote content for %s"
 msgstr "Tillat eksternt innhold for %s"
 
-#: ../src/mail/e-mail-reader.c:5476
+#: ../src/mail/e-mail-reader.c:5467
 #, c-format
 msgid "Allow remote content from %s"
 msgstr "Tillat eksternt innhold fra %s"
 
-#: ../src/mail/e-mail-reader.c:5493
+#: ../src/mail/e-mail-reader.c:5484
 msgid "Do not show this message again"
 msgstr "Ikke vis denne meldingen igjen"
 
-#: ../src/mail/e-mail-reader.c:5541
+#: ../src/mail/e-mail-reader.c:5536
 msgid "Load remote content"
 msgstr "Last eksternt innhold"
 
@@ -17293,7 +17530,7 @@ msgid_plural "Messages"
 msgstr[0] "Melding"
 msgstr[1] "Meldinger"
 
-#: ../src/mail/e-mail-reader-utils.c:3248
+#: ../src/mail/e-mail-reader-utils.c:3271
 msgid "Parsing message"
 msgstr "Leser melding"
 
@@ -17380,16 +17617,23 @@ msgstr "---------Videresendt melding-------"
 msgid "-----Original Message-----"
 msgstr "-----Opprinnelig melding-----"
 
-#: ../src/mail/em-composer-utils.c:3102
+#. Translators: This is a reply attribution in the message reply subject. The %s is replaced with the 
subject of the original message. Both 'Re'-s in the 'reply-attribution' translation context should translate 
into the same string, the same as the ':' separator.
+#: ../src/mail/em-composer-utils.c:2565
+#, c-format
+msgctxt "reply-attribution"
+msgid "Re: %s"
+msgstr "Re: %s"
+
+#: ../src/mail/em-composer-utils.c:3111
 msgid "an unknown sender"
 msgstr "en ukjent avsender"
 
 #. FIXME GTK_WINDOW (composer)
-#: ../src/mail/em-composer-utils.c:3580
+#: ../src/mail/em-composer-utils.c:3589
 msgid "Posting destination"
 msgstr "Destinasjon for post"
 
-#: ../src/mail/em-composer-utils.c:3585
+#: ../src/mail/em-composer-utils.c:3594
 msgid "Choose folders to post the message to."
 msgstr "Velg mapper meldingen skal postes til."
 
@@ -17397,12 +17641,16 @@ msgstr "Velg mapper meldingen skal postes til."
 msgid "Select Folder"
 msgstr "Velg mappe"
 
+#: ../src/mail/em-filter-rule.c:610
+msgid "Rul_e type:"
+msgstr "Regel_type:"
+
 #. and now for the action area
-#: ../src/mail/em-filter-rule.c:595
+#: ../src/mail/em-filter-rule.c:632
 msgid "Then"
 msgstr "Så etter"
 
-#: ../src/mail/em-filter-rule.c:660
+#: ../src/mail/em-filter-rule.c:697
 msgid "Add Ac_tion"
 msgstr "Legg til hand_ling"
 
@@ -17495,7 +17743,7 @@ msgstr "Etikett"
 msgid "AutoArchive"
 msgstr "Automatisk arkivering"
 
-#: ../src/mail/em-folder-properties.c:1076 ../src/mail/mail-config.ui.h:120
+#: ../src/mail/em-folder-properties.c:1076 ../src/mail/mail-config.ui.h:121
 #: ../src/mail/message-list.etspec.h:19
 msgid "Labels"
 msgstr "Etiketter"
@@ -17548,22 +17796,22 @@ msgstr "%s (%u%s)"
 msgid "Mail Folder Tree"
 msgstr "Tre for e-postmapper"
 
-#: ../src/mail/em-folder-tree.c:2279 ../src/mail/em-folder-utils.c:83
+#: ../src/mail/em-folder-tree.c:2279
 #, c-format
 msgid "Moving folder %s"
 msgstr "Flytter mappe %s"
 
-#: ../src/mail/em-folder-tree.c:2282 ../src/mail/em-folder-utils.c:85
+#: ../src/mail/em-folder-tree.c:2282
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopierer mappe %s"
 
-#: ../src/mail/em-folder-tree.c:2289 ../src/mail/message-list.c:2509
+#: ../src/mail/em-folder-tree.c:2289 ../src/mail/message-list.c:2555
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Flytter meldinger til mappe %s"
 
-#: ../src/mail/em-folder-tree.c:2293 ../src/mail/message-list.c:2511
+#: ../src/mail/em-folder-tree.c:2293 ../src/mail/message-list.c:2557
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopierer meldinger til mappe %s"
@@ -17584,112 +17832,132 @@ msgstr "UTEN TREFF"
 msgid "Loading..."
 msgstr "Laster …"
 
-#: ../src/mail/em-folder-utils.c:502
+#: ../src/mail/em-folder-utils.c:111
+#, c-format
+msgid "Moving folder “%s”"
+msgstr "Flytter mappe «%s»"
+
+#: ../src/mail/em-folder-utils.c:113
+#, c-format
+msgid "Copying folder “%s”"
+msgstr "Kopierer mappe «%s»"
+
+#: ../src/mail/em-folder-utils.c:252
+#, c-format
+msgid "Moving folder “%s” (%d/%d)"
+msgstr "Flytter mappe «%s» (%d/%d)"
+
+#: ../src/mail/em-folder-utils.c:252
+#, c-format
+msgid "Copying folder “%s” (%d/%d)"
+msgstr "Kopierer mappe «%s» (%d/%d)"
+
+#: ../src/mail/em-folder-utils.c:569
 msgid "Move Folder To"
 msgstr "Flytt mappe til"
 
-#: ../src/mail/em-folder-utils.c:502
+#: ../src/mail/em-folder-utils.c:569
 msgid "Copy Folder To"
 msgstr "Kopier mappe til"
 
-#: ../src/mail/em-subscription-editor.c:855
+#: ../src/mail/em-subscription-editor.c:813
 msgid "_Subscribe"
 msgstr "A_bonner"
 
-#: ../src/mail/em-subscription-editor.c:864
+#: ../src/mail/em-subscription-editor.c:822
 msgid "Su_bscribe To Shown"
 msgstr "Abonner på innhold som vises"
 
-#: ../src/mail/em-subscription-editor.c:872
+#: ../src/mail/em-subscription-editor.c:830
 msgid "Subscribe To _All"
 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/mail/em-subscription-editor.c:935
+#: ../src/mail/em-subscription-editor.c:1886 ../src/mail/mail.error.xml.h:73
 #: ../src/modules/mail/e-mail-shell-view-actions.c:1751
 msgid "_Unsubscribe"
 msgstr "_Fjern abonnement"
 
-#: ../src/mail/em-subscription-editor.c:979
+#: ../src/mail/em-subscription-editor.c:944
 msgid "Unsu_bscribe From Hidden"
 msgstr "_Fjern abonnement på skjulte"
 
-#: ../src/mail/em-subscription-editor.c:987
+#: ../src/mail/em-subscription-editor.c:952
 msgid "Unsubscribe From _All"
 msgstr "Fjern abonnement på _alle"
 
-#: ../src/mail/em-subscription-editor.c:1339
-#: ../src/modules/mail/e-mail-shell-view-private.c:942
-#: ../src/modules/mail/e-mail-shell-view-private.c:974
-#: ../src/modules/mail/e-mail-shell-view-private.c:1018
+#: ../src/mail/em-subscription-editor.c:1311
+#: ../src/modules/mail/e-mail-shell-view-private.c:936
+#: ../src/modules/mail/e-mail-shell-view-private.c:968
+#: ../src/modules/mail/e-mail-shell-view-private.c:1012
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d ulest, "
 msgstr[1] "%d uleste, "
 
-#: ../src/mail/em-subscription-editor.c:1343
-#: ../src/modules/mail/e-mail-shell-view-private.c:1028
+#: ../src/mail/em-subscription-editor.c:1315
+#: ../src/modules/mail/e-mail-shell-view-private.c:1022
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d totalt"
 msgstr[1] "%d totalt"
 
-#: ../src/mail/em-subscription-editor.c:1755
+#: ../src/mail/em-subscription-editor.c:1727
 msgid "Folder Subscriptions"
 msgstr "Abonnement på mapper"
 
-#: ../src/mail/em-subscription-editor.c:1790
+#: ../src/mail/em-subscription-editor.c:1762
 msgid "_Account:"
 msgstr "K_onto:"
 
-#: ../src/mail/em-subscription-editor.c:1803
+#: ../src/mail/em-subscription-editor.c:1775
 msgid "Clear Search"
 msgstr "Tøm søk"
 
-#: ../src/mail/em-subscription-editor.c:1820
+#: ../src/mail/em-subscription-editor.c:1792
 msgid "Sho_w items that contain:"
 msgstr "_Vis oppføringer som inneholder:"
 
-#: ../src/mail/em-subscription-editor.c:1867
+#: ../src/mail/em-subscription-editor.c:1839
 msgid "Subscribe to the selected folder"
 msgstr "Abonner på valgt mappe"
 
-#: ../src/mail/em-subscription-editor.c:1868
+#: ../src/mail/em-subscription-editor.c:1840
 msgid "Su_bscribe"
 msgstr "A_bonner"
 
-#: ../src/mail/em-subscription-editor.c:1913
+#: ../src/mail/em-subscription-editor.c:1885
 #: ../src/modules/mail/e-mail-shell-view-actions.c:1753
 msgid "Unsubscribe from the selected folder"
 msgstr "Fjern abonnement på valgt mappe"
 
-#: ../src/mail/em-subscription-editor.c:1953
+#: ../src/mail/em-subscription-editor.c:1925
 msgid "Collapse all folders"
 msgstr "Slå sammen alle mapper"
 
-#: ../src/mail/em-subscription-editor.c:1954
+#: ../src/mail/em-subscription-editor.c:1926
 msgid "C_ollapse All"
 msgstr "Slå sammen _alle"
 
-#: ../src/mail/em-subscription-editor.c:1964
+#: ../src/mail/em-subscription-editor.c:1936
 msgid "Expand all folders"
 msgstr "Utvid alle mapper"
 
-#: ../src/mail/em-subscription-editor.c:1965
+#: ../src/mail/em-subscription-editor.c:1937
 msgid "E_xpand All"
 msgstr "Ut_vid alle"
 
-#: ../src/mail/em-subscription-editor.c:1975
+#: ../src/mail/em-subscription-editor.c:1947
 msgid "Refresh the folder list"
 msgstr "Oppdater mappelisten"
 
-#: ../src/mail/em-subscription-editor.c:1987
+#: ../src/mail/em-subscription-editor.c:1959
 msgid "Stop the current operation"
 msgstr "Stopp aktiv operasjon"
 
-#: ../src/mail/em-subscription-editor.c:1988
+#: ../src/mail/em-subscription-editor.c:1960
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1005
 msgid "_Stop"
 msgstr "_Stopp"
@@ -17714,7 +17982,19 @@ msgstr "Meldingsfiltre"
 msgid "Messages from %s"
 msgstr "Meldinger fra %s"
 
-#: ../src/mail/em-utils.c:1764
+#. Translators: This is a reply attribution in the message reply subject. Both 'Re'-s in the 
'reply-attribution' translation context should translate into the same string.
+#: ../src/mail/em-utils.c:1503
+msgctxt "reply-attribution"
+msgid "Re"
+msgstr "Re"
+
+#. Translators: This is a reply attribution separator in the message reply subject. This should match the 
':' in 'Re: %s' in the 'reply-attribution' translation context.
+#: ../src/mail/em-utils.c:1506
+msgctxt "reply-attribution"
+msgid ":"
+msgstr ":"
+
+#: ../src/mail/em-utils.c:1792
 msgid "Deleting old messages"
 msgstr "Sletter gamle meldinger"
 
@@ -17905,7 +18185,7 @@ msgstr "Viktig"
 msgid "Read"
 msgstr "Les"
 
-#: ../src/mail/filtertypes.xml.in.h:41 ../src/mail/mail-config.ui.h:134
+#: ../src/mail/filtertypes.xml.in.h:41 ../src/mail/mail-config.ui.h:135
 #: ../src/mail/vfoldertypes.xml.in.h:44
 msgid "Junk"
 msgstr "Uønsket e-post"
@@ -18117,7 +18397,7 @@ msgid "Import mail and contacts from KMail."
 msgstr "Importer e-post og kontakter fra KMail."
 
 #: ../src/mail/importers/kmail-libs.c:150
-#: ../src/modules/mail/e-mail-shell-view-private.c:1049
+#: ../src/modules/mail/e-mail-shell-view-private.c:1043
 msgid "Trash"
 msgstr "Papirkurv"
 
@@ -18184,7 +18464,7 @@ msgstr "Legg til filterregel"
 #. * folder. For more than one filter rule is each of
 #. * them on a separate line, with four spaces in front
 #. * of its name, without quotes.
-#: ../src/mail/mail-autofilter.c:509
+#: ../src/mail/mail-autofilter.c:551
 #, c-format
 msgid ""
 "The filter rule “%s” has been modified to account for the deleted folder\n"
@@ -18201,6 +18481,10 @@ msgstr[1] ""
 "%s ble oppdatert fordi de brukte en mappe som ble slettet\n"
 "«%s»."
 
+#: ../src/mail/mail-autofilter.c:559
+msgid "Open Message Filters"
+msgstr "Åpne meldingsfiltre"
+
 #: ../src/mail/mail-config.ui.h:1
 msgid "Set custom junk header"
 msgstr "Sett egendefinert meldingshode for uønsket e-post"
@@ -18473,7 +18757,7 @@ msgid "Highlight _quotations with"
 msgstr "_Merk sitering med"
 
 #: ../src/mail/mail-config.ui.h:95
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:62
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:63
 msgid "Pick a color"
 msgstr "Velg en farge"
 
@@ -18510,127 +18794,133 @@ msgid "Confirm when emptying a _Junk folder"
 msgstr "_Bekreft ved tømming av en søppelpostmappe"
 
 #: ../src/mail/mail-config.ui.h:104
+#, fuzzy
+#| msgid "Go to the section %s of the message"
+msgid "Go to the previ_ous message after message deletion"
+msgstr "Gå til %s-del av meldingen"
+
+#: ../src/mail/mail-config.ui.h:105
 msgid "Archive Mail"
 msgstr "Arkiver e-post"
 
-#: ../src/mail/mail-config.ui.h:105
+#: ../src/mail/mail-config.ui.h:106
 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:106
+#: ../src/mail/mail-config.ui.h:107
 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:108
+#: ../src/mail/mail-config.ui.h:109
 msgid "_Show animated images"
 msgstr "Vi_s animerte bilder"
 
-#: ../src/mail/mail-config.ui.h:109
+#: ../src/mail/mail-config.ui.h:110
 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:110
+#: ../src/mail/mail-config.ui.h:111
 msgid "Loading Remote Content"
 msgstr "Laster eksternt innhold"
 
-#: ../src/mail/mail-config.ui.h:111
+#: ../src/mail/mail-config.ui.h:112
 msgid "_Never load remote content from the Internet"
 msgstr "Aldri last _ned eksternt innhold fra internett"
 
-#: ../src/mail/mail-config.ui.h:112
+#: ../src/mail/mail-config.ui.h:113
 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:113
+#: ../src/mail/mail-config.ui.h:114
 msgid "_Always load remote content from the Internet"
 msgstr "_Alltid last ned eksternt innhold fra internett"
 
-#: ../src/mail/mail-config.ui.h:114
+#: ../src/mail/mail-config.ui.h:115
 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
+#: ../src/mail/mail-config.ui.h:116
 msgid "Add"
 msgstr "Legg til"
 
-#: ../src/mail/mail-config.ui.h:116
+#: ../src/mail/mail-config.ui.h:117
 msgid "Remove"
 msgstr "Fjern"
 
-#: ../src/mail/mail-config.ui.h:117
+#: ../src/mail/mail-config.ui.h:118
 msgid "Allow for sites:"
 msgstr "Tillat for nettsteder:"
 
-#: ../src/mail/mail-config.ui.h:118
+#: ../src/mail/mail-config.ui.h:119
 msgid "Allow for senders:"
 msgstr "Tillat for avsendere:"
 
-#: ../src/mail/mail-config.ui.h:119
+#: ../src/mail/mail-config.ui.h:120
 msgid "HTML Messages"
 msgstr "HTML-meldinger"
 
-#: ../src/mail/mail-config.ui.h:121
+#: ../src/mail/mail-config.ui.h:122
 msgid "Sender Photograph"
 msgstr "Bilde av avsender"
 
-#: ../src/mail/mail-config.ui.h:122
+#: ../src/mail/mail-config.ui.h:123
 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:123
+#: ../src/mail/mail-config.ui.h:124
 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:124
+#: ../src/mail/mail-config.ui.h:125
 msgid "Displayed Message Headers"
 msgstr "Viste meldingshoder"
 
-#: ../src/mail/mail-config.ui.h:125
+#: ../src/mail/mail-config.ui.h:126
 msgid "Mail Headers Table"
 msgstr "Tabell med meldingshoder"
 
-#: ../src/mail/mail-config.ui.h:126
+#: ../src/mail/mail-config.ui.h:127
 #: ../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:128
+#: ../src/mail/mail-config.ui.h:129
 msgid "Check incoming _messages for junk"
 msgstr "Sjekk om innkommende _meldinger er uønsket"
 
-#: ../src/mail/mail-config.ui.h:129
+#: ../src/mail/mail-config.ui.h:130
 msgid "_Delete junk messages"
 msgstr "_Slett uønskede meldinger"
 
-#: ../src/mail/mail-config.ui.h:130
+#: ../src/mail/mail-config.ui.h:131
 msgid "Junk Test Options"
 msgstr "Alternativer for test av søppelpost"
 
-#: ../src/mail/mail-config.ui.h:131
+#: ../src/mail/mail-config.ui.h:132
 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:132
+#: ../src/mail/mail-config.ui.h:133
 msgid "_Lookup in local address book only"
 msgstr "S_lå kun opp i lokale adressebokmapper"
 
-#: ../src/mail/mail-config.ui.h:133
+#: ../src/mail/mail-config.ui.h:134
 msgid "Check cu_stom headers for junk"
 msgstr "_Sjekk egendefinerte meldingshoder for uønsket e-post"
 
-#: ../src/mail/mail-config.ui.h:135
+#: ../src/mail/mail-config.ui.h:136
 #: ../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:136
+#: ../src/mail/mail-config.ui.h:137
 msgid "TLS encryption"
 msgstr "TLS-kryptering"
 
-#: ../src/mail/mail-config.ui.h:137
+#: ../src/mail/mail-config.ui.h:138
 msgid "SSL encryption"
 msgstr "SSL-kryptering"
 
@@ -19643,42 +19933,50 @@ msgstr "_Tøm søppelpost"
 msgid "Failed to empty Junk folder “{0}”"
 msgstr "Klarte ikke å tømme søppelpostmappe «{0}»"
 
-#: ../src/mail/mail-send-recv.c:192
+#: ../src/mail/mail-send-recv.c:193
 msgid "Canceling..."
 msgstr "Avbryter …"
 
-#: ../src/mail/mail-send-recv.c:640
+#: ../src/mail/mail-send-recv.c:581
+msgid "Edit Message"
+msgstr "Rediger melding"
+
+#: ../src/mail/mail-send-recv.c:586
+msgid "Open Outbox Folder"
+msgstr "Åpne utboksmappe"
+
+#: ../src/mail/mail-send-recv.c:760
 msgid "Send & Receive Mail"
 msgstr "Send & motta e-post"
 
-#: ../src/mail/mail-send-recv.c:654
+#: ../src/mail/mail-send-recv.c:774
 msgid "Cancel _All"
 msgstr "Avbryt _alle"
 
-#: ../src/mail/mail-send-recv.c:744 ../src/mail/mail-send-recv.c:1262
+#: ../src/mail/mail-send-recv.c:864 ../src/mail/mail-send-recv.c:1396
 msgid "Updating..."
 msgstr "Oppdaterer …"
 
-#: ../src/mail/mail-send-recv.c:744 ../src/mail/mail-send-recv.c:826
+#: ../src/mail/mail-send-recv.c:864 ../src/mail/mail-send-recv.c:946
 msgid "Waiting..."
 msgstr "Venter …"
 
-#: ../src/mail/mail-send-recv.c:1228
+#: ../src/mail/mail-send-recv.c:1362
 #, c-format
 msgid "Checking for new mail at “%s”"
 msgstr "Ser etter nye meldinger på «%s»"
 
-#: ../src/mail/mail-send-recv.c:1455
+#: ../src/mail/mail-send-recv.c:1589
 #, c-format
 msgid "Deleting junk and expunging trash at “%s”"
 msgstr "Sletter søppel og tømmer papirkurv ved «%s»"
 
-#: ../src/mail/mail-send-recv.c:1457
+#: ../src/mail/mail-send-recv.c:1591
 #, c-format
 msgid "Deleting junk at “%s”"
 msgstr "Sletter søppelpost ved «%s»"
 
-#: ../src/mail/mail-send-recv.c:1459
+#: ../src/mail/mail-send-recv.c:1593
 #, c-format
 msgid "Expunging trash at “%s”"
 msgstr "Tømmer papirkurv i «%s»"
@@ -19695,87 +19993,87 @@ msgstr "Rediger søkemappe"
 msgid "New Search Folder"
 msgstr "Ny søkemappe"
 
-#: ../src/mail/message-list.c:301
+#: ../src/mail/message-list.c:303
 msgid "Unseen"
 msgstr "Ulest"
 
-#: ../src/mail/message-list.c:302
+#: ../src/mail/message-list.c:304
 msgid "Seen"
 msgstr "Lest"
 
-#: ../src/mail/message-list.c:303
+#: ../src/mail/message-list.c:305
 msgid "Answered"
 msgstr "Besvart"
 
-#: ../src/mail/message-list.c:304
+#: ../src/mail/message-list.c:306
 msgid "Forwarded"
 msgstr "Videresendt"
 
-#: ../src/mail/message-list.c:305
+#: ../src/mail/message-list.c:307
 msgid "Multiple Unseen Messages"
 msgstr "Flere uleste meldinger"
 
-#: ../src/mail/message-list.c:306
+#: ../src/mail/message-list.c:308
 msgid "Multiple Messages"
 msgstr "Flere meldinger"
 
-#: ../src/mail/message-list.c:319
+#: ../src/mail/message-list.c:321
 msgid "Lowest"
 msgstr "Lavest"
 
-#: ../src/mail/message-list.c:320
+#: ../src/mail/message-list.c:322
 msgid "Lower"
 msgstr "Lavere"
 
-#: ../src/mail/message-list.c:324
+#: ../src/mail/message-list.c:326
 msgid "Higher"
 msgstr "Høyere"
 
-#: ../src/mail/message-list.c:325
+#: ../src/mail/message-list.c:327
 msgid "Highest"
 msgstr "Høyest"
 
-#: ../src/mail/message-list.c:471 ../src/mail/message-list.c:6297
+#: ../src/mail/message-list.c:473 ../src/mail/message-list.c:6407
 msgid "Generating message list"
 msgstr "Genererer meldingsliste"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../src/mail/message-list.c:2075
+#: ../src/mail/message-list.c:2077
 #: ../src/modules/itip-formatter/itip-view.c:267
 msgid "Today %l:%M %p"
 msgstr "I dag %l:%M %p"
 
-#: ../src/mail/message-list.c:2084
+#: ../src/mail/message-list.c:2086
 msgid "Yesterday %l:%M %p"
 msgstr "I går %l:%M %p"
 
-#: ../src/mail/message-list.c:2096
+#: ../src/mail/message-list.c:2098
 msgid "%a %l:%M %p"
 msgstr "%a %H.%M"
 
-#: ../src/mail/message-list.c:2104
+#: ../src/mail/message-list.c:2106
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H.%M"
 
-#: ../src/mail/message-list.c:2106
+#: ../src/mail/message-list.c:2108
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../src/mail/message-list.c:3063
+#: ../src/mail/message-list.c:3122
 msgid "Select all visible messages"
 msgstr "Velg alle synlige meldinger"
 
-#: ../src/mail/message-list.c:3782 ../src/mail/message-list.etspec.h:17
+#: ../src/mail/message-list.c:3853 ../src/mail/message-list.etspec.h:17
 msgid "Messages"
 msgstr "Meldinger"
 
 #. default follow-up flag name to use when clicked in the message list column
-#: ../src/mail/message-list.c:5207
+#: ../src/mail/message-list.c:5317
 msgid "Follow-up"
 msgstr "Følg opp"
 
-#: ../src/mail/message-list.c:6236
+#: ../src/mail/message-list.c:6346
 msgid ""
 "No message satisfies your search criteria. Change search criteria by "
 "selecting a new Show message filter from the drop down list above or by "
@@ -19787,7 +20085,7 @@ msgstr ""
 "starte et nytt søk enten ved å tømme det med Søk->Tøm menyoppføringen eller "
 "ved å endre spørringen over."
 
-#: ../src/mail/message-list.c:6244
+#: ../src/mail/message-list.c:6354
 msgid "There are no messages in this folder."
 msgstr "Det er ingen meldinger i denne mappen."
 
@@ -19879,42 +20177,48 @@ msgstr "_E-post"
 msgid "C_alendar"
 msgstr "K_alender"
 
-#: ../src/modules/accounts-window/e-accounts-window-editors.c:428
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:476
 #: ../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/accounts-window/e-accounts-window-editors.c:484
 #: ../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/accounts-window/e-accounts-window-editors.c:532
 #: ../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/accounts-window/e-accounts-window-editors.c:536
 #: ../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/accounts-window/e-accounts-window-editors.c:540
 #: ../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/accounts-window/e-accounts-window-editors.c:544
 #: ../src/modules/calendar/e-task-shell-view-actions.c:274
 msgid "Task List Properties"
 msgstr "Egenskaper for oppgaveliste"
 
+#: ../src/modules/accounts-window/e-collection-wizard-page.c:75
+#: ../src/modules/accounts-window/e-collection-wizard-page.c:209
 #: ../src/modules/accounts-window/e-webdav-browser-page.c:174
 msgid "_Back"
 msgstr "Til_bake"
 
+#: ../src/modules/accounts-window/e-collection-wizard-page.c:78
+msgid "_Finish"
+msgstr "_Fullfør"
+
 #: ../src/modules/accounts-window/e-webdav-browser-page.c:195
 msgid "_Browse"
 msgstr "_Bla gjennom"
@@ -19923,11 +20227,13 @@ msgstr "_Bla gjennom"
 msgid ""
 "Browse a WebDAV (CalDAV or CardDAV) server and create, edit or delete "
 "address books, calendars, memo lists or task lists there"
-msgstr "Bla gjennom WebDAV (CalDAV eller CardDAV) tjenere og lag, rediger eller slett adressebøker, 
kalendere, notatlister eller oppgavelister der"
+msgstr ""
+"Bla gjennom WebDAV (CalDAV eller CardDAV) tjenere og lag, rediger eller "
+"slett adressebøker, kalendere, notatlister eller oppgavelister der"
 
 #. 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:124
-#: ../src/modules/mail/em-mailer-prefs.c:1562
+#: ../src/modules/mail/em-mailer-prefs.c:1568
 msgid "_Table column:"
 msgstr "Kolonne i _tabell:"
 
@@ -20310,40 +20616,40 @@ msgstr "Velg en fil som skal gjenopprettes"
 msgid "Restore from Backup"
 msgstr "Gjenopprett fra sikkerhetskopi"
 
-#: ../src/modules/backup-restore/evolution-backup-restore.c:285
+#: ../src/modules/backup-restore/evolution-backup-restore.c:304
 msgid "Select name of the Evolution backup file"
 msgstr "Velg navn på sikkerhetskopifilen for Evolution"
 
-#: ../src/modules/backup-restore/evolution-backup-restore.c:318
+#: ../src/modules/backup-restore/evolution-backup-restore.c:349
 msgid "_Restart Evolution after backup"
 msgstr "Sta_rt Evolution på nytt etter sikkerhetskopiering"
 
-#: ../src/modules/backup-restore/evolution-backup-restore.c:353
+#: ../src/modules/backup-restore/evolution-backup-restore.c:384
 msgid "Re_start Evolution after restore"
 msgstr "_Start Evolution på nytt etter gjenoppretting"
 
-#: ../src/modules/backup-restore/evolution-backup-restore.c:395
+#: ../src/modules/backup-restore/evolution-backup-restore.c:426
 msgid "Select name of the Evolution backup file to restore"
 msgstr "Velg navn på sikkerhetskopifil for Evolution som skal gjenopprettes"
 
-#: ../src/modules/backup-restore/evolution-backup-restore.c:404
+#: ../src/modules/backup-restore/evolution-backup-restore.c:435
 #, c-format
 msgid "Checking content of backup file “%s”, please wait..."
 msgstr "Sjekker innholdet i sikkerhetskopifilen «%s», vennligst vent …"
 
-#: ../src/modules/backup-restore/evolution-backup-restore.c:425
+#: ../src/modules/backup-restore/evolution-backup-restore.c:456
 msgid "_Back up Evolution Data..."
 msgstr "Ta si_kkerhetskopi av data for Evolution …"
 
-#: ../src/modules/backup-restore/evolution-backup-restore.c:427
+#: ../src/modules/backup-restore/evolution-backup-restore.c:458
 msgid "Back up Evolution data and settings to an archive file"
 msgstr "Sikkerhetskopier data og innstillinger for Evolution til en arkivfil"
 
-#: ../src/modules/backup-restore/evolution-backup-restore.c:432
+#: ../src/modules/backup-restore/evolution-backup-restore.c:463
 msgid "R_estore Evolution Data..."
 msgstr "Gjenopp_rett data for Evolution …"
 
-#: ../src/modules/backup-restore/evolution-backup-restore.c:434
+#: ../src/modules/backup-restore/evolution-backup-restore.c:465
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "Gjenopprett data og innstillinger fra en arkivfil"
 
@@ -20525,16 +20831,16 @@ msgid "Convert message text to _Unicode"
 msgstr "Konverter tekst i meldinger til _Unicode"
 
 #: ../src/modules/bogofilter/evolution-bogofilter.c:537
-#: ../src/modules/bogofilter/evolution-bogofilter.metainfo.xml.in.h:1
+#: ../src/modules/bogofilter/org.gnome.Evolution-bogofilter.metainfo.xml.in.h:1
 msgid "Bogofilter"
 msgstr "Bogofilter"
 
-#: ../src/modules/bogofilter/evolution-bogofilter.metainfo.xml.in.h:2
+#: ../src/modules/bogofilter/org.gnome.Evolution-bogofilter.metainfo.xml.in.h:2
 msgid "Junk filter using Bogofilter"
 msgstr "Søppelfilter bruker Bogofilter"
 
 #: ../src/modules/book-config-google/evolution-book-config-google.c:93
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:994
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:1045
 #: ../src/modules/cal-config-google/e-cal-config-google.c:190
 #: ../src/modules/cal-config-google/e-cal-config-gtasks.c:115
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:434
@@ -20542,73 +20848,79 @@ msgstr "Søppelfilter bruker Bogofilter"
 msgid "User name cannot be empty"
 msgstr "Brukernavn kan ikke være tomt"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:443
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:418
+#, fuzzy
+#| msgid "Searching for user home, please wait…"
+msgid "Looking up server search bases, please wait…"
+msgstr "Søker etter hjem for bruker. Vennligst vent …"
+
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:494
 msgid "Standard LDAP Port"
 msgstr "Standard LDAP-port"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:449
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:632
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:500
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:683
 msgid "LDAP over SSL/TLS (deprecated)"
 msgstr "LDAP over SSL/TLS (utfaset)"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:455
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:506
 msgid "Microsoft Global Catalog"
 msgstr "Microsoft Global Catalog"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:461
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:512
 msgid "Microsoft Global Catalog over SSL/TLS"
 msgstr "Microsoft Global Catalog over SSL/TLS"
 
 #. Page 1
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:568
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:619
 msgid "Connecting to LDAP"
 msgstr "Kobler til LDAP"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:585
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:636
 msgid "Server Information"
 msgstr "Tjenerinformasjon"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:612
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:663
 msgid "Port:"
 msgstr "Port:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:620
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:671
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:246
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:201
 msgid "Port number is not valid"
 msgstr "Portnummeret er ikke en gyldig"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:635
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:686
 msgid "StartTLS (recommended)"
 msgstr "StartTLS (anbefalt)"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:637
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:688
 msgid "Encryption:"
 msgstr "Kryptering:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:661
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:712
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:323
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:266
 msgid "Authentication"
 msgstr "Autentisering"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:684
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:735
 msgid "Anonymous"
 msgstr "Anonym"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:687
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:738
 msgid "Using email address"
 msgstr "Bruker e-postadresse"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:690
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:741
 msgid "Using distinguished name (DN)"
 msgstr "Bruk distinguished name (DN)"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:692
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:743
 msgid "Method:"
 msgstr "Metode:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:697
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:748
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to “Using email address” requires anonymous access to your LDAP "
@@ -20618,36 +20930,36 @@ msgstr ""
 "setter denne til «E-post-adresse» kreves anonym tilgang til din LDAP-tjener."
 
 #. Page 2
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:712
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:763
 msgid "Using LDAP"
 msgstr "Bruker LDAP"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:729
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:780
 #: ../src/modules/mail/e-mail-shell-view.c:118
 msgid "Searching"
 msgstr "Søker"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:751
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:802
 msgid "Search Base:"
 msgstr "Startnivå:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:755
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:806
 msgid "Find Possible Search Bases"
 msgstr "Finn mulige startnivå"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:777
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:828
 msgid "One Level"
 msgstr "Ett nivå"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:779
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:830
 msgid "Subtree"
 msgstr "Undertre"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:781
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:832
 msgid "Search Scope:"
 msgstr "Søkeområde:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:786
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:837
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the directory tree.  A search scope of “Subtree” will include all entries "
@@ -20659,27 +20971,27 @@ msgstr ""
 "din søkebase. Et søkeområde som «Ett nivå» vil kun ta med oppføringer ett "
 "nivå under startnivået."
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:795
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:846
 msgid "Search Filter:"
 msgstr "Søkefilter:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:807
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:858
 msgid "Downloading"
 msgstr "Laster ned"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:828
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:879
 msgid "Limit:"
 msgstr "Grense:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:839
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:890
 msgid "contacts"
 msgstr "kontakter"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:844
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:895
 msgid "Browse until limit is reached"
 msgstr "Bla gjennom til grensen nås"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:979
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:1030
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:415
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:451
 msgid "Server address cannot be empty"
@@ -20899,41 +21211,41 @@ msgstr "Valgt av notatliste"
 msgid "Task List Selector"
 msgstr "Valg av oppgaveliste"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:525
+#: ../src/modules/calendar/e-calendar-preferences.c:523
 msgid "Selected Calendars for Notifications of Reminders"
 msgstr "Valgte kalendere for varsling av påminnelser"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:532
+#: ../src/modules/calendar/e-calendar-preferences.c:530
 msgid "Selected Memo Lists for Notifications of Reminders"
 msgstr "Valgte notatlister for varsling av påminnelser"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:539
+#: ../src/modules/calendar/e-calendar-preferences.c:537
 msgid "Selected Task Lists for Notifications of Reminders"
 msgstr "Valgte oppgavelister for varsling av påminnelser"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:635
+#: ../src/modules/calendar/e-calendar-preferences.c:633
 msgid "Meeting Invitations"
 msgstr "Møteinvitasjoner"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:661
+#: ../src/modules/calendar/e-calendar-preferences.c:659
 msgid "_Delete message after acting"
 msgstr "_Slett melding etter utført handling"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:675
-#: ../src/modules/calendar/e-calendar-preferences.c:706
+#: ../src/modules/calendar/e-calendar-preferences.c:673
+#: ../src/modules/calendar/e-calendar-preferences.c:704
 msgid "Conflict Search"
 msgstr "Søk etter konflikter"
 
 #. Source selector
-#: ../src/modules/calendar/e-calendar-preferences.c:690
+#: ../src/modules/calendar/e-calendar-preferences.c:688
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Velg kalendere som skal gjennomsøkes for å finne møtekonflikter"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:1102
+#: ../src/modules/calendar/e-calendar-preferences.c:1114
 msgid "Ti_me and date:"
 msgstr "T_id og dato:"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:1103
+#: ../src/modules/calendar/e-calendar-preferences.c:1115
 msgid "_Date only:"
 msgstr "Kun _dato:"
 
@@ -21119,87 +21431,95 @@ msgid "Sc_roll Month View by a week"
 msgstr "_Rull månedsvisning en uke om gangen"
 
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:57
+msgid "Order days in Week View from _left to right"
+msgstr "Arranger dagene i ukevisning fra _venstre til høyre"
+
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:58
 msgid "Alerts"
 msgstr "Varsel"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:58
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:59
 msgid "_Ask for confirmation when deleting items"
 msgstr "Spør etter bekreftelse ved sletting _av oppføringer"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:59
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:60
 msgid "Display"
 msgstr "Vis"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:60
-msgid "Task List"
-msgstr "Oppgaveliste"
-
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:61
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:62
 msgid "Highlight t_asks due today"
 msgstr "Uthev oppg_aver som går ut i dag"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:63
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:64
 msgid "Highlight _overdue tasks"
 msgstr "Uthev utgåtte _oppgaver"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:64
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:65
 msgid "_Hide completed tasks after"
 msgstr "Sk_jul utførte oppgaver etter"
 
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:66
+msgid "To Do bar"
+msgstr "Oppgavelinje"
+
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:67
+msgid "Show Tasks without _Due date"
+msgstr "Vis oppgaver uten fer_dig-dato"
+
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:70
 msgid "Display reminders in _notification area only"
 msgstr "Vis alarmer kun i varsli_ngsområdet"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:68
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:71
 msgid "Keep reminder notification _window always on top"
 msgstr "Alltid vis _vindu for varsling av påminnelser øverst"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:69
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:72
 msgid "Display reminders for completed _tasks"
 msgstr "Vis påminnelser for f_ullførte oppgaver"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:70
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:73
 msgid "Display reminders for _past events"
 msgstr "Vis påminnelser for _tidligere hendelser"
 
 #. This is the first half of a user preference. "Set default reminder [time-period] before every new 
appointment"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:72
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:75
 msgid "Set _default reminder"
 msgstr "Sett _forvalgt verdi for påminnelse"
 
 #. This is the last half of a user preference. "Set default reminder [time-period] before every new 
appointment"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:74
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:77
 msgid "before every new appointment"
 msgstr "før hver nye avtale"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every 
anniversary/birthday"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:76
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:79
 msgid "Show a _reminder"
 msgstr "Vis en _påminnelse"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every 
anniversary/birthday"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:78
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:81
 msgid "before every anniversary/birthday"
 msgstr "før hvert jubileum/bursdag"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:79
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:82
 msgid "Default _snooze time (in minutes)"
 msgstr "Forvalgt _utsettelsestid (i minutter)"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:80
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:83
 msgid "Select the sources for reminder notification:"
 msgstr "Velg kilder for varsling av påminnelser:"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:84
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:87
 msgid "Default Free/Busy Server"
 msgstr "Forvalgt ledig/opptatt-tjener"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:87
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:90
 #, no-c-format
 msgid "%u and %d will be replaced by user and domain from the email address."
 msgstr "%u og %d vil bli erstattet av brukernavn og domene fra e-postadressen."
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:88
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:91
 msgid "Publishing Information"
 msgstr "Publiserer informasjon"
 
@@ -21987,21 +22307,78 @@ msgstr "Konverter til m_elding"
 msgid "Convert to the mail message"
 msgstr "Konverter til en e-postmelding"
 
+#: ../src/modules/config-lookup/e-gnome-config-lookup.c:67
+msgid "Look up e-mail domain on the GNOME server"
+msgstr "Slå opp e-postdomene på GNOME-tjeneren"
+
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:82
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:83
+msgid "Looking up IMAP server…"
+msgstr "Slår opp IMAP-tjener …"
+
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:84
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:85
+msgid "Looking up POP3 server…"
+msgstr "Slår opp POP3-tjener …"
+
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:86
+msgid "Looking up SMTP server…"
+msgstr "Slår opp SMTP-tjener …"
+
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:87
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:88
+#: ../src/modules/config-lookup/e-webdav-config-lookup.c:118
 msgid "CalDAV server"
 msgstr "CalDAV-tjener"
 
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:85
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:86
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:87
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:88
+msgid "Looking up CalDAV server…"
+msgstr "Slår opp CalDAV-tjener …"
+
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:89
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:90
+#: ../src/modules/config-lookup/e-webdav-config-lookup.c:118
 msgid "CardDAV server"
 msgstr "CardDAV-tjener"
 
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:87
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:88
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:89
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:90
+msgid "Looking up CardDAV server…"
+msgstr "Slår opp CardDAV-tjener …"
+
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:91
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:92
 msgid "LDAP server"
 msgstr "LDAP-tjener"
 
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:91
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:92
+msgid "Looking up LDAP server…"
+msgstr "Slår opp LDAP-tjener …"
+
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:234
+msgid "Look up in SRV records"
+msgstr "Slå opp i SRV-oppføringer"
+
+#: ../src/modules/config-lookup/e-webdav-config-lookup.c:104
+#, c-format
+msgid "CalDAV: %s"
+msgstr "CalDAV: %s"
+
+#: ../src/modules/config-lookup/e-webdav-config-lookup.c:111
+#, c-format
+msgid "CardDAV: %s"
+msgstr "CardDAV: %s"
+
+#: ../src/modules/config-lookup/e-webdav-config-lookup.c:117
+msgid "CalDAV and CardDAV server"
+msgstr "CalDAV og CardDAV-tjener"
+
+#: ../src/modules/config-lookup/e-webdav-config-lookup.c:209
+msgid "Look up for a CalDAV/CardDAV server"
+msgstr "Slå opp en CalDAV/CardDAV-tjener"
+
 #: ../src/modules/itip-formatter/e-mail-formatter-itip.c:162
 msgid "ITIP"
 msgstr "ITIP"
@@ -22810,12 +23187,6 @@ msgstr "Mbox e-postkatalog kan ikke være tom"
 msgid "Configuration"
 msgstr "Konfigurasjon"
 
-#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:216
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:172
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:24
-msgid "_Server:"
-msgstr "Tj_ener:"
-
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:230
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:185
 msgid "_Port:"
@@ -22953,38 +23324,38 @@ msgctxt "NetworkMonitor"
 msgid "networkmanager"
 msgstr "networkmanager"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:757
+#: ../src/modules/mail/e-mail-shell-backend.c:753
 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:766
+#: ../src/modules/mail/e-mail-shell-backend.c:762
 msgctxt "NetworkMonitor"
 msgid "Default"
 msgstr "Forvalgt"
 
 #. Always as the last
-#: ../src/modules/mail/e-mail-shell-backend.c:780
+#: ../src/modules/mail/e-mail-shell-backend.c:776
 msgctxt "NetworkMonitor"
 msgid "Always Online"
 msgstr "Alltid tilkoblet"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:849
+#: ../src/modules/mail/e-mail-shell-backend.c:845
 msgid "Mail Preferences"
 msgstr "Brukervalg for e-post"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:858
+#: ../src/modules/mail/e-mail-shell-backend.c:854
 msgid "Composer Preferences"
 msgstr "Brukervalg for redigering"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:867
+#: ../src/modules/mail/e-mail-shell-backend.c:863
 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:1220
+#: ../src/modules/mail/e-mail-shell-backend.c:1224
 msgctxt "label"
 msgid "None"
 msgstr "Ingen"
@@ -23365,58 +23736,58 @@ msgstr "Søk i alle konti"
 msgid "Account Search"
 msgstr "Søk i konto"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:935
+#: ../src/modules/mail/e-mail-shell-view-private.c:929
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d valgt, "
 msgstr[1] "%d valgt, "
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:950
-#: ../src/modules/mail/e-mail-shell-view-private.c:967
+#: ../src/modules/mail/e-mail-shell-view-private.c:944
+#: ../src/modules/mail/e-mail-shell-view-private.c:961
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d slettet"
 msgstr[1] "%d slettet"
 
+#: ../src/modules/mail/e-mail-shell-view-private.c:975
 #: ../src/modules/mail/e-mail-shell-view-private.c:981
-#: ../src/modules/mail/e-mail-shell-view-private.c:987
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d uønsket e-post"
 msgstr[1] "%d uønsket e-poster"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:994
+#: ../src/modules/mail/e-mail-shell-view-private.c:988
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d skisse"
 msgstr[1] "%d skisser"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:1000
+#: ../src/modules/mail/e-mail-shell-view-private.c:994
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d usendt"
 msgstr[1] "%d usendte"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:1006
+#: ../src/modules/mail/e-mail-shell-view-private.c:1000
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d sendt"
 msgstr[1] "%d sendt"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:1023
+#: ../src/modules/mail/e-mail-shell-view-private.c:1017
 #, c-format
 msgid "%d unread"
 msgid_plural "%d unread"
 msgstr[0] "%d ulest"
 msgstr[1] "%d uleste"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:1541
+#: ../src/modules/mail/e-mail-shell-view-private.c:1535
 msgid "Send / Receive"
 msgstr "Send / motta"
 
@@ -23477,11 +23848,11 @@ msgid "Contains Value"
 msgstr "Inneholder verdi"
 
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail 
message window/preview
-#: ../src/modules/mail/em-mailer-prefs.c:1564
+#: ../src/modules/mail/em-mailer-prefs.c:1570
 msgid "_Date header:"
 msgstr "_Datohode:"
 
-#: ../src/modules/mail/em-mailer-prefs.c:1565
+#: ../src/modules/mail/em-mailer-prefs.c:1571
 msgid "Show _original header value"
 msgstr "Vis _opprinnelig verdi for hode"
 
@@ -23698,11 +24069,11 @@ msgid "This will make SpamAssassin more reliable, but slower."
 msgstr "Dette vil gjøre SpamAssassin mer pålitelig, men tregere."
 
 #: ../src/modules/spamassassin/evolution-spamassassin.c:740
-#: ../src/modules/spamassassin/evolution-spamassassin.metainfo.xml.in.h:1
+#: ../src/modules/spamassassin/org.gnome.Evolution-spamassassin.metainfo.xml.in.h:1
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
-#: ../src/modules/spamassassin/evolution-spamassassin.metainfo.xml.in.h:2
+#: ../src/modules/spamassassin/org.gnome.Evolution-spamassassin.metainfo.xml.in.h:2
 msgid "Junk filter using SpamAssassin"
 msgstr "Søppelfilter bruker SpamAssassin"
 
@@ -24716,12 +25087,12 @@ msgstr "Lag et nytt møte fra den valgte meldingen"
 msgid "Convert a mail message to a task."
 msgstr "Konverter en e-postmelding til en oppgave."
 
-#: ../src/plugins/pst-import/evolution-pst.metainfo.xml.in.h:1
+#: ../src/plugins/pst-import/org.gnome.Evolution-pst.metainfo.xml.in.h:1
 #: ../src/plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
 msgid "Outlook PST import"
 msgstr "Outlook PST-import"
 
-#: ../src/plugins/pst-import/evolution-pst.metainfo.xml.in.h:2
+#: ../src/plugins/pst-import/org.gnome.Evolution-pst.metainfo.xml.in.h:2
 #: ../src/plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
 msgid "Import Outlook messages from PST file"
 msgstr "Importer Outlook-meldinger fra PST-fil"
@@ -24876,15 +25247,6 @@ msgstr "P_ort:"
 msgid "_Username:"
 msgstr "Br_ukernavn:"
 
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:29
-#: ../src/smime/gui/certificate-manager.c:785
-msgid "_Password:"
-msgstr "_Passord:"
-
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:30
-msgid "_Remember password"
-msgstr "Hu_sk passord"
-
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:31
 msgid "Publishing Location"
 msgstr "Plassering for publisering"



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