[evolution] Updated Norwegian bokmÃl translation

[Kjartan Maraas <kmaraas src gnome org>]

commit f083c6b589c6bb80f2af51006f616a91dcbbf979
Author: Kjartan Maraas <kmaraas gnome org>
Date:   Mon Nov 5 19:35:36 2012 +0100

    Updated Norwegian bokmÃl translation

 po/nb.po | 1779 +++++++++++++++++++++++++++++---------------------------------
 1 files changed, 833 insertions(+), 946 deletions(-)
---
diff --git a/po/nb.po b/po/nb.po
index c141d2c..41ff710 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -4,13 +4,13 @@
 # Kjartan Maraas <kmaraas gnome org>, 1998-2012.
 # Terance Edward Sola <terance lyse net>, 2005.
 # Torstein Adolf Winterseth <kvikende fsfe org>, 2010.
-#: ../shell/main.c:555
+#: ../shell/main.c:586
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution 3.5.x\n"
+"Project-Id-Version: evolution 3.7.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-28 07:25+0200\n"
-"PO-Revision-Date: 2012-08-28 07:26+0200\n"
+"POT-Creation-Date: 2012-11-05 19:30+0100\n"
+"PO-Revision-Date: 2012-11-05 19:35+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas gnome org>\n"
 "Language-Team: Norwegian bokmÃl <i18n-nb lister ping uio no>\n"
 "Language: Norsk bokmÃl\n"
@@ -320,7 +320,7 @@ msgstr "_Hjemmeside:"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
 #: ../calendar/gui/dialogs/event-page.c:722
 #: ../calendar/gui/dialogs/event-page.ui.h:22
-#: ../modules/itip-formatter/itip-view.c:1842
+#: ../modules/itip-formatter/itip-view.c:1858
 msgid "_Calendar:"
 msgstr "_Kalender:"
 
@@ -424,7 +424,7 @@ msgstr "Bryllupsdag"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:705
-#: ../calendar/gui/e-calendar-view.c:2149 ../shell/main.c:129
+#: ../calendar/gui/e-calendar-view.c:2149 ../shell/main.c:135
 msgid "Birthday"
 msgstr "FÃdselsdag"
 
@@ -465,7 +465,7 @@ msgstr "_Adresse:"
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:193
 #: ../addressbook/gui/widgets/eab-contact-display.c:399
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:75
-#: ../widgets/misc/e-contact-map.c:298
+#: ../widgets/misc/e-contact-map.c:306
 msgid "Home"
 msgstr "Hjemme"
 
@@ -474,7 +474,7 @@ msgstr "Hjemme"
 #: ../addressbook/gui/widgets/eab-contact-display.c:396
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:74
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:687
-#: ../widgets/misc/e-contact-map.c:306
+#: ../widgets/misc/e-contact-map.c:314
 msgid "Work"
 msgstr "Arbeid"
 
@@ -558,15 +558,15 @@ msgstr "Feil under fjerning av kontakt"
 msgid "Contact Editor - %s"
 msgstr "Kontaktredigering - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3411
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3450
 msgid "Please select an image for this contact"
 msgstr "Vennligst velg et bilde for denne kontakten"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3412
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3451
 msgid "_No image"
 msgstr "_Uten bilde"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3745
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3784
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -574,28 +574,28 @@ msgstr ""
 "Kontaktdata er ugyldig:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3751
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3790
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "Â%s har ugyldig format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3758
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3797
 #, c-format
 msgid "'%s' cannot be a future date"
 msgstr "Â%s kan ikke vÃre en dato i fremtiden"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3766
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3805
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%sÂ%s har ugyldig format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3779
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3793
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3818
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3832
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%sÂ%s er tom"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3808
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3847
 msgid "Invalid contact."
 msgstr "Ugyldig kontakt."
 
@@ -834,7 +834,7 @@ msgid "Send a mail message to this address"
 msgstr "Send en e-postmelding til denne adressen"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:333
-#: ../widgets/misc/e-web-view.c:1102 ../widgets/misc/e-web-view-gtkhtml.c:973
+#: ../widgets/misc/e-web-view.c:1097 ../widgets/misc/e-web-view-gtkhtml.c:973
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klikk for à sende melding til %s"
@@ -1540,7 +1540,7 @@ msgstr[1] "timer"
 #. * (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #: ../calendar/alarm-notify/alarm-notify-dialog.c:134
-#: ../calendar/gui/dialogs/recurrence-page.c:1195
+#: ../calendar/gui/dialogs/recurrence-page.c:1199
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dag"
@@ -1568,11 +1568,11 @@ msgid "_Dismiss"
 msgstr "_Lukk"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:5
-#: ../calendar/alarm-notify/alarm-queue.c:1755
-#: ../calendar/alarm-notify/alarm-queue.c:1765
+#: ../calendar/alarm-notify/alarm-queue.c:1757
+#: ../calendar/alarm-notify/alarm-queue.c:1767
 #: ../modules/cal-config-weather/evolution-cal-config-weather.c:191
-#: ../modules/itip-formatter/itip-view.c:1460
-#: ../modules/itip-formatter/itip-view.c:1569
+#: ../modules/itip-formatter/itip-view.c:1472
+#: ../modules/itip-formatter/itip-view.c:1583
 msgid "Location:"
 msgstr "Sted:"
 
@@ -1601,43 +1601,41 @@ msgstr "dager"
 msgid "hours"
 msgstr "timer"
 
-#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../calendar/alarm-notify/alarm-notify.ui.h:10
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
 #: ../calendar/gui/dialogs/event-page.ui.h:19 ../filter/filter.ui.h:6
 #: ../mail/e-mail-config-provider-page.c:527
-#: ../modules/addressbook/ldap-config.ui.h:29
 #: ../widgets/misc/e-interval-chooser.c:139
 msgid "minutes"
 msgstr "minutter"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1604
-#: ../calendar/alarm-notify/alarm-queue.c:1736
+#: ../calendar/alarm-notify/alarm-queue.c:1606
+#: ../calendar/alarm-notify/alarm-queue.c:1738
 msgid "No summary available."
 msgstr "Sammendrag er ikke tilgjengelig."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1613
 #: ../calendar/alarm-notify/alarm-queue.c:1615
+#: ../calendar/alarm-notify/alarm-queue.c:1617
 msgid "No description available."
 msgstr "Ingen beskrivelse tilgjengelig."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1623
+#: ../calendar/alarm-notify/alarm-queue.c:1625
 msgid "No location information available."
 msgstr "Stedsinformasjon er ikke tilgjengelig."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1669
+#: ../calendar/alarm-notify/alarm-queue.c:1671
 #, c-format
 msgid "You have %d reminder"
 msgid_plural "You have %d reminders"
 msgstr[0] "Du har %d pÃminnelse"
 msgstr[1] "Du har %d pÃminnelser"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1865
-#: ../calendar/alarm-notify/alarm-queue.c:1900
+#: ../calendar/alarm-notify/alarm-queue.c:1867
+#: ../calendar/alarm-notify/alarm-queue.c:1902
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1869
+#: ../calendar/alarm-notify/alarm-queue.c:1871
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -1649,7 +1647,7 @@ msgstr ""
 "er konfigurert til à sende e-post. Evolution vil vise\n"
 "en vanlig dialog med pÃminnelsen i stedet."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1906
+#: ../calendar/alarm-notify/alarm-queue.c:1908
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -1665,7 +1663,7 @@ msgstr ""
 "\n"
 "Er du sikker pà at du vil kjÃre dette programmet?"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1921
+#: ../calendar/alarm-notify/alarm-queue.c:1923
 msgid "Do not ask me about this program again."
 msgstr "Ikke spÃr meg om dette programmet igjen."
 
@@ -1930,7 +1928,6 @@ msgstr ""
 "hvis den blir lagret nÃ."
 
 #: ../calendar/calendar.error.xml.h:47 ../composer/e-composer-actions.c:316
-#: ../modules/itip-formatter/itip-view.c:3078
 msgid "_Save"
 msgstr "_Lagre"
 
@@ -2529,7 +2526,7 @@ msgid "Close the current window"
 msgstr "Lukk aktiv vindu"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1164 ../mail/e-mail-browser.c:134
-#: ../shell/e-shell-window-actions.c:1446
+#: ../shell/e-shell-window-actions.c:1443
 #: ../widgets/misc/e-focus-tracker.c:121 ../widgets/misc/e-focus-tracker.c:558
 #: ../widgets/misc/e-web-view.c:323 ../widgets/misc/e-web-view.c:1428
 #: ../widgets/misc/e-web-view-gtkhtml.c:456
@@ -2538,14 +2535,14 @@ msgid "Copy the selection"
 msgstr "Kopier utvalget"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1171 ../mail/e-mail-browser.c:141
-#: ../shell/e-shell-window-actions.c:1453
+#: ../shell/e-shell-window-actions.c:1450
 #: ../widgets/misc/e-focus-tracker.c:114 ../widgets/misc/e-focus-tracker.c:553
 #: ../widgets/misc/e-web-view.c:1422 ../widgets/misc/e-web-view-gtkhtml.c:1293
 msgid "Cut the selection"
 msgstr "Klipp ut utvalget"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1178
-#: ../shell/e-shell-window-actions.c:1460
+#: ../shell/e-shell-window-actions.c:1457
 #: ../widgets/misc/e-focus-tracker.c:135 ../widgets/misc/e-focus-tracker.c:568
 msgid "Delete the selection"
 msgstr "Slett utvalget"
@@ -2555,7 +2552,7 @@ msgid "View help"
 msgstr "Vis hjelp"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1192 ../mail/e-mail-browser.c:148
-#: ../shell/e-shell-window-actions.c:1481
+#: ../shell/e-shell-window-actions.c:1478
 #: ../widgets/misc/e-focus-tracker.c:128 ../widgets/misc/e-focus-tracker.c:563
 #: ../widgets/misc/e-web-view.c:1434 ../widgets/misc/e-web-view-gtkhtml.c:1305
 msgid "Paste the clipboard"
@@ -2566,7 +2563,7 @@ msgid "Save current changes"
 msgstr "Lagre endringer"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1218
-#: ../widgets/misc/e-mail-signature-editor.c:294
+#: ../widgets/misc/e-mail-signature-editor.c:301
 msgid "Save and Close"
 msgstr "Lagre og lukk"
 
@@ -2575,7 +2572,7 @@ msgid "Save current changes and close editor"
 msgstr "Lagre endringer og lukk redigering"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1227 ../mail/e-mail-browser.c:155
-#: ../shell/e-shell-window-actions.c:1558
+#: ../shell/e-shell-window-actions.c:1555
 #: ../widgets/misc/e-focus-tracker.c:142 ../widgets/misc/e-focus-tracker.c:573
 msgid "Select all text"
 msgstr "Velg all tekst"
@@ -2588,19 +2585,19 @@ msgstr "K_lassifisering"
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:19 ../filter/filter.ui.h:16
 #: ../mail/e-mail-browser.c:169
 #: ../plugins/publish-calendar/publish-calendar.ui.h:32
-#: ../shell/e-shell-window-actions.c:1586
+#: ../shell/e-shell-window-actions.c:1583
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "R_ediger"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1248 ../mail/e-mail-browser.c:162
-#: ../shell/e-shell-window-actions.c:1593
-#: ../widgets/misc/e-mail-signature-editor.c:299
+#: ../shell/e-shell-window-actions.c:1590
+#: ../widgets/misc/e-mail-signature-editor.c:306
 msgid "_File"
 msgstr "_Fil"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1255
-#: ../shell/e-shell-window-actions.c:1600
+#: ../shell/e-shell-window-actions.c:1597
 msgid "_Help"
 msgstr "_Hjelp"
 
@@ -2614,7 +2611,7 @@ msgid "_Options"
 msgstr "_Alternativer"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1276 ../mail/e-mail-browser.c:176
-#: ../shell/e-shell-window-actions.c:1635 ../smime/gui/smime-ui.ui.h:28
+#: ../shell/e-shell-window-actions.c:1632 ../smime/gui/smime-ui.ui.h:28
 msgid "_View"
 msgstr "_Vis"
 
@@ -2707,19 +2704,19 @@ msgid "Attach"
 msgstr "Legg ved"
 
 #: ../calendar/gui/dialogs/comp-editor.c:2463
-#: ../calendar/gui/dialogs/comp-editor.c:2647
-#: ../calendar/gui/dialogs/comp-editor.c:3651
+#: ../calendar/gui/dialogs/comp-editor.c:2650
+#: ../calendar/gui/dialogs/comp-editor.c:3654
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Endringer som gjÃres i denne oppfÃringen kan bli forkastet hvis det kommer "
 "enoppdatering"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3615
+#: ../calendar/gui/dialogs/comp-editor.c:3618
 #: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:118
 msgid "attachment"
 msgstr "vedlegg"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3683
+#: ../calendar/gui/dialogs/comp-editor.c:3686
 msgid "Unable to use current version!"
 msgstr "Kan ikke bruke denne versjonen!"
 
@@ -2878,7 +2875,7 @@ msgstr "_Ledig/opptatt"
 msgid "Query free / busy information for the attendees"
 msgstr "Slà opp ledig/opptatt informasjon for deltakerene"
 
-#: ../calendar/gui/dialogs/event-editor.c:318 ../calendar/gui/print.c:3324
+#: ../calendar/gui/dialogs/event-editor.c:318 ../calendar/gui/print.c:3391
 msgid "Appointment"
 msgstr "Avtale"
 
@@ -3124,7 +3121,7 @@ msgstr "Velg dato"
 msgid "Select _Today"
 msgstr "Velg i _dag"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:3328
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:3395
 msgid "Memo"
 msgstr "Notat"
 
@@ -3156,9 +3153,9 @@ msgstr "Kan ikke Ãpne notater i Â%sÂ: %s"
 #: ../em-format/e-mail-parser-inlinepgp-signed.c:96
 #: ../em-format/e-mail-parser-multipart-encrypted.c:122
 #: ../em-format/e-mail-parser-multipart-signed.c:147
-#: ../libemail-engine/mail-ops.c:720 ../mail/e-mail-reader.c:1727
-#: ../mail/em-folder-tree.c:675 ../modules/itip-formatter/itip-view.c:4524
-#: ../modules/itip-formatter/itip-view.c:4875 ../plugins/face/face.c:174
+#: ../libemail-engine/mail-ops.c:760 ../mail/e-mail-reader.c:1733
+#: ../mail/em-folder-tree.c:675 ../modules/itip-formatter/itip-view.c:4574
+#: ../modules/itip-formatter/itip-view.c:4925 ../plugins/face/face.c:174
 #: ../smime/gui/certificate-manager.c:317
 msgid "Unknown error"
 msgstr "Ukjent feil"
@@ -3242,13 +3239,13 @@ msgstr ""
 msgid "Recurrence date is invalid"
 msgstr "Gjenintreffingsdato er ugyldig"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1009
+#: ../calendar/gui/dialogs/recurrence-page.c:1013
 msgid "End time of the recurrence was before event's start"
 msgstr "Tid for slutt av gjentakelse var fÃr hendelsens start"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:1039
+#: ../calendar/gui/dialogs/recurrence-page.c:1043
 msgid "on"
 msgstr "pÃ"
 
@@ -3256,7 +3253,7 @@ msgstr "pÃ"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1102
+#: ../calendar/gui/dialogs/recurrence-page.c:1106
 msgid "first"
 msgstr "fÃrste"
 
@@ -3265,7 +3262,7 @@ msgstr "fÃrste"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1108
+#: ../calendar/gui/dialogs/recurrence-page.c:1112
 msgid "second"
 msgstr "sekund"
 
@@ -3273,7 +3270,7 @@ msgstr "sekund"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1113
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
 msgid "third"
 msgstr "tredje"
 
@@ -3281,7 +3278,7 @@ msgstr "tredje"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/dialogs/recurrence-page.c:1122
 msgid "fourth"
 msgstr "fjerde"
 
@@ -3289,7 +3286,7 @@ msgstr "fjerde"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1123
+#: ../calendar/gui/dialogs/recurrence-page.c:1127
 msgid "fifth"
 msgstr "femte"
 
@@ -3297,13 +3294,13 @@ msgstr "femte"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1128
+#: ../calendar/gui/dialogs/recurrence-page.c:1132
 msgid "last"
 msgstr "siste"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1152
+#: ../calendar/gui/dialogs/recurrence-page.c:1156
 msgid "Other Date"
 msgstr "Annen dato"
 
@@ -3311,7 +3308,7 @@ msgstr "Annen dato"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1158
+#: ../calendar/gui/dialogs/recurrence-page.c:1162
 msgid "1st to 10th"
 msgstr "FÃrste til tiende"
 
@@ -3319,7 +3316,7 @@ msgstr "FÃrste til tiende"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1164
+#: ../calendar/gui/dialogs/recurrence-page.c:1168
 msgid "11th to 20th"
 msgstr "ellevte til tjuende"
 
@@ -3327,41 +3324,41 @@ msgstr "ellevte til tjuende"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1170
+#: ../calendar/gui/dialogs/recurrence-page.c:1174
 msgid "21st to 31st"
 msgstr "tjuefÃrste til trettifÃrste"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1196
+#: ../calendar/gui/dialogs/recurrence-page.c:1200
 #: ../modules/calendar/e-calendar-preferences.ui.h:1
 msgid "Monday"
 msgstr "Mandag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1197
+#: ../calendar/gui/dialogs/recurrence-page.c:1201
 #: ../modules/calendar/e-calendar-preferences.ui.h:2
 msgid "Tuesday"
 msgstr "Tirsdag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1198
+#: ../calendar/gui/dialogs/recurrence-page.c:1202
 #: ../modules/calendar/e-calendar-preferences.ui.h:3
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1199
+#: ../calendar/gui/dialogs/recurrence-page.c:1203
 #: ../modules/calendar/e-calendar-preferences.ui.h:4
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1200
+#: ../calendar/gui/dialogs/recurrence-page.c:1204
 #: ../modules/calendar/e-calendar-preferences.ui.h:5
 msgid "Friday"
 msgstr "Fredag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1201
+#: ../calendar/gui/dialogs/recurrence-page.c:1205
 #: ../modules/calendar/e-calendar-preferences.ui.h:6
 msgid "Saturday"
 msgstr "LÃrdag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1202
+#: ../calendar/gui/dialogs/recurrence-page.c:1206
 #: ../modules/calendar/e-calendar-preferences.ui.h:7
 msgid "Sunday"
 msgstr "SÃndag"
@@ -3369,31 +3366,31 @@ msgstr "SÃndag"
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1326
+#: ../calendar/gui/dialogs/recurrence-page.c:1330
 msgid "on the"
 msgstr "den"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1505
+#: ../calendar/gui/dialogs/recurrence-page.c:1509
 msgid "occurrences"
 msgstr "gjentakelser"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2221
+#: ../calendar/gui/dialogs/recurrence-page.c:2225
 msgid "Add exception"
 msgstr "Legg til unntak"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2262
+#: ../calendar/gui/dialogs/recurrence-page.c:2266
 msgid "Could not get a selection to modify."
 msgstr "Fant ikke et utvalg à endre."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2268
+#: ../calendar/gui/dialogs/recurrence-page.c:2272
 msgid "Modify exception"
 msgstr "Endre unntak"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2312
+#: ../calendar/gui/dialogs/recurrence-page.c:2316
 msgid "Could not get a selection to delete."
 msgstr "Fant ikke et utvalg à slette."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2451
+#: ../calendar/gui/dialogs/recurrence-page.c:2455
 msgid "Date/Time"
 msgstr "Dato/klokkeslett"
 
@@ -3510,7 +3507,7 @@ msgstr "Udefinert"
 #: ../calendar/gui/e-cal-model-tasks.c:489
 #: ../calendar/gui/e-cal-model-tasks.c:774 ../calendar/gui/e-task-table.c:227
 #: ../calendar/gui/e-task-table.c:242 ../calendar/gui/e-task-table.c:656
-#: ../calendar/gui/print.c:3405 ../calendar/gui/tasktypes.xml.h:11
+#: ../calendar/gui/print.c:3472 ../calendar/gui/tasktypes.xml.h:11
 msgid "Not Started"
 msgstr "Ikke startet"
 
@@ -3521,7 +3518,7 @@ msgstr "Ikke startet"
 #: ../calendar/gui/e-cal-model-tasks.c:776
 #: ../calendar/gui/e-cal-model-tasks.c:854 ../calendar/gui/e-task-table.c:229
 #: ../calendar/gui/e-task-table.c:244 ../calendar/gui/e-task-table.c:657
-#: ../calendar/gui/print.c:3408
+#: ../calendar/gui/print.c:3475
 msgid "In Progress"
 msgstr "Under arbeid"
 
@@ -3532,7 +3529,7 @@ msgstr "Under arbeid"
 #: ../calendar/gui/e-cal-model-tasks.c:778
 #: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/e-meeting-store.c:232
 #: ../calendar/gui/e-task-table.c:231 ../calendar/gui/e-task-table.c:246
-#: ../calendar/gui/e-task-table.c:658 ../calendar/gui/print.c:3411
+#: ../calendar/gui/e-task-table.c:658 ../calendar/gui/print.c:3478
 #: ../calendar/gui/tasktypes.xml.h:13
 #: ../plugins/save-calendar/csv-format.c:376
 msgid "Completed"
@@ -3544,7 +3541,7 @@ msgstr "FullfÃrt"
 #: ../calendar/gui/e-cal-model-tasks.c:495
 #: ../calendar/gui/e-cal-model-tasks.c:780 ../calendar/gui/e-task-table.c:233
 #: ../calendar/gui/e-task-table.c:248 ../calendar/gui/e-task-table.c:659
-#: ../calendar/gui/print.c:3414 ../mail/mail-send-recv.c:879
+#: ../calendar/gui/print.c:3481 ../mail/mail-send-recv.c:879
 msgid "Canceled"
 msgstr "Avbrutt"
 
@@ -3593,7 +3590,7 @@ msgstr "Klikk for à endre/vise detaljer om status for oppgaven"
 msgid "_Send Options"
 msgstr "Alternativer for _sending"
 
-#: ../calendar/gui/dialogs/task-editor.c:186 ../calendar/gui/print.c:3326
+#: ../calendar/gui/dialogs/task-editor.c:186 ../calendar/gui/print.c:3393
 #: ../widgets/misc/e-send-options.c:553
 msgid "Task"
 msgstr "Oppgave"
@@ -3746,7 +3743,7 @@ msgid "Gnome Calendar"
 msgstr "GNOME kalender"
 
 #: ../calendar/gui/ea-gnome-calendar.c:199
-#: ../modules/calendar/e-cal-shell-view-private.c:1085
+#: ../modules/calendar/e-cal-shell-view-private.c:1104
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -3759,16 +3756,16 @@ msgstr "%A %d %b %Y"
 #: ../calendar/gui/ea-gnome-calendar.c:202 ../calendar/gui/e-day-view.c:1853
 #: ../calendar/gui/e-day-view-top-item.c:835
 #: ../calendar/gui/e-week-view-main-item.c:231
-#: ../modules/calendar/e-cal-shell-view-private.c:1089
+#: ../modules/calendar/e-cal-shell-view-private.c:1108
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #: ../calendar/gui/ea-gnome-calendar.c:204
 #: ../calendar/gui/ea-gnome-calendar.c:209
 #: ../calendar/gui/ea-gnome-calendar.c:211
-#: ../modules/calendar/e-cal-shell-view-private.c:1092
-#: ../modules/calendar/e-cal-shell-view-private.c:1098
-#: ../modules/calendar/e-cal-shell-view-private.c:1101
+#: ../modules/calendar/e-cal-shell-view-private.c:1111
+#: ../modules/calendar/e-cal-shell-view-private.c:1117
+#: ../modules/calendar/e-cal-shell-view-private.c:1120
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -3776,10 +3773,10 @@ msgstr "%a %d %b %Y"
 #: ../calendar/gui/ea-gnome-calendar.c:234
 #: ../calendar/gui/ea-gnome-calendar.c:240
 #: ../calendar/gui/ea-gnome-calendar.c:242
-#: ../modules/calendar/e-cal-shell-view-private.c:1118
-#: ../modules/calendar/e-cal-shell-view-private.c:1129
-#: ../modules/calendar/e-cal-shell-view-private.c:1136
-#: ../modules/calendar/e-cal-shell-view-private.c:1139
+#: ../modules/calendar/e-cal-shell-view-private.c:1137
+#: ../modules/calendar/e-cal-shell-view-private.c:1148
+#: ../modules/calendar/e-cal-shell-view-private.c:1155
+#: ../modules/calendar/e-cal-shell-view-private.c:1158
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -3791,7 +3788,7 @@ msgstr "%d %b %Y"
 #: ../calendar/gui/ea-gnome-calendar.c:232 ../calendar/gui/e-day-view.c:1869
 #: ../calendar/gui/e-day-view-top-item.c:839
 #: ../calendar/gui/e-week-view-main-item.c:245
-#: ../modules/calendar/e-cal-shell-view-private.c:1125
+#: ../modules/calendar/e-cal-shell-view-private.c:1144
 msgid "%d %b"
 msgstr "%d %b"
 
@@ -3897,7 +3894,7 @@ msgstr "kalendervisning for en mÃned"
 msgid "calendar view for one or more weeks"
 msgstr "kalendervisning for en eller flere uker"
 
-#: ../calendar/gui/e-cal-component-preview.c:237 ../filter/e-filter-rule.c:748
+#: ../calendar/gui/e-cal-component-preview.c:237 ../filter/e-filter-rule.c:751
 #: ../mail/e-mail-config-page.c:126
 msgid "Untitled"
 msgstr "Uten navn"
@@ -3923,8 +3920,8 @@ msgid "Due Date:"
 msgstr "Ferdig-dato:"
 
 #: ../calendar/gui/e-cal-component-preview.c:317
-#: ../modules/itip-formatter/itip-view.c:1463
-#: ../modules/itip-formatter/itip-view.c:1578
+#: ../modules/itip-formatter/itip-view.c:1475
+#: ../modules/itip-formatter/itip-view.c:1592
 msgid "Status:"
 msgstr "Status:"
 
@@ -4039,7 +4036,7 @@ msgid "Organizer: %s"
 msgstr "Organisator: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2012 ../calendar/gui/print.c:3360
+#: ../calendar/gui/e-calendar-view.c:2012 ../calendar/gui/print.c:3427
 #, c-format
 msgid "Location: %s"
 msgstr "Sted: %s"
@@ -4062,10 +4059,10 @@ msgstr "Sluttdato"
 #: ../calendar/gui/e-cal-model.c:842 ../calendar/gui/e-meeting-list-view.c:186
 #: ../calendar/gui/e-meeting-list-view.c:200
 #: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:174
-#: ../calendar/gui/e-meeting-store.c:237 ../calendar/gui/print.c:1159
-#: ../calendar/gui/print.c:1176 ../e-util/e-charset.c:52
-#: ../modules/itip-formatter/itip-view.c:3462
-#: ../modules/itip-formatter/itip-view.c:5962
+#: ../calendar/gui/e-meeting-store.c:237 ../calendar/gui/print.c:1222
+#: ../calendar/gui/print.c:1239 ../e-util/e-charset.c:52
+#: ../modules/itip-formatter/itip-view.c:3480
+#: ../modules/itip-formatter/itip-view.c:6012
 #: ../modules/plugin-manager/evolution-plugin-manager.c:101
 msgid "Unknown"
 msgstr "Ukjent"
@@ -4099,14 +4096,14 @@ msgstr "Ãpner %s"
 #: ../calendar/gui/e-cal-model.c:3565
 #: ../calendar/gui/e-meeting-list-view.c:222
 #: ../calendar/gui/e-meeting-store.c:201 ../calendar/gui/e-meeting-store.c:224
-#: ../modules/itip-formatter/itip-view.c:5950
+#: ../modules/itip-formatter/itip-view.c:6000
 msgid "Accepted"
 msgstr "Godtatt"
 
 #: ../calendar/gui/e-cal-model.c:3566
 #: ../calendar/gui/e-meeting-list-view.c:223
 #: ../calendar/gui/e-meeting-store.c:203 ../calendar/gui/e-meeting-store.c:226
-#: ../modules/itip-formatter/itip-view.c:5956
+#: ../modules/itip-formatter/itip-view.c:6006
 msgid "Declined"
 msgstr "AvslÃtt"
 
@@ -4120,7 +4117,7 @@ msgstr "Tentativ"
 #: ../calendar/gui/e-cal-model.c:3568
 #: ../calendar/gui/e-meeting-list-view.c:225
 #: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/e-meeting-store.c:230
-#: ../modules/itip-formatter/itip-view.c:5959
+#: ../modules/itip-formatter/itip-view.c:6009
 msgid "Delegated"
 msgstr "Delegert"
 
@@ -4175,15 +4172,15 @@ msgstr ""
 
 #. String to use in 12-hour time format for times in the morning.
 #: ../calendar/gui/e-day-view.c:1027 ../calendar/gui/e-week-view.c:773
-#: ../calendar/gui/print.c:985 ../calendar/gui/print.c:1004
-#: ../calendar/gui/print.c:2495 ../calendar/gui/print.c:2515
+#: ../calendar/gui/print.c:1048 ../calendar/gui/print.c:1067
+#: ../calendar/gui/print.c:2564 ../calendar/gui/print.c:2584
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: ../calendar/gui/e-day-view.c:1030 ../calendar/gui/e-week-view.c:776
-#: ../calendar/gui/print.c:990 ../calendar/gui/print.c:1006
-#: ../calendar/gui/print.c:2500 ../calendar/gui/print.c:2517
+#: ../calendar/gui/print.c:1053 ../calendar/gui/print.c:1069
+#: ../calendar/gui/print.c:2569 ../calendar/gui/print.c:2586
 msgid "pm"
 msgstr "pm"
 
@@ -4194,12 +4191,12 @@ msgstr "pm"
 #. * order but don't change the specifiers or add
 #. * anything.
 #: ../calendar/gui/e-day-view.c:1836 ../calendar/gui/e-day-view-top-item.c:831
-#: ../calendar/gui/e-week-view-main-item.c:222 ../calendar/gui/print.c:1979
+#: ../calendar/gui/e-week-view-main-item.c:222 ../calendar/gui/print.c:2044
 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
-#: ../calendar/gui/e-day-view.c:2671
+#: ../calendar/gui/e-day-view.c:2673
 #, c-format
 msgid "Week %d"
 msgstr "Uke %d"
@@ -4252,49 +4249,49 @@ msgstr "Ressurser"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
 #: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:131
-#: ../calendar/gui/e-meeting-store.c:1069 ../calendar/gui/print.c:1155
+#: ../calendar/gui/e-meeting-store.c:1069 ../calendar/gui/print.c:1218
 msgid "Individual"
 msgstr "Individuell"
 
 #: ../calendar/gui/e-meeting-list-view.c:183
 #: ../calendar/gui/e-meeting-store.c:116 ../calendar/gui/e-meeting-store.c:133
-#: ../calendar/gui/print.c:1156 ../widgets/table/e-table-config.ui.h:8
+#: ../calendar/gui/print.c:1219 ../widgets/table/e-table-config.ui.h:8
 msgid "Group"
 msgstr "Gruppe"
 
 #: ../calendar/gui/e-meeting-list-view.c:184
 #: ../calendar/gui/e-meeting-store.c:118 ../calendar/gui/e-meeting-store.c:135
-#: ../calendar/gui/print.c:1157
+#: ../calendar/gui/print.c:1220
 msgid "Resource"
 msgstr "Ressurs"
 
 #: ../calendar/gui/e-meeting-list-view.c:185
 #: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:137
-#: ../calendar/gui/print.c:1158
+#: ../calendar/gui/print.c:1221
 msgid "Room"
 msgstr "Rom"
 
 #: ../calendar/gui/e-meeting-list-view.c:196
 #: ../calendar/gui/e-meeting-store.c:149 ../calendar/gui/e-meeting-store.c:166
-#: ../calendar/gui/print.c:1172
+#: ../calendar/gui/print.c:1235
 msgid "Chair"
 msgstr "Styremedlem"
 
 #: ../calendar/gui/e-meeting-list-view.c:197
 #: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:168
-#: ../calendar/gui/e-meeting-store.c:1072 ../calendar/gui/print.c:1173
+#: ../calendar/gui/e-meeting-store.c:1072 ../calendar/gui/print.c:1236
 msgid "Required Participant"
 msgstr "Obligatorisk deltaker"
 
 #: ../calendar/gui/e-meeting-list-view.c:198
 #: ../calendar/gui/e-meeting-store.c:153 ../calendar/gui/e-meeting-store.c:170
-#: ../calendar/gui/print.c:1174
+#: ../calendar/gui/print.c:1237
 msgid "Optional Participant"
 msgstr "Valgfri deltaker"
 
 #: ../calendar/gui/e-meeting-list-view.c:199
 #: ../calendar/gui/e-meeting-store.c:155 ../calendar/gui/e-meeting-store.c:172
-#: ../calendar/gui/print.c:1175
+#: ../calendar/gui/print.c:1238
 msgid "Non-Participant"
 msgstr "Ikke-deltaker"
 
@@ -4477,7 +4474,7 @@ msgstr "Klikk for à legge til et notat"
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:705 ../calendar/gui/print.c:2284
+#: ../calendar/gui/e-task-table.c:705 ../calendar/gui/print.c:2353
 #: ../calendar/importers/icalendar-importer.c:84
 #: ../calendar/importers/icalendar-importer.c:1082
 #: ../modules/calendar/e-calendar-preferences.ui.h:61
@@ -4516,11 +4513,11 @@ msgstr "Velg tidssone"
 #. strftime format %d = day of month, %B = full
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:239 ../calendar/gui/print.c:1960
+#: ../calendar/gui/e-week-view-main-item.c:239 ../calendar/gui/print.c:2025
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:2315
+#: ../calendar/gui/gnome-cal.c:2318
 msgid "Purging"
 msgstr "TÃmmer"
 
@@ -4635,237 +4632,237 @@ msgstr "iCalendar-informasjon"
 
 #: ../calendar/gui/itip-utils.c:1123
 msgid "Unable to book a resource, the new event collides with some other."
-msgstr ""
-"Klarer ikke à booke en ressurs. Den nye hendelsen er i konflikt med en annen."
+msgstr "Klarer ikke à bestille en ressurs. Den nye hendelsen er i konflikt med en annen."
 
 #: ../calendar/gui/itip-utils.c:1127
-msgid "Unable to book a resource, error: "
-msgstr "Kan ikke booke en ressurs. Feil: "
+#, c-format
+msgid "Unable to book a resource, error: %s"
+msgstr "Kan ikke bestille en ressurs. Feil: %s"
 
-#: ../calendar/gui/itip-utils.c:1306
+#: ../calendar/gui/itip-utils.c:1303
 msgid "You must be an attendee of the event."
 msgstr "Du mà vÃre en deltager i hendelsen."
 
-#: ../calendar/gui/print.c:589
+#: ../calendar/gui/print.c:652
 msgid "1st"
 msgstr "1"
 
-#: ../calendar/gui/print.c:589
+#: ../calendar/gui/print.c:652
 msgid "2nd"
 msgstr "2"
 
-#: ../calendar/gui/print.c:589
+#: ../calendar/gui/print.c:652
 msgid "3rd"
 msgstr "3"
 
-#: ../calendar/gui/print.c:589
+#: ../calendar/gui/print.c:652
 msgid "4th"
 msgstr "4"
 
-#: ../calendar/gui/print.c:589
+#: ../calendar/gui/print.c:652
 msgid "5th"
 msgstr "5"
 
-#: ../calendar/gui/print.c:590
+#: ../calendar/gui/print.c:653
 msgid "6th"
 msgstr "6"
 
-#: ../calendar/gui/print.c:590
+#: ../calendar/gui/print.c:653
 msgid "7th"
 msgstr "7"
 
-#: ../calendar/gui/print.c:590
+#: ../calendar/gui/print.c:653
 msgid "8th"
 msgstr "8"
 
-#: ../calendar/gui/print.c:590
+#: ../calendar/gui/print.c:653
 msgid "9th"
 msgstr "9"
 
-#: ../calendar/gui/print.c:590
+#: ../calendar/gui/print.c:653
 msgid "10th"
 msgstr "10"
 
-#: ../calendar/gui/print.c:591
+#: ../calendar/gui/print.c:654
 msgid "11th"
 msgstr "11"
 
-#: ../calendar/gui/print.c:591
+#: ../calendar/gui/print.c:654
 msgid "12th"
 msgstr "12"
 
-#: ../calendar/gui/print.c:591
+#: ../calendar/gui/print.c:654
 msgid "13th"
 msgstr "13"
 
-#: ../calendar/gui/print.c:591
+#: ../calendar/gui/print.c:654
 msgid "14th"
 msgstr "14"
 
-#: ../calendar/gui/print.c:591
+#: ../calendar/gui/print.c:654
 msgid "15th"
 msgstr "15"
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:655
 msgid "16th"
 msgstr "16"
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:655
 msgid "17th"
 msgstr "17"
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:655
 msgid "18th"
 msgstr "18"
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:655
 msgid "19th"
 msgstr "19"
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:655
 msgid "20th"
 msgstr "20"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:656
 msgid "21st"
 msgstr "21"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:656
 msgid "22nd"
 msgstr "22"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:656
 msgid "23rd"
 msgstr "23"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:656
 msgid "24th"
 msgstr "24"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:656
 msgid "25th"
 msgstr "25"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:657
 msgid "26th"
 msgstr "26"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:657
 msgid "27th"
 msgstr "27"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:657
 msgid "28th"
 msgstr "28"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:657
 msgid "29th"
 msgstr "29"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:657
 msgid "30th"
 msgstr "30"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:658
 msgid "31st"
 msgstr "31"
 
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:652
+#: ../calendar/gui/print.c:715
 msgid "Su"
 msgstr "SÃ."
 
-#: ../calendar/gui/print.c:652
+#: ../calendar/gui/print.c:715
 msgid "Mo"
 msgstr "Ma."
 
-#: ../calendar/gui/print.c:652
+#: ../calendar/gui/print.c:715
 msgid "Tu"
 msgstr "Ti."
 
-#: ../calendar/gui/print.c:652
+#: ../calendar/gui/print.c:715
 msgid "We"
 msgstr "On."
 
-#: ../calendar/gui/print.c:653
+#: ../calendar/gui/print.c:716
 msgid "Th"
 msgstr "To."
 
-#: ../calendar/gui/print.c:653
+#: ../calendar/gui/print.c:716
 msgid "Fr"
 msgstr "Fr."
 
-#: ../calendar/gui/print.c:653
+#: ../calendar/gui/print.c:716
 msgid "Sa"
 msgstr "LÃ."
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:3153
+#: ../calendar/gui/print.c:3220
 msgid " to "
 msgstr " til "
 
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../calendar/gui/print.c:3163
+#: ../calendar/gui/print.c:3230
 msgid " (Completed "
 msgstr " (FullfÃrt "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3169
+#: ../calendar/gui/print.c:3236
 msgid "Completed "
 msgstr "FullfÃrt "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3179
+#: ../calendar/gui/print.c:3246
 msgid " (Due "
 msgstr " (Ferdig "
 
 #. Translators: This is part of "Due DUE",
 #. * where DUE is a date/time due the event
 #. * should be finished.
-#: ../calendar/gui/print.c:3186
+#: ../calendar/gui/print.c:3253
 msgid "Due "
 msgstr "Ferdig "
 
-#: ../calendar/gui/print.c:3351
+#: ../calendar/gui/print.c:3418
 #, c-format
 msgid "Summary: %s"
 msgstr "Sammendrag: %s"
 
-#: ../calendar/gui/print.c:3378
+#: ../calendar/gui/print.c:3445
 msgid "Attendees: "
 msgstr "Deltakere: "
 
-#: ../calendar/gui/print.c:3421
+#: ../calendar/gui/print.c:3488
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: ../calendar/gui/print.c:3436
+#: ../calendar/gui/print.c:3503
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioritet: %s"
 
-#: ../calendar/gui/print.c:3454
+#: ../calendar/gui/print.c:3521
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Prosent fullfÃrt: %i"
 
-#: ../calendar/gui/print.c:3465
+#: ../calendar/gui/print.c:3532
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:3478
+#: ../calendar/gui/print.c:3545
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorier: %s"
 
-#: ../calendar/gui/print.c:3489
+#: ../calendar/gui/print.c:3556
 msgid "Contacts: "
 msgstr "Kontakter: "
 
@@ -4896,7 +4893,7 @@ msgstr "Avtaler og mÃter"
 
 #: ../calendar/importers/icalendar-importer.c:468
 #: ../calendar/importers/icalendar-importer.c:905
-#: ../modules/itip-formatter/itip-view.c:5564
+#: ../modules/itip-formatter/itip-view.c:5614
 msgid "Opening calendar"
 msgstr "Ãpner kalender"
 
@@ -6626,7 +6623,7 @@ msgid "Save as..."
 msgstr "Lagre som â"
 
 #: ../composer/e-composer-actions.c:295
-#: ../widgets/misc/e-mail-signature-editor.c:285
+#: ../widgets/misc/e-mail-signature-editor.c:292
 msgid "_Close"
 msgstr "L_ukk"
 
@@ -6642,7 +6639,7 @@ msgstr "Ny _melding"
 msgid "Open New Message window"
 msgstr "Ãpne nytt meldingsvindu"
 
-#: ../composer/e-composer-actions.c:311 ../shell/e-shell-window-actions.c:1495
+#: ../composer/e-composer-actions.c:311 ../shell/e-shell-window-actions.c:1492
 msgid "Configure Evolution"
 msgstr "Konfigurer Evolution"
 
@@ -6678,7 +6675,7 @@ msgstr "Lagre som ut_kast"
 msgid "Save as draft"
 msgstr "Lagre som utkast"
 
-#: ../composer/e-composer-actions.c:370 ../composer/e-composer-private.c:325
+#: ../composer/e-composer-actions.c:370 ../composer/e-composer-private.c:327
 msgid "S_end"
 msgstr "S_end"
 
@@ -6815,11 +6812,11 @@ msgid "S_ubject:"
 msgstr "Em_ne:"
 
 #: ../composer/e-composer-header-table.c:890
-#: ../mail/e-mail-config-identity-page.c:466
+#: ../mail/e-mail-config-identity-page.c:490
 msgid "Si_gnature:"
 msgstr "Si_gnatur:"
 
-#: ../composer/e-composer-name-header.c:215
+#: ../composer/e-composer-name-header.c:233
 msgid "Click here for the address book"
 msgstr "Klikk her for à fà opp adresseboken"
 
@@ -6827,7 +6824,7 @@ msgstr "Klikk her for à fà opp adresseboken"
 msgid "Click here to select folders to post to"
 msgstr "Klikk her for à velge mapper à poste til"
 
-#: ../composer/e-composer-private.c:345
+#: ../composer/e-composer-private.c:347
 msgid "Save draft"
 msgstr "Lagre utkast"
 
@@ -6852,13 +6849,13 @@ msgstr ""
 msgid "Compose Message"
 msgstr "Skriv melding"
 
-#: ../composer/e-msg-composer.c:4198
+#: ../composer/e-msg-composer.c:4204
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr ""
 "Redigering inneholder en meldingskropp som ikke er tekst, og som ikke kan "
 "redigeres."
 
-#: ../composer/e-msg-composer.c:4875
+#: ../composer/e-msg-composer.c:4881
 msgid "Untitled Message"
 msgstr "Melding uten navn"
 
@@ -7045,6 +7042,10 @@ msgstr "Evolution e-post og kalender"
 msgid "Manage your email, contacts and schedule"
 msgstr "HÃndter e-post, kontakter og kalender"
 
+#: ../data/evolution.desktop.in.in.h:5
+msgid "mail;calendar;contact;addressbook;task;"
+msgstr "e-post;kalender;kontakt;adressebok;oppgave;"
+
 #: ../data/evolution-settings.desktop.in.in.h:1
 msgid "Email Settings"
 msgstr "Innstillinger for e-post"
@@ -9173,7 +9174,7 @@ msgstr "ForhÃndsvalgt mappe for filvelger"
 msgid "Initial folder for GtkFileChooser dialogs."
 msgstr "Startmappe for GtkFileChooser dialoger."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:311
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:317
 msgid "Start in offline mode"
 msgstr "Start i frakoblet modus"
 
@@ -9276,18 +9277,10 @@ msgid "Use SpamAssassin daemon and client"
 msgstr "Bruk SpamAssassin tjener og klient"
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:5
-msgid "Use SpamAssassin daemon and client (spamc/spamd)."
-msgstr "Bruk SpamAssassin tjener og klient (spamd/spamc)."
+msgid "Use spamc and spamd programs, if available."
+msgstr "Bruk programmene spamc og spamd hvis tilgjengelig."
 
-#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:6
-msgid "SpamAssassin client binary"
-msgstr "KjÃrbar fil for SpamAssassin-klient"
-
-#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:7
-msgid "SpamAssassin daemon binary"
-msgstr "KjÃrbar fil for SpamAssassin-tjeneste"
-
-#: ../em-format/e-mail-formatter-attachment.c:363
+#: ../em-format/e-mail-formatter-attachment.c:364
 #: ../mail/message-list.etspec.h:4 ../widgets/misc/e-attachment-bar.c:101
 #: ../widgets/misc/e-attachment-bar.c:106
 #: ../widgets/misc/e-attachment-paned.c:176
@@ -9297,7 +9290,7 @@ msgid_plural "Attachments"
 msgstr[0] "Vedlegg"
 msgstr[1] "Vedlegg"
 
-#: ../em-format/e-mail-formatter-attachment.c:369
+#: ../em-format/e-mail-formatter-attachment.c:370
 msgid "Display as attachment"
 msgstr "Vis som vedlegg"
 
@@ -9383,7 +9376,7 @@ msgstr "Formater del som en RFC822-melding"
 
 #: ../em-format/e-mail-formatter-print.c:53
 #: ../mail/e-mail-label-tree-view.c:99
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1255
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1270
 #: ../modules/cal-config-google/e-google-chooser.c:209
 #: ../modules/plugin-manager/evolution-plugin-manager.c:68
 #: ../widgets/menus/gal-define-views-dialog.c:352
@@ -9448,12 +9441,12 @@ msgid "Format part as HTML"
 msgstr "Formater del som HTML"
 
 #: ../em-format/e-mail-formatter-quote-text-plain.c:123
-#: ../em-format/e-mail-formatter-text-plain.c:182
+#: ../em-format/e-mail-formatter-text-plain.c:183
 msgid "Plain Text"
 msgstr "Ren tekst"
 
 #: ../em-format/e-mail-formatter-quote-text-plain.c:129
-#: ../em-format/e-mail-formatter-text-plain.c:188
+#: ../em-format/e-mail-formatter-text-plain.c:189
 msgid "Format part as plain text"
 msgstr "Formater del som ren tekst"
 
@@ -9568,12 +9561,12 @@ msgstr ""
 "Denne meldingen er kryptert med en sterk algoritme. Det vil vÃre meget "
 "vanskelig for en utenforstÃende à se innholdet i denne meldingen pà kort tid."
 
-#: ../em-format/e-mail-formatter-secure-button.c:190
+#: ../em-format/e-mail-formatter-secure-button.c:191
 #: ../smime/gui/smime-ui.ui.h:43
 msgid "_View Certificate"
 msgstr "_Vis sertifikat"
 
-#: ../em-format/e-mail-formatter-secure-button.c:205
+#: ../em-format/e-mail-formatter-secure-button.c:206
 msgid "This certificate is not viewable"
 msgstr "Dette sertifikatet kan ikke vises"
 
@@ -9653,7 +9646,7 @@ msgstr "Kunne ikke lese PGP/MIME-melding: %s"
 msgid "Unsupported signature format"
 msgstr "UstÃttet signaturformat"
 
-#: ../em-format/e-mail-part-utils.c:493
+#: ../em-format/e-mail-part-utils.c:496
 #, c-format
 msgid "%s attachment"
 msgstr "%s-vedlegg"
@@ -9925,11 +9918,11 @@ msgstr "Klarte ikke à oppdatere datakilde &quot;{0}&quot;."
 msgid "Failed to delete resource &quot;{0}&quot;."
 msgstr "Klarte ikke à slette ressurs &quot;{0}&quot;."
 
-#: ../e-util/e-util.c:243
+#: ../e-util/e-util.c:249
 msgid "Could not open the link."
 msgstr "Kunne ikke Ãpne lenken."
 
-#: ../e-util/e-util.c:290
+#: ../e-util/e-util.c:296
 msgid "Could not display help for Evolution."
 msgstr "Kunne ikke vise hjelp for Evolution."
 
@@ -10047,7 +10040,7 @@ msgstr "nÃ"
 msgid "%d-%b-%Y"
 msgstr "%d.%b.%Y"
 
-#: ../filter/e-filter-datespec.c:289
+#: ../filter/e-filter-datespec.c:291
 msgid "Select a time to compare against"
 msgstr "Velg en tid à sammenligne mot"
 
@@ -10055,23 +10048,23 @@ msgstr "Velg en tid à sammenligne mot"
 msgid "Choose a File"
 msgstr "Velg en fil"
 
-#: ../filter/e-filter-rule.c:741
+#: ../filter/e-filter-rule.c:744
 msgid "R_ule name:"
 msgstr "Regel_navn:"
 
-#: ../filter/e-filter-rule.c:791
+#: ../filter/e-filter-rule.c:794
 msgid "all the following conditions"
 msgstr "alle fÃlgende betingelser"
 
-#: ../filter/e-filter-rule.c:792
+#: ../filter/e-filter-rule.c:795
 msgid "any of the following conditions"
 msgstr "noen av fÃlgende betingelser"
 
-#: ../filter/e-filter-rule.c:798
+#: ../filter/e-filter-rule.c:801
 msgid "_Find items which match:"
 msgstr "_Finn oppfÃringer som er lik:"
 
-#: ../filter/e-filter-rule.c:820
+#: ../filter/e-filter-rule.c:824
 msgid "Find items that meet the following conditions"
 msgstr "Finn oppfÃringer som mÃter fÃlgende kriterier"
 
@@ -10079,51 +10072,51 @@ msgstr "Finn oppfÃringer som mÃter fÃlgende kriterier"
 #. * part of "Include threads: None"
 #. protocol:
 #. name:
-#: ../filter/e-filter-rule.c:835 ../libemail-engine/camel-null-store.c:28
+#: ../filter/e-filter-rule.c:839 ../libemail-engine/camel-null-store.c:28
 #: ../mail/e-mail-config-summary-page.c:139
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:616
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:624
 #: ../widgets/misc/e-mail-signature-combo-box.c:369
 msgid "None"
 msgstr "Ingen"
 
-#: ../filter/e-filter-rule.c:836
+#: ../filter/e-filter-rule.c:840
 msgid "All related"
 msgstr "Alle relaterte"
 
-#: ../filter/e-filter-rule.c:837 ../widgets/misc/e-send-options.ui.h:19
+#: ../filter/e-filter-rule.c:841 ../widgets/misc/e-send-options.ui.h:19
 msgid "Replies"
 msgstr "Svar"
 
-#: ../filter/e-filter-rule.c:838
+#: ../filter/e-filter-rule.c:842
 msgid "Replies and parents"
 msgstr "Svar med opphav"
 
-#: ../filter/e-filter-rule.c:839
+#: ../filter/e-filter-rule.c:843
 msgid "No reply or parent"
 msgstr "Ingen svar eller opphav"
 
-#: ../filter/e-filter-rule.c:842
+#: ../filter/e-filter-rule.c:846
 msgid "I_nclude threads:"
 msgstr "Ta _med trÃder:"
 
-#: ../filter/e-filter-rule.c:919
+#: ../filter/e-filter-rule.c:923
 msgid "A_dd Condition"
 msgstr "Legg til _kriterie"
 
-#: ../filter/e-filter-rule.c:1236 ../filter/filter.ui.h:1
+#: ../filter/e-filter-rule.c:1240 ../filter/filter.ui.h:1
 #: ../mail/em-utils.c:302
 msgid "Incoming"
 msgstr "Innkommende"
 
-#: ../filter/e-filter-rule.c:1236 ../mail/em-utils.c:303
+#: ../filter/e-filter-rule.c:1240 ../mail/em-utils.c:303
 msgid "Outgoing"
 msgstr "UtgÃende"
 
-#: ../filter/e-rule-editor.c:273
+#: ../filter/e-rule-editor.c:288
 msgid "Add Rule"
 msgstr "Legg til regel"
 
-#: ../filter/e-rule-editor.c:366
+#: ../filter/e-rule-editor.c:395
 msgid "Edit Rule"
 msgstr "Rediger regel"
 
@@ -10249,114 +10242,114 @@ msgstr ""
 msgid "Invalid authentication result code (%d)"
 msgstr "Ugyldig resultatkode for autentisering (%d)"
 
-#: ../libemail-engine/e-mail-folder-utils.c:112
+#: ../libemail-engine/e-mail-folder-utils.c:114
 #, c-format
 msgid "Saving message to folder '%s'"
 msgstr "Lagrer melding til mappe Â%sÂ"
 
-#: ../libemail-engine/e-mail-folder-utils.c:565
+#: ../libemail-engine/e-mail-folder-utils.c:566
 msgid "Forwarded messages"
 msgstr "Videresendte meldinger"
 
-#: ../libemail-engine/e-mail-folder-utils.c:675
-#: ../libemail-engine/e-mail-folder-utils.c:926
+#: ../libemail-engine/e-mail-folder-utils.c:676
+#: ../libemail-engine/e-mail-folder-utils.c:927
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Henter %d melding"
 msgstr[1] "Henter %d melding(er)"
 
-#: ../libemail-engine/e-mail-folder-utils.c:769
+#: ../libemail-engine/e-mail-folder-utils.c:770
 msgid "Scanning messages for duplicates"
 msgstr "Sjekker meldinger for duplikater"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1177
+#: ../libemail-engine/e-mail-folder-utils.c:1178
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "Fjerner mappe Â%sÂ"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1314
+#: ../libemail-engine/e-mail-folder-utils.c:1315
 #, c-format
 msgid "File \"%s\" has been removed."
 msgstr "Filen Â%s ble fjernet."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1318
+#: ../libemail-engine/e-mail-folder-utils.c:1319
 msgid "File has been removed."
 msgstr "Filen er fjernet."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1377
+#: ../libemail-engine/e-mail-folder-utils.c:1378
 msgid "Removing attachments"
 msgstr "Fjerner vedlegg"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1541
+#: ../libemail-engine/e-mail-folder-utils.c:1542
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "Lagrer %d melding"
 msgstr[1] "Lagrer %d meldinger"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1897 ../mail/em-folder-utils.c:613
+#: ../libemail-engine/e-mail-folder-utils.c:1898 ../mail/em-folder-utils.c:613
 #, c-format
 msgid "Invalid folder URI '%s'"
 msgstr "Ugyldig URI for mappe Â%sÂ"
 
 #: ../libemail-engine/e-mail-session.c:116 ../mail/em-folder-properties.c:333
 #: ../mail/em-folder-tree-model.c:765
-#: ../modules/mail/e-mail-shell-view-private.c:1034
-#: ../modules/mail/e-mail-shell-view-private.c:1045
+#: ../modules/mail/e-mail-shell-view-private.c:1066
+#: ../modules/mail/e-mail-shell-view-private.c:1077
 msgid "Inbox"
 msgstr "Innboks"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
 #: ../libemail-engine/e-mail-session.c:117 ../mail/em-folder-tree-model.c:758
-#: ../modules/mail/e-mail-shell-view-private.c:1032
+#: ../modules/mail/e-mail-shell-view-private.c:1064
 msgid "Drafts"
 msgstr "Skisser"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
 #: ../libemail-engine/e-mail-session.c:118 ../mail/em-folder-tree-model.c:769
-#: ../modules/mail/e-mail-shell-view-private.c:1036
+#: ../modules/mail/e-mail-shell-view-private.c:1068
 msgid "Outbox"
 msgstr "Utboks"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
 #: ../libemail-engine/e-mail-session.c:119 ../mail/em-folder-tree-model.c:773
-#: ../modules/mail/e-mail-shell-view-private.c:1038
+#: ../modules/mail/e-mail-shell-view-private.c:1070
 msgid "Sent"
 msgstr "Sendt"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
 #: ../libemail-engine/e-mail-session.c:120 ../mail/em-folder-tree-model.c:761
-#: ../modules/mail/e-mail-shell-view-private.c:1040
+#: ../modules/mail/e-mail-shell-view-private.c:1072
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
 #: ../plugins/templates/templates.c:1048 ../plugins/templates/templates.c:1345
 #: ../plugins/templates/templates.c:1355
 msgid "Templates"
 msgstr "Maler"
 
-#: ../libemail-engine/e-mail-session.c:1319
+#: ../libemail-engine/e-mail-session.c:1323
 #, c-format
 msgid "User cancelled operation"
 msgstr "Operasjon avbrutt av bruker"
 
-#: ../libemail-engine/e-mail-session.c:1489
+#: ../libemail-engine/e-mail-session.c:1493
 #, c-format
 msgid "%s authentication failed"
 msgstr "%s autentisering feilet"
 
-#: ../libemail-engine/e-mail-session.c:1534
+#: ../libemail-engine/e-mail-session.c:1538
 #, c-format
 msgid "No data source found for UID '%s'"
 msgstr "Fant ingen datakilde for UID Â%sÂ"
 
-#: ../libemail-engine/e-mail-session.c:1585
+#: ../libemail-engine/e-mail-session.c:1589
 #, c-format
 msgid ""
 "No destination address provided, forwarding of the message has been "
 "cancelled."
 msgstr "Ingen mÃladresse oppgitt. Videresending av meldingen ble avbrutt."
 
-#: ../libemail-engine/e-mail-session.c:1598
+#: ../libemail-engine/e-mail-session.c:1602
 #, c-format
 msgid "No identity found to use, forwarding of the message has been cancelled."
 msgstr "Fant ingen identitet à bruke. Videresending av meldingen ble avbrutt."
@@ -10372,14 +10365,14 @@ msgid "UID '%s' is not a mail transport"
 msgstr "UID Â%s er ikke en e-posttransport"
 
 #: ../libemail-engine/e-mail-session-utils.c:641
-#: ../libemail-engine/mail-ops.c:698
+#: ../libemail-engine/mail-ops.c:738
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Feil under pÃfÃring av utgÃende filtre: %s"
 
 #: ../libemail-engine/e-mail-session-utils.c:670
 #: ../libemail-engine/e-mail-session-utils.c:704
-#: ../libemail-engine/mail-ops.c:715 ../libemail-engine/mail-ops.c:751
+#: ../libemail-engine/mail-ops.c:755 ../libemail-engine/mail-ops.c:791
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -10389,13 +10382,13 @@ msgstr ""
 "Legger til i lokal ÂSendtÂ-mappe i stedet."
 
 #: ../libemail-engine/e-mail-session-utils.c:724
-#: ../libemail-engine/mail-ops.c:773
+#: ../libemail-engine/mail-ops.c:813
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "Kunne ikke legge til i lokal Sendt-mappe: %s"
 
-#: ../libemail-engine/e-mail-session-utils.c:954
-#: ../libemail-engine/mail-ops.c:905 ../libemail-engine/mail-ops.c:1007
+#: ../libemail-engine/e-mail-session-utils.c:968
+#: ../libemail-engine/mail-ops.c:945 ../libemail-engine/mail-ops.c:1047
 msgid "Sending message"
 msgstr "Sender melding"
 
@@ -10414,7 +10407,7 @@ msgstr "Kobler til Â%s pà nytt"
 msgid "Preparing account '%s' for offline"
 msgstr "Forbereder konto Â%s for frakoblet bruk"
 
-#: ../libemail-engine/mail-folder-cache.c:876
+#: ../libemail-engine/mail-folder-cache.c:880
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinger %s"
@@ -10423,56 +10416,57 @@ msgstr "Pinger %s"
 msgid "Filtering Selected Messages"
 msgstr "Filtrerer valgte meldinger"
 
-#: ../libemail-engine/mail-ops.c:216
-msgid "Fetching Mail"
-msgstr "Henter e-post"
+#: ../libemail-engine/mail-ops.c:219
+#, c-format
+msgid "Fetching mail from '%s'"
+msgstr "Henter e-post fra Â%sÂ"
 
-#: ../libemail-engine/mail-ops.c:916
+#: ../libemail-engine/mail-ops.c:956
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sender melding %d av %d"
 
-#: ../libemail-engine/mail-ops.c:968
+#: ../libemail-engine/mail-ops.c:1008
 #, 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"
 
-#: ../libemail-engine/mail-ops.c:974
+#: ../libemail-engine/mail-ops.c:1014
 msgid "Canceled."
 msgstr "Avbrutt."
 
-#: ../libemail-engine/mail-ops.c:976
+#: ../libemail-engine/mail-ops.c:1016
 msgid "Complete."
 msgstr "FullfÃrt."
 
-#: ../libemail-engine/mail-ops.c:1088
+#: ../libemail-engine/mail-ops.c:1128
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Flytter meldinger til Â%sÂ"
 
-#: ../libemail-engine/mail-ops.c:1089
+#: ../libemail-engine/mail-ops.c:1129
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Kopierer meldinger til Â%sÂ"
 
-#: ../libemail-engine/mail-ops.c:1207
+#: ../libemail-engine/mail-ops.c:1247
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Lagrer mappe Â%sÂ"
 
-#: ../libemail-engine/mail-ops.c:1281
+#: ../libemail-engine/mail-ops.c:1321
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "TÃmmer og lagrer konto Â%sÂ"
 
-#: ../libemail-engine/mail-ops.c:1282
+#: ../libemail-engine/mail-ops.c:1322
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Lagrer konto Â%sÂ"
 
-#: ../libemail-engine/mail-ops.c:1356
+#: ../libemail-engine/mail-ops.c:1396
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "TÃmmer sÃppel i Â%sÂ"
@@ -10542,7 +10536,7 @@ msgid "De_fault"
 msgstr "_Forvalgt"
 
 #: ../mail/e-mail-account-tree-view.c:85
-#: ../modules/mail/em-composer-prefs.c:505
+#: ../modules/mail/em-composer-prefs.c:495
 #: ../modules/plugin-manager/evolution-plugin-manager.c:360
 #: ../plugins/publish-calendar/publish-calendar.c:864
 msgid "Enabled"
@@ -10554,7 +10548,7 @@ msgstr "Kontonavn"
 
 #: ../mail/e-mail-account-tree-view.c:134
 #: ../mail/e-mail-config-security-page.c:333
-#: ../mail/e-mail-config-security-page.c:472 ../mail/e-mail-reader.c:3655
+#: ../mail/e-mail-config-security-page.c:472 ../mail/e-mail-reader.c:3661
 #: ../mail/mail-config.ui.h:44
 msgid "Default"
 msgstr "Forvalgt"
@@ -10587,13 +10581,13 @@ msgstr "Ingen e-postadresse ble oppgitt"
 msgid "Missing domain in email address"
 msgstr "Mangler domene i e-postadresse"
 
-#: ../mail/e-mail-backend.c:734
+#: ../mail/e-mail-backend.c:737
 msgid "Unknown background operation"
 msgstr "Ukjent bakgrunnsoperasjon"
 
-#: ../mail/e-mail-browser.c:127 ../shell/e-shell-window-actions.c:1418
-#: ../shell/e-shell-window-actions.c:1425
-#: ../shell/e-shell-window-actions.c:1432
+#: ../mail/e-mail-browser.c:127 ../shell/e-shell-window-actions.c:1415
+#: ../shell/e-shell-window-actions.c:1422
+#: ../shell/e-shell-window-actions.c:1429
 msgid "Close this window"
 msgstr "Lukk dette vinduet"
 
@@ -10627,83 +10621,87 @@ msgstr ""
 msgid "Done"
 msgstr "Ferdig"
 
-#: ../mail/e-mail-config-defaults-page.c:539
+#: ../mail/e-mail-config-defaults-page.c:552
 msgid "Special Folders"
 msgstr "Spesielle mapper"
 
-#: ../mail/e-mail-config-defaults-page.c:548
+#: ../mail/e-mail-config-defaults-page.c:561
 msgid "Draft Messages _Folder:"
 msgstr "Mappe _for skisser:"
 
-#: ../mail/e-mail-config-defaults-page.c:558
+#: ../mail/e-mail-config-defaults-page.c:571
 msgid "Choose a folder for saving draft messages."
 msgstr "Velg en mappe for lagring av skisser."
 
-#: ../mail/e-mail-config-defaults-page.c:572
+#: ../mail/e-mail-config-defaults-page.c:585
 msgid "Sent _Messages Folder:"
 msgstr "Mappe for sendte _meldinger:"
 
-#: ../mail/e-mail-config-defaults-page.c:582
+#: ../mail/e-mail-config-defaults-page.c:595
 msgid "Choose a folder for saving sent messages."
 msgstr "Velg en mappe for lagring av sendte meldinger."
 
-#: ../mail/e-mail-config-defaults-page.c:596
+#: ../mail/e-mail-config-defaults-page.c:614
+msgid "S_ave replies in the folder of the message being replied to"
+msgstr ""
+
+#: ../mail/e-mail-config-defaults-page.c:631
 msgid "_Restore Defaults"
 msgstr "Gjenopp_rett forvalg"
 
-#: ../mail/e-mail-config-defaults-page.c:610
+#: ../mail/e-mail-config-defaults-page.c:645
 msgid "Use a Real Folder for _Trash:"
 msgstr "Bruk en virkelig mappe som _papirkurv:"
 
-#: ../mail/e-mail-config-defaults-page.c:611
+#: ../mail/e-mail-config-defaults-page.c:646
 msgid "Choose a folder for deleted messages."
 msgstr "Velg en mappe for slettede meldinger."
 
-#: ../mail/e-mail-config-defaults-page.c:620
+#: ../mail/e-mail-config-defaults-page.c:655
 msgid "Use a Real Folder for _Junk:"
 msgstr "Bruk en virkelig mappe for uÃnskede _meldinger:"
 
-#: ../mail/e-mail-config-defaults-page.c:621
+#: ../mail/e-mail-config-defaults-page.c:656
 msgid "Choose a folder for junk messages."
 msgstr "Velg en mappe for uÃnskede meldinger."
 
-#: ../mail/e-mail-config-defaults-page.c:638
+#: ../mail/e-mail-config-defaults-page.c:673
 msgid "Composing Messages"
 msgstr "Skriver meldinger"
 
-#: ../mail/e-mail-config-defaults-page.c:647
+#: ../mail/e-mail-config-defaults-page.c:682
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "All_tid _kopi (cc) til:"
 
-#: ../mail/e-mail-config-defaults-page.c:672
+#: ../mail/e-mail-config-defaults-page.c:707
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Alltid _blindkopi (bcc) til:"
 
-#: ../mail/e-mail-config-defaults-page.c:707
+#: ../mail/e-mail-config-defaults-page.c:742
 msgid "Message Receipts"
 msgstr "Meldingsmottakere"
 
-#: ../mail/e-mail-config-defaults-page.c:716
+#: ../mail/e-mail-config-defaults-page.c:751
 msgid "S_end message receipts:"
 msgstr "Send kvittering for m_eldinger:"
 
-#: ../mail/e-mail-config-defaults-page.c:741
+#: ../mail/e-mail-config-defaults-page.c:776
 msgid "Never"
 msgstr "Aldri"
 
-#: ../mail/e-mail-config-defaults-page.c:747
+#: ../mail/e-mail-config-defaults-page.c:782
 msgid "Always"
 msgstr "Alltid"
 
-#: ../mail/e-mail-config-defaults-page.c:753
+#: ../mail/e-mail-config-defaults-page.c:788
 msgid "Ask for each message"
 msgstr "SpÃr for hver melding"
 
-#: ../mail/e-mail-config-defaults-page.c:824
+#: ../mail/e-mail-config-defaults-page.c:859
 msgid "Defaults"
 msgstr "Forvalg"
 
-#: ../mail/e-mail-config-identity-page.c:254
+#: ../mail/e-mail-config-identity-page.c:268
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -10713,12 +10711,12 @@ msgstr ""
 "under mà ikke nÃdvendigvis fylles ut, hvis du ikke Ãnsker à inkludere denne "
 "informasjonen i meldingene du sender."
 
-#: ../mail/e-mail-config-identity-page.c:282
+#: ../mail/e-mail-config-identity-page.c:296
 #: ../mail/e-mail-config-summary-page.c:324
 msgid "Account Information"
 msgstr "Kontoinformasjon"
 
-#: ../mail/e-mail-config-identity-page.c:291
+#: ../mail/e-mail-config-identity-page.c:305
 #: ../mail/e-mail-config-summary-page.c:333
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
@@ -10727,44 +10725,43 @@ msgstr ""
 "Skriv navnet du vil referere til denne kontoen.\n"
 "For eksempel ÂArbeid eller ÂPersonligÂ"
 
-#: ../mail/e-mail-config-identity-page.c:299
+#: ../mail/e-mail-config-identity-page.c:313
 #: ../mail/e-mail-config-summary-page.c:341
-#: ../modules/addressbook/ldap-config.ui.h:12
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
 #: ../widgets/misc/e-mail-signature-script-dialog.c:417
 msgid "_Name:"
 msgstr "_Navn:"
 
-#: ../mail/e-mail-config-identity-page.c:336
+#: ../mail/e-mail-config-identity-page.c:350
 msgid "Required Information"
 msgstr "NÃdvendig informasjon"
 
-#: ../mail/e-mail-config-identity-page.c:345
+#: ../mail/e-mail-config-identity-page.c:359
 msgid "Full Nam_e:"
 msgstr "_Fullt navn:"
 
-#: ../mail/e-mail-config-identity-page.c:372
+#: ../mail/e-mail-config-identity-page.c:386
 msgid "Email _Address:"
 msgstr "E-post_adresse:"
 
-#: ../mail/e-mail-config-identity-page.c:409
+#: ../mail/e-mail-config-identity-page.c:433
 #: ../plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "Optional Information"
 msgstr "Valgfri informasjon"
 
-#: ../mail/e-mail-config-identity-page.c:417
+#: ../mail/e-mail-config-identity-page.c:441
 msgid "Re_ply-To:"
 msgstr "S_var-til:"
 
-#: ../mail/e-mail-config-identity-page.c:444
+#: ../mail/e-mail-config-identity-page.c:468
 msgid "Or_ganization:"
 msgstr "Or_ganisasjon:"
 
-#: ../mail/e-mail-config-identity-page.c:499
+#: ../mail/e-mail-config-identity-page.c:523
 msgid "Add Ne_w Signature..."
 msgstr "Legg til n_y signatur â"
 
-#: ../mail/e-mail-config-identity-page.c:640
+#: ../mail/e-mail-config-identity-page.c:679
 msgid "Identity"
 msgstr "Identitet"
 
@@ -10926,13 +10923,13 @@ msgid "Server Type:"
 msgstr "Tjenertype:"
 
 #: ../mail/e-mail-config-summary-page.c:454
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:602
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:610
 #: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:244
 msgid "Server:"
 msgstr "Tjener:"
 
 #: ../mail/e-mail-config-summary-page.c:475
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:691
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:699
 msgid "Username:"
 msgstr "Brukernavn:"
 
@@ -11082,619 +11079,619 @@ msgstr "Verdi for meldingshode"
 msgid "Headers"
 msgstr "Meldingshoder"
 
-#: ../mail/e-mail-reader.c:349
+#: ../mail/e-mail-reader.c:350
 msgid "Save Image"
 msgstr "Lagre bilde"
 
-#: ../mail/e-mail-reader.c:431 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:432 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Kopier til mappe"
 
-#: ../mail/e-mail-reader.c:431 ../mail/em-folder-utils.c:492
+#: ../mail/e-mail-reader.c:432 ../mail/em-folder-utils.c:492
 msgid "C_opy"
 msgstr "K_opier"
 
-#: ../mail/e-mail-reader.c:965 ../mail/em-filter-i18n.h:53
+#: ../mail/e-mail-reader.c:966 ../mail/em-filter-i18n.h:53
 msgid "Move to Folder"
 msgstr "Flytt til mappe"
 
-#: ../mail/e-mail-reader.c:965 ../mail/em-folder-utils.c:492
+#: ../mail/e-mail-reader.c:966 ../mail/em-folder-utils.c:492
 msgid "_Move"
 msgstr "_Flytt"
 
-#: ../mail/e-mail-reader.c:1313 ../mail/e-mail-reader.c:1495
-#: ../mail/e-mail-reader.c:1535
+#: ../mail/e-mail-reader.c:1314 ../mail/e-mail-reader.c:1496
+#: ../mail/e-mail-reader.c:1536
 msgid "_Do not ask me again."
 msgstr "_Ikke spÃr meg igjen."
 
-#: ../mail/e-mail-reader.c:1541
+#: ../mail/e-mail-reader.c:1542
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Alltid ignorer Reply-To: for e-postlister."
 
-#: ../mail/e-mail-reader.c:1726
+#: ../mail/e-mail-reader.c:1732
 msgid "Failed to retrieve message:"
 msgstr "Klarte ikke à hente melding:"
 
-#: ../mail/e-mail-reader.c:1772 ../mail/e-mail-reader.c:2862
+#: ../mail/e-mail-reader.c:1778 ../mail/e-mail-reader.c:2868
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "Henter melding Â%sÂ"
 
-#: ../mail/e-mail-reader.c:1949
+#: ../mail/e-mail-reader.c:1955
 msgid "A_dd Sender to Address Book"
 msgstr "L_egg til avsender i adressebok"
 
-#: ../mail/e-mail-reader.c:1951
+#: ../mail/e-mail-reader.c:1957
 msgid "Add sender to address book"
 msgstr "Legg til avsender i adressebok"
 
-#: ../mail/e-mail-reader.c:1956
+#: ../mail/e-mail-reader.c:1962
 msgid "Check for _Junk"
 msgstr "Sjekk etter _uÃnsket e-post"
 
-#: ../mail/e-mail-reader.c:1958
+#: ../mail/e-mail-reader.c:1964
 msgid "Filter the selected messages for junk status"
 msgstr "Filtrer valgte meldinger etter uÃnsket e-poststatus"
 
-#: ../mail/e-mail-reader.c:1963
+#: ../mail/e-mail-reader.c:1969
 msgid "_Copy to Folder..."
 msgstr "K_opier til mappe â"
 
-#: ../mail/e-mail-reader.c:1965
+#: ../mail/e-mail-reader.c:1971
 msgid "Copy selected messages to another folder"
 msgstr "Kopier valgte meldinger til en annen mappe"
 
-#: ../mail/e-mail-reader.c:1970
+#: ../mail/e-mail-reader.c:1976
 msgid "_Delete Message"
 msgstr "_Slett melding"
 
-#: ../mail/e-mail-reader.c:1972
+#: ../mail/e-mail-reader.c:1978
 msgid "Mark the selected messages for deletion"
 msgstr "Merk valgte meldinger for sletting"
 
-#: ../mail/e-mail-reader.c:1977
+#: ../mail/e-mail-reader.c:1983
 msgid "Create a Filter Rule for Mailing _List..."
 msgstr "Lag filterregel for e-post_liste â"
 
-#: ../mail/e-mail-reader.c:1979
+#: ../mail/e-mail-reader.c:1985
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Lag en regel for à filtrere meldinger til denne meldingslisten"
 
-#: ../mail/e-mail-reader.c:1984
+#: ../mail/e-mail-reader.c:1990
 msgid "Create a Filter Rule for _Recipients..."
 msgstr "Lag en filterregel for mottake_re â"
 
-#: ../mail/e-mail-reader.c:1986
+#: ../mail/e-mail-reader.c:1992
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Lag en regel for à filtrere meldinger til disse mottakerene"
 
-#: ../mail/e-mail-reader.c:1991
+#: ../mail/e-mail-reader.c:1997
 msgid "Create a Filter Rule for Se_nder..."
 msgstr "Lag en filterregel for avse_nder â"
 
-#: ../mail/e-mail-reader.c:1993
+#: ../mail/e-mail-reader.c:1999
 msgid "Create a rule to filter messages from this sender"
 msgstr "Lag en regel for à filtrere meldinger fra denne avsenderen"
 
-#: ../mail/e-mail-reader.c:1998
+#: ../mail/e-mail-reader.c:2004
 msgid "Create a Filter Rule for _Subject..."
 msgstr "Lag en filterregel for e_mne â"
 
-#: ../mail/e-mail-reader.c:2000
+#: ../mail/e-mail-reader.c:2006
 msgid "Create a rule to filter messages with this subject"
 msgstr "Lag en regel for filtrering av meldinger med dette emnet"
 
-#: ../mail/e-mail-reader.c:2005
+#: ../mail/e-mail-reader.c:2011
 msgid "A_pply Filters"
 msgstr "_PÃfÃr filtre"
 
-#: ../mail/e-mail-reader.c:2007
+#: ../mail/e-mail-reader.c:2013
 msgid "Apply filter rules to the selected messages"
 msgstr "Aktiver filterregler pà de valgte meldingene"
 
-#: ../mail/e-mail-reader.c:2012
+#: ../mail/e-mail-reader.c:2018
 msgid "_Find in Message..."
 msgstr "_Finn i melding â"
 
-#: ../mail/e-mail-reader.c:2014
+#: ../mail/e-mail-reader.c:2020
 msgid "Search for text in the body of the displayed message"
 msgstr "SÃk etter tekst i kroppen av vist melding"
 
-#: ../mail/e-mail-reader.c:2019
+#: ../mail/e-mail-reader.c:2025
 msgid "_Clear Flag"
 msgstr "F_jern flagg"
 
-#: ../mail/e-mail-reader.c:2021
+#: ../mail/e-mail-reader.c:2027
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Fjern flagg for oppfÃlging fra valgte meldinger"
 
-#: ../mail/e-mail-reader.c:2026
+#: ../mail/e-mail-reader.c:2032
 msgid "_Flag Completed"
 msgstr "Merk som _fullfÃrt"
 
-#: ../mail/e-mail-reader.c:2028
+#: ../mail/e-mail-reader.c:2034
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "Sett flagg for oppfÃlging til fullfÃrt pà valgte meldinger"
 
-#: ../mail/e-mail-reader.c:2033
+#: ../mail/e-mail-reader.c:2039
 msgid "Follow _Up..."
 msgstr "FÃlg _opp â"
 
-#: ../mail/e-mail-reader.c:2035
+#: ../mail/e-mail-reader.c:2041
 msgid "Flag the selected messages for follow-up"
 msgstr "Merk valgte meldinger for oppfÃlging"
 
-#: ../mail/e-mail-reader.c:2040
+#: ../mail/e-mail-reader.c:2046
 msgid "_Attached"
 msgstr "L_agt ved"
 
-#: ../mail/e-mail-reader.c:2042 ../mail/e-mail-reader.c:2049
+#: ../mail/e-mail-reader.c:2048 ../mail/e-mail-reader.c:2055
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Videresend den valgte meldingen til noen som et vedlegg"
 
-#: ../mail/e-mail-reader.c:2047
+#: ../mail/e-mail-reader.c:2053
 msgid "Forward As _Attached"
 msgstr "Videresend s_om vedlegg"
 
-#: ../mail/e-mail-reader.c:2054
+#: ../mail/e-mail-reader.c:2060
 msgid "_Inline"
 msgstr "_I meldingen"
 
-#: ../mail/e-mail-reader.c:2056 ../mail/e-mail-reader.c:2063
+#: ../mail/e-mail-reader.c:2062 ../mail/e-mail-reader.c:2069
 msgid "Forward the selected message in the body of a new message"
 msgstr "Videresend den valgte meldingen i kroppen av en ny melding"
 
-#: ../mail/e-mail-reader.c:2061
+#: ../mail/e-mail-reader.c:2067
 msgid "Forward As _Inline"
 msgstr "V_ideresend som vedlegg"
 
-#: ../mail/e-mail-reader.c:2068
+#: ../mail/e-mail-reader.c:2074
 msgid "_Quoted"
 msgstr "_Sitert"
 
-#: ../mail/e-mail-reader.c:2070 ../mail/e-mail-reader.c:2077
+#: ../mail/e-mail-reader.c:2076 ../mail/e-mail-reader.c:2083
 msgid "Forward the selected message quoted like a reply"
 msgstr "Videresend den valgte meldingen sitert som et svar"
 
-#: ../mail/e-mail-reader.c:2075
+#: ../mail/e-mail-reader.c:2081
 msgid "Forward As _Quoted"
 msgstr "Videresend s_om sitat"
 
-#: ../mail/e-mail-reader.c:2082
+#: ../mail/e-mail-reader.c:2088
 msgid "_Load Images"
 msgstr "_Last bilder"
 
-#: ../mail/e-mail-reader.c:2084
+#: ../mail/e-mail-reader.c:2090
 msgid "Force images in HTML mail to be loaded"
 msgstr "Tvungen lasting av bilder i HTML e-post"
 
-#: ../mail/e-mail-reader.c:2089
+#: ../mail/e-mail-reader.c:2095
 msgid "_Important"
 msgstr "V_iktig"
 
-#: ../mail/e-mail-reader.c:2091
+#: ../mail/e-mail-reader.c:2097
 msgid "Mark the selected messages as important"
 msgstr "Merk valgte meldinger som viktige"
 
-#: ../mail/e-mail-reader.c:2096
+#: ../mail/e-mail-reader.c:2102
 msgid "_Junk"
 msgstr "_UÃnsket e-post"
 
-#: ../mail/e-mail-reader.c:2098
+#: ../mail/e-mail-reader.c:2104
 msgid "Mark the selected messages as junk"
 msgstr "Merk valgte meldinger som uÃnsket e-post"
 
-#: ../mail/e-mail-reader.c:2103
+#: ../mail/e-mail-reader.c:2109
 msgid "_Not Junk"
 msgstr "_Ikke uÃnsket e-post"
 
-#: ../mail/e-mail-reader.c:2105
+#: ../mail/e-mail-reader.c:2111
 msgid "Mark the selected messages as not being junk"
 msgstr "Merk valgte meldinger som Ãnsket e-post"
 
-#: ../mail/e-mail-reader.c:2110
+#: ../mail/e-mail-reader.c:2116
 msgid "_Read"
 msgstr "_Les"
 
-#: ../mail/e-mail-reader.c:2112
+#: ../mail/e-mail-reader.c:2118
 msgid "Mark the selected messages as having been read"
 msgstr "Merk valgte meldinger som lest"
 
-#: ../mail/e-mail-reader.c:2117
+#: ../mail/e-mail-reader.c:2123
 msgid "Uni_mportant"
 msgstr "_Ikke viktig"
 
-#: ../mail/e-mail-reader.c:2119
+#: ../mail/e-mail-reader.c:2125
 msgid "Mark the selected messages as unimportant"
 msgstr "Merk valgte meldinger som uviktige"
 
-#: ../mail/e-mail-reader.c:2124
+#: ../mail/e-mail-reader.c:2130
 msgid "_Unread"
 msgstr "_Ulest"
 
-#: ../mail/e-mail-reader.c:2126
+#: ../mail/e-mail-reader.c:2132
 msgid "Mark the selected messages as not having been read"
 msgstr "Merk valgte meldinger som ulest"
 
-#: ../mail/e-mail-reader.c:2131
+#: ../mail/e-mail-reader.c:2137
 msgid "_Edit as New Message..."
 msgstr "R_ediger som ny melding â"
 
-#: ../mail/e-mail-reader.c:2133
+#: ../mail/e-mail-reader.c:2139
 msgid "Open the selected messages in the composer for editing"
 msgstr "Ãpne valgte meldinger i redigeringskomponenten"
 
-#: ../mail/e-mail-reader.c:2138
+#: ../mail/e-mail-reader.c:2144
 msgid "Compose _New Message"
 msgstr "Skriv _ny melding"
 
-#: ../mail/e-mail-reader.c:2140
+#: ../mail/e-mail-reader.c:2146
 msgid "Open a window for composing a mail message"
 msgstr "Ãpne et vindu for à skrive en e-post melding"
 
-#: ../mail/e-mail-reader.c:2145
+#: ../mail/e-mail-reader.c:2151
 msgid "_Open in New Window"
 msgstr "_Ãpne i _nytt vindu"
 
-#: ../mail/e-mail-reader.c:2147
+#: ../mail/e-mail-reader.c:2153
 msgid "Open the selected messages in a new window"
 msgstr "Ãpne valgte meldinger i et nytt vindu"
 
-#: ../mail/e-mail-reader.c:2152
+#: ../mail/e-mail-reader.c:2158
 msgid "_Move to Folder..."
 msgstr "Fl_ytt til mappe â"
 
-#: ../mail/e-mail-reader.c:2154
+#: ../mail/e-mail-reader.c:2160
 msgid "Move selected messages to another folder"
 msgstr "Flytt valgte meldinger til en annen mappe"
 
-#: ../mail/e-mail-reader.c:2159
+#: ../mail/e-mail-reader.c:2165
 msgid "_Switch to Folder"
 msgstr "_Bytt til mappe"
 
-#: ../mail/e-mail-reader.c:2161
+#: ../mail/e-mail-reader.c:2167
 msgid "Display the parent folder"
 msgstr "Vis opphavsmappe"
 
-#: ../mail/e-mail-reader.c:2166
+#: ../mail/e-mail-reader.c:2172
 msgid "Switch to _next tab"
 msgstr "Bytt til _neste fane"
 
-#: ../mail/e-mail-reader.c:2168
+#: ../mail/e-mail-reader.c:2174
 msgid "Switch to the next tab"
 msgstr "Bytt til neste fane"
 
-#: ../mail/e-mail-reader.c:2173
+#: ../mail/e-mail-reader.c:2179
 msgid "Switch to _previous tab"
 msgstr "Bytt til _forrige fane"
 
-#: ../mail/e-mail-reader.c:2175
+#: ../mail/e-mail-reader.c:2181
 msgid "Switch to the previous tab"
 msgstr "Bytt til forrige fane"
 
-#: ../mail/e-mail-reader.c:2180
+#: ../mail/e-mail-reader.c:2186
 msgid "Cl_ose current tab"
 msgstr "L_ukk aktiv fane"
 
-#: ../mail/e-mail-reader.c:2182
+#: ../mail/e-mail-reader.c:2188
 msgid "Close current tab"
 msgstr "Lukk aktiv fane"
 
-#: ../mail/e-mail-reader.c:2187
+#: ../mail/e-mail-reader.c:2193
 msgid "_Next Message"
 msgstr "_Neste melding"
 
-#: ../mail/e-mail-reader.c:2189
+#: ../mail/e-mail-reader.c:2195
 msgid "Display the next message"
 msgstr "Vis neste melding"
 
-#: ../mail/e-mail-reader.c:2194
+#: ../mail/e-mail-reader.c:2200
 msgid "Next _Important Message"
 msgstr "Neste v_iktige melding"
 
-#: ../mail/e-mail-reader.c:2196
+#: ../mail/e-mail-reader.c:2202
 msgid "Display the next important message"
 msgstr "Vis neste viktige melding"
 
-#: ../mail/e-mail-reader.c:2201
+#: ../mail/e-mail-reader.c:2207
 msgid "Next _Thread"
 msgstr "Neste _trÃd"
 
-#: ../mail/e-mail-reader.c:2203
+#: ../mail/e-mail-reader.c:2209
 msgid "Display the next thread"
 msgstr "Vis neste trÃd"
 
-#: ../mail/e-mail-reader.c:2208
+#: ../mail/e-mail-reader.c:2214
 msgid "Next _Unread Message"
 msgstr "Neste _uleste melding"
 
-#: ../mail/e-mail-reader.c:2210
+#: ../mail/e-mail-reader.c:2216
 msgid "Display the next unread message"
 msgstr "Vis neste uleste melding"
 
-#: ../mail/e-mail-reader.c:2215
+#: ../mail/e-mail-reader.c:2221
 msgid "_Previous Message"
 msgstr "_Forrige melding"
 
-#: ../mail/e-mail-reader.c:2217
+#: ../mail/e-mail-reader.c:2223
 msgid "Display the previous message"
 msgstr "Vis forrige melding"
 
-#: ../mail/e-mail-reader.c:2222
+#: ../mail/e-mail-reader.c:2228
 msgid "Pr_evious Important Message"
 msgstr "Forrig_e viktige melding"
 
-#: ../mail/e-mail-reader.c:2224
+#: ../mail/e-mail-reader.c:2230
 msgid "Display the previous important message"
 msgstr "Vis forrige viktige melding"
 
-#: ../mail/e-mail-reader.c:2229
+#: ../mail/e-mail-reader.c:2235
 msgid "Previous T_hread"
 msgstr "Forrige trÃ_d"
 
-#: ../mail/e-mail-reader.c:2231
+#: ../mail/e-mail-reader.c:2237
 msgid "Display the previous thread"
 msgstr "Vis forrige trÃd"
 
-#: ../mail/e-mail-reader.c:2236
+#: ../mail/e-mail-reader.c:2242
 msgid "P_revious Unread Message"
 msgstr "Fo_rrige uleste melding"
 
-#: ../mail/e-mail-reader.c:2238
+#: ../mail/e-mail-reader.c:2244
 msgid "Display the previous unread message"
 msgstr "Vis forrige uleste melding"
 
-#: ../mail/e-mail-reader.c:2245
+#: ../mail/e-mail-reader.c:2251
 msgid "Print this message"
 msgstr "Skriv ut denne meldingen"
 
-#: ../mail/e-mail-reader.c:2252
+#: ../mail/e-mail-reader.c:2258
 msgid "Preview the message to be printed"
 msgstr "ForhÃndsvis meldingen som skal skrives ut"
 
-#: ../mail/e-mail-reader.c:2257
+#: ../mail/e-mail-reader.c:2263
 msgid "Re_direct"
 msgstr "Om_diriger"
 
-#: ../mail/e-mail-reader.c:2259
+#: ../mail/e-mail-reader.c:2265
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Omdiriger (bounce) den valgte meldingen til noen"
 
-#: ../mail/e-mail-reader.c:2264
+#: ../mail/e-mail-reader.c:2270
 msgid "Remo_ve Attachments"
 msgstr "Fjern _vedlegg"
 
-#: ../mail/e-mail-reader.c:2266
+#: ../mail/e-mail-reader.c:2272
 msgid "Remove attachments"
 msgstr "Fjern vedlegg"
 
-#: ../mail/e-mail-reader.c:2271
+#: ../mail/e-mail-reader.c:2277
 msgid "Remove Du_plicate Messages"
 msgstr "Fjern du_plikatmeldinger"
 
-#: ../mail/e-mail-reader.c:2273
+#: ../mail/e-mail-reader.c:2279
 msgid "Checks selected messages for duplicates"
 msgstr "Sjekk valgte meldinger for duplikater"
 
-#: ../mail/e-mail-reader.c:2278 ../mail/mail.error.xml.h:27
+#: ../mail/e-mail-reader.c:2284 ../mail/mail.error.xml.h:27
 #: ../modules/calendar/e-cal-shell-view-actions.c:1574
-#: ../modules/mail/e-mail-attachment-handler.c:182
+#: ../modules/mail/e-mail-attachment-handler.c:160
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: ../mail/e-mail-reader.c:2280
+#: ../mail/e-mail-reader.c:2286
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "Skriv et svar til alle mottakere av den valgte meldingen"
 
-#: ../mail/e-mail-reader.c:2285 ../mail/mail.error.xml.h:25
+#: ../mail/e-mail-reader.c:2291 ../mail/mail.error.xml.h:25
 msgid "Reply to _List"
 msgstr "Svar til _listen"
 
-#: ../mail/e-mail-reader.c:2287
+#: ../mail/e-mail-reader.c:2293
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Skriv et svar til e-postlisten for den valgte meldingen"
 
-#: ../mail/e-mail-reader.c:2292
-#: ../modules/mail/e-mail-attachment-handler.c:189
+#: ../mail/e-mail-reader.c:2298
+#: ../modules/mail/e-mail-attachment-handler.c:167
 msgid "_Reply to Sender"
 msgstr "Sva_r til avsender"
 
-#: ../mail/e-mail-reader.c:2294
+#: ../mail/e-mail-reader.c:2300
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Skriv et svar til avsender av den valgte meldingen"
 
-#: ../mail/e-mail-reader.c:2299
+#: ../mail/e-mail-reader.c:2305
 msgid "_Save as mbox..."
 msgstr "Lagre _som mbox â"
 
-#: ../mail/e-mail-reader.c:2301
+#: ../mail/e-mail-reader.c:2307
 msgid "Save selected messages as an mbox file"
 msgstr "Lagre valgte meldinger som en mbox-fil"
 
-#: ../mail/e-mail-reader.c:2306
+#: ../mail/e-mail-reader.c:2312
 msgid "_Message Source"
 msgstr "_Meldingskilde"
 
-#: ../mail/e-mail-reader.c:2308
+#: ../mail/e-mail-reader.c:2314
 msgid "Show the raw email source of the message"
 msgstr "Vis e-post meldingen i sin rÃe form"
 
-#: ../mail/e-mail-reader.c:2320
+#: ../mail/e-mail-reader.c:2326
 msgid "_Undelete Message"
 msgstr "_Angre sletting av melding"
 
-#: ../mail/e-mail-reader.c:2322
+#: ../mail/e-mail-reader.c:2328
 msgid "Undelete the selected messages"
 msgstr "Angre sletting av valgte meldinger"
 
-#: ../mail/e-mail-reader.c:2327
+#: ../mail/e-mail-reader.c:2333
 msgid "_Normal Size"
 msgstr "_Normal stÃrrelse"
 
-#: ../mail/e-mail-reader.c:2329
+#: ../mail/e-mail-reader.c:2335
 msgid "Reset the text to its original size"
 msgstr "Ta teksten tilbake til sin opprinnelige stÃrrelse"
 
-#: ../mail/e-mail-reader.c:2334
+#: ../mail/e-mail-reader.c:2340
 msgid "_Zoom In"
 msgstr "_Zoom inn"
 
-#: ../mail/e-mail-reader.c:2336
+#: ../mail/e-mail-reader.c:2342
 msgid "Increase the text size"
 msgstr "StÃrre tekst"
 
-#: ../mail/e-mail-reader.c:2341
+#: ../mail/e-mail-reader.c:2347
 msgid "Zoom _Out"
 msgstr "Zoom _ut"
 
-#: ../mail/e-mail-reader.c:2343
+#: ../mail/e-mail-reader.c:2349
 msgid "Decrease the text size"
 msgstr "Mindre skrift"
 
-#: ../mail/e-mail-reader.c:2350
+#: ../mail/e-mail-reader.c:2356
 msgid "Cre_ate"
 msgstr "L_ag"
 
-#: ../mail/e-mail-reader.c:2357
+#: ../mail/e-mail-reader.c:2363
 msgid "Ch_aracter Encoding"
 msgstr "Tegn_koding"
 
-#: ../mail/e-mail-reader.c:2364
+#: ../mail/e-mail-reader.c:2370
 msgid "F_orward As"
 msgstr "Videresend s_om"
 
-#: ../mail/e-mail-reader.c:2371
+#: ../mail/e-mail-reader.c:2377
 msgid "_Group Reply"
 msgstr "_Gruppesvar"
 
-#: ../mail/e-mail-reader.c:2378
+#: ../mail/e-mail-reader.c:2384
 msgid "_Go To"
 msgstr "_GÃ til"
 
-#: ../mail/e-mail-reader.c:2385
+#: ../mail/e-mail-reader.c:2391
 msgid "Mar_k As"
 msgstr "Mer_k som"
 
-#: ../mail/e-mail-reader.c:2392
+#: ../mail/e-mail-reader.c:2398
 msgid "_Message"
 msgstr "_Melding"
 
-#: ../mail/e-mail-reader.c:2399
+#: ../mail/e-mail-reader.c:2405
 msgid "_Zoom"
 msgstr "_Zoom"
 
-#: ../mail/e-mail-reader.c:2409
+#: ../mail/e-mail-reader.c:2415
 msgid "Create a Search Folder from Mailing _List..."
 msgstr "Lag en sÃkemappe fra e-post_liste â"
 
-#: ../mail/e-mail-reader.c:2411
+#: ../mail/e-mail-reader.c:2417
 msgid "Create a search folder for this mailing list"
 msgstr "Lag en sÃkemappe for denne e-postlisten"
 
-#: ../mail/e-mail-reader.c:2416
+#: ../mail/e-mail-reader.c:2422
 msgid "Create a Search Folder from Recipien_ts..."
 msgstr "Lag en sÃkemappe fra mo_ttakere â"
 
-#: ../mail/e-mail-reader.c:2418
+#: ../mail/e-mail-reader.c:2424
 msgid "Create a search folder for these recipients"
 msgstr "Lag en sÃkemappe for disse mottakerene"
 
-#: ../mail/e-mail-reader.c:2423
+#: ../mail/e-mail-reader.c:2429
 msgid "Create a Search Folder from Sen_der..."
 msgstr "Lag en sÃkemappe fra avsen_der â"
 
-#: ../mail/e-mail-reader.c:2425
+#: ../mail/e-mail-reader.c:2431
 msgid "Create a search folder for this sender"
 msgstr "Lag en sÃkemappe for denne avsenderen"
 
-#: ../mail/e-mail-reader.c:2430
+#: ../mail/e-mail-reader.c:2436
 msgid "Create a Search Folder from S_ubject..."
 msgstr "Lag en sÃkemappe fra _emne â"
 
-#: ../mail/e-mail-reader.c:2432
+#: ../mail/e-mail-reader.c:2438
 msgid "Create a search folder for this subject"
 msgstr "Lag en sÃkemappe for dette emnet"
 
-#: ../mail/e-mail-reader.c:2455
+#: ../mail/e-mail-reader.c:2461
 msgid "Mark for Follo_w Up..."
 msgstr "Merk for oppfÃl_ging â"
 
-#: ../mail/e-mail-reader.c:2463
+#: ../mail/e-mail-reader.c:2469
 msgid "Mark as _Important"
 msgstr "Merk som v_iktig"
 
-#: ../mail/e-mail-reader.c:2467
+#: ../mail/e-mail-reader.c:2473
 msgid "Mark as _Junk"
 msgstr "Merk som _uÃnsket e-post"
 
-#: ../mail/e-mail-reader.c:2471
+#: ../mail/e-mail-reader.c:2477
 msgid "Mark as _Not Junk"
 msgstr "Merk som _gyldig melding"
 
-#: ../mail/e-mail-reader.c:2475
+#: ../mail/e-mail-reader.c:2481
 msgid "Mar_k as Read"
 msgstr "Mer_k som lest"
 
-#: ../mail/e-mail-reader.c:2479
+#: ../mail/e-mail-reader.c:2485
 msgid "Mark as Uni_mportant"
 msgstr "_Merk som uviktig"
 
-#: ../mail/e-mail-reader.c:2483
+#: ../mail/e-mail-reader.c:2489
 msgid "Mark as _Unread"
 msgstr "Merk som _ulest"
 
-#: ../mail/e-mail-reader.c:2527
+#: ../mail/e-mail-reader.c:2533
 msgid "_Caret Mode"
 msgstr "MarkÃr_modus"
 
-#: ../mail/e-mail-reader.c:2529
+#: ../mail/e-mail-reader.c:2535
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Vis en blinkende markÃr i kroppen av meldinger som vises"
 
-#: ../mail/e-mail-reader.c:2535
+#: ../mail/e-mail-reader.c:2541
 msgid "All Message _Headers"
 msgstr "Alle meldings_hoder"
 
-#: ../mail/e-mail-reader.c:2537
+#: ../mail/e-mail-reader.c:2543
 msgid "Show messages with all email headers"
 msgstr "Vis meldinger med alle meldingshoder"
 
-#: ../mail/e-mail-reader.c:2868
+#: ../mail/e-mail-reader.c:2874
 msgid "Retrieving message"
 msgstr "Henter melding"
 
-#: ../mail/e-mail-reader.c:3851
-#: ../modules/mail/e-mail-attachment-handler.c:175
+#: ../mail/e-mail-reader.c:3854
+#: ../modules/mail/e-mail-attachment-handler.c:153
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: ../mail/e-mail-reader.c:3852
+#: ../mail/e-mail-reader.c:3855
 msgid "Forward the selected message to someone"
 msgstr "Videresend den valgte meldingen til noen"
 
-#: ../mail/e-mail-reader.c:3871
+#: ../mail/e-mail-reader.c:3874
 msgid "Group Reply"
 msgstr "Gruppesvar"
 
-#: ../mail/e-mail-reader.c:3872
+#: ../mail/e-mail-reader.c:3875
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "Svar til e-postlisten eller til alle mottakere"
 
-#: ../mail/e-mail-reader.c:3929 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:3941 ../mail/em-filter-i18n.h:14
 msgid "Delete"
 msgstr "Slett"
 
-#: ../mail/e-mail-reader.c:3962
+#: ../mail/e-mail-reader.c:3974
 #: ../modules/calendar/e-cal-shell-view-actions.c:1399
 msgid "Next"
 msgstr "Neste"
 
-#: ../mail/e-mail-reader.c:3966
+#: ../mail/e-mail-reader.c:3978
 #: ../modules/calendar/e-cal-shell-view-actions.c:1392
 msgid "Previous"
 msgstr "Forrige"
 
-#: ../mail/e-mail-reader.c:3975 ../mail/mail-dialogs.ui.h:15
+#: ../mail/e-mail-reader.c:3987 ../mail/mail-dialogs.ui.h:15
 msgid "Reply"
 msgstr "Svar"
 
@@ -11728,7 +11725,7 @@ msgstr[1] ""
 "Mappen Â%s inneholder %u duplikatmeldinger. Er du sikker pà at du vil "
 "slette dem?"
 
-#: ../mail/e-mail-reader-utils.c:1541
+#: ../mail/e-mail-reader-utils.c:1544
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Lagre melding"
@@ -11739,13 +11736,13 @@ msgstr[1] "Lagre meldinger"
 #. * mbox format, when the first message doesn't have a
 #. * subject.  The extension ".mbox" is appended to the
 #. * string; for example "Message.mbox".
-#: ../mail/e-mail-reader-utils.c:1562
+#: ../mail/e-mail-reader-utils.c:1565
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Melding"
 msgstr[1] "Meldinger"
 
-#: ../mail/e-mail-reader-utils.c:2017
+#: ../mail/e-mail-reader-utils.c:2020
 msgid "Parsing message"
 msgstr "Leser melding"
 
@@ -11778,15 +11775,15 @@ msgstr "---------Videresendt melding-------"
 msgid "-----Original Message-----"
 msgstr "-----Opprinnelig melding-----"
 
-#: ../mail/em-composer-utils.c:2573
+#: ../mail/em-composer-utils.c:2617
 msgid "an unknown sender"
 msgstr "en ukjent avsender"
 
-#: ../mail/em-composer-utils.c:2991
+#: ../mail/em-composer-utils.c:3036
 msgid "Posting destination"
 msgstr "Destinasjon for post"
 
-#: ../mail/em-composer-utils.c:2992
+#: ../mail/em-composer-utils.c:3037
 msgid "Choose folders to post the message to."
 msgstr "Velg mapper meldingen skal postes til."
 
@@ -12303,7 +12300,7 @@ msgid "Importing Elm data"
 msgstr "Importerer data fra Elm"
 
 #: ../mail/importers/elm-importer.c:332 ../mail/importers/pine-importer.c:423
-#: ../modules/mail/e-mail-shell-view.c:1074
+#: ../modules/mail/e-mail-shell-view.c:1034
 #: ../widgets/misc/e-send-options.c:538
 msgid "Mail"
 msgstr "E-post"
@@ -12522,6 +12519,10 @@ msgid "_Languages"
 msgstr "_SprÃk"
 
 #: ../mail/mail-config.ui.h:23
+msgid "Languages Table"
+msgstr "SprÃktabell"
+
+#: ../mail/mail-config.ui.h:24
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -12529,10 +12530,6 @@ msgstr ""
 "SprÃklisten som vises her reflekterer kun de sprÃkene du har installert en "
 "ordbok for."
 
-#: ../mail/mail-config.ui.h:24
-msgid "Languages Table"
-msgstr "SprÃktabell"
-
 #: ../mail/mail-config.ui.h:26
 msgid "Check spelling while I _type"
 msgstr "Sjekk s_taving mens jeg skriver"
@@ -12658,7 +12655,7 @@ msgid "No _Proxy for:"
 msgstr "Ingen _proxy for:"
 
 #: ../mail/mail-config.ui.h:64
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:608
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:616
 msgid "Port:"
 msgstr "Port:"
 
@@ -12831,17 +12828,17 @@ msgstr ""
 "Alternativet vil ignoreres hvis det finnes treff for egendefinerte "
 "meldingshoder for uÃnsket e-post."
 
-#: ../mail/mail-config.ui.h:110 ../modules/addressbook/ldap-config.ui.h:3
+#: ../mail/mail-config.ui.h:110
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:237
 #: ../modules/mail-config/e-mail-config-smtp-backend.c:161
 msgid "No encryption"
 msgstr "Ingen kryptering"
 
-#: ../mail/mail-config.ui.h:111 ../modules/addressbook/ldap-config.ui.h:1
+#: ../mail/mail-config.ui.h:111
 msgid "TLS encryption"
 msgstr "TLS-kryptering"
 
-#: ../mail/mail-config.ui.h:112 ../modules/addressbook/ldap-config.ui.h:2
+#: ../mail/mail-config.ui.h:112
 msgid "SSL encryption"
 msgstr "SSL-kryptering"
 
@@ -13668,7 +13665,7 @@ msgstr "Send & motta e-post"
 msgid "Cancel _All"
 msgstr "Avbryt _alle"
 
-#: ../mail/mail-send-recv.c:656 ../mail/mail-send-recv.c:1040
+#: ../mail/mail-send-recv.c:656 ../mail/mail-send-recv.c:1041
 msgid "Updating..."
 msgstr "Oppdaterer â"
 
@@ -13678,8 +13675,8 @@ msgstr "Venter â"
 
 #: ../mail/mail-send-recv.c:1020
 #, c-format
-msgid "Checking for new mail"
-msgstr "Ser etter nye meldinger"
+msgid "Checking for new mail at '%s'"
+msgstr "Ser etter nye meldinger pà Â%sÂ"
 
 #: ../mail/mail-vfolder-ui.c:79
 msgid "Search Folders"
@@ -13814,8 +13811,8 @@ msgid "Due By"
 msgstr "Ferdig til"
 
 #: ../mail/message-list.etspec.h:18
-msgid "Sent Messages"
-msgstr "Sendte meldinger"
+msgid "Messages To"
+msgstr "Meldinger til"
 
 #: ../mail/message-list.etspec.h:20
 msgid "Subject - Trimmed"
@@ -14206,112 +14203,6 @@ msgstr "_Send melding til liste"
 msgid "_Send Message to Contact"
 msgstr "_Send melding til kontakt"
 
-#: ../modules/addressbook/ldap-config.ui.h:4
-msgid "Anonymously"
-msgstr "Anonymt"
-
-#: ../modules/addressbook/ldap-config.ui.h:5
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:674
-msgid "Using email address"
-msgstr "Bruker e-postadresse"
-
-#: ../modules/addressbook/ldap-config.ui.h:6
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:677
-msgid "Using distinguished name (DN)"
-msgstr "Bruk distinguished name (DN)"
-
-#. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:8
-msgid "One"
-msgstr "En"
-
-#. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:10
-msgid "Sub"
-msgstr "Sub"
-
-#: ../modules/addressbook/ldap-config.ui.h:11
-msgid "Supported Search Bases"
-msgstr "StÃttede sÃkebaser"
-
-#: ../modules/addressbook/ldap-config.ui.h:13
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:181
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:113
-msgid "_Port:"
-msgstr "_Port:"
-
-#: ../modules/addressbook/ldap-config.ui.h:14
-msgid "Ser_ver:"
-msgstr "T_jener:"
-
-#: ../modules/addressbook/ldap-config.ui.h:15
-msgid "Use secure _connection:"
-msgstr "Bruk sikker til_kobling:"
-
-#: ../modules/addressbook/ldap-config.ui.h:16
-msgid "_Login method:"
-msgstr "Metode for pÃ_logging:"
-
-#: ../modules/addressbook/ldap-config.ui.h:17
-msgid "Lo_gin:"
-msgstr "Lo_gin"
-
-#: ../modules/addressbook/ldap-config.ui.h:18
-msgid "Search _base:"
-msgstr "SÃke_base:"
-
-#: ../modules/addressbook/ldap-config.ui.h:19
-msgid "_Search scope:"
-msgstr "_SÃkeomrÃde:"
-
-#: ../modules/addressbook/ldap-config.ui.h:20
-msgid "_Find Possible Search Bases"
-msgstr "_Finn mulige sÃkebaser"
-
-#: ../modules/addressbook/ldap-config.ui.h:21
-msgid "S_earch filter:"
-msgstr "SÃk_efilter:"
-
-#: ../modules/addressbook/ldap-config.ui.h:22
-msgid "Search Filter"
-msgstr "SÃkefilter"
-
-#: ../modules/addressbook/ldap-config.ui.h:23
-msgid ""
-"Search filter is the type of object to be searched for. If this is not "
-"modified, the default search will be performed on the type \"person\"."
-msgstr ""
-"SÃkefilter angir type objekter det skal sÃkes etter nÃr et sÃk utfÃres. Hvis "
-"dette ikke endres vil sÃket bruke objektklassen Âperson som forvalg."
-
-#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
-#: ../modules/addressbook/ldap-config.ui.h:25
-msgid "1"
-msgstr "1"
-
-#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
-#: ../modules/addressbook/ldap-config.ui.h:27
-msgid "5"
-msgstr "5"
-
-#: ../modules/addressbook/ldap-config.ui.h:30
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:830
-msgid "contacts"
-msgstr "kontakter"
-
-#: ../modules/addressbook/ldap-config.ui.h:31
-msgid "_Timeout:"
-msgstr "_Tidsavbrudd:"
-
-#: ../modules/addressbook/ldap-config.ui.h:32
-msgid "_Download limit:"
-msgstr "Grense for ne_dlasting:"
-
-#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
-#: ../modules/addressbook/ldap-config.ui.h:34
-msgid "B_rowse this book until limit reached"
-msgstr "B_la gjennom denne boken til grensen nÃs"
-
 #: ../modules/audio-inline/e-mail-formatter-audio-inline.c:310
 msgid "Audio Player"
 msgstr "Lydavspiller"
@@ -14417,7 +14308,7 @@ msgid "Back up complete"
 msgstr "Sikkerhetskopiering fullfÃrt"
 
 #: ../modules/backup-restore/evolution-backup-tool.c:364
-#: ../modules/backup-restore/evolution-backup-tool.c:654
+#: ../modules/backup-restore/evolution-backup-tool.c:659
 msgid "Restarting Evolution"
 msgstr "Starter Evolution pà nytt"
 
@@ -14433,49 +14324,49 @@ msgstr "Henter ut filer fra sikkerhetskopien"
 msgid "Loading Evolution settings"
 msgstr "Laster innstillinger for Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:624
+#: ../modules/backup-restore/evolution-backup-tool.c:629
 msgid "Removing temporary back up files"
 msgstr "Fjerner midlertidige sikkerhetskopifiler"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:636
+#: ../modules/backup-restore/evolution-backup-tool.c:641
 msgid "Reloading registry service"
 msgstr "Laster registertjenesten pà nytt"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:861
+#: ../modules/backup-restore/evolution-backup-tool.c:866
 msgid "Evolution Back Up"
 msgstr "Evolution sikkerhetskopiering"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:862
+#: ../modules/backup-restore/evolution-backup-tool.c:867
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Sikkerhetskopierer til mappe %s"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:866
+#: ../modules/backup-restore/evolution-backup-tool.c:871
 msgid "Evolution Restore"
 msgstr "Evolution gjenoppretting"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:867
+#: ../modules/backup-restore/evolution-backup-tool.c:872
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Gjenoppretter fra mappe %s"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:935
+#: ../modules/backup-restore/evolution-backup-tool.c:940
 msgid "Backing up Evolution Data"
 msgstr "Ta sikkerhetskopi av data for Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:936
+#: ../modules/backup-restore/evolution-backup-tool.c:941
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Vennligst vent mens Evolution tar sikkerhetskopi av dine data."
 
-#: ../modules/backup-restore/evolution-backup-tool.c:938
+#: ../modules/backup-restore/evolution-backup-tool.c:943
 msgid "Restoring Evolution Data"
 msgstr "Gjenoppretter data for Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:939
+#: ../modules/backup-restore/evolution-backup-tool.c:944
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Vennligst vent mens Evolution gjenoppretter dine data."
 
-#: ../modules/backup-restore/evolution-backup-tool.c:957
+#: ../modules/backup-restore/evolution-backup-tool.c:962
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "Dette kan ta en stund avhengig av hvor mye data du har i din konto."
 
@@ -14533,80 +14424,88 @@ msgstr "Ikke tilstrekkelige rettigheter"
 msgid "The selected folder is not writable."
 msgstr "Valgt mappe er ikke skrivbar."
 
-#: ../modules/bogofilter/evolution-bogofilter.c:149
+#: ../modules/bogofilter/evolution-bogofilter.c:145
 #, c-format
 msgid "Failed to spawn Bogofilter (%s): "
 msgstr "Klarte ikke à starte Bogofilter (%s): "
 
-#: ../modules/bogofilter/evolution-bogofilter.c:167
+#: ../modules/bogofilter/evolution-bogofilter.c:163
 msgid "Failed to stream mail message content to Bogofilter: "
 msgstr "Klarte ikke à sende innhold i e-postmelding til Bogofilter: "
 
-#: ../modules/bogofilter/evolution-bogofilter.c:216
+#: ../modules/bogofilter/evolution-bogofilter.c:212
 msgid "Bogofilter either crashed or failed to process a mail message"
 msgstr "Bogofilter krasjet eller klarte ikke à prosessere en e-postmelding"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:318
+#: ../modules/bogofilter/evolution-bogofilter.c:308
 msgid "Bogofilter Options"
 msgstr "Alternativer for Bogofilter"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:327
+#: ../modules/bogofilter/evolution-bogofilter.c:317
 msgid "Convert message text to _Unicode"
 msgstr "Konverter tekst i meldinger til _Unicode"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:483
+#: ../modules/bogofilter/evolution-bogofilter.c:474
 msgid "Bogofilter"
 msgstr "Bogofilter"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:442
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:449
 msgid "Standard LDAP Port"
 msgstr "Standard LDAP-port"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:448
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:619
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:455
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:627
 msgid "LDAP over SSL (deprecated)"
 msgstr "LDAP over SSL (utfaset)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:454
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:461
 msgid "Microsoft Global Catalog"
 msgstr "Microsoft Global Catalog"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:460
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:467
 msgid "Microsoft Global Catalog over SSL"
 msgstr "Microsoft Global Catalog over SSL"
 
 #. Page 1
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:564
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:572
 msgid "Connecting to LDAP"
 msgstr "Kobler til LDAP"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:581
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:589
 msgid "Server Information"
 msgstr "Tjenerinformasjon"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:622
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:630
 msgid "StartTLS (recommended)"
 msgstr "StartTLS (anbefalt)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:624
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:632
 msgid "Encryption:"
 msgstr "Kryptering:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:648
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:656
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:258
 #: ../modules/mail-config/e-mail-config-smtp-backend.c:182
 msgid "Authentication"
 msgstr "Autentisering"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:671
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:679
 msgid "Anonymous"
 msgstr "Anonym"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:679
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:682
+msgid "Using email address"
+msgstr "Bruker e-postadresse"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:685
+msgid "Using distinguished name (DN)"
+msgstr "Bruk distinguished name (DN)"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:687
 msgid "Method:"
 msgstr "Metode:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:684
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:692
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Using email address\" requires anonymous access to your "
@@ -14616,36 +14515,36 @@ msgstr ""
 "setter denne til ÂE-post-adresse kreves anonym tilgang til din LDAP-tjener."
 
 #. Page 2
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:699
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:707
 msgid "Using LDAP"
 msgstr "Bruker LDAP"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:716
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:724
 #: ../modules/mail/e-mail-shell-view.c:116
 msgid "Searching"
 msgstr "SÃker"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:738
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:746
 msgid "Search Base:"
 msgstr "StartnivÃ:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:743
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:751
 msgid "Find Possible Search Bases"
 msgstr "Finn mulige startnivÃ"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:768
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:776
 msgid "One Level"
 msgstr "Ett nivÃ"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:770
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:778
 msgid "Subtree"
 msgstr "Undertre"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:772
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:780
 msgid "Search Scope:"
 msgstr "SÃkeomrÃde:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:777
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:785
 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 "
@@ -14657,28 +14556,32 @@ msgstr ""
 "din sÃkebase. Et sÃkeomrÃde som ÂEtt nivÃÂ vil kun ta med oppfÃringer ett "
 "nivà under startnivÃet."
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:786
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:794
 msgid "Search Filter:"
 msgstr "SÃkefilter:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:798
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:806
 msgid "Downloading"
 msgstr "Laster ned"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:819
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:827
 msgid "Limit:"
 msgstr "Grense:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:835
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:838
+msgid "contacts"
+msgstr "kontakter"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:843
 msgid "Browse until limit is reached"
 msgstr "Bla gjennom til grensen nÃs"
 
-#: ../modules/book-config-webdav/evolution-book-config-webdav.c:134
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:136
 #: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:130
 msgid "URL:"
 msgstr "URL:"
 
-#: ../modules/book-config-webdav/evolution-book-config-webdav.c:144
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:146
 msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "Unngà IfMatch (kreves med Apache < 2.2.8)"
 
@@ -14687,23 +14590,23 @@ msgstr "Unngà IfMatch (kreves med Apache < 2.2.8)"
 msgid "HTTP Error: %s"
 msgstr "HTTP-feil: %s"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:447
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:445
 msgid "Could not parse response"
 msgstr "Kunne ikke lese svar"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:456
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:454
 msgid "Empty response"
 msgstr "Tomt svar"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:464
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:462
 msgid "Unexpected reply from server"
 msgstr "Uventet svar fra tjener"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1051
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1066
 msgid "Could not locate user's calendars"
 msgstr "Fant ikke brukers kalender"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1275
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1290
 msgid "Path"
 msgstr "Sti"
 
@@ -15076,7 +14979,7 @@ msgstr "Kale_nder"
 msgid "Create a new calendar"
 msgstr "Opprett en ny kalender"
 
-#: ../modules/calendar/e-cal-shell-backend.c:597
+#: ../modules/calendar/e-cal-shell-backend.c:627
 msgid "Calendar and Tasks"
 msgstr "Kalender og oppgaver"
 
@@ -15442,29 +15345,29 @@ msgstr "_Ãpne nettside"
 msgid "Print the selected memo"
 msgstr "Skriv ut valgt notat"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1477
+#: ../modules/calendar/e-cal-shell-view-private.c:1496
 msgid "Searching next matching event"
 msgstr "SÃker etter neste hendelsen som passer"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1478
+#: ../modules/calendar/e-cal-shell-view-private.c:1497
 msgid "Searching previous matching event"
 msgstr "SÃker etter forrige hendelse som passer"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1499
+#: ../modules/calendar/e-cal-shell-view-private.c:1518
 #, c-format
 msgid "Cannot find matching event in the next %d year"
 msgid_plural "Cannot find matching event in the next %d years"
 msgstr[0] "Kan ikke finne treff pà hendelse neste %d Ãr"
 msgstr[1] "Kan ikke finne treff pà hendelse de neste %d Ãr"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1503
+#: ../modules/calendar/e-cal-shell-view-private.c:1522
 #, c-format
 msgid "Cannot find matching event in the previous %d year"
 msgid_plural "Cannot find matching event in the previous %d years"
 msgstr[0] "Kan ikke finne treff pà hendelse forrige %d Ãr"
 msgstr[1] "Kan ikke finne treff pà hendelse forrige %d Ãr"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1528
+#: ../modules/calendar/e-cal-shell-view-private.c:1547
 msgid "Cannot search with no active calendar"
 msgstr "Kan ikke sÃke uten en aktiv kalender"
 
@@ -15878,11 +15781,11 @@ msgstr ""
 "Oppgi ekstra meldingshoder som skal hentes i tillegg til det predefinerte "
 "settet med meldingshoder over."
 
-#: ../modules/itip-formatter/e-mail-formatter-itip.c:137
+#: ../modules/itip-formatter/e-mail-formatter-itip.c:139
 msgid "ITIP"
 msgstr "ITIP"
 
-#: ../modules/itip-formatter/e-mail-formatter-itip.c:143
+#: ../modules/itip-formatter/e-mail-formatter-itip.c:145
 msgid "Display part as an invitation"
 msgstr "Vis del som en invitasjon"
 
@@ -16258,7 +16161,7 @@ msgid "Start day:"
 msgstr "Startdag:"
 
 #: ../modules/itip-formatter/itip-view.c:693
-#: ../modules/itip-formatter/itip-view.c:1461
+#: ../modules/itip-formatter/itip-view.c:1473
 msgid "Start time:"
 msgstr "Start-tid:"
 
@@ -16267,243 +16170,247 @@ msgid "End day:"
 msgstr "Sluttdag:"
 
 #: ../modules/itip-formatter/itip-view.c:702
-#: ../modules/itip-formatter/itip-view.c:1462
+#: ../modules/itip-formatter/itip-view.c:1474
 msgid "End time:"
 msgstr "Slutt-tid:"
 
-#: ../modules/itip-formatter/itip-view.c:1010
-msgid "_Open Calendar"
-msgstr "_Ãpne kalender"
+#: ../modules/itip-formatter/itip-view.c:1022
+msgid "Ope_n Calendar"
+msgstr "Ãp_ne kalender"
 
-#: ../modules/itip-formatter/itip-view.c:1013
+#: ../modules/itip-formatter/itip-view.c:1025
 msgid "_Decline all"
 msgstr "A_vslà alle"
 
-#: ../modules/itip-formatter/itip-view.c:1016
+#: ../modules/itip-formatter/itip-view.c:1028
 msgid "_Decline"
 msgstr "A_vslÃ"
 
-#: ../modules/itip-formatter/itip-view.c:1019
+#: ../modules/itip-formatter/itip-view.c:1031
 msgid "_Tentative all"
 msgstr "GjÃr alle _tentative"
 
-#: ../modules/itip-formatter/itip-view.c:1022
+#: ../modules/itip-formatter/itip-view.c:1034
 msgid "_Tentative"
 msgstr "_Tentativ"
 
-#: ../modules/itip-formatter/itip-view.c:1025
-msgid "A_ccept all"
+#: ../modules/itip-formatter/itip-view.c:1037
+msgid "Acce_pt all"
 msgstr "_Godta alle"
 
-#: ../modules/itip-formatter/itip-view.c:1028
-msgid "A_ccept"
+#: ../modules/itip-formatter/itip-view.c:1040
+msgid "Acce_pt"
 msgstr "_Godta"
 
-#: ../modules/itip-formatter/itip-view.c:1031
-msgid "_Send Information"
-msgstr "_Send informasjon"
+#: ../modules/itip-formatter/itip-view.c:1043
+msgid "Send _Information"
+msgstr "Send _informasjon"
 
-#: ../modules/itip-formatter/itip-view.c:1034
+#: ../modules/itip-formatter/itip-view.c:1046
 msgid "_Update Attendee Status"
 msgstr "_Oppdater status for deltaker"
 
-#: ../modules/itip-formatter/itip-view.c:1037
+#: ../modules/itip-formatter/itip-view.c:1049
 msgid "_Update"
 msgstr "_Oppdater"
 
-#: ../modules/itip-formatter/itip-view.c:1464
-#: ../modules/itip-formatter/itip-view.c:1512
-#: ../modules/itip-formatter/itip-view.c:1581
+#: ../modules/itip-formatter/itip-view.c:1476
+#: ../modules/itip-formatter/itip-view.c:1524
+#: ../modules/itip-formatter/itip-view.c:1595
 msgid "Comment:"
 msgstr "Kommentar:"
 
 #. RSVP area
-#: ../modules/itip-formatter/itip-view.c:1500
+#: ../modules/itip-formatter/itip-view.c:1512
 msgid "Send reply to sender"
 msgstr "Send svar til avsender"
 
 #. Updates
-#: ../modules/itip-formatter/itip-view.c:1515
+#: ../modules/itip-formatter/itip-view.c:1527
 msgid "Send _updates to attendees"
 msgstr "Send _oppdateringer til deltakere"
 
 #. The recurrence check button
-#: ../modules/itip-formatter/itip-view.c:1518
+#: ../modules/itip-formatter/itip-view.c:1530
 msgid "_Apply to all instances"
 msgstr "Bruk pà _alle instanser"
 
-#: ../modules/itip-formatter/itip-view.c:1519
+#: ../modules/itip-formatter/itip-view.c:1531
 msgid "Show time as _free"
 msgstr "Vis tid som _ledig"
 
-#: ../modules/itip-formatter/itip-view.c:1520
+#: ../modules/itip-formatter/itip-view.c:1532
 msgid "_Preserve my reminder"
 msgstr "_Bevar min pÃminnelse"
 
-#: ../modules/itip-formatter/itip-view.c:1521
+#: ../modules/itip-formatter/itip-view.c:1533
 msgid "_Inherit reminder"
 msgstr "Arv pÃm_innelse"
 
-#: ../modules/itip-formatter/itip-view.c:1845
+#: ../modules/itip-formatter/itip-view.c:1861
 msgid "_Tasks:"
 msgstr "_Oppgaver:"
 
-#: ../modules/itip-formatter/itip-view.c:1848
+#: ../modules/itip-formatter/itip-view.c:1864
 msgid "_Memos:"
 msgstr "_Notater:"
 
+#: ../modules/itip-formatter/itip-view.c:3094
+msgid "Sa_ve"
+msgstr "L_agre"
+
 #. Translators: The first '%s' is replaced with a calendar name,
 #. * the second '%s' with an error message
-#: ../modules/itip-formatter/itip-view.c:3493
+#: ../modules/itip-formatter/itip-view.c:3511
 #, c-format
 msgid "Failed to load the calendar '%s' (%s)"
 msgstr "Kunne ikke Ãpne kalender Â%s (%s)"
 
-#: ../modules/itip-formatter/itip-view.c:3652
+#: ../modules/itip-formatter/itip-view.c:3670
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "En avtale i kalender Â%s er i konflikt med dette mÃtet"
 
-#: ../modules/itip-formatter/itip-view.c:3679
+#: ../modules/itip-formatter/itip-view.c:3699
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Fant avtalen i kalender Â%sÂ"
 
-#: ../modules/itip-formatter/itip-view.c:3774
+#: ../modules/itip-formatter/itip-view.c:3812
 msgid "Unable to find any calendars"
 msgstr "Kan ikke finne noen kalendere"
 
-#: ../modules/itip-formatter/itip-view.c:3782
+#: ../modules/itip-formatter/itip-view.c:3820
 msgid "Unable to find this meeting in any calendar"
 msgstr "Kan ikke finne dette mÃtet i noen kalender"
 
-#: ../modules/itip-formatter/itip-view.c:3787
+#: ../modules/itip-formatter/itip-view.c:3825
 msgid "Unable to find this task in any task list"
 msgstr "Kan ikke finne denne oppgaven i noen oppgaveliste"
 
-#: ../modules/itip-formatter/itip-view.c:3792
+#: ../modules/itip-formatter/itip-view.c:3830
 msgid "Unable to find this memo in any memo list"
 msgstr "Kan ikke finne dette notatet i noen notatliste"
 
-#: ../modules/itip-formatter/itip-view.c:4132
+#: ../modules/itip-formatter/itip-view.c:4179
 msgid "Opening the calendar. Please wait..."
 msgstr "Ãpner kalender. Vennligst vent â"
 
-#: ../modules/itip-formatter/itip-view.c:4137
+#: ../modules/itip-formatter/itip-view.c:4184
 msgid "Searching for an existing version of this appointment"
 msgstr "SÃker etter en eksisterende versjon av denne avtalen"
 
-#: ../modules/itip-formatter/itip-view.c:4523
+#: ../modules/itip-formatter/itip-view.c:4573
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Kunne ikke sende oppfÃring til kalender Â%sÂ. %s"
 
-#: ../modules/itip-formatter/itip-view.c:4538
+#: ../modules/itip-formatter/itip-view.c:4588
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Sendt til kalender Â%s som godtatt"
 
-#: ../modules/itip-formatter/itip-view.c:4543
+#: ../modules/itip-formatter/itip-view.c:4593
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Sendt til kalender Â%s som tentativ"
 
-#: ../modules/itip-formatter/itip-view.c:4549
+#: ../modules/itip-formatter/itip-view.c:4599
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Sendt til kalender Â%s som avslÃtt"
 
-#: ../modules/itip-formatter/itip-view.c:4555
+#: ../modules/itip-formatter/itip-view.c:4605
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Sendt til kalender Â%s som avlyst"
 
-#: ../modules/itip-formatter/itip-view.c:4576
-#: ../modules/itip-formatter/itip-view.c:5016
-#: ../modules/itip-formatter/itip-view.c:5123
+#: ../modules/itip-formatter/itip-view.c:4626
+#: ../modules/itip-formatter/itip-view.c:5066
+#: ../modules/itip-formatter/itip-view.c:5173
 msgid "Saving changes to the calendar. Please wait..."
 msgstr "Lagrer endringer i kalender. Vennligst vent â"
 
-#: ../modules/itip-formatter/itip-view.c:4617
+#: ../modules/itip-formatter/itip-view.c:4667
 msgid "Unable to parse item"
 msgstr "Kunne ikke lese oppfÃring"
 
-#: ../modules/itip-formatter/itip-view.c:4807
+#: ../modules/itip-formatter/itip-view.c:4857
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organisator har fjernet delegat %s"
 
-#: ../modules/itip-formatter/itip-view.c:4822
+#: ../modules/itip-formatter/itip-view.c:4872
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Avlysningsvarsel sendt til delegat"
 
-#: ../modules/itip-formatter/itip-view.c:4826
+#: ../modules/itip-formatter/itip-view.c:4876
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Kunne ikke sende avlysningsmelding til delegaten"
 
-#: ../modules/itip-formatter/itip-view.c:4874
+#: ../modules/itip-formatter/itip-view.c:4924
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Kan ikke oppdatere deltaker. %s"
 
-#: ../modules/itip-formatter/itip-view.c:4882
+#: ../modules/itip-formatter/itip-view.c:4932
 msgid "Attendee status updated"
 msgstr "Deltakerstatus oppdatert"
 
-#: ../modules/itip-formatter/itip-view.c:4905
+#: ../modules/itip-formatter/itip-view.c:4955
 msgid "The meeting is invalid and cannot be updated"
 msgstr "MÃtet er ugyldig og kan ikke oppdateres"
 
-#: ../modules/itip-formatter/itip-view.c:4981
+#: ../modules/itip-formatter/itip-view.c:5031
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Deltakerstatus kunne ikke oppdateres pga ugyldig status"
 
-#: ../modules/itip-formatter/itip-view.c:5053
-#: ../modules/itip-formatter/itip-view.c:5093
+#: ../modules/itip-formatter/itip-view.c:5103
+#: ../modules/itip-formatter/itip-view.c:5143
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Deltakerstatus kan ikke oppdateres fordi oppfÃringen ikke eksisterer lenger"
 
-#: ../modules/itip-formatter/itip-view.c:5156
+#: ../modules/itip-formatter/itip-view.c:5206
 msgid "Meeting information sent"
 msgstr "Informasjon om mÃte sendt"
 
-#: ../modules/itip-formatter/itip-view.c:5161
+#: ../modules/itip-formatter/itip-view.c:5211
 msgid "Task information sent"
 msgstr "Informasjon om oppgave sendt"
 
-#: ../modules/itip-formatter/itip-view.c:5166
+#: ../modules/itip-formatter/itip-view.c:5216
 msgid "Memo information sent"
 msgstr "Informasjon om notat sendt"
 
-#: ../modules/itip-formatter/itip-view.c:5177
+#: ../modules/itip-formatter/itip-view.c:5227
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Kan ikke sende mÃteinformasjon. MÃtet eksisterer ikke"
 
-#: ../modules/itip-formatter/itip-view.c:5182
+#: ../modules/itip-formatter/itip-view.c:5232
 msgid "Unable to send task information, the task does not exist"
 msgstr "Kan ikke sende informasjon om oppgave. Oppgaven eksisterer ikke"
 
-#: ../modules/itip-formatter/itip-view.c:5187
+#: ../modules/itip-formatter/itip-view.c:5237
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Kan ikke sende informasjon om notat. Notatet eksisterer ikke"
 
 #. Translators: This is a default filename for a calendar.
-#: ../modules/itip-formatter/itip-view.c:5252
+#: ../modules/itip-formatter/itip-view.c:5302
 msgid "calendar.ics"
 msgstr "kalender.ics"
 
-#: ../modules/itip-formatter/itip-view.c:5257
+#: ../modules/itip-formatter/itip-view.c:5307
 msgid "Save Calendar"
 msgstr "Lagre kalender"
 
-#: ../modules/itip-formatter/itip-view.c:5310
-#: ../modules/itip-formatter/itip-view.c:5323
+#: ../modules/itip-formatter/itip-view.c:5360
+#: ../modules/itip-formatter/itip-view.c:5373
 msgid "The calendar attached is not valid"
 msgstr "Vedlagt kalender er ugyldig"
 
-#: ../modules/itip-formatter/itip-view.c:5311
-#: ../modules/itip-formatter/itip-view.c:5324
+#: ../modules/itip-formatter/itip-view.c:5361
+#: ../modules/itip-formatter/itip-view.c:5374
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -16511,15 +16418,15 @@ msgstr ""
 "Meldingen pÃstÃr at den inneholder en kalender, men kalenderen er ikke en "
 "gyldig iCalendar."
 
-#: ../modules/itip-formatter/itip-view.c:5366
-#: ../modules/itip-formatter/itip-view.c:5396
-#: ../modules/itip-formatter/itip-view.c:5496
+#: ../modules/itip-formatter/itip-view.c:5416
+#: ../modules/itip-formatter/itip-view.c:5446
+#: ../modules/itip-formatter/itip-view.c:5546
 msgid "The item in the calendar is not valid"
 msgstr "OppfÃringen i kalenderen er ikke gyldig"
 
-#: ../modules/itip-formatter/itip-view.c:5367
-#: ../modules/itip-formatter/itip-view.c:5397
-#: ../modules/itip-formatter/itip-view.c:5497
+#: ../modules/itip-formatter/itip-view.c:5417
+#: ../modules/itip-formatter/itip-view.c:5447
+#: ../modules/itip-formatter/itip-view.c:5547
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -16527,11 +16434,11 @@ msgstr ""
 "Meldingen inneholder en kalender, men kalenderen inneholder ingen hendelser, "
 "oppgaver eller ledig/opptatt-informasjon"
 
-#: ../modules/itip-formatter/itip-view.c:5412
+#: ../modules/itip-formatter/itip-view.c:5462
 msgid "The calendar attached contains multiple items"
 msgstr "Vedlagt kalender inneholder flere oppfÃringer"
 
-#: ../modules/itip-formatter/itip-view.c:5413
+#: ../modules/itip-formatter/itip-view.c:5463
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -16539,24 +16446,24 @@ msgstr ""
 "Du mà lagre filen og importere kalenderen for à prosessere alle disse "
 "oppfÃringene"
 
-#: ../modules/itip-formatter/itip-view.c:5937
+#: ../modules/itip-formatter/itip-view.c:5987
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Ingen"
 
-#: ../modules/itip-formatter/itip-view.c:5953
+#: ../modules/itip-formatter/itip-view.c:6003
 msgid "Tentatively Accepted"
 msgstr "Akseptert tentativt"
 
-#: ../modules/itip-formatter/itip-view.c:6096
+#: ../modules/itip-formatter/itip-view.c:6146
 msgid "This meeting recurs"
 msgstr "Dettee mÃtet gjeninntreffer"
 
-#: ../modules/itip-formatter/itip-view.c:6099
+#: ../modules/itip-formatter/itip-view.c:6149
 msgid "This task recurs"
 msgstr "Denne oppgaven gjeninntreffer"
 
-#: ../modules/itip-formatter/itip-view.c:6102
+#: ../modules/itip-formatter/itip-view.c:6152
 msgid "This memo recurs"
 msgstr "Dette notatet gjeninntreffer"
 
@@ -16654,6 +16561,7 @@ msgid "Choose a mbox spool directory"
 msgstr "Velg en kÃkatalog for mbox"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:149
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:53
 #: ../modules/mail-config/e-mail-config-smtp-backend.c:82
 #: ../modules/plugin-manager/evolution-plugin-manager.c:160
 msgid "Configuration"
@@ -16665,6 +16573,11 @@ msgstr "Konfigurasjon"
 msgid "_Server:"
 msgstr "Tj_ener:"
 
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:181
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:113
+msgid "_Port:"
+msgstr "_Port:"
+
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:193
 #: ../modules/mail-config/e-mail-config-smtp-backend.c:229
 msgid "User_name:"
@@ -16685,6 +16598,32 @@ msgstr "STARTTLS etter tilkobling"
 msgid "SSL on a dedicated port"
 msgstr "SSL pà en dedikert port"
 
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:69
+msgid "_Use custom binary, instead of 'sendmail'"
+msgstr "Br_uk egendefinert binÃrfil i stedet for ÂsendmailÂ"
+
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:73
+msgid "_Custom binary:"
+msgstr "E_gendefinert binÃrfil:"
+
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:90
+msgid "U_se custom arguments"
+msgstr "Bruk tilpa_ssede argumenter"
+
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:94
+msgid "Cus_tom arguments:"
+msgstr "_Tilpassede argumenter:"
+
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:112
+msgid ""
+"Default arguments are '-i -f %F -- %R', where\n"
+"   %F - stands for the From address\n"
+"   %R - stands for the recipient addresses"
+msgstr ""
+"Forvalgte argumenter er Â-i -f -%F -- %RÂ, hvor\n"
+"   %F - stÃr for Fra-adresse\n"
+"   %R - stÃr for mottakeradresse"
+
 #: ../modules/mail-config/e-mail-config-smtp-backend.c:125
 msgid "Ser_ver requires authentication"
 msgstr "Tjener kre_ver autentisering"
@@ -16701,7 +16640,7 @@ msgstr "Yahoo!-funksjoner"
 msgid "Add Yahoo! Ca_lendar and Tasks to this account"
 msgstr "Legg til kalender og oppgaver fra Yahoo i denne kontoen"
 
-#: ../modules/mail/e-mail-attachment-handler.c:390
+#: ../modules/mail/e-mail-attachment-handler.c:368
 #, c-format
 msgid "%d attached message"
 msgid_plural "%d attached messages"
@@ -16758,7 +16697,6 @@ msgid "None"
 msgstr "Ingen"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1226
-#: ../modules/mail/e-mail-shell-view.c:975
 msgid "_Disable Account"
 msgstr "_Deaktiver konto"
 
@@ -17066,76 +17004,72 @@ msgstr "SÃk i alle konti"
 msgid "Account Search"
 msgstr "SÃk i konto"
 
-#: ../modules/mail/e-mail-shell-view.c:973
-msgid "Proxy _Logout"
-msgstr "_Logg ut proxy"
-
-#: ../modules/mail/e-mail-shell-view-private.c:962
+#: ../modules/mail/e-mail-shell-view-private.c:994
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d valgt, "
 msgstr[1] "%d valgt, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:973
+#: ../modules/mail/e-mail-shell-view-private.c:1005
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d slettet"
 msgstr[1] "%d slettet"
 
-#: ../modules/mail/e-mail-shell-view-private.c:979
-#: ../modules/mail/e-mail-shell-view-private.c:986
+#: ../modules/mail/e-mail-shell-view-private.c:1011
+#: ../modules/mail/e-mail-shell-view-private.c:1018
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d uÃnsket e-post"
 msgstr[1] "%d uÃnsket e-poster"
 
-#: ../modules/mail/e-mail-shell-view-private.c:992
+#: ../modules/mail/e-mail-shell-view-private.c:1024
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d skisse"
 msgstr[1] "%d skisser"
 
-#: ../modules/mail/e-mail-shell-view-private.c:998
+#: ../modules/mail/e-mail-shell-view-private.c:1030
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d usendt"
 msgstr[1] "%d usendte"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1004
+#: ../modules/mail/e-mail-shell-view-private.c:1036
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d sendt"
 msgstr[1] "%d sendt"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1016
+#: ../modules/mail/e-mail-shell-view-private.c:1048
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d ulest, "
 msgstr[1] "%d uleste, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:1019
+#: ../modules/mail/e-mail-shell-view-private.c:1051
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d totalt"
 msgstr[1] "%d totalt"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1042
+#: ../modules/mail/e-mail-shell-view-private.c:1074
 msgid "Trash"
 msgstr "Papirkurv"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1458
+#: ../modules/mail/e-mail-shell-view-private.c:1490
 msgid "Send / Receive"
 msgstr "Send / motta"
 
-#: ../modules/mail/em-composer-prefs.c:509
+#: ../modules/mail/em-composer-prefs.c:499
 msgid "Language(s)"
 msgstr "SprÃk"
 
@@ -17227,7 +17161,8 @@ msgstr ""
 "Evolution vil gà tilbake i tilkoblet modus nÃr en nettverkstilkobling er "
 "tilgjengelig."
 
-#: ../modules/online-accounts/camel-sasl-xoauth.c:417
+#: ../modules/online-accounts/camel-sasl-xoauth2.c:166
+#: ../modules/online-accounts/camel-sasl-xoauth.c:298
 msgid ""
 "Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
 "from which to obtain an authentication token."
@@ -17235,16 +17170,21 @@ msgstr ""
 "Kan ikke finne en passende konto à hente autentiseringsinformasjon for fra "
 "org.gnome.OnlineAccounts-tjenesten."
 
-#: ../modules/online-accounts/camel-sasl-xoauth.c:504
-msgid "OAuth"
-msgstr "OAuth"
+#: ../modules/online-accounts/camel-sasl-xoauth2.c:222
+msgid "OAuth2"
+msgstr "OAuth2"
 
-#: ../modules/online-accounts/camel-sasl-xoauth.c:506
+#: ../modules/online-accounts/camel-sasl-xoauth2.c:224
+#: ../modules/online-accounts/camel-sasl-xoauth.c:379
 msgid ""
 "This option will connect to the server by way of the GNOME Online Accounts "
 "service"
 msgstr "Dette valget vil koble til tjeneren via GNOME nettkontotjenesten"
 
+#: ../modules/online-accounts/camel-sasl-xoauth.c:377
+msgid "OAuth"
+msgstr "OAuth"
+
 #: ../modules/plugin-manager/evolution-plugin-manager.c:69
 msgid "Author(s)"
 msgstr "Fofatter(e)"
@@ -17350,41 +17290,41 @@ msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr ""
 "Vis e-postmeldinger som vanlig tekst, selv om de inneholder HTML-innhold."
 
-#: ../modules/spamassassin/evolution-spamassassin.c:192
+#: ../modules/spamassassin/evolution-spamassassin.c:185
 #, c-format
 msgid "Failed to spawn SpamAssassin (%s): "
 msgstr "Klarte ikke à starte SpamAssassin (%s): "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:215
+#: ../modules/spamassassin/evolution-spamassassin.c:208
 msgid "Failed to stream mail message content to SpamAssassin: "
 msgstr "Klarte ikke à sende innhold i e-postmelding til SpamAssassin: "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:234
+#: ../modules/spamassassin/evolution-spamassassin.c:227
 #, c-format
 msgid "Failed to write '%s' to SpamAssassin: "
 msgstr "Klarte ikke à skrive Â%s til SpamAssassin: "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:262
+#: ../modules/spamassassin/evolution-spamassassin.c:255
 msgid "Failed to read output from SpamAssassin: "
 msgstr "Klarte ikke à lese utdata fra SpamAssassin: "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:317
+#: ../modules/spamassassin/evolution-spamassassin.c:310
 msgid "SpamAssassin either crashed or failed to process a mail message"
 msgstr "SpamAssassin krasjet eller klarte ikke à prosessere en e-postmelding"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:885
+#: ../modules/spamassassin/evolution-spamassassin.c:748
 msgid "SpamAssassin Options"
 msgstr "Alternativer for SpamAssassin"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:900
+#: ../modules/spamassassin/evolution-spamassassin.c:763
 msgid "I_nclude remote tests"
 msgstr "Inkluder eksterne tester"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:914
+#: ../modules/spamassassin/evolution-spamassassin.c:777
 msgid "This will make SpamAssassin more reliable, but slower."
 msgstr "Dette vil gjÃre SpamAssassin mer pÃlitelig, men tregere."
 
-#: ../modules/spamassassin/evolution-spamassassin.c:1123
+#: ../modules/spamassassin/evolution-spamassassin.c:1034
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
@@ -17438,11 +17378,11 @@ msgstr "_Formater som â"
 msgid "_Other languages"
 msgstr "_Andre sprÃk"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:342
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:365
 msgid "Text Highlight"
 msgstr "Tekstutheving"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:348
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:371
 msgid "Syntax highlighting of mail parts"
 msgstr "Syntaksutheving for e-postdeler"
 
@@ -18758,17 +18698,21 @@ msgstr "Lagre som _mal"
 msgid "Save as Template"
 msgstr "Lagre som mal"
 
-#: ../shell/e-shell.c:313
+#: ../shell/e-shell.c:314
 msgid "Preparing to go offline..."
 msgstr "Forbereder frakoblet bruk â"
 
-#: ../shell/e-shell.c:366
+#: ../shell/e-shell.c:367
 msgid "Preparing to go online..."
 msgstr "Forbereder tilkoblet bruk â"
 
-#: ../shell/e-shell.c:437
+#: ../shell/e-shell.c:441
+msgid "Preparing to quit"
+msgstr "Forbereder à avslutte"
+
+#: ../shell/e-shell.c:447
 msgid "Preparing to quit..."
-msgstr "Forbereder avslutting â"
+msgstr "Forbereder à avslutte â"
 
 #: ../shell/e-shell-content.c:727 ../shell/e-shell-content.c:728
 msgid "Searches"
@@ -18782,19 +18726,19 @@ msgstr "Lagre sÃk"
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:940
+#: ../shell/e-shell-searchbar.c:1102
 msgid "Sho_w:"
 msgstr "_Vis:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:973
+#: ../shell/e-shell-searchbar.c:1144
 msgid "Sear_ch:"
 msgstr "SÃ_k:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1036
+#: ../shell/e-shell-searchbar.c:1218
 msgid "i_n"
 msgstr " _i"
 
@@ -18806,7 +18750,7 @@ msgstr "vCard (.vcf)"
 msgid "All Files (*)"
 msgstr "Alle filer (*)"
 
-#: ../shell/e-shell-view.c:304
+#: ../shell/e-shell-view.c:303
 msgid "Saving user interface state"
 msgstr "Lagrer tilstand for brukergrensesnitt"
 
@@ -18825,260 +18769,260 @@ msgstr "Evolution nettsted"
 msgid "Categories Editor"
 msgstr "Redigering av kategorier"
 
-#: ../shell/e-shell-window-actions.c:1228
+#: ../shell/e-shell-window-actions.c:1227
 msgid "Bug Buddy is not installed."
 msgstr "Bug Buddy er ikke installert."
 
-#: ../shell/e-shell-window-actions.c:1230
+#: ../shell/e-shell-window-actions.c:1228
 msgid "Bug Buddy could not be run."
 msgstr "Bug Buddy kunne ikke kjÃres."
 
-#: ../shell/e-shell-window-actions.c:1411
+#: ../shell/e-shell-window-actions.c:1408
 msgid "Show information about Evolution"
 msgstr "Vis informasjon om Evolution"
 
-#: ../shell/e-shell-window-actions.c:1416
-#: ../shell/e-shell-window-actions.c:1430
+#: ../shell/e-shell-window-actions.c:1413
+#: ../shell/e-shell-window-actions.c:1427
 msgid "_Close Window"
 msgstr "_Lukk vindu"
 
-#: ../shell/e-shell-window-actions.c:1437
+#: ../shell/e-shell-window-actions.c:1434
 msgid "_Contents"
 msgstr "_Innhold"
 
-#: ../shell/e-shell-window-actions.c:1439
+#: ../shell/e-shell-window-actions.c:1436
 msgid "Open the Evolution User Guide"
 msgstr "Ãpne Evolutions brukermanual"
 
-#: ../shell/e-shell-window-actions.c:1465
+#: ../shell/e-shell-window-actions.c:1462
 msgid "I_mport..."
 msgstr "I_mporter â"
 
-#: ../shell/e-shell-window-actions.c:1467
+#: ../shell/e-shell-window-actions.c:1464
 msgid "Import data from other programs"
 msgstr "Importer data fra andre programmer"
 
-#: ../shell/e-shell-window-actions.c:1472
+#: ../shell/e-shell-window-actions.c:1469
 msgid "New _Window"
 msgstr "Nytt _vindu"
 
-#: ../shell/e-shell-window-actions.c:1474
+#: ../shell/e-shell-window-actions.c:1471
 msgid "Create a new window displaying this view"
 msgstr "Opprett et nytt vindu med denne visningen"
 
-#: ../shell/e-shell-window-actions.c:1486
+#: ../shell/e-shell-window-actions.c:1483
 msgid "Available Cate_gories"
 msgstr "Tilgjengelige kate_gorier"
 
-#: ../shell/e-shell-window-actions.c:1488
+#: ../shell/e-shell-window-actions.c:1485
 msgid "Manage available categories"
 msgstr "HÃndter tilgjengelige kategorier"
 
-#: ../shell/e-shell-window-actions.c:1500
+#: ../shell/e-shell-window-actions.c:1497
 msgid "_Quick Reference"
 msgstr "_Hurtigreferanse"
 
-#: ../shell/e-shell-window-actions.c:1502
+#: ../shell/e-shell-window-actions.c:1499
 msgid "Show Evolution's shortcut keys"
 msgstr "Vis snarveitaster for Evolution"
 
-#: ../shell/e-shell-window-actions.c:1509
+#: ../shell/e-shell-window-actions.c:1506
 msgid "Exit the program"
 msgstr "Avslutt programmet"
 
-#: ../shell/e-shell-window-actions.c:1514
+#: ../shell/e-shell-window-actions.c:1511
 msgid "_Advanced Search..."
 msgstr "_Avansert sÃk â"
 
-#: ../shell/e-shell-window-actions.c:1516
+#: ../shell/e-shell-window-actions.c:1513
 msgid "Construct a more advanced search"
 msgstr "Sett sammen et mer avansert sÃk"
 
-#: ../shell/e-shell-window-actions.c:1523
+#: ../shell/e-shell-window-actions.c:1520
 msgid "Clear the current search parameters"
 msgstr "TÃm aktive sÃkeparametere"
 
-#: ../shell/e-shell-window-actions.c:1528
+#: ../shell/e-shell-window-actions.c:1525
 msgid "_Edit Saved Searches..."
 msgstr "R_ediger lagrede sÃk â"
 
-#: ../shell/e-shell-window-actions.c:1530
+#: ../shell/e-shell-window-actions.c:1527
 msgid "Manage your saved searches"
 msgstr "HÃndter dine lagrede sÃk"
 
-#: ../shell/e-shell-window-actions.c:1537
+#: ../shell/e-shell-window-actions.c:1534
 msgid "Click here to change the search type"
 msgstr "Klikk her for à endre sÃketype"
 
-#: ../shell/e-shell-window-actions.c:1542
+#: ../shell/e-shell-window-actions.c:1539
 msgid "_Find Now"
 msgstr "_Finn nà "
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1544
+#: ../shell/e-shell-window-actions.c:1541
 msgid "Execute the current search parameters"
 msgstr "KjÃr aktive sÃkeparametere"
 
-#: ../shell/e-shell-window-actions.c:1549
+#: ../shell/e-shell-window-actions.c:1546
 msgid "_Save Search..."
 msgstr "_Lagre sÃk â"
 
-#: ../shell/e-shell-window-actions.c:1551
+#: ../shell/e-shell-window-actions.c:1548
 msgid "Save the current search parameters"
 msgstr "Lagre aktive sÃkeparametere"
 
-#: ../shell/e-shell-window-actions.c:1563
+#: ../shell/e-shell-window-actions.c:1560
 msgid "Submit _Bug Report..."
 msgstr "Sen_d inn feilrapport â"
 
-#: ../shell/e-shell-window-actions.c:1565
+#: ../shell/e-shell-window-actions.c:1562
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Send inn en feilrapport med Bug Buddy"
 
-#: ../shell/e-shell-window-actions.c:1570
+#: ../shell/e-shell-window-actions.c:1567
 msgid "_Work Offline"
 msgstr "Ar_beid frakoblet"
 
-#: ../shell/e-shell-window-actions.c:1572
+#: ../shell/e-shell-window-actions.c:1569
 msgid "Put Evolution into offline mode"
 msgstr "Sett Evolution i frakoblet modus"
 
-#: ../shell/e-shell-window-actions.c:1577
+#: ../shell/e-shell-window-actions.c:1574
 msgid "_Work Online"
 msgstr "Ar_beid tilkoblet"
 
-#: ../shell/e-shell-window-actions.c:1579
+#: ../shell/e-shell-window-actions.c:1576
 msgid "Put Evolution into online mode"
 msgstr "Sett Evolution i tilkoblet modus"
 
-#: ../shell/e-shell-window-actions.c:1607
+#: ../shell/e-shell-window-actions.c:1604
 msgid "Lay_out"
 msgstr "Utf_orming"
 
-#: ../shell/e-shell-window-actions.c:1614
+#: ../shell/e-shell-window-actions.c:1611
 msgid "_New"
 msgstr "_Ny"
 
-#: ../shell/e-shell-window-actions.c:1621
+#: ../shell/e-shell-window-actions.c:1618
 msgid "_Search"
 msgstr "_SÃk"
 
-#: ../shell/e-shell-window-actions.c:1628
+#: ../shell/e-shell-window-actions.c:1625
 msgid "_Switcher Appearance"
 msgstr "Ut_seende for bytter"
 
-#: ../shell/e-shell-window-actions.c:1642
+#: ../shell/e-shell-window-actions.c:1639
 msgid "_Window"
 msgstr "_Vindu"
 
-#: ../shell/e-shell-window-actions.c:1671
+#: ../shell/e-shell-window-actions.c:1668
 msgid "Show Side _Bar"
 msgstr "Vis si_delinje"
 
-#: ../shell/e-shell-window-actions.c:1673
+#: ../shell/e-shell-window-actions.c:1670
 msgid "Show the side bar"
 msgstr "Vis sidelinjen"
 
-#: ../shell/e-shell-window-actions.c:1679
+#: ../shell/e-shell-window-actions.c:1676
 msgid "Show _Buttons"
 msgstr "Vis _knapper"
 
-#: ../shell/e-shell-window-actions.c:1681
+#: ../shell/e-shell-window-actions.c:1678
 msgid "Show the switcher buttons"
 msgstr "Vis knapper for bytter"
 
-#: ../shell/e-shell-window-actions.c:1687
+#: ../shell/e-shell-window-actions.c:1684
 msgid "Show _Status Bar"
 msgstr "Vis _statuslinje"
 
-#: ../shell/e-shell-window-actions.c:1689
+#: ../shell/e-shell-window-actions.c:1686
 msgid "Show the status bar"
 msgstr "Vis statuslinjen"
 
-#: ../shell/e-shell-window-actions.c:1695
+#: ../shell/e-shell-window-actions.c:1692
 msgid "Show _Tool Bar"
 msgstr "Vis verk_tÃylinjen"
 
-#: ../shell/e-shell-window-actions.c:1697
+#: ../shell/e-shell-window-actions.c:1694
 msgid "Show the tool bar"
 msgstr "Vis verktÃylinjen"
 
-#: ../shell/e-shell-window-actions.c:1719
+#: ../shell/e-shell-window-actions.c:1716
 msgid "_Icons Only"
 msgstr "Kun _ikoner"
 
-#: ../shell/e-shell-window-actions.c:1721
+#: ../shell/e-shell-window-actions.c:1718
 msgid "Display window buttons with icons only"
 msgstr "Vis bare ikoner pà vinduknapper"
 
-#: ../shell/e-shell-window-actions.c:1726
+#: ../shell/e-shell-window-actions.c:1723
 msgid "_Text Only"
 msgstr "Kun _tekst"
 
-#: ../shell/e-shell-window-actions.c:1728
+#: ../shell/e-shell-window-actions.c:1725
 msgid "Display window buttons with text only"
 msgstr "Vis bare tekst pà vinduknapper"
 
-#: ../shell/e-shell-window-actions.c:1733
+#: ../shell/e-shell-window-actions.c:1730
 msgid "Icons _and Text"
 msgstr "Ikoner _og tekst"
 
-#: ../shell/e-shell-window-actions.c:1735
+#: ../shell/e-shell-window-actions.c:1732
 msgid "Display window buttons with icons and text"
 msgstr "Vis tekst og ikoner pà vinduknapper"
 
-#: ../shell/e-shell-window-actions.c:1740
+#: ../shell/e-shell-window-actions.c:1737
 msgid "Tool_bar Style"
 msgstr "S_til for verktÃylinje"
 
-#: ../shell/e-shell-window-actions.c:1742
+#: ../shell/e-shell-window-actions.c:1739
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr ""
 "Vis vinduknapper ved à bruke instillinger for verktÃylinjen pà skrivebordet"
 
-#: ../shell/e-shell-window-actions.c:1750
+#: ../shell/e-shell-window-actions.c:1747
 msgid "Define Views..."
 msgstr "Definer visninger â"
 
-#: ../shell/e-shell-window-actions.c:1752
+#: ../shell/e-shell-window-actions.c:1749
 msgid "Create or edit views"
 msgstr "Opprett eller rediger visninger"
 
-#: ../shell/e-shell-window-actions.c:1757
+#: ../shell/e-shell-window-actions.c:1754
 msgid "Save Custom View..."
 msgstr "Lagre egendefinert visning â"
 
-#: ../shell/e-shell-window-actions.c:1759
+#: ../shell/e-shell-window-actions.c:1756
 msgid "Save current custom view"
 msgstr "Lagre aktiv egendefinert visning"
 
-#: ../shell/e-shell-window-actions.c:1766
+#: ../shell/e-shell-window-actions.c:1763
 msgid "C_urrent View"
 msgstr "A_ktiv visning"
 
-#: ../shell/e-shell-window-actions.c:1776
+#: ../shell/e-shell-window-actions.c:1773
 msgid "Custom View"
 msgstr "Egendefinert visning"
 
-#: ../shell/e-shell-window-actions.c:1778
+#: ../shell/e-shell-window-actions.c:1775
 msgid "Current view is a customized view"
 msgstr "Aktiv visning er en egendefinert visning"
 
-#: ../shell/e-shell-window-actions.c:1788
+#: ../shell/e-shell-window-actions.c:1785
 msgid "Change the page settings for your current printer"
 msgstr "Endre sideinnstillingene for din skriver"
 
-#: ../shell/e-shell-window-actions.c:2178
+#: ../shell/e-shell-window-actions.c:2175
 #, c-format
 msgid "Switch to %s"
 msgstr "Bytt til %s"
 
-#: ../shell/e-shell-window-actions.c:2299
+#: ../shell/e-shell-window-actions.c:2296
 #, c-format
 msgid "Select view: %s"
 msgstr "Velg visning: %s"
 
-#: ../shell/e-shell-window-actions.c:2400
+#: ../shell/e-shell-window-actions.c:2397
 msgid "Execute these search parameters"
 msgstr "KjÃr disse sÃkeparameterene"
 
@@ -19093,7 +19037,7 @@ msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:184
+#: ../shell/main.c:190
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19128,7 +19072,7 @@ msgstr ""
 "Vi hÃper at du nyter resultatene av vÃrt harde arbeid, og vi venter i\n"
 "spenning pà at du tilbyr din hjelp!\n"
 
-#: ../shell/main.c:208
+#: ../shell/main.c:214
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19136,13 +19080,13 @@ msgstr ""
 "Takk\n"
 "Evolution utviklerene\n"
 
-#: ../shell/main.c:214
+#: ../shell/main.c:220
 msgid "Do not tell me again"
 msgstr "Ikke gi beskjed igjen"
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../shell/main.c:305
+#: ../shell/main.c:311
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
@@ -19150,47 +19094,54 @@ msgstr ""
 "Start Evolution med oppgitt komponent. Tilgjengelige valg er ÂmailÂ, "
 "ÂcalendarÂ, ÂcontactsÂ, Âtasks og ÂmemosÂ"
 
-#: ../shell/main.c:309
+#: ../shell/main.c:315
 msgid "Apply the given geometry to the main window"
 msgstr "Bruk oppgitt geometri pà hovedvinduet"
 
-#: ../shell/main.c:313
+#: ../shell/main.c:319
 msgid "Start in online mode"
 msgstr "Start i tilkoblet modus"
 
-#: ../shell/main.c:315
+#: ../shell/main.c:321
 msgid "Ignore network availability"
 msgstr "Ignorer nettverkstilgjengelighet"
 
-#: ../shell/main.c:317
+#: ../shell/main.c:323
 msgid "Start in \"express\" mode"
 msgstr "Start i ÂekspressÂ-modus"
 
-#: ../shell/main.c:320
+#: ../shell/main.c:326
 msgid "Forcibly shut down Evolution"
 msgstr "Tvungen nedstenging av Evolution"
 
-#: ../shell/main.c:323
+#: ../shell/main.c:329
 msgid "Disable loading of any plugins."
 msgstr "Slà av lasting av tillegg."
 
-#: ../shell/main.c:325
+#: ../shell/main.c:331
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Deaktiver forhÃndsvisningsomrÃdet for e-post, kontakter og oppgaver."
 
-#: ../shell/main.c:329
+#: ../shell/main.c:335
 msgid "Import URIs or filenames given as rest of arguments."
 msgstr "Importer URIer eller filnavn gitt som argumenter."
 
-#: ../shell/main.c:331
+#: ../shell/main.c:337
 msgid "Request a running Evolution process to quit"
 msgstr "Be en kjÃrende Evolution-prosess om à stenge ned"
 
-#: ../shell/main.c:504
+#: ../shell/main.c:426
+#, c-format
+msgid ""
+"Cannot start Evolution, other instance is probably running and is "
+"unresponsive. System error: %s"
+msgstr "Kan ikke starte Evolution. En annen instans kjÃrer sannsynligvis og svarer ikke. Systemfeil: %s"
+
+#: ../shell/main.c:528 ../shell/main.c:533
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution personlig informasjonshÃndterer og e-postklient"
 
-#: ../shell/main.c:569
+#: ../shell/main.c:600
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19199,7 +19150,7 @@ msgstr ""
 "%s: --online og --offline kan ikke brukes samtidig.\n"
 "  Bruk Â%s --help for mer informasjon.\n"
 
-#: ../shell/main.c:575
+#: ../shell/main.c:606
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -19245,70 +19196,6 @@ msgstr ""
 "Evolution stÃtter ikke lenger à oppgradere direkte fra versjon {0}. Du kan "
 "prÃve à oppgradere til Evolution 2 for sà à oppgradere til Evolution 3."
 
-#: ../smclient/eggdesktopfile.c:166
-#, c-format
-msgid "File is not a valid .desktop file"
-msgstr "Filen er ikke en gyldig .desktop-fil"
-
-#: ../smclient/eggdesktopfile.c:189
-#, c-format
-msgid "Unrecognized desktop file Version '%s'"
-msgstr "Ikke gjenkjent Version Â%s i skrivebordsfil"
-
-#: ../smclient/eggdesktopfile.c:959
-#, c-format
-msgid "Starting %s"
-msgstr "Starter %s"
-
-#: ../smclient/eggdesktopfile.c:1102
-#, c-format
-msgid "Application does not accept documents on command line"
-msgstr "Programmet tar ikke dokumenter som argumenter pà kommandolinjen"
-
-#: ../smclient/eggdesktopfile.c:1170
-#, c-format
-msgid "Unrecognized launch option: %d"
-msgstr "Ukjent oppstartsalternativ: %d"
-
-#: ../smclient/eggdesktopfile.c:1370
-#, c-format
-msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
-msgstr ""
-"Kan ikke sende dokument-URIer til en skrivebordsoppfÃring med ÂType=LinkÂ"
-
-#: ../smclient/eggdesktopfile.c:1391
-#, c-format
-msgid "Not a launchable item"
-msgstr "Ikke en oppstartbar oppfÃring"
-
-#: ../smclient/eggsmclient.c:229
-msgid "Disable connection to session manager"
-msgstr "Slà av tilkobling til ÃkthÃndterer"
-
-#: ../smclient/eggsmclient.c:232
-msgid "Specify file containing saved configuration"
-msgstr "Oppgi fil som inneholder lagret konfigurasjon"
-
-#: ../smclient/eggsmclient.c:232
-msgid "FILE"
-msgstr "FIL"
-
-#: ../smclient/eggsmclient.c:235
-msgid "Specify session management ID"
-msgstr "Oppgi ÃkthÃndterings-ID"
-
-#: ../smclient/eggsmclient.c:235
-msgid "ID"
-msgstr "ID"
-
-#: ../smclient/eggsmclient.c:256
-msgid "Session management options:"
-msgstr "Alternativer for ÃkthÃndtering:"
-
-#: ../smclient/eggsmclient.c:257
-msgid "Show session management options"
-msgstr "Vis alternativer for ÃkthÃndtering"
-
 #: ../smime/gui/ca-trust-dialog.c:107
 #, c-format
 msgid ""
@@ -20025,54 +19912,54 @@ msgstr "Listevisning"
 #. * message when, for example, attaching it to a composer. When the
 #. * message to be attached has also filled Subject, then this text is
 #. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../widgets/misc/e-attachment.c:966
+#: ../widgets/misc/e-attachment.c:979
 msgid "Attached message"
 msgstr "Vedlagt melding"
 
 #. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment.c:1829 ../widgets/misc/e-attachment.c:2384
+#: ../widgets/misc/e-attachment.c:1842 ../widgets/misc/e-attachment.c:2397
 #: ../widgets/misc/e-attachment-store.c:525
 msgid "attachment.dat"
 msgstr "vedlegg.dat"
 
-#: ../widgets/misc/e-attachment.c:1874 ../widgets/misc/e-attachment.c:2686
+#: ../widgets/misc/e-attachment.c:1887 ../widgets/misc/e-attachment.c:2699
 msgid "A load operation is already in progress"
 msgstr "En lasteoperasjon er allerede i gang"
 
-#: ../widgets/misc/e-attachment.c:1882 ../widgets/misc/e-attachment.c:2694
+#: ../widgets/misc/e-attachment.c:1895 ../widgets/misc/e-attachment.c:2707
 msgid "A save operation is already in progress"
 msgstr "En lagreoperasjon er allerede i gang"
 
-#: ../widgets/misc/e-attachment.c:1989
+#: ../widgets/misc/e-attachment.c:2002
 #, c-format
 msgid "Could not load '%s'"
 msgstr "Kunne ikke laste Â%sÂ"
 
-#: ../widgets/misc/e-attachment.c:1992
+#: ../widgets/misc/e-attachment.c:2005
 #, c-format
 msgid "Could not load the attachment"
 msgstr "Kunne ikke laste vedlegget"
 
-#: ../widgets/misc/e-attachment.c:2265
+#: ../widgets/misc/e-attachment.c:2278
 #, c-format
 msgid "Could not open '%s'"
 msgstr "Kunne ikke Ãpne Â%sÂ"
 
-#: ../widgets/misc/e-attachment.c:2268
+#: ../widgets/misc/e-attachment.c:2281
 #, c-format
 msgid "Could not open the attachment"
 msgstr "Kunne ikke Ãpne vedlegget"
 
-#: ../widgets/misc/e-attachment.c:2702
+#: ../widgets/misc/e-attachment.c:2715
 msgid "Attachment contents not loaded"
 msgstr "Vedleggets innhold ble ikke lastet"
 
-#: ../widgets/misc/e-attachment.c:2778
+#: ../widgets/misc/e-attachment.c:2791
 #, c-format
 msgid "Could not save '%s'"
 msgstr "Kunne ikke lagre Â%sÂ"
 
-#: ../widgets/misc/e-attachment.c:2781
+#: ../widgets/misc/e-attachment.c:2794
 #, c-format
 msgid "Could not save the attachment"
 msgstr "Kunne ikke lagre vedlegget"
@@ -20438,23 +20325,23 @@ msgstr "Klikk pà ÂBruk for à starte import av filen til Evolution."
 msgid "Autogenerated"
 msgstr "Generert automatisk"
 
-#: ../widgets/misc/e-mail-signature-editor.c:287
+#: ../widgets/misc/e-mail-signature-editor.c:294
 msgid "Close"
 msgstr "Lukk"
 
-#: ../widgets/misc/e-mail-signature-editor.c:292
+#: ../widgets/misc/e-mail-signature-editor.c:299
 msgid "_Save and Close"
 msgstr "L_agre og lukk"
 
-#: ../widgets/misc/e-mail-signature-editor.c:506
+#: ../widgets/misc/e-mail-signature-editor.c:513
 msgid "Edit Signature"
 msgstr "Rediger signatur"
 
-#: ../widgets/misc/e-mail-signature-editor.c:526
+#: ../widgets/misc/e-mail-signature-editor.c:533
 msgid "_Signature Name:"
 msgstr "Navn pà _signatur:"
 
-#: ../widgets/misc/e-mail-signature-editor.c:572
+#: ../widgets/misc/e-mail-signature-editor.c:579
 msgid "Unnamed"
 msgstr "Uten navn"
 
@@ -20462,11 +20349,11 @@ msgstr "Uten navn"
 msgid "Add _Script"
 msgstr "Legg til _skript"
 
-#: ../widgets/misc/e-mail-signature-manager.c:421
+#: ../widgets/misc/e-mail-signature-manager.c:422
 msgid "Add Signature Script"
 msgstr "Legg til signaturskript"
 
-#: ../widgets/misc/e-mail-signature-manager.c:491
+#: ../widgets/misc/e-mail-signature-manager.c:492
 msgid "Edit Signature Script"
 msgstr "Rediger signaturskript"
 
@@ -20698,30 +20585,30 @@ msgstr "Returvarsling"
 msgid "Sta_tus Tracking"
 msgstr "Sta_tusoppfÃlging"
 
-#: ../widgets/misc/e-source-config.c:675 ../widgets/misc/e-source-config.c:679
+#: ../widgets/misc/e-source-config.c:680 ../widgets/misc/e-source-config.c:684
 msgid "Type:"
 msgstr "Type:"
 
-#: ../widgets/misc/e-source-config.c:687 ../widgets/misc/e-source-config.c:691
+#: ../widgets/misc/e-source-config.c:692 ../widgets/misc/e-source-config.c:696
 msgid "Name:"
 msgstr "Navn:"
 
 #. Translators: This is the first of a sequence of widgets:
 #. * "Refresh every [NUMERIC_ENTRY] [TIME_UNITS_COMBO]"
-#: ../widgets/misc/e-source-config.c:1289
+#: ../widgets/misc/e-source-config.c:1294
 msgid "Refresh every"
 msgstr "Oppdater hver"
 
-#: ../widgets/misc/e-source-config.c:1319
-#: ../widgets/misc/e-source-config.c:1347
+#: ../widgets/misc/e-source-config.c:1324
+#: ../widgets/misc/e-source-config.c:1373
 msgid "Use a secure connection"
 msgstr "Bruk sikker forbindelse"
 
-#: ../widgets/misc/e-source-config.c:1361
+#: ../widgets/misc/e-source-config.c:1397
 msgid "Ignore invalid SSL certificate"
 msgstr "Ignorer ugyldig SSL-sertifikat"
 
-#: ../widgets/misc/e-source-config.c:1398
+#: ../widgets/misc/e-source-config.c:1434
 msgid "User"
 msgstr "Bruker"
 
@@ -20787,19 +20674,19 @@ msgstr "Kopier bildet til utklippstavlen"
 msgid "Select all text and images"
 msgstr "Velg all tekst og alle bilder"
 
-#: ../widgets/misc/e-web-view.c:1104 ../widgets/misc/e-web-view.c:1106
-#: ../widgets/misc/e-web-view.c:1108 ../widgets/misc/e-web-view-gtkhtml.c:975
+#: ../widgets/misc/e-web-view.c:1099 ../widgets/misc/e-web-view.c:1101
+#: ../widgets/misc/e-web-view.c:1103 ../widgets/misc/e-web-view-gtkhtml.c:975
 #: ../widgets/misc/e-web-view-gtkhtml.c:977
 #: ../widgets/misc/e-web-view-gtkhtml.c:979
 #, c-format
 msgid "Click to call %s"
 msgstr "Klikk for à ringe %s"
 
-#: ../widgets/misc/e-web-view.c:1110 ../widgets/misc/e-web-view-gtkhtml.c:981
+#: ../widgets/misc/e-web-view.c:1105 ../widgets/misc/e-web-view-gtkhtml.c:981
 msgid "Click to hide/unhide addresses"
 msgstr "Klikk for à skjule/vise adresser"
 
-#: ../widgets/misc/e-web-view.c:1112 ../widgets/misc/e-web-view-gtkhtml.c:983
+#: ../widgets/misc/e-web-view.c:1107 ../widgets/misc/e-web-view-gtkhtml.c:983
 #, c-format
 msgid "Click to open %s"
 msgstr "Klikk for à Ãpne %s"