=?utf-8?q?=5Bevolution=5D_Updated_Norwegian_bokm=C3=A5l_translation?=

From: Kjartan Maraas <kmaraas src gnome org>
To: commits-list gnome org
Cc:
Subject: [evolution] Updated Norwegian bokmÃl translation
Date: Wed, 18 Apr 2012 18:27:16 +0000 (UTC)
commit c6a669bd773916b909ac4f6135e445aa1c68e3d6
Author: Kjartan Maraas <kmaraas gnome org>
Date:   Wed Apr 18 20:28:30 2012 +0200

    Updated Norwegian bokmÃl translation

 po/nb.po | 2598 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 1392 insertions(+), 1206 deletions(-)
---
diff --git a/po/nb.po b/po/nb.po
index fe0dd7d..12f1219 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,10 +7,10 @@
 #: ../shell/main.c:575
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution 3.3.x\n"
+"Project-Id-Version: evolution 3.5.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-19 19:30+0100\n"
-"PO-Revision-Date: 2012-03-19 19:31+0100\n"
+"POT-Creation-Date: 2012-04-18 20:12+0200\n"
+"PO-Revision-Date: 2012-04-18 20:26+0200\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"
@@ -304,9 +304,8 @@ msgstr "_Ãnsker Ã motta HTML-formatert e-post"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
 #: ../addressbook/gui/merging/eab-contact-merging.c:392
-#: ../addressbook/gui/widgets/eab-contact-display.c:647
-#: ../addressbook/gui/widgets/eab-contact-display.c:655
-#: ../addressbook/gui/widgets/eab-contact-display.c:1055
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:627
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:979
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 #: ../smime/lib/e-cert.c:811
 msgid "Email"
@@ -332,7 +331,6 @@ msgstr "_Hjemmeside:"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
 #: ../calendar/gui/dialogs/event-page.c:718
 #: ../calendar/gui/dialogs/event-page.ui.h:22
-#: ../plugins/itip-formatter/itip-view.c:1980
 msgid "_Calendar:"
 msgstr "_Kalender:"
 
@@ -349,6 +347,7 @@ msgid "Home Page:"
 msgstr "Hjemmeside:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
+#: ../plugins/itip-formatter/itip-view.c:1539
 msgid "Calendar:"
 msgstr "Kalender:"
 
@@ -423,7 +422,7 @@ msgid "_Anniversary:"
 msgstr "_Bryllupsdag:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
-#: ../addressbook/gui/widgets/eab-contact-display.c:729
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:721
 #: ../calendar/gui/e-calendar-view.c:2131
 msgid "Anniversary"
 msgstr "Bryllupsdag"
@@ -434,7 +433,7 @@ msgstr "Bryllupsdag"
 #. * which, so long as it has an icon.  We're just interested in
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
-#: ../addressbook/gui/widgets/eab-contact-display.c:728
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:720
 #: ../calendar/gui/e-calendar-view.c:2130 ../capplet/anjal-settings-main.c:83
 #: ../shell/main.c:135
 msgid "Birthday"
@@ -475,25 +474,25 @@ msgstr "_Adresse:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:196
-#: ../addressbook/gui/widgets/eab-contact-display.c:82
-#: ../addressbook/gui/widgets/eab-contact-display.c:1360
+#: ../addressbook/gui/widgets/eab-contact-display.c:366
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:72
 #: ../widgets/misc/e-contact-map.c:300
 msgid "Home"
 msgstr "Hjemme"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:195
-#: ../addressbook/gui/widgets/eab-contact-display.c:81
-#: ../addressbook/gui/widgets/eab-contact-display.c:708
-#: ../addressbook/gui/widgets/eab-contact-display.c:1357
+#: ../addressbook/gui/widgets/eab-contact-display.c:363
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:71
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:702
 #: ../widgets/misc/e-contact-map.c:308
 msgid "Work"
 msgstr "Arbeid"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:197
-#: ../addressbook/gui/widgets/eab-contact-display.c:83
-#: ../addressbook/gui/widgets/eab-contact-display.c:421
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:73
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:402
 #: ../calendar/gui/e-cal-model.c:3471
 msgid "Other"
 msgstr "Andre"
@@ -507,42 +506,42 @@ msgid "Notes"
 msgstr "Notater"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-display.c:669
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:630
 msgid "AIM"
 msgstr "AIM"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-display.c:672
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:633
 msgid "Jabber"
 msgstr "Jabber"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:674
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:635
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-display.c:675
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:636
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:180
-#: ../addressbook/gui/widgets/eab-contact-display.c:673
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:634
 msgid "MSN"
 msgstr "MSN"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:181
-#: ../addressbook/gui/widgets/eab-contact-display.c:671
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:632
 msgid "ICQ"
 msgstr "ICQ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:182
-#: ../addressbook/gui/widgets/eab-contact-display.c:670
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:631
 msgid "GroupWise"
 msgstr "GroupWise"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:183
-#: ../addressbook/gui/widgets/eab-contact-display.c:676
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:637
 msgid "Skype"
 msgstr "Skype"
 
@@ -798,7 +797,7 @@ msgstr "E-post begynner med"
 #: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:19
 #: ../calendar/gui/tasktypes.xml.h:30
 #: ../modules/addressbook/e-book-shell-view-actions.c:1063
-#: ../modules/calendar/e-cal-shell-view-actions.c:1734
+#: ../modules/calendar/e-cal-shell-view-actions.c:1776
 #: ../modules/calendar/e-memo-shell-view-actions.c:788
 #: ../modules/calendar/e-task-shell-view-actions.c:987
 msgid "Any field contains"
@@ -810,116 +809,121 @@ msgstr "Et felt inneholder"
 msgid "evolution address book"
 msgstr "evolution adressebok"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:191
+#: ../addressbook/gui/widgets/eab-contact-display.c:155
 msgid "Copy _Email Address"
 msgstr "Kopier _e-postadresse"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:193
-#: ../widgets/misc/e-web-view.c:432
+#: ../addressbook/gui/widgets/eab-contact-display.c:157
+#: ../widgets/misc/e-web-view.c:297 ../widgets/misc/e-web-view-gtkhtml.c:431
 msgid "Copy the email address to the clipboard"
 msgstr "Kopier e-postadresser til utklippstavlen"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:198
-#: ../widgets/misc/e-web-view.c:437
+#: ../addressbook/gui/widgets/eab-contact-display.c:162
+#: ../widgets/misc/e-web-view.c:302 ../widgets/misc/e-web-view-gtkhtml.c:436
 msgid "_Send New Message To..."
 msgstr "_Send ny melding til â"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:200
-#: ../widgets/misc/e-web-view.c:439
+#: ../addressbook/gui/widgets/eab-contact-display.c:164
+#: ../widgets/misc/e-web-view.c:304 ../widgets/misc/e-web-view-gtkhtml.c:438
 msgid "Send a mail message to this address"
 msgstr "Send en e-postmelding til denne adressen"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:227
+#: ../addressbook/gui/widgets/eab-contact-display.c:301
+#: ../widgets/misc/e-web-view.c:1065 ../widgets/misc/e-web-view-gtkhtml.c:955
+#, c-format
+msgid "Click to mail %s"
+msgstr "Klikk for Ã sende melding til %s"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:170
 msgid "Open map"
 msgstr "Ãpne kart"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:542
-#: ../addressbook/gui/widgets/eab-contact-display.c:570
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:565
 msgid "List Members:"
 msgstr "Listemedlemmer:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:662
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:629
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Nickname"
 msgstr "Kallenavn"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:694
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:681
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Company"
 msgstr "Firma"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:695
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:682
 msgid "Department"
 msgstr "Avdeling"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:696
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:683
 msgid "Profession"
 msgstr "Yrke"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:697
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:684
 msgid "Position"
 msgstr "Stilling"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:698
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:685
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Manager"
 msgstr "Leder"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:699
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:686
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Assistant"
 msgstr "Assistent"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:700
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:687
 msgid "Video Chat"
 msgstr "Videosamtale"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:701
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:688
 #: ../calendar/gui/dialogs/calendar-setup.c:469
 #: ../modules/calendar/e-cal-shell-view-actions.c:232
 #: ../modules/calendar/e-cal-shell-view-actions.c:261
-#: ../modules/calendar/e-cal-shell-view.c:528
+#: ../modules/calendar/e-cal-shell-view.c:606
 #: ../modules/online-accounts/e-online-accounts-google.c:302
 #: ../plugins/publish-calendar/publish-calendar.ui.h:21
 #: ../widgets/misc/e-send-options.c:546
 msgid "Calendar"
 msgstr "Kalender"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:702
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:689
 #: ../calendar/gui/dialogs/event-editor.c:127
 #: ../calendar/gui/dialogs/event-editor.c:354
 #: ../plugins/publish-calendar/publish-calendar.ui.h:2
 msgid "Free/Busy"
 msgstr "Ledig/opptatt"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:703
-#: ../addressbook/gui/widgets/eab-contact-display.c:725
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:690
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:717
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:704
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:691
 msgid "Fax"
 msgstr "Faks"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:705
-#: ../addressbook/gui/widgets/eab-contact-display.c:727
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:692
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:719
 msgid "Address"
 msgstr "Adresse"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:722
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:715
 msgid "Home Page"
 msgstr "Hjemmeside"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:723
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:716
 msgid "Web Log"
 msgstr "Nettdagbok"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:726
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:718
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:730
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:722
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
 msgid "Spouse"
 msgstr "Ektefelle"
@@ -928,7 +932,7 @@ msgstr "Ektefelle"
 #. Create the default Person calendar
 #. Create the default Person memo list
 #. Create the default Person task list
-#: ../addressbook/gui/widgets/eab-contact-display.c:732
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:732
 #: ../capplet/settings/mail-capplet-shell.c:385
 #: ../modules/addressbook/e-book-shell-backend.c:126
 #: ../modules/addressbook/e-book-shell-migrate.c:144
@@ -941,33 +945,27 @@ msgstr "Ektefelle"
 msgid "Personal"
 msgstr "Personlig"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:753
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:756
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
 msgid "Note"
 msgstr "Kommentar"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1022
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:943
 msgid "List Members"
 msgstr "Listemedlemmer"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1040
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:964
 msgid "Job Title"
 msgstr "Jobbtittel"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1077
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1005
 msgid "Home page"
 msgstr "Hjemmeside"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1086
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1015
 msgid "Blog"
 msgstr "Weblogg"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1285
-#: ../widgets/misc/e-web-view.c:980
-#, c-format
-msgid "Click to mail %s"
-msgstr "Klikk for Ã sende melding til %s"
-
 #: ../addressbook/gui/widgets/eab-gui-util.c:120
 msgid ""
 "This address book cannot be opened. This either means this book is not "
@@ -1538,12 +1536,12 @@ msgstr "Kunne ikke hente liste med adressebÃker: %s"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
-#: ../calendar/gui/dialogs/memo-page.c:951 ../em-format/em-format.c:2330
-#: ../libemail-engine/mail-ops.c:640 ../mail/em-folder-tree.c:678
+#: ../calendar/gui/dialogs/memo-page.c:951 ../em-format/em-format.c:964
+#: ../libemail-engine/mail-ops.c:683 ../mail/em-folder-tree.c:678
 #: ../plugins/caldav/caldav-browse-server.c:221
 #: ../plugins/caldav/caldav-browse-server.c:1478 ../plugins/face/face.c:174
-#: ../plugins/itip-formatter/itip-formatter.c:1485
-#: ../plugins/itip-formatter/itip-formatter.c:1855
+#: ../plugins/itip-formatter/itip-formatter.c:1503
+#: ../plugins/itip-formatter/itip-formatter.c:1896
 #: ../smime/gui/certificate-manager.c:317
 msgid "Unknown error"
 msgstr "Ukjent feil"
@@ -1627,11 +1625,11 @@ msgstr "minutter"
 msgid "location of appointment"
 msgstr "sted for avtalen"
 
-#. Location
 #: ../calendar/alarm-notify/alarm-notify.ui.h:9
 #: ../calendar/alarm-notify/alarm-queue.c:1758
 #: ../calendar/alarm-notify/alarm-queue.c:1768
-#: ../plugins/itip-formatter/itip-view.c:1051
+#: ../plugins/itip-formatter/itip-view.c:1163
+#: ../plugins/itip-formatter/itip-view.c:1263
 msgid "Location:"
 msgstr "Sted:"
 
@@ -2153,6 +2151,14 @@ msgstr ""
 "muligens stÃte pÃ problemer. Tjeneren bÃr oppgraderes til en stÃttet versjon "
 "for Ã unngÃ problemer."
 
+#: ../calendar/calendar.error.xml.h:91
+msgid "Could not perform this operation."
+msgstr "Kunne ikke utfÃre denne operasjonen."
+
+#: ../calendar/calendar.error.xml.h:92 ../mail/mail.error.xml.h:175
+msgid "You must be working online to complete this operation."
+msgstr "Du mÃ arbeide frakoblet for Ã fullfÃre denne operasjonen."
+
 #: ../calendar/gui/calendar-view-factory.c:88
 msgid "Day View"
 msgstr "Dagvisning"
@@ -2258,6 +2264,7 @@ msgstr "Kategori"
 
 #: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:15 ../mail/em-filter-i18n.h:5
+#: ../mail/em-format-html-print.c:83 ../mail/em-format-html-print.c:254
 msgid "Attachments"
 msgstr "Vedlegg"
 
@@ -2471,7 +2478,7 @@ msgstr "Fa_rge:"
 #: ../modules/addressbook/addressbook-config.c:1114
 #: ../modules/addressbook/autocompletion-config.c:240
 #: ../modules/calendar/e-calendar-preferences.ui.h:47
-#: ../plugins/itip-formatter/itip-formatter.c:3240
+#: ../plugins/itip-formatter/itip-formatter.c:3403
 #: ../plugins/publish-calendar/publish-calendar.ui.h:16
 #: ../smime/gui/smime-ui.ui.h:21
 msgid "General"
@@ -2605,17 +2612,19 @@ msgstr "Behold opprinnelig oppfÃring?"
 msgid "Close the current window"
 msgstr "Lukk aktiv vindu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1132 ../mail/e-mail-browser.c:137
+#: ../calendar/gui/dialogs/comp-editor.c:1132 ../mail/e-mail-browser.c:139
 #: ../shell/e-shell-window-actions.c:1467
 #: ../widgets/misc/e-focus-tracker.c:121 ../widgets/misc/e-focus-tracker.c:558
-#: ../widgets/misc/e-web-view.c:459 ../widgets/misc/e-web-view.c:1306
+#: ../widgets/misc/e-web-view.c:324 ../widgets/misc/e-web-view.c:1398
+#: ../widgets/misc/e-web-view-gtkhtml.c:458
+#: ../widgets/misc/e-web-view-gtkhtml.c:1281
 msgid "Copy the selection"
 msgstr "Kopier utvalget"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1139 ../mail/e-mail-browser.c:144
+#: ../calendar/gui/dialogs/comp-editor.c:1139 ../mail/e-mail-browser.c:146
 #: ../shell/e-shell-window-actions.c:1474
 #: ../widgets/misc/e-focus-tracker.c:114 ../widgets/misc/e-focus-tracker.c:553
-#: ../widgets/misc/e-web-view.c:1300
+#: ../widgets/misc/e-web-view.c:1392 ../widgets/misc/e-web-view-gtkhtml.c:1275
 msgid "Cut the selection"
 msgstr "Klipp ut utvalget"
 
@@ -2629,10 +2638,10 @@ msgstr "Slett utvalget"
 msgid "View help"
 msgstr "Vis hjelp"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1160 ../mail/e-mail-browser.c:151
+#: ../calendar/gui/dialogs/comp-editor.c:1160 ../mail/e-mail-browser.c:153
 #: ../shell/e-shell-window-actions.c:1509
 #: ../widgets/misc/e-focus-tracker.c:128 ../widgets/misc/e-focus-tracker.c:563
-#: ../widgets/misc/e-web-view.c:1312
+#: ../widgets/misc/e-web-view.c:1404 ../widgets/misc/e-web-view-gtkhtml.c:1287
 msgid "Paste the clipboard"
 msgstr "Lim inn fra utklippstavlen"
 
@@ -2640,7 +2649,7 @@ msgstr "Lim inn fra utklippstavlen"
 msgid "Save current changes"
 msgstr "Lagre endringer"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1188 ../mail/e-mail-browser.c:158
+#: ../calendar/gui/dialogs/comp-editor.c:1188 ../mail/e-mail-browser.c:160
 #: ../shell/e-shell-window-actions.c:1586
 #: ../widgets/misc/e-focus-tracker.c:142 ../widgets/misc/e-focus-tracker.c:573
 msgid "Select all text"
@@ -2652,14 +2661,14 @@ msgstr "K_lassifisering"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1202
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:19 ../filter/filter.ui.h:16
-#: ../mail/e-mail-browser.c:172
+#: ../mail/e-mail-browser.c:174
 #: ../plugins/publish-calendar/publish-calendar.ui.h:32
 #: ../shell/e-shell-window-actions.c:1614
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "R_ediger"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1209 ../mail/e-mail-browser.c:165
+#: ../calendar/gui/dialogs/comp-editor.c:1209 ../mail/e-mail-browser.c:167
 #: ../shell/e-shell-window-actions.c:1621
 #: ../widgets/misc/e-signature-editor.c:225
 msgid "_File"
@@ -2679,7 +2688,7 @@ msgstr "Sett _inn"
 msgid "_Options"
 msgstr "_Alternativer"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1237 ../mail/e-mail-browser.c:179
+#: ../calendar/gui/dialogs/comp-editor.c:1237 ../mail/e-mail-browser.c:181
 #: ../shell/e-shell-window-actions.c:1663 ../smime/gui/smime-ui.ui.h:28
 msgid "_View"
 msgstr "_Vis"
@@ -2781,7 +2790,7 @@ msgstr ""
 "enoppdatering"
 
 #: ../calendar/gui/dialogs/comp-editor.c:3512
-#: ../plugins/prefer-plain/prefer-plain.c:66
+#: ../plugins/prefer-plain/prefer-plain.c:64
 msgid "attachment"
 msgstr "vedlegg"
 
@@ -3200,7 +3209,7 @@ msgid "Select Date"
 msgstr "Velg dato"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:14
-#: ../modules/calendar/e-cal-shell-view-actions.c:1363
+#: ../modules/calendar/e-cal-shell-view-actions.c:1384
 msgid "Select _Today"
 msgstr "Velg i _dag"
 
@@ -3229,10 +3238,10 @@ msgstr "Notatet kan ikke redigeres i sin helhet fordi du ikke er organisator"
 msgid "Unable to open memos in '%s': %s"
 msgstr "Kan ikke Ãpne notater i Â%sÂ: %s"
 
-#: ../calendar/gui/dialogs/memo-page.c:1156 ../em-format/em-format.c:1065
-#: ../em-format/em-format-quote.c:318 ../mail/em-format-html.c:2666
-#: ../mail/em-format-html.c:2731 ../mail/em-format-html.c:2755
-#: ../mail/message-list.etspec.h:9 ../modules/mail/em-mailer-prefs.c:72
+#: ../calendar/gui/dialogs/memo-page.c:1156 ../em-format/em-format.c:1227
+#: ../em-format/em-format-quote.c:154 ../mail/em-format-html.c:2286
+#: ../mail/em-format-html.c:2309 ../mail/message-list.etspec.h:9
+#: ../modules/mail/em-mailer-prefs.c:72
 msgid "To"
 msgstr "Til"
 
@@ -3539,7 +3548,7 @@ msgstr "Nettside"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:326
+#: ../calendar/gui/e-cal-component-preview.c:316
 #: ../calendar/gui/e-task-table.c:582 ../calendar/gui/tasktypes.xml.h:19
 #: ../mail/message-list.c:1285 ../widgets/misc/e-send-options.ui.h:2
 msgid "High"
@@ -3547,7 +3556,7 @@ msgstr "HÃy"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
-#: ../calendar/gui/e-cal-component-preview.c:328
+#: ../calendar/gui/e-cal-component-preview.c:318
 #: ../calendar/gui/e-cal-model.c:1623 ../calendar/gui/e-task-table.c:583
 #: ../calendar/gui/tasktypes.xml.h:20 ../mail/message-list.c:1284
 #: ../widgets/misc/e-send-options.ui.h:5
@@ -3556,7 +3565,7 @@ msgstr "Normal"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
-#: ../calendar/gui/e-cal-component-preview.c:330
+#: ../calendar/gui/e-cal-component-preview.c:320
 #: ../calendar/gui/e-task-table.c:584 ../calendar/gui/tasktypes.xml.h:21
 #: ../mail/message-list.c:1283 ../widgets/misc/e-send-options.ui.h:4
 msgid "Low"
@@ -3571,7 +3580,7 @@ msgstr "Udefinert"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:311
+#: ../calendar/gui/e-cal-component-preview.c:302
 #: ../calendar/gui/e-cal-model-tasks.c:490
 #: ../calendar/gui/e-cal-model-tasks.c:775 ../calendar/gui/e-task-table.c:230
 #: ../calendar/gui/e-task-table.c:245 ../calendar/gui/e-task-table.c:659
@@ -3581,7 +3590,7 @@ msgstr "Ikke startet"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:12
-#: ../calendar/gui/e-cal-component-preview.c:301
+#: ../calendar/gui/e-cal-component-preview.c:292
 #: ../calendar/gui/e-cal-model-tasks.c:492
 #: ../calendar/gui/e-cal-model-tasks.c:777
 #: ../calendar/gui/e-cal-model-tasks.c:855 ../calendar/gui/e-task-table.c:232
@@ -3592,7 +3601,7 @@ msgstr "Under arbeid"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:14
-#: ../calendar/gui/e-cal-component-preview.c:304
+#: ../calendar/gui/e-cal-component-preview.c:295
 #: ../calendar/gui/e-cal-model-tasks.c:494
 #: ../calendar/gui/e-cal-model-tasks.c:779
 #: ../calendar/gui/e-meeting-store.c:214 ../calendar/gui/e-meeting-store.c:237
@@ -3605,13 +3614,11 @@ msgstr "FullfÃrt"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:16
-#: ../calendar/gui/e-cal-component-preview.c:307
+#: ../calendar/gui/e-cal-component-preview.c:298
 #: ../calendar/gui/e-cal-model-tasks.c:496
 #: ../calendar/gui/e-cal-model-tasks.c:781 ../calendar/gui/e-task-table.c:236
 #: ../calendar/gui/e-task-table.c:251 ../calendar/gui/e-task-table.c:662
-#: ../calendar/gui/print.c:3417 ../mail/em-sync-stream.c:152
-#: ../mail/em-sync-stream.c:180 ../mail/em-sync-stream.c:202
-#, c-format
+#: ../calendar/gui/print.c:3417
 msgid "Canceled"
 msgstr "Avbrutt"
 
@@ -3813,7 +3820,7 @@ msgid "Gnome Calendar"
 msgstr "GNOME kalender"
 
 #: ../calendar/gui/ea-gnome-calendar.c:201
-#: ../modules/calendar/e-cal-shell-view-private.c:1050
+#: ../modules/calendar/e-cal-shell-view-private.c:1072
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -3826,16 +3833,16 @@ msgstr "%A %d %b %Y"
 #: ../calendar/gui/ea-gnome-calendar.c:204 ../calendar/gui/e-day-view.c:1850
 #: ../calendar/gui/e-day-view-top-item.c:837
 #: ../calendar/gui/e-week-view-main-item.c:231
-#: ../modules/calendar/e-cal-shell-view-private.c:1054
+#: ../modules/calendar/e-cal-shell-view-private.c:1076
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #: ../calendar/gui/ea-gnome-calendar.c:206
 #: ../calendar/gui/ea-gnome-calendar.c:211
 #: ../calendar/gui/ea-gnome-calendar.c:213
-#: ../modules/calendar/e-cal-shell-view-private.c:1057
-#: ../modules/calendar/e-cal-shell-view-private.c:1063
-#: ../modules/calendar/e-cal-shell-view-private.c:1066
+#: ../modules/calendar/e-cal-shell-view-private.c:1079
+#: ../modules/calendar/e-cal-shell-view-private.c:1085
+#: ../modules/calendar/e-cal-shell-view-private.c:1088
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -3843,10 +3850,10 @@ msgstr "%a %d %b %Y"
 #: ../calendar/gui/ea-gnome-calendar.c:236
 #: ../calendar/gui/ea-gnome-calendar.c:242
 #: ../calendar/gui/ea-gnome-calendar.c:244
-#: ../modules/calendar/e-cal-shell-view-private.c:1083
-#: ../modules/calendar/e-cal-shell-view-private.c:1094
-#: ../modules/calendar/e-cal-shell-view-private.c:1101
-#: ../modules/calendar/e-cal-shell-view-private.c:1104
+#: ../modules/calendar/e-cal-shell-view-private.c:1105
+#: ../modules/calendar/e-cal-shell-view-private.c:1116
+#: ../modules/calendar/e-cal-shell-view-private.c:1123
+#: ../modules/calendar/e-cal-shell-view-private.c:1126
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -3858,7 +3865,7 @@ msgstr "%d %b %Y"
 #: ../calendar/gui/ea-gnome-calendar.c:234 ../calendar/gui/e-day-view.c:1866
 #: ../calendar/gui/e-day-view-top-item.c:841
 #: ../calendar/gui/e-week-view-main-item.c:245
-#: ../modules/calendar/e-cal-shell-view-private.c:1090
+#: ../modules/calendar/e-cal-shell-view-private.c:1112
 msgid "%d %b"
 msgstr "%d %b"
 
@@ -3964,42 +3971,45 @@ 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:201 ../filter/e-filter-rule.c:691
+#: ../calendar/gui/e-cal-component-preview.c:208 ../filter/e-filter-rule.c:691
 msgid "Untitled"
 msgstr "Uten navn"
 
-#: ../calendar/gui/e-cal-component-preview.c:207
+#: ../calendar/gui/e-cal-component-preview.c:216
 msgid "Categories:"
 msgstr "Kategorier:"
 
-#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-cal-component-preview.c:247
 msgid "Summary:"
 msgstr "Sammendrag:"
 
-#: ../calendar/gui/e-cal-component-preview.c:256
-#: ../calendar/gui/e-cal-component-preview.c:270
+#: ../calendar/gui/e-cal-component-preview.c:255
 msgid "Start Date:"
 msgstr "Startdato:"
 
-#: ../calendar/gui/e-cal-component-preview.c:284
+#: ../calendar/gui/e-cal-component-preview.c:266
+msgid "End Date:"
+msgstr "Sluttdato:"
+
+#: ../calendar/gui/e-cal-component-preview.c:277
 msgid "Due Date:"
 msgstr "Ferdig-dato:"
 
-#. Status
-#: ../calendar/gui/e-cal-component-preview.c:297
-#: ../plugins/itip-formatter/itip-view.c:1082
+#: ../calendar/gui/e-cal-component-preview.c:288
+#: ../plugins/itip-formatter/itip-view.c:1166
+#: ../plugins/itip-formatter/itip-view.c:1272
 msgid "Status:"
 msgstr "Status:"
 
-#: ../calendar/gui/e-cal-component-preview.c:324
+#: ../calendar/gui/e-cal-component-preview.c:314
 msgid "Priority:"
 msgstr "Prioritet:"
 
-#: ../calendar/gui/e-cal-component-preview.c:349 ../mail/mail-config.ui.h:159
+#: ../calendar/gui/e-cal-component-preview.c:338 ../mail/mail-config.ui.h:159
 msgid "Description:"
 msgstr "Beskrivelse:"
 
-#: ../calendar/gui/e-cal-component-preview.c:380
+#: ../calendar/gui/e-cal-component-preview.c:368
 msgid "Web Page:"
 msgstr "Nettside:"
 
@@ -4127,8 +4137,8 @@ msgstr "Sluttdato"
 #: ../calendar/gui/e-meeting-store.c:242 ../calendar/gui/print.c:1162
 #: ../calendar/gui/print.c:1179 ../e-util/e-charset.c:52
 #: ../modules/plugin-manager/evolution-plugin-manager.c:101
-#: ../plugins/itip-formatter/itip-formatter.c:475
-#: ../plugins/itip-formatter/itip-formatter.c:2885
+#: ../plugins/itip-formatter/itip-formatter.c:474
+#: ../plugins/itip-formatter/itip-formatter.c:2949
 msgid "Unknown"
 msgstr "Ukjent"
 
@@ -4161,14 +4171,14 @@ msgstr "Ãpner %s"
 #: ../calendar/gui/e-cal-model.c:3466
 #: ../calendar/gui/e-meeting-list-view.c:218
 #: ../calendar/gui/e-meeting-store.c:206 ../calendar/gui/e-meeting-store.c:229
-#: ../plugins/itip-formatter/itip-formatter.c:2873
+#: ../plugins/itip-formatter/itip-formatter.c:2937
 msgid "Accepted"
 msgstr "Godtatt"
 
 #: ../calendar/gui/e-cal-model.c:3467
 #: ../calendar/gui/e-meeting-list-view.c:219
 #: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/e-meeting-store.c:231
-#: ../plugins/itip-formatter/itip-formatter.c:2879
+#: ../plugins/itip-formatter/itip-formatter.c:2943
 msgid "Declined"
 msgstr "AvslÃtt"
 
@@ -4176,13 +4186,14 @@ msgstr "AvslÃtt"
 #: ../calendar/gui/e-meeting-list-view.c:220
 #: ../calendar/gui/e-meeting-store.c:210 ../calendar/gui/e-meeting-store.c:233
 #: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../plugins/itip-formatter/itip-view.c:1111
 msgid "Tentative"
 msgstr "Tentativ"
 
 #: ../calendar/gui/e-cal-model.c:3469
 #: ../calendar/gui/e-meeting-list-view.c:221
 #: ../calendar/gui/e-meeting-store.c:212 ../calendar/gui/e-meeting-store.c:235
-#: ../plugins/itip-formatter/itip-formatter.c:2882
+#: ../plugins/itip-formatter/itip-formatter.c:2946
 msgid "Delegated"
 msgstr "Delegert"
 
@@ -4261,7 +4272,7 @@ 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:2650
+#: ../calendar/gui/e-day-view.c:2653
 #, c-format
 msgid "Week %d"
 msgstr "Uke %d"
@@ -4962,7 +4973,7 @@ msgstr "Avtaler og mÃter"
 
 #: ../calendar/importers/icalendar-importer.c:437
 #: ../calendar/importers/icalendar-importer.c:870
-#: ../plugins/itip-formatter/itip-formatter.c:2499
+#: ../plugins/itip-formatter/itip-formatter.c:2559
 msgid "Opening calendar"
 msgstr "Ãpner kalender"
 
@@ -6721,7 +6732,7 @@ msgstr "CalDAV"
 #: ../capplet/settings/mail-account-view.c:421
 #: ../mail/em-account-editor.c:5324 ../mail/em-account-editor.c:5381
 #: ../modules/online-accounts/e-online-accounts-google.c:295
-#: ../modules/online-accounts/e-online-accounts-google.c:369
+#: ../modules/online-accounts/e-online-accounts-google.c:371
 #: ../plugins/google-account-setup/google-contacts-source.c:55
 #: ../plugins/google-account-setup/google-source.c:83
 msgid "Google"
@@ -7218,7 +7229,7 @@ msgstr "SÃk etter / erstatt tekst"
 msgid "Save draft"
 msgstr "Lagre utkast"
 
-#: ../composer/e-msg-composer.c:813
+#: ../composer/e-msg-composer.c:817
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
@@ -7226,7 +7237,7 @@ msgstr ""
 "Kan ikke signere utgÃende melding: Ingen sertifikat for signering satt for "
 "denne kontoen"
 
-#: ../composer/e-msg-composer.c:822
+#: ../composer/e-msg-composer.c:826
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -7235,17 +7246,17 @@ msgstr ""
 "Kan ikke kryptere utgÃende melding: Sertifikat for kryptering ikke satt for "
 "denne kontoen"
 
-#: ../composer/e-msg-composer.c:1609 ../composer/e-msg-composer.c:1996
+#: ../composer/e-msg-composer.c:1613 ../composer/e-msg-composer.c:2000
 msgid "Compose Message"
 msgstr "Skriv melding"
 
-#: ../composer/e-msg-composer.c:4163
+#: ../composer/e-msg-composer.c:4203
 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:4867
+#: ../composer/e-msg-composer.c:4907
 msgid "Untitled Message"
 msgstr "Melding uten navn"
 
@@ -7376,7 +7387,7 @@ msgstr ""
 msgid "An error occurred while sending. How do you want to proceed?"
 msgstr "En feil oppsto under sending. Hvordan vil du fortsette?"
 
-#: ../composer/mail-composer.error.xml.h:30 ../mail/mail.error.xml.h:157
+#: ../composer/mail-composer.error.xml.h:30 ../mail/mail.error.xml.h:161
 msgid "The reported error was &quot;{0}&quot;."
 msgstr "Feilen som ble rapportert var &quot;{0}&quot;."
 
@@ -8024,85 +8035,96 @@ msgstr ""
 "venstre"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:88
+msgid "Search range for time-based searching in years"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:89
+msgid ""
+"How many years can the time-based search go forward or backward from "
+"currently selected day when searching for another occurrence; default is ten "
+"years"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:90
 msgid "List of selected calendars"
 msgstr "Liste med valgte kalendere"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:89
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:91
 msgid "List of calendars to load"
 msgstr "Liste med kalendere som skal lastes"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
 msgid "List of selected memo lists"
 msgstr "Liste med valgte notatlister"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
 msgid "List of memo lists to load"
 msgstr "Liste med notatlister som skal lastes"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
 msgid "List of selected task lists"
 msgstr "Liste med valgte oppgavelister"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
 msgid "List of task lists to load"
 msgstr "Liste med oppgavelister som skal lastes"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:65
 msgid "Show appointment end times in week and month views"
 msgstr "Vis tid for avtalers slutt i ukes- og mÃnedsvisning"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
 msgid "Whether to display the end time of events in the week and month views"
 msgstr ""
 "Om tidspunktet en hendelse slutter pÃ skal vises i uke- og mÃnedsvisninger"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
 msgid "Show the memo preview pane"
 msgstr "Vis forhÃndsvisningsvinduet for notat"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
 msgid "If \"true\", show the memo preview pane in the main window"
 msgstr "Vis forhÃndsvisningsomrÃdet for notater i hovedvinduet hvis ÂtrueÂ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
 msgid "Show the task preview pane"
 msgstr "Vis forhÃndsvisningsomrÃdet for oppgave"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
 msgid "If \"true\", show the task preview pane in the main window"
 msgstr "Vis forhÃndsvisningsomrÃdet for oppgaver i hovedvinduet hvis ÂtrueÂ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:107
 msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
 msgstr "Vis ukenummer i dagvisning, arbeidsukevisning og datonavigator"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
 msgid "Whether to show week numbers in various places in the Calendar"
 msgstr "Om ukenummer skal vises pÃ relevante steder i kalenderen"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
 msgid "Vertical position for the tag pane"
 msgstr "Vertikal posisjon for merkefelt"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
 msgid "Highlight tasks due today"
 msgstr "Uthev oppgaver som gÃr ut i dag"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
 msgid ""
 "Whether highlight tasks due today with a special color (task-due-today-color)"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:107
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:87
 msgid "Tasks due today color"
 msgstr "Farge for oppgaver som gÃr ut i dag"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
 msgid ""
 "Background color of tasks that are due today, in \"#rrggbb\" format. Used "
 "together with task-due-today-highlight"
@@ -8110,48 +8132,48 @@ msgstr ""
 "Bakgrunnsfarge for oppgaver som gÃr ut i dag i Â#rrggbbÂ-format. Brukes "
 "sammen med task-due-today-highlight"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
 msgid "Task preview pane position (horizontal)"
 msgstr "Posisjon for forhÃndsvisning av oppgaver (horisontal)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
 msgid "Task layout style"
 msgstr "Stil for utforming av oppgaver"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the task list. \"0\" (Classic View) places the preview pane below the task "
 "list. \"1\" (Vertical View) places the preview pane next to the task list"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
 msgid "Task preview pane position (vertical)"
 msgstr "Posisjon for forhÃndsvisning av oppgaver (vertikal)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
 msgid "Position of the task preview pane when oriented vertically"
 msgstr ""
 "Posisjon for forhÃndsvisningsomrÃdet for oppgaver med vertikal orientering"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
 msgid "Highlight overdue tasks"
 msgstr "Uthev utgÃtte oppgaver"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
 msgid ""
 "Whether highlight overdue tasks with a special color (task-overdue-color)"
 msgstr ""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:89
 msgid "Overdue tasks color"
 msgstr "Farge for utgÃtte oppgaver"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
 msgid ""
 "Background color of tasks that are overdue, in \"#rrggbb\" format. Used "
 "together with task-overdue-highlight."
@@ -8159,21 +8181,21 @@ msgstr ""
 "Bakgrunnsfarge for oppgaver som har gÃtt ut i Â#rrggbbÂ-format. Brukes "
 "sammen med task-overdue-highlight."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
 msgid "Time divisions"
 msgstr "Oppdeling av tid"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
 msgid "Intervals shown in Day and Work Week views, in minutes"
 msgstr "Intervaller i minutter som vises i dag- og arbeidsukevisningene."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
 msgid "Timezone"
 msgstr "Tidssone"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olson timezone database location like \"America/New York\""
@@ -8181,59 +8203,59 @@ msgstr ""
 "Forvalgt tidssone som brukes for datoer og tidspunkt i kalenderen som en "
 "uoversatt Olson tidssonedatabaseplassering som ÂAmerica/New YorkÂ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
 msgid "Twenty four hour time format"
 msgstr "24-timers tidsformat"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
 msgid "Whether to show times in twenty four hour format instead of using am/pm"
 msgstr "Om tider skal vises i 24-timers format i stedet for Ã bruke am/pm"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:101
 msgid "Birthday and anniversary reminder"
 msgstr "PÃminnelse om fÃdselsdager og jubileum"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
 msgid "Whether to set a reminder for birthdays and anniversaries"
 msgstr ""
 "Om en forvalgt pÃminnelse skal bli satt for fÃdselsdager og bryllupsdager"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:95
 msgid "Default appointment reminder"
 msgstr "Forvalgt pÃminnelse for avtale"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
 msgid "Whether to set a default reminder for appointments"
 msgstr "Om en forvalgt pÃminnelse skal bli satt for avtaler"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
 msgid "Use system timezone"
 msgstr "Bruk systemets tidssone"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
 msgid "Use the system timezone instead of the timezone selected in Evolution"
 msgstr ""
 "Bruk systemets tidssone i stedet for tidssonen som er valgt i Evolution"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
 msgid "Week start"
 msgstr "Ukestart"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)"
 msgstr "Ukedag uken starter pÃ. Fra sÃndag (0) til lÃrdag (6)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:67
 msgid "Work days"
 msgstr "Arbeidsdager"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:133
 msgid "Days on which the start and end of work hours should be indicated"
 msgstr "Dager som starten og slutten pÃ arbeidstid skal vÃre indikert"
 
@@ -9252,11 +9274,35 @@ msgstr ""
 "sÃkeresultatene."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
+msgid "Asks whether to copy a folder by drag &amp; drop in the folder tree"
+msgstr "SpÃr om kopiering av en mappe med dra-og-slipp i mappetreet"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
+msgid ""
+"Possible values are: 'never' - do not allow copy with drag &amp; drop of "
+"folders in folder tree, 'always' - allow copy with drag &amp; drop of "
+"folders in folder tree without asking, or 'ask' - (or any other value) will "
+"ask user."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
+msgid "Asks whether to move a folder by drag &amp; drop in the folder tree"
+msgstr "SpÃr om flytting av mappe med dra-og-slipp i mappetreet"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
+msgid ""
+"Possible values are: 'never' - do not allow move with drag &amp; drop of "
+"folders in folder tree, 'always' - allow move with drag &amp; drop of "
+"folders in folder tree without asking, or 'ask' - (or any other value) will "
+"ask user."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
 #: ../mail/evolution-mail.schemas.in.h:165
 msgid "Prompt when replying privately to list messages"
 msgstr "SpÃr ved privat svar til meldinger fra e-postlister"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
 #: ../mail/evolution-mail.schemas.in.h:166
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
@@ -9265,12 +9311,12 @@ msgstr ""
 "Aktiverer/deaktiverer funksjonen som varsler om at du sender et privat svar "
 "pÃ en melding som har kommet via en e-postliste."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
 #: ../mail/evolution-mail.schemas.in.h:167
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "SpÃr nÃr e-postlister stikker av med private svar"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
 #: ../mail/evolution-mail.schemas.in.h:168
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying sending "
@@ -9278,76 +9324,76 @@ msgid ""
 "sets a Reply-To: header which redirects your reply back to the list"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
 #: ../mail/evolution-mail.schemas.in.h:169
 msgid "Prompt when replying to many recipients"
 msgstr "SpÃr ved svar til mange mottakere"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
 #: ../mail/evolution-mail.schemas.in.h:170
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "reply to many people."
 msgstr "SlÃr av/pÃ varsel om at du sender et svar til mange personer."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
 #: ../mail/evolution-mail.schemas.in.h:171
 msgid ""
 "Asks whether to close the message window when the user forwards or replies "
 "to the message shown in the window"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
 msgid ""
 "Possible values are: 'never' - to never close browser window, 'always' - to "
 "always close browser window or 'ask' - (or any other value) will ask user."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
 #: ../mail/evolution-mail.schemas.in.h:175
 msgid "Empty Trash folders on exit"
 msgstr "TÃm papirkurven nÃr programmet avsluttes"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
 #: ../mail/evolution-mail.schemas.in.h:176
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "TÃm alle papirkurver nÃr programmet avsluttes."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
 #: ../mail/evolution-mail.schemas.in.h:177
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Minimum antall dager mellom tÃmming av papirkurven ved avslutting"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
 #: ../mail/evolution-mail.schemas.in.h:178
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 "Minste tidsperiode mellom tÃmming av papirkurven ved avslutting, i dager."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
 #: ../mail/evolution-mail.schemas.in.h:179
 msgid "Last time Empty Trash was run"
 msgstr "Siste gang papirkurven ble tÃmt"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
 #: ../mail/evolution-mail.schemas.in.h:180
 msgid ""
 "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr "Sist gang papirkurven ble tÃmt, i dager siden 1 januar, 1970 (Epoch)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
 #: ../mail/evolution-mail.schemas.in.h:181
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:125
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "Antall sekunder feilen skal vises i statuslinjen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
 #: ../mail/evolution-mail.schemas.in.h:182
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:126
 msgid "Level beyond which the message should be logged."
 msgstr "Over dette nivÃet skal meldingen logges."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
 #: ../mail/evolution-mail.schemas.in.h:183
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
@@ -9356,12 +9402,12 @@ msgstr ""
 "Denne har tre mulige verdier. Â0Â for feil. Â1Â for advarsler. Â2Â for "
 "feilsÃkingsmeldinger."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
 #: ../mail/evolution-mail.schemas.in.h:184
 msgid "Show original \"Date\" header value."
 msgstr "Vis opprinnelig verdi for ÂDateÂ-meldingshode."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
 #: ../mail/evolution-mail.schemas.in.h:185
 msgid ""
 "Show the original \"Date\" header (with a local time only if the time zone "
@@ -9369,12 +9415,12 @@ msgid ""
 "format and local time zone."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
 #: ../mail/evolution-mail.schemas.in.h:186
 msgid "List of Labels and their associated colors"
 msgstr "Liste over etiketter og deres assosierte farger"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
 #: ../mail/evolution-mail.schemas.in.h:187
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
@@ -9384,46 +9430,46 @@ msgstr ""
 "inneholder strenger som inneholder Âname:colorÂ hvor ÂcolorÂ bruker HTML hex "
 "koding."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
 #: ../mail/evolution-mail.schemas.in.h:188
 msgid "Check incoming mail being junk"
 msgstr "Sjekk om innkommende meldinger er uÃnsket e-post"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
 #: ../mail/evolution-mail.schemas.in.h:189
 msgid "Run junk test on incoming mail."
 msgstr "Sjekk om innkommende e-post er uÃnsket."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
 #: ../mail/evolution-mail.schemas.in.h:190
 msgid "Empty Junk folders on exit"
 msgstr "TÃm mappe for uÃnsket e-post nÃr programmet avsluttes"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
 #: ../mail/evolution-mail.schemas.in.h:191
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "TÃm alle mapper for uÃnsket e-post nÃr programmet avsluttes."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
 #: ../mail/evolution-mail.schemas.in.h:192
 msgid "Minimum days between emptying the junk on exit"
 msgstr ""
 "Minimum antall dager mellom tÃmming av mapper for uÃnsket e-post ved "
 "avslutting"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
 #: ../mail/evolution-mail.schemas.in.h:193
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr ""
 "Minste tidsperiode mellom tÃmming av mapper for uÃnsket e-post ved "
 "avslutting, i dager."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 #: ../mail/evolution-mail.schemas.in.h:194
 msgid "Last time Empty Junk was run"
 msgstr "Siste gang mapper for uÃnsket e-post ble tÃmt"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
 #: ../mail/evolution-mail.schemas.in.h:195
 msgid ""
 "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
@@ -9431,12 +9477,12 @@ msgstr ""
 "Sist gang mapper for uÃnsket e-post ble tÃmt i dager siden 1 januar 1970 "
 "(epoch)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
 #: ../mail/evolution-mail.schemas.in.h:196
 msgid "The default plugin for Junk hook"
 msgstr "Forvalgt tillegg for uÃnsket e-post"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
 #: ../mail/evolution-mail.schemas.in.h:197
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
@@ -9447,12 +9493,12 @@ msgstr ""
 "tillegg er aktivert. Hvis forvalgt tillegg deaktiveres vil ikke de andre "
 "brukes."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
 #: ../mail/evolution-mail.schemas.in.h:198
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "Bestemmer om avsenders e-post skal slÃs opp i adresseboken"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
 #: ../mail/evolution-mail.schemas.in.h:199
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
@@ -9465,7 +9511,7 @@ msgstr ""
 "som er merket for automatisk fullfÃring. Operasjonen kan vÃre treg hvils "
 "eksterne adressebÃker som LDAP er merket for automatisk fullfÃring."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
 #: ../mail/evolution-mail.schemas.in.h:200
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
@@ -9474,7 +9520,7 @@ msgstr ""
 "Bestemmer om oppslag for filtrering av uÃnsket e-post kun skal slÃs opp i "
 "lokale adressebÃker"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
 #: ../mail/evolution-mail.schemas.in.h:201
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
@@ -9482,14 +9528,14 @@ msgid ""
 "mail sent by known contacts from junk filtering."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
 #: ../mail/evolution-mail.schemas.in.h:202
 msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
 "Bestemmer om egendefinerte meldingshoder skal brukes for Ã se etter uÃnsket "
 "e-post"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
 #: ../mail/evolution-mail.schemas.in.h:203
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
@@ -9500,12 +9546,12 @@ msgstr ""
 "post. Hvis dette alternativet er aktivert og meldingshodene finnes vil  "
 "dette forbedre hastigheten for denne sjekken."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
 #: ../mail/evolution-mail.schemas.in.h:204
 msgid "Custom headers to use while checking for junk."
 msgstr "Egendefinert meldingshode som skal sjekkes for uÃnsket e-post."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
 #: ../mail/evolution-mail.schemas.in.h:205
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
@@ -9514,58 +9560,58 @@ msgstr ""
 "Egendefinerte meldingshoder som brukes ved sjekk etter uÃnsket e-post. "
 "Formatet for listeelementene er Âheadername=valueÂ."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
 #: ../mail/evolution-mail.schemas.in.h:206
 msgid "UID string of the default account."
 msgstr "UID-streng for forvalgt konto."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
 #: ../mail/evolution-mail.schemas.in.h:211
 msgid "Save directory"
 msgstr "Lagre katalog"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
 #: ../mail/evolution-mail.schemas.in.h:212
 msgid "Directory for saving mail component files."
 msgstr "Katalog for Ã lagre komponentfiler for e-post."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
 msgid "Composer load/attach directory"
 msgstr "Katalog for vedlegg i redigering"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
 msgid "Directory for loading/attaching files to composer."
 msgstr "Katalog for Ã laste/legge ved filer i redigering."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
 #: ../mail/evolution-mail.schemas.in.h:219
 msgid "Check for new messages on start"
 msgstr "Se etter nye meldinger ved oppstart"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
 msgid ""
 "Whether to check for new messages when Evolution is started. This includes "
 "also sending messages from Outbox."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
 #: ../mail/evolution-mail.schemas.in.h:221
 msgid "Check for new messages in all active accounts"
 msgstr "Se etter nye meldinger i alle aktive kontoer"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
 msgid ""
 "Whether to check for new messages in all active accounts regardless of the "
 "account \"Check for new messages every X minutes\" option when Evolution is "
 "started. This option is used only together with 'send_recv_on_start' option."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
 #: ../mail/evolution-mail.schemas.in.h:239
 msgid "Server synchronization interval"
 msgstr "Intervall for serversynkronisering"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
 #: ../mail/evolution-mail.schemas.in.h:240
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
@@ -9596,17 +9642,16 @@ msgid "Address book source"
 msgstr "Kilde for adressebok"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:2
-msgid "Address book to use for storing automatically synced contacts"
-msgstr ""
-"Adressebok som skal brukes til Ã lagre automatisk synkroniserte kontakter"
+msgid "Address book to use for storing automatically synced contacts."
+msgstr "Adressebok som skal brukes til Ã lagre automatisk synkroniserte kontakter."
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:3
-msgid "Auto sync GAIM contacts"
-msgstr "Automatisk synkronisering av kontakter fra GAIM"
+msgid "Auto sync Pidgin contacts"
+msgstr "Automatisk synkronisering av kontakter fra Pidgin"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:4
-msgid "Whether GAIM contacts should be automaticall synced"
-msgstr "Om kontakter fra GAIM skal synkroniseres automatisk"
+msgid "Whether Pidgin contacts should be automatically synced."
+msgstr "Om kontakter fra Pidgin skal synkroniseres automatisk."
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:5
 msgid "Enable autocontacts"
@@ -9614,34 +9659,41 @@ msgstr "SlÃ pÃ automatiske kontakter"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:6
 msgid ""
-"Whether contacts should be automatically added to the user's addressbook"
-msgstr "Om kontakter skal legges til automatisk i brukers adressebok"
+"Whether contacts should be automatically added to the user's address book."
+msgstr "Om kontakter skal legges til automatisk i brukers adressebok."
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:7
-msgid "GAIM address book source"
-msgstr "Kilde for GAIM-adressebok"
+msgid "Pidgin address book source"
+msgstr "Kilde for Pidgin-adressebok"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:8
-msgid "Address book to use for storing automatically synced contacts from GAIM"
-msgstr ""
-"Adressebok som skal brukes til Ã lagre automatisk synkroniserte kontakter "
-"fra GAIM"
+msgid ""
+"Address book to use for storing automatically synced contacts from Pidgin."
+msgstr "Adressebok som skal brukes til Ã lagre automatisk synkroniserte kontakter fra Pidgin."
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:9
-msgid "GAIM check interval"
-msgstr "Intervall for sjekk mot GAIM"
+msgid "Pidgin check interval"
+msgstr "Intervall for sjekk mot Pidgin"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:10
-msgid "Check interval for GAIM syncing of contacts"
-msgstr "Intervall for sjekk fÃr synkronisering av kontakter fra GAIM"
+msgid "Check interval for Pidgin syncing of contacts."
+msgstr "Intervall for sjekk fÃr synkronisering av kontakter fra Pidgin."
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:11
-msgid "GAIM last sync MD5"
-msgstr "MD5-sum for siste synkronisering fra GAIM"
+msgid "Pidgin last sync MD5"
+msgstr "MD5-sum for siste synkronisering fra Pidgin"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:12
-msgid "GAIM last sync time"
-msgstr "Tid for siste synkronisering fra GAIM"
+msgid "Pidgin last sync MD5."
+msgstr "MD5-sum for siste synkronisering fra Pidgin."
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:13
+msgid "Pidgin last sync time"
+msgstr "Tid for siste synkronisering fra Pidgin"
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:14
+msgid "Pidgin last sync time."
+msgstr "Tid for siste synkronisering fra Pidgin."
 
 #: ../data/org.gnome.evolution.plugin.email-custom-header.gschema.xml.in.h:1
 #: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
@@ -9738,26 +9790,23 @@ msgid "Whether show message over the icon when new messages arrive."
 msgstr "Om meldingen skal vises over ikonet nÃr nye meldinger ankommer."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:9
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
-msgid "Play sound when new messages arrive."
-msgstr "Spill en lyd nÃr nye meldinger ankommer."
+msgid "Enable audible notifications when new messages arrive."
+msgstr "SlÃ pÃ varsling med lyd nÃr nye meldinger ankommer."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:10
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
-msgid "Whether play sound or beep when new messages arrive."
-msgstr "Om en lydfil eller et pip skal spilles av nÃr nye meldinger ankommer."
+msgid ""
+"Whether to make a sound of any kind when new messages arrive. If \"false\", "
+"the \"notify-sound-beep\", \"notify-sound-file\", \"notify-sound-play-file\" "
+"and \"notify-sound-use-theme\" keys are disregarded."
+msgstr ""
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:11
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
-msgid "Beep or play sound file."
-msgstr "Pip eller spill av en lydfil."
+msgid "Whether to emit a beep."
+msgstr "Hvorvidt pip skal brukes."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:12
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
-msgid ""
-"If \"true\", then beep, otherwise will play sound file when new messages "
-"arrive."
-msgstr "Pip hvis ÂtrueÂ, eller spill en lydfil nÃr nye meldinger ankommer."
+msgid "Whether to emit a beep when new messages arrive."
+msgstr "Hvorvidt et pip skal spilles av nÃr nye meldinger ankommer."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:13
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
@@ -9765,22 +9814,27 @@ msgid "Sound filename to be played."
 msgstr "Navn pÃ lydfil som skal spilles av."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:14
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
-msgid "Sound file to be played when new messages arrive, if not in beep mode."
-msgstr ""
-"Lydfil som skal spilles av nÃr nye meldinger ankommer hvis pip-modus ikke er "
-"aktivert."
+msgid ""
+"Sound file to be played when new messages arrive, if \"notify-sound-play-file"
+"\" is \"true\"."
+msgstr "Lydfil som skal spilles av nÃr nye meldinger ankommer hvis Ânotify-sound-play-fileÂ er ÂtrueÂ."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:15
-msgid "FIXME"
-msgstr "FIKSMEG"
+msgid "Whether to play a sound file."
+msgstr "Hvorvidt en lydfil skal spilles av."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:16
+msgid ""
+"Whether to play a sound file when new messages arrive. The name of the sound "
+"file is given by the 'notify-sound-file' key."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:17
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
 msgid "Use sound theme"
 msgstr "Bruk lydtema"
 
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:17
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:18
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
 msgid "Play themed sound when new messages arrive, if not in beep mode."
 msgstr ""
@@ -9980,103 +10034,103 @@ msgstr "KjÃrbar fil for SpamAssassin-klient"
 msgid "SpamAssassin daemon binary"
 msgstr "KjÃrbar fil for SpamAssassin-tjeneste"
 
-#: ../em-format/em-format.c:1063 ../em-format/em-format-quote.c:318
-#: ../mail/e-mail-tag-editor.c:327 ../mail/message-list.etspec.h:5
-#: ../modules/mail/em-mailer-prefs.c:70
-msgid "From"
-msgstr "Fra"
-
-#: ../em-format/em-format.c:1064 ../em-format/em-format-quote.c:318
-#: ../modules/mail/em-mailer-prefs.c:71
-msgid "Reply-To"
-msgstr "Svar-til"
+#: ../em-format/em-format.c:235
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Kunne ikke lese S/MIME-melding: Ukjent feil"
 
-#: ../em-format/em-format.c:1066 ../em-format/em-format-quote.c:318
-#: ../mail/em-format-html.c:2667 ../mail/em-format-html.c:2735
-#: ../mail/em-format-html.c:2758 ../modules/mail/em-mailer-prefs.c:73
-msgid "Cc"
-msgstr "Cc"
+#: ../em-format/em-format.c:480 ../em-format/em-format.c:599
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Kunne ikke lese MIME-melding. Viser ren meldingstekst."
 
-#: ../em-format/em-format.c:1067 ../em-format/em-format-quote.c:318
-#: ../mail/em-format-html.c:2668 ../mail/em-format-html.c:2739
-#: ../mail/em-format-html.c:2761 ../modules/mail/em-mailer-prefs.c:74
+#: ../em-format/em-format.c:490
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "Krypteringstype for multipart/encrypted som ikke er stÃttet"
+
+#: ../em-format/em-format.c:503
+msgid "Could not parse PGP/MIME message"
+msgstr "Kunne ikke lese PGP/MIME-melding"
+
+#: ../em-format/em-format.c:504
+msgid "Could not parse PGP/MIME message: Unknown error"
+msgstr "Kunne ikke lese PGP/MIME-melding: Ukjent feil"
+
+#: ../em-format/em-format.c:622
+msgid "Unsupported signature format"
+msgstr "UstÃttet signaturformat"
+
+#: ../em-format/em-format.c:633 ../em-format/em-format.c:850
+msgid "Error verifying signature"
+msgstr "Feil under verifisering av signatur"
+
+#: ../em-format/em-format.c:634 ../em-format/em-format.c:839
+#: ../em-format/em-format.c:851
+msgid "Unknown error verifying signature"
+msgstr "Ukjent feil under verifisering av signatur"
+
+#: ../em-format/em-format.c:958
+msgid "Could not parse PGP message: "
+msgstr "Kunne ikke lese PGP-melding:"
+
+#: ../em-format/em-format.c:1131
+msgid "Cannot proccess non-text mime/part"
+msgstr "Kan ikke prosessere mime/part som ikke er tekst"
+
+#: ../em-format/em-format.c:1225 ../em-format/em-format-quote.c:154
+#: ../mail/e-mail-tag-editor.c:327 ../mail/message-list.etspec.h:5
+#: ../modules/mail/em-mailer-prefs.c:70
+msgid "From"
+msgstr "Fra"
+
+#: ../em-format/em-format.c:1226 ../em-format/em-format-quote.c:154
+#: ../modules/mail/em-mailer-prefs.c:71
+msgid "Reply-To"
+msgstr "Svar-til"
+
+#: ../em-format/em-format.c:1228 ../em-format/em-format-quote.c:154
+#: ../mail/em-format-html.c:2288 ../mail/em-format-html.c:2311
+#: ../modules/mail/em-mailer-prefs.c:73
+msgid "Cc"
+msgstr "Cc"
+
+#: ../em-format/em-format.c:1229 ../em-format/em-format-quote.c:154
+#: ../mail/em-format-html.c:2290 ../mail/em-format-html.c:2313
+#: ../modules/mail/em-mailer-prefs.c:74
 msgid "Bcc"
 msgstr "Bcc"
 
-#: ../em-format/em-format.c:1068 ../em-format/em-format-quote.c:465
+#: ../em-format/em-format.c:1230 ../em-format/em-format-quote.c:301
 #: ../mail/e-mail-tag-editor.c:332 ../mail/em-filter-i18n.h:76
 #: ../mail/message-list.etspec.h:6 ../modules/mail/em-mailer-prefs.c:75
 #: ../smime/lib/e-cert.c:1126
 msgid "Subject"
 msgstr "Emne"
 
-#: ../em-format/em-format.c:1069 ../mail/message-list.etspec.h:7
+#: ../em-format/em-format.c:1231 ../mail/message-list.etspec.h:7
 #: ../modules/mail/em-mailer-prefs.c:76 ../widgets/misc/e-dateedit.c:526
 #: ../widgets/misc/e-dateedit.c:548
 msgid "Date"
 msgstr "Dato"
 
-#: ../em-format/em-format.c:1070 ../modules/mail/em-mailer-prefs.c:77
+#: ../em-format/em-format.c:1232 ../modules/mail/em-mailer-prefs.c:77
 msgid "Newsgroups"
 msgstr "Nyhetsgrupper"
 
-#: ../em-format/em-format.c:1071 ../modules/mail/em-mailer-prefs.c:78
+#: ../em-format/em-format.c:1233 ../modules/mail/em-mailer-prefs.c:78
 #: ../plugins/face/org-gnome-face.eplug.xml.h:1
 msgid "Face"
 msgstr "Ansikt"
 
-#: ../em-format/em-format.c:1474
+#: ../em-format/em-format.c:2291
 #, c-format
 msgid "%s attachment"
 msgstr "%s-vedlegg"
 
-#: ../em-format/em-format.c:1588
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Kunne ikke lese S/MIME-melding: Ukjent feil"
-
-#: ../em-format/em-format.c:1782 ../em-format/em-format.c:2010
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Kunne ikke lese MIME-melding. Viser ren meldingstekst."
-
-#: ../em-format/em-format.c:1793
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "Krypteringstype for multipart/encrypted som ikke er stÃttet"
-
-#: ../em-format/em-format.c:1813
-msgid "Could not parse PGP/MIME message"
-msgstr "Kunne ikke lese PGP/MIME-melding"
-
-#: ../em-format/em-format.c:1814
-msgid "Could not parse PGP/MIME message: Unknown error"
-msgstr "Kunne ikke lese PGP/MIME-melding: Ukjent feil"
-
-#: ../em-format/em-format.c:2035
-msgid "Unsupported signature format"
-msgstr "UstÃttet signaturformat"
-
-#: ../em-format/em-format.c:2048 ../em-format/em-format.c:2230
-msgid "Error verifying signature"
-msgstr "Feil under verifisering av signatur"
-
-#: ../em-format/em-format.c:2049 ../em-format/em-format.c:2215
-#: ../em-format/em-format.c:2231
-msgid "Unknown error verifying signature"
-msgstr "Ukjent feil under verifisering av signatur"
-
-#: ../em-format/em-format.c:2324
-msgid "Could not parse PGP message: "
-msgstr "Kunne ikke lese PGP-melding:"
-
 #. pseudo-header
-#: ../em-format/em-format-quote.c:476 ../mail/em-format-html.c:2860
+#: ../em-format/em-format-quote.c:312 ../mail/em-format-html.c:2421
 #: ../modules/mail/em-mailer-prefs.c:1046
 msgid "Mailer"
 msgstr "E-postprogram"
 
-#: ../em-format/em-format-quote.c:566 ../mail/em-composer-utils.c:1235
-msgid "-------- Forwarded Message --------"
-msgstr "---------Videresendt melding-------"
-
 #. Translators: This is a cancelled activity.
 #: ../e-util/e-activity.c:248
 #, c-format
@@ -10191,14 +10245,14 @@ msgstr "Synlig"
 
 #. strftime format of a weekday and a date.
 #: ../e-util/e-datetime-format.c:206
-#: ../modules/calendar/e-cal-shell-view-actions.c:1863
-#: ../plugins/itip-formatter/itip-view.c:194
+#: ../modules/calendar/e-cal-shell-view-actions.c:1905
+#: ../plugins/itip-formatter/itip-view.c:211
 #: ../widgets/table/e-cell-date-edit.c:307
 msgid "Today"
 msgstr "I dag"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:217 ../plugins/itip-formatter/itip-view.c:222
+#: ../e-util/e-datetime-format.c:217 ../plugins/itip-formatter/itip-view.c:239
 msgid "Tomorrow"
 msgstr "I morgen"
 
@@ -10517,11 +10571,11 @@ msgid "A_dd Condition"
 msgstr "Legg til _kriterie"
 
 #: ../filter/e-filter-rule.c:1162 ../filter/filter.ui.h:1
-#: ../mail/em-utils.c:306
+#: ../mail/em-utils.c:308
 msgid "Incoming"
 msgstr "Innkommende"
 
-#: ../filter/e-filter-rule.c:1162 ../mail/em-utils.c:307
+#: ../filter/e-filter-rule.c:1162 ../mail/em-utils.c:309
 msgid "Outgoing"
 msgstr "UtgÃende"
 
@@ -10698,33 +10752,33 @@ msgid "Invalid folder URI '%s'"
 msgstr "Ugyldig URI for mappe Â%sÂ"
 
 #: ../libemail-engine/e-mail-session.c:108 ../mail/em-folder-properties.c:333
-#: ../mail/em-folder-tree-model.c:719
-#: ../modules/mail/e-mail-shell-view-private.c:1095
-#: ../modules/mail/e-mail-shell-view-private.c:1106
+#: ../mail/em-folder-tree-model.c:703
+#: ../modules/mail/e-mail-shell-view-private.c:1021
+#: ../modules/mail/e-mail-shell-view-private.c:1032
 msgid "Inbox"
 msgstr "Innboks"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../libemail-engine/e-mail-session.c:109 ../mail/em-folder-tree-model.c:712
-#: ../modules/mail/e-mail-shell-view-private.c:1093
+#: ../libemail-engine/e-mail-session.c:109 ../mail/em-folder-tree-model.c:696
+#: ../modules/mail/e-mail-shell-view-private.c:1019
 msgid "Drafts"
 msgstr "Skisser"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../libemail-engine/e-mail-session.c:110 ../mail/em-folder-tree-model.c:723
-#: ../modules/mail/e-mail-shell-view-private.c:1097
+#: ../libemail-engine/e-mail-session.c:110 ../mail/em-folder-tree-model.c:707
+#: ../modules/mail/e-mail-shell-view-private.c:1023
 msgid "Outbox"
 msgstr "Utboks"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../libemail-engine/e-mail-session.c:111 ../mail/em-folder-tree-model.c:727
-#: ../modules/mail/e-mail-shell-view-private.c:1099
+#: ../libemail-engine/e-mail-session.c:111 ../mail/em-folder-tree-model.c:711
+#: ../modules/mail/e-mail-shell-view-private.c:1025
 msgid "Sent"
 msgstr "Sendt"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../libemail-engine/e-mail-session.c:112 ../mail/em-folder-tree-model.c:715
-#: ../modules/mail/e-mail-shell-view-private.c:1101
+#: ../libemail-engine/e-mail-session.c:112 ../mail/em-folder-tree-model.c:699
+#: ../modules/mail/e-mail-shell-view-private.c:1027
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
 #: ../plugins/templates/templates.c:1041 ../plugins/templates/templates.c:1341
 #: ../plugins/templates/templates.c:1351
@@ -10735,46 +10789,46 @@ msgstr "Maler"
 msgid "Search Folders"
 msgstr "SÃkemapper"
 
-#: ../libemail-engine/e-mail-session.c:975
+#: ../libemail-engine/e-mail-session.c:987
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Skriv inn passord for %s"
 
-#: ../libemail-engine/e-mail-session.c:979
+#: ../libemail-engine/e-mail-session.c:991
 msgid "Enter Passphrase"
 msgstr "Skriv inn passord"
 
-#: ../libemail-engine/e-mail-session.c:983
+#: ../libemail-engine/e-mail-session.c:995
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Skriv inn passord for %s"
 
-#: ../libemail-engine/e-mail-session.c:987
+#: ../libemail-engine/e-mail-session.c:999
 msgid "Enter Password"
 msgstr "Skriv inn passord"
 
-#: ../libemail-engine/e-mail-session.c:1038
+#: ../libemail-engine/e-mail-session.c:1050
 #, c-format
 msgid "User canceled operation."
 msgstr "Operasjon avbrutt av bruker."
 
-#: ../libemail-engine/e-mail-session.c:1157
+#: ../libemail-engine/e-mail-session.c:1169
 #, c-format
 msgid ""
 "No destination address provided, forward of the message has been cancelled."
 msgstr "Ingen mÃladresse oppgitt. Videresending av meldingen ble avbrutt."
 
-#: ../libemail-engine/e-mail-session.c:1166
+#: ../libemail-engine/e-mail-session.c:1178
 #, c-format
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr "Fant ingen konto Ã bruke. Videresending av meldingen ble avbrutt."
 
-#: ../libemail-engine/e-mail-session.c:1320
+#: ../libemail-engine/e-mail-session.c:1332
 #, c-format
 msgid "%s authentication failed"
 msgstr "%s autentisering feilet"
 
-#: ../libemail-engine/e-mail-session.c:1394
+#: ../libemail-engine/e-mail-session.c:1406
 #, c-format
 msgid "No password was provided"
 msgstr "Passord ikke oppgitt"
@@ -10785,14 +10839,14 @@ msgid "Cannot get transport for account '%s'"
 msgstr "Kan ikke hente transport for konto Â%sÂ"
 
 #: ../libemail-engine/e-mail-session-utils.c:505
-#: ../libemail-engine/mail-ops.c:616
+#: ../libemail-engine/mail-ops.c:659
 #, 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:531
-#: ../libemail-engine/e-mail-session-utils.c:565
-#: ../libemail-engine/mail-ops.c:635 ../libemail-engine/mail-ops.c:671
+#: ../libemail-engine/e-mail-session-utils.c:534
+#: ../libemail-engine/e-mail-session-utils.c:568
+#: ../libemail-engine/mail-ops.c:678 ../libemail-engine/mail-ops.c:714
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -10801,18 +10855,18 @@ msgstr ""
 "Kunne ikke legge til i %s: %s\n"
 "Legger til i lokal ÂSendtÂ-mappe i stedet."
 
-#: ../libemail-engine/e-mail-session-utils.c:585
-#: ../libemail-engine/mail-ops.c:693
+#: ../libemail-engine/e-mail-session-utils.c:588
+#: ../libemail-engine/mail-ops.c:736
 #, 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:795
-#: ../libemail-engine/mail-ops.c:821 ../libemail-engine/mail-ops.c:922
+#: ../libemail-engine/e-mail-session-utils.c:816
+#: ../libemail-engine/mail-ops.c:864 ../libemail-engine/mail-ops.c:965
 msgid "Sending message"
 msgstr "Sender melding"
 
-#: ../libemail-engine/e-mail-session-utils.c:869
+#: ../libemail-engine/e-mail-session-utils.c:890
 #, c-format
 msgid "Unsubscribing from folder '%s'"
 msgstr "Fjerner abonnement pÃ mappe Â%sÂ"
@@ -10837,15 +10891,15 @@ msgstr "Forbereder konto Â%sÂ for frakoblet bruk"
 msgid "Pinging %s"
 msgstr "Pinger %s"
 
-#: ../libemail-engine/mail-ops.c:87
+#: ../libemail-engine/mail-ops.c:94
 msgid "Filtering Selected Messages"
 msgstr "Filtrerer valgte meldinger"
 
-#: ../libemail-engine/mail-ops.c:209
+#: ../libemail-engine/mail-ops.c:216
 msgid "Fetching Mail"
 msgstr "Henter e-post"
 
-#: ../libemail-engine/mail-ops.c:832
+#: ../libemail-engine/mail-ops.c:875
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sender melding %d av %d"
@@ -10853,62 +10907,62 @@ msgstr "Sender melding %d av %d"
 #. Translators: The string is distinguished by total
 #. * count of messages to be sent.  Failed messages is
 #. * always more than zero.
-#: ../libemail-engine/mail-ops.c:883
+#: ../libemail-engine/mail-ops.c:926
 #, 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:889 ../mail/mail-send-recv.c:885
+#: ../libemail-engine/mail-ops.c:932 ../mail/mail-send-recv.c:887
 msgid "Canceled."
 msgstr "Avbrutt."
 
-#: ../libemail-engine/mail-ops.c:891 ../mail/mail-send-recv.c:887
+#: ../libemail-engine/mail-ops.c:934 ../mail/mail-send-recv.c:889
 msgid "Complete."
 msgstr "FullfÃrt."
 
-#: ../libemail-engine/mail-ops.c:1003
+#: ../libemail-engine/mail-ops.c:1046
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Flytter meldinger til Â%sÂ"
 
-#: ../libemail-engine/mail-ops.c:1004
+#: ../libemail-engine/mail-ops.c:1047
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Kopierer meldinger til Â%sÂ"
 
-#: ../libemail-engine/mail-ops.c:1121
+#: ../libemail-engine/mail-ops.c:1164
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Lagrer mappe Â%sÂ"
 
-#: ../libemail-engine/mail-ops.c:1194
+#: ../libemail-engine/mail-ops.c:1237
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "TÃmmer og lagrer konto Â%sÂ"
 
-#: ../libemail-engine/mail-ops.c:1195
+#: ../libemail-engine/mail-ops.c:1238
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Lagrer konto Â%sÂ"
 
-#: ../libemail-engine/mail-ops.c:1257
+#: ../libemail-engine/mail-ops.c:1300
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "Oppdaterer mappe Â%sÂ"
 
-#: ../libemail-engine/mail-ops.c:1475
+#: ../libemail-engine/mail-ops.c:1518
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "TÃmmer mappe Â%sÂ"
 
-#: ../libemail-engine/mail-ops.c:1568
+#: ../libemail-engine/mail-ops.c:1611
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "TÃmmer sÃppel i Â%sÂ"
 
-#: ../libemail-engine/mail-ops.c:1664
+#: ../libemail-engine/mail-ops.c:1707
 #, c-format
 msgid "Disconnecting %s"
 msgstr "Kobler fra %s"
@@ -11072,7 +11126,9 @@ msgstr "Se etter _nye meldinger hver(t)"
 msgid "minu_tes"
 msgstr "minu_tter"
 
-#: ../mail/em-account-editor.c:4276 ../mail/mail-config.ui.h:166
+#. Add encryption/signature header
+#: ../mail/em-account-editor.c:4276 ../mail/em-format-html-print.c:187
+#: ../mail/mail-config.ui.h:166
 msgid "Security"
 msgstr "Sikkerhet"
 
@@ -11127,7 +11183,7 @@ msgstr "Kontonavn"
 
 #. we changed user, thus reset the chosen calendar combo too, because
 #. * other user means other calendars subscribed
-#: ../mail/e-mail-account-tree-view.c:116 ../mail/e-mail-reader.c:3439
+#: ../mail/e-mail-account-tree-view.c:116 ../mail/e-mail-reader.c:3648
 #: ../mail/mail-config.ui.h:51
 #: ../plugins/google-account-setup/google-source.c:311
 #: ../plugins/google-account-setup/google-source.c:553
@@ -11135,7 +11191,7 @@ msgstr "Kontonavn"
 msgid "Default"
 msgstr "Forvalgt"
 
-#: ../mail/e-mail-attachment-bar.c:102 ../mail/e-mail-attachment-bar.c:107
+#: ../mail/e-mail-attachment-bar.c:101 ../mail/e-mail-attachment-bar.c:106
 #: ../mail/message-list.etspec.h:4 ../widgets/misc/e-attachment-paned.c:176
 #: ../widgets/misc/e-attachment-paned.c:181
 msgid "Attachment"
@@ -11143,12 +11199,12 @@ msgid_plural "Attachments"
 msgstr[0] "Vedlegg"
 msgstr[1] "Vedlegg"
 
-#: ../mail/e-mail-attachment-bar.c:619
+#: ../mail/e-mail-attachment-bar.c:656
 #: ../widgets/misc/e-attachment-paned.c:703
 msgid "Icon View"
 msgstr "Ikonvisning"
 
-#: ../mail/e-mail-attachment-bar.c:621
+#: ../mail/e-mail-attachment-bar.c:658
 #: ../widgets/misc/e-attachment-paned.c:705
 msgid "List View"
 msgstr "Listevisning"
@@ -11157,7 +11213,7 @@ msgstr "Listevisning"
 msgid "Unknown background operation"
 msgstr "Ukjent bakgrunnsoperasjon"
 
-#: ../mail/e-mail-browser.c:130 ../shell/e-shell-window-actions.c:1439
+#: ../mail/e-mail-browser.c:132 ../shell/e-shell-window-actions.c:1439
 #: ../shell/e-shell-window-actions.c:1446
 #: ../shell/e-shell-window-actions.c:1453
 msgid "Close this window"
@@ -11167,30 +11223,38 @@ msgstr "Lukk dette vinduet"
 msgid "(No Subject)"
 msgstr "(Uten emne)"
 
-#: ../mail/e-mail-display.c:68
+#: ../mail/e-mail-display.c:114
 msgid "_Add to Address Book..."
 msgstr "Legg til i _adressebok â"
 
-#: ../mail/e-mail-display.c:75
+#: ../mail/e-mail-display.c:121
 msgid "_To This Address"
 msgstr "_Til denne adressen"
 
-#: ../mail/e-mail-display.c:82
+#: ../mail/e-mail-display.c:128
 msgid "_From This Address"
 msgstr "_Fra denne adressen"
 
-#: ../mail/e-mail-display.c:89
+#: ../mail/e-mail-display.c:135
 msgid "Send _Reply To..."
 msgstr "Send sva_r til â"
 
-#: ../mail/e-mail-display.c:91
+#: ../mail/e-mail-display.c:137
 msgid "Send a reply message to this address"
 msgstr "Send svarmelding til denne adressen"
 
-#: ../mail/e-mail-display.c:98
+#: ../mail/e-mail-display.c:144
 msgid "Create Search _Folder"
 msgstr "Opprett _sÃkemappe"
 
+#: ../mail/e-mail-display.c:154
+msgid "Save _Image..."
+msgstr "Lagre b_ilde â"
+
+#: ../mail/e-mail-display.c:156
+msgid "Save the image to a file"
+msgstr "Lagre bildet til en fil"
+
 #. Label + combo box has a 12px left margin so it's
 #. * aligned with the junk mail options above it.
 #: ../mail/e-mail-junk-options.c:252
@@ -11246,7 +11310,7 @@ msgstr ""
 msgid "Color"
 msgstr "Farge"
 
-#: ../mail/e-mail-label-tree-view.c:99
+#: ../mail/e-mail-label-tree-view.c:99 ../mail/em-format-html-print.c:83
 #: ../modules/plugin-manager/evolution-plugin-manager.c:68
 #: ../plugins/caldav/caldav-browse-server.c:1359
 #: ../widgets/menus/gal-define-views-dialog.c:352
@@ -11263,624 +11327,663 @@ msgstr "Kunne ikke opprette lokale e-postmapper i Â%sÂ: %s"
 msgid "Please select a folder"
 msgstr "Vennligst velg en mappe"
 
-#: ../mail/e-mail-reader.c:314 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-printer.c:122
+#, c-format
+msgid "Page %d of %d"
+msgstr "Side %d av %d"
+
+#: ../mail/e-mail-printer.c:530
+#: ../modules/calendar/e-cal-shell-view-actions.c:232
+#: ../modules/calendar/e-cal-shell-view-actions.c:261
+msgid "Print"
+msgstr "Skriv ut"
+
+#: ../mail/e-mail-printer.c:536
+msgid "Header Name"
+msgstr "Navn pÃ meldingshode"
+
+#: ../mail/e-mail-printer.c:542
+msgid "Header Value"
+msgstr "Verdi for meldingshode"
+
+#: ../mail/e-mail-printer.c:590 ../mail/mail-config.ui.h:107
+msgid "Headers"
+msgstr "Meldingshoder"
+
+#: ../mail/e-mail-reader.c:353
+msgid "Save Image"
+msgstr "Lagre bilde"
+
+#: ../mail/e-mail-reader.c:438 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Kopier til mappe"
 
-#: ../mail/e-mail-reader.c:314 ../mail/em-folder-utils.c:488
+#: ../mail/e-mail-reader.c:438 ../mail/em-folder-utils.c:488
 msgid "C_opy"
 msgstr "K_opier"
 
-#: ../mail/e-mail-reader.c:841 ../mail/em-filter-i18n.h:53
+#: ../mail/e-mail-reader.c:965 ../mail/em-filter-i18n.h:53
 msgid "Move to Folder"
 msgstr "Flytt til mappe"
 
-#: ../mail/e-mail-reader.c:841 ../mail/em-folder-utils.c:488
+#: ../mail/e-mail-reader.c:965 ../mail/em-folder-utils.c:488
 msgid "_Move"
 msgstr "_Flytt"
 
-#: ../mail/e-mail-reader.c:1202 ../mail/e-mail-reader.c:1384
-#: ../mail/e-mail-reader.c:1424
+#: ../mail/e-mail-reader.c:1326 ../mail/e-mail-reader.c:1508
+#: ../mail/e-mail-reader.c:1548
 msgid "_Do not ask me again."
 msgstr "_Ikke spÃr meg igjen."
 
-#: ../mail/e-mail-reader.c:1430
+#: ../mail/e-mail-reader.c:1554
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Alltid ignorer Reply-To: for e-postlister."
 
-#: ../mail/e-mail-reader.c:1795
+#: ../mail/e-mail-reader.c:1902
 msgid "A_dd Sender to Address Book"
 msgstr "L_egg til avsender i adressebok"
 
-#: ../mail/e-mail-reader.c:1797
+#: ../mail/e-mail-reader.c:1904
 msgid "Add sender to address book"
 msgstr "Legg til avsender i adressebok"
 
-#: ../mail/e-mail-reader.c:1802
+#: ../mail/e-mail-reader.c:1909
 msgid "Check for _Junk"
 msgstr "Sjekk etter _uÃnsket e-post"
 
-#: ../mail/e-mail-reader.c:1804
+#: ../mail/e-mail-reader.c:1911
 msgid "Filter the selected messages for junk status"
 msgstr "Filtrer valgte meldinger etter uÃnsket e-poststatus"
 
-#: ../mail/e-mail-reader.c:1809
+#: ../mail/e-mail-reader.c:1916
 msgid "_Copy to Folder..."
 msgstr "K_opier til mappe â"
 
-#: ../mail/e-mail-reader.c:1811
+#: ../mail/e-mail-reader.c:1918
 msgid "Copy selected messages to another folder"
 msgstr "Kopier valgte meldinger til en annen mappe"
 
-#: ../mail/e-mail-reader.c:1816
+#: ../mail/e-mail-reader.c:1923
 msgid "_Delete Message"
 msgstr "_Slett melding"
 
-#: ../mail/e-mail-reader.c:1818
+#: ../mail/e-mail-reader.c:1925
 msgid "Mark the selected messages for deletion"
 msgstr "Merk valgte meldinger for sletting"
 
-#: ../mail/e-mail-reader.c:1823
+#: ../mail/e-mail-reader.c:1930
 msgid "Filter on Mailing _List..."
 msgstr "Filtrer pÃ e-post_liste â"
 
-#: ../mail/e-mail-reader.c:1825
+#: ../mail/e-mail-reader.c:1932
 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:1830
+#: ../mail/e-mail-reader.c:1937
 msgid "Filter on _Recipients..."
 msgstr "Filtrer pÃ mottake_re â"
 
-#: ../mail/e-mail-reader.c:1832
+#: ../mail/e-mail-reader.c:1939
 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:1837
+#: ../mail/e-mail-reader.c:1944
 msgid "Filter on Se_nder..."
 msgstr "Filtrer pÃ se_nder â"
 
-#: ../mail/e-mail-reader.c:1839
+#: ../mail/e-mail-reader.c:1946
 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:1844
+#: ../mail/e-mail-reader.c:1951
 msgid "Filter on _Subject..."
 msgstr "Filtrer pÃ e_mne â"
 
-#: ../mail/e-mail-reader.c:1846
+#: ../mail/e-mail-reader.c:1953
 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:1851
+#: ../mail/e-mail-reader.c:1958
 msgid "A_pply Filters"
 msgstr "_PÃfÃr filtre"
 
-#: ../mail/e-mail-reader.c:1853
+#: ../mail/e-mail-reader.c:1960
 msgid "Apply filter rules to the selected messages"
 msgstr "Aktiver filterregler pÃ de valgte meldingene"
 
-#: ../mail/e-mail-reader.c:1858
+#: ../mail/e-mail-reader.c:1965
 msgid "_Find in Message..."
 msgstr "_Finn i melding â"
 
-#: ../mail/e-mail-reader.c:1860
+#: ../mail/e-mail-reader.c:1967
 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:1865
+#: ../mail/e-mail-reader.c:1972
 msgid "_Clear Flag"
 msgstr "F_jern flagg"
 
-#: ../mail/e-mail-reader.c:1867
+#: ../mail/e-mail-reader.c:1974
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Fjern flagg for oppfÃlging fra valgte meldinger"
 
-#: ../mail/e-mail-reader.c:1872
+#: ../mail/e-mail-reader.c:1979
 msgid "_Flag Completed"
 msgstr "Merk som _fullfÃrt"
 
-#: ../mail/e-mail-reader.c:1874
+#: ../mail/e-mail-reader.c:1981
 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:1879
+#: ../mail/e-mail-reader.c:1986
 msgid "Follow _Up..."
 msgstr "FÃlg _opp â"
 
-#: ../mail/e-mail-reader.c:1881
+#: ../mail/e-mail-reader.c:1988
 msgid "Flag the selected messages for follow-up"
 msgstr "Merk valgte meldinger for oppfÃlging"
 
-#: ../mail/e-mail-reader.c:1886
+#: ../mail/e-mail-reader.c:1993
 msgid "_Attached"
 msgstr "L_agt ved"
 
-#: ../mail/e-mail-reader.c:1888 ../mail/e-mail-reader.c:1895
+#: ../mail/e-mail-reader.c:1995 ../mail/e-mail-reader.c:2002
 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:1893
+#: ../mail/e-mail-reader.c:2000
 msgid "Forward As _Attached"
 msgstr "Videresend s_om vedlegg"
 
-#: ../mail/e-mail-reader.c:1900
+#: ../mail/e-mail-reader.c:2007
 msgid "_Inline"
 msgstr "_I meldingen"
 
-#: ../mail/e-mail-reader.c:1902 ../mail/e-mail-reader.c:1909
+#: ../mail/e-mail-reader.c:2009 ../mail/e-mail-reader.c:2016
 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:1907
+#: ../mail/e-mail-reader.c:2014
 msgid "Forward As _Inline"
 msgstr "V_ideresend som vedlegg"
 
-#: ../mail/e-mail-reader.c:1914
+#: ../mail/e-mail-reader.c:2021
 msgid "_Quoted"
 msgstr "_Sitert"
 
-#: ../mail/e-mail-reader.c:1916 ../mail/e-mail-reader.c:1923
+#: ../mail/e-mail-reader.c:2023 ../mail/e-mail-reader.c:2030
 msgid "Forward the selected message quoted like a reply"
 msgstr "Videresend den valgte meldingen sitert som et svar"
 
-#: ../mail/e-mail-reader.c:1921
+#: ../mail/e-mail-reader.c:2028
 msgid "Forward As _Quoted"
 msgstr "Videresend s_om sitat"
 
-#: ../mail/e-mail-reader.c:1928
+#: ../mail/e-mail-reader.c:2035
 msgid "_Load Images"
 msgstr "_Last bilder"
 
-#: ../mail/e-mail-reader.c:1930
+#: ../mail/e-mail-reader.c:2037
 msgid "Force images in HTML mail to be loaded"
 msgstr "Tvungen lasting av bilder i HTML e-post"
 
-#: ../mail/e-mail-reader.c:1935
+#: ../mail/e-mail-reader.c:2042
 msgid "_Important"
 msgstr "V_iktig"
 
-#: ../mail/e-mail-reader.c:1937
+#: ../mail/e-mail-reader.c:2044
 msgid "Mark the selected messages as important"
 msgstr "Merk valgte meldinger som viktige"
 
-#: ../mail/e-mail-reader.c:1942
+#: ../mail/e-mail-reader.c:2049
 msgid "_Junk"
 msgstr "_UÃnsket e-post"
 
-#: ../mail/e-mail-reader.c:1944
+#: ../mail/e-mail-reader.c:2051
 msgid "Mark the selected messages as junk"
 msgstr "Merk valgte meldinger som uÃnsket e-post"
 
-#: ../mail/e-mail-reader.c:1949
+#: ../mail/e-mail-reader.c:2056
 msgid "_Not Junk"
 msgstr "_Ikke uÃnsket e-post"
 
-#: ../mail/e-mail-reader.c:1951
+#: ../mail/e-mail-reader.c:2058
 msgid "Mark the selected messages as not being junk"
 msgstr "Merk valgte meldinger som Ãnsket e-post"
 
-#: ../mail/e-mail-reader.c:1956
+#: ../mail/e-mail-reader.c:2063
 msgid "_Read"
 msgstr "_Les"
 
-#: ../mail/e-mail-reader.c:1958
+#: ../mail/e-mail-reader.c:2065
 msgid "Mark the selected messages as having been read"
 msgstr "Merk valgte meldinger som lest"
 
-#: ../mail/e-mail-reader.c:1963
+#: ../mail/e-mail-reader.c:2070
 msgid "Uni_mportant"
 msgstr "_Ikke viktig"
 
-#: ../mail/e-mail-reader.c:1965
+#: ../mail/e-mail-reader.c:2072
 msgid "Mark the selected messages as unimportant"
 msgstr "Merk valgte meldinger som uviktige"
 
-#: ../mail/e-mail-reader.c:1970
+#: ../mail/e-mail-reader.c:2077
 msgid "_Unread"
 msgstr "_Ulest"
 
-#: ../mail/e-mail-reader.c:1972
+#: ../mail/e-mail-reader.c:2079
 msgid "Mark the selected messages as not having been read"
 msgstr "Merk valgte meldinger som ulest"
 
-#: ../mail/e-mail-reader.c:1977
+#: ../mail/e-mail-reader.c:2084
 msgid "_Edit as New Message..."
 msgstr "R_ediger som ny melding â"
 
-#: ../mail/e-mail-reader.c:1979
+#: ../mail/e-mail-reader.c:2086
 msgid "Open the selected messages in the composer for editing"
 msgstr "Ãpne valgte meldinger i redigeringskomponenten"
 
-#: ../mail/e-mail-reader.c:1984
+#: ../mail/e-mail-reader.c:2091
 msgid "Compose _New Message"
 msgstr "Skriv _ny melding"
 
-#: ../mail/e-mail-reader.c:1986
+#: ../mail/e-mail-reader.c:2093
 msgid "Open a window for composing a mail message"
 msgstr "Ãpne et vindu for Ã skrive en e-post melding"
 
-#: ../mail/e-mail-reader.c:1991
+#: ../mail/e-mail-reader.c:2098
 msgid "_Open in New Window"
 msgstr "_Ãpne i _nytt vindu"
 
-#: ../mail/e-mail-reader.c:1993
+#: ../mail/e-mail-reader.c:2100
 msgid "Open the selected messages in a new window"
 msgstr "Ãpne valgte meldinger i et nytt vindu"
 
-#: ../mail/e-mail-reader.c:1998
+#: ../mail/e-mail-reader.c:2105
 msgid "_Move to Folder..."
 msgstr "Fl_ytt til mappe â"
 
-#: ../mail/e-mail-reader.c:2000
+#: ../mail/e-mail-reader.c:2107
 msgid "Move selected messages to another folder"
 msgstr "Flytt valgte meldinger til en annen mappe"
 
-#: ../mail/e-mail-reader.c:2005
+#: ../mail/e-mail-reader.c:2112
 msgid "_Switch to Folder"
 msgstr "_Bytt til mappe"
 
-#: ../mail/e-mail-reader.c:2007
+#: ../mail/e-mail-reader.c:2114
 msgid "Display the parent folder"
 msgstr "Vis opphavsmappe"
 
-#: ../mail/e-mail-reader.c:2012
+#: ../mail/e-mail-reader.c:2119
 msgid "Switch to _next tab"
 msgstr "Bytt til _neste fane"
 
-#: ../mail/e-mail-reader.c:2014
+#: ../mail/e-mail-reader.c:2121
 msgid "Switch to the next tab"
 msgstr "Bytt til neste fane"
 
-#: ../mail/e-mail-reader.c:2019
+#: ../mail/e-mail-reader.c:2126
 msgid "Switch to _previous tab"
 msgstr "Bytt til _forrige fane"
 
-#: ../mail/e-mail-reader.c:2021
+#: ../mail/e-mail-reader.c:2128
 msgid "Switch to the previous tab"
 msgstr "Bytt til forrige fane"
 
-#: ../mail/e-mail-reader.c:2026
+#: ../mail/e-mail-reader.c:2133
 msgid "Cl_ose current tab"
 msgstr "L_ukk aktiv fane"
 
-#: ../mail/e-mail-reader.c:2028
+#: ../mail/e-mail-reader.c:2135
 msgid "Close current tab"
 msgstr "Lukk aktiv fane"
 
-#: ../mail/e-mail-reader.c:2033
+#: ../mail/e-mail-reader.c:2140
 msgid "_Next Message"
 msgstr "_Neste melding"
 
-#: ../mail/e-mail-reader.c:2035
+#: ../mail/e-mail-reader.c:2142
 msgid "Display the next message"
 msgstr "Vis neste melding"
 
-#: ../mail/e-mail-reader.c:2040
+#: ../mail/e-mail-reader.c:2147
 msgid "Next _Important Message"
 msgstr "Neste v_iktige melding"
 
-#: ../mail/e-mail-reader.c:2042
+#: ../mail/e-mail-reader.c:2149
 msgid "Display the next important message"
 msgstr "Vis neste viktige melding"
 
-#: ../mail/e-mail-reader.c:2047
+#: ../mail/e-mail-reader.c:2154
 msgid "Next _Thread"
 msgstr "Neste _trÃd"
 
-#: ../mail/e-mail-reader.c:2049
+#: ../mail/e-mail-reader.c:2156
 msgid "Display the next thread"
 msgstr "Vis neste trÃd"
 
-#: ../mail/e-mail-reader.c:2054
+#: ../mail/e-mail-reader.c:2161
 msgid "Next _Unread Message"
 msgstr "Neste _uleste melding"
 
-#: ../mail/e-mail-reader.c:2056
+#: ../mail/e-mail-reader.c:2163
 msgid "Display the next unread message"
 msgstr "Vis neste uleste melding"
 
-#: ../mail/e-mail-reader.c:2061
+#: ../mail/e-mail-reader.c:2168
 msgid "_Previous Message"
 msgstr "_Forrige melding"
 
-#: ../mail/e-mail-reader.c:2063
+#: ../mail/e-mail-reader.c:2170
 msgid "Display the previous message"
 msgstr "Vis forrige melding"
 
-#: ../mail/e-mail-reader.c:2068
+#: ../mail/e-mail-reader.c:2175
 msgid "Pr_evious Important Message"
 msgstr "Forrig_e viktige melding"
 
-#: ../mail/e-mail-reader.c:2070
+#: ../mail/e-mail-reader.c:2177
 msgid "Display the previous important message"
 msgstr "Vis forrige viktige melding"
 
-#: ../mail/e-mail-reader.c:2075
+#: ../mail/e-mail-reader.c:2182
 msgid "Previous T_hread"
 msgstr "Forrige trÃ_d"
 
-#: ../mail/e-mail-reader.c:2077
+#: ../mail/e-mail-reader.c:2184
 msgid "Display the previous thread"
 msgstr "Vis forrige trÃd"
 
-#: ../mail/e-mail-reader.c:2082
+#: ../mail/e-mail-reader.c:2189
 msgid "P_revious Unread Message"
 msgstr "Fo_rrige uleste melding"
 
-#: ../mail/e-mail-reader.c:2084
+#: ../mail/e-mail-reader.c:2191
 msgid "Display the previous unread message"
 msgstr "Vis forrige uleste melding"
 
-#: ../mail/e-mail-reader.c:2091
+#: ../mail/e-mail-reader.c:2198
 msgid "Print this message"
 msgstr "Skriv ut denne meldingen"
 
-#: ../mail/e-mail-reader.c:2098
+#: ../mail/e-mail-reader.c:2205
 msgid "Preview the message to be printed"
 msgstr "ForhÃndsvis meldingen som skal skrives ut"
 
-#: ../mail/e-mail-reader.c:2103
+#: ../mail/e-mail-reader.c:2210
 msgid "Re_direct"
 msgstr "Om_diriger"
 
-#: ../mail/e-mail-reader.c:2105
+#: ../mail/e-mail-reader.c:2212
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Omdiriger (bounce) den valgte meldingen til noen"
 
-#: ../mail/e-mail-reader.c:2110
+#: ../mail/e-mail-reader.c:2217
 msgid "Remo_ve Attachments"
 msgstr "Fjern _vedlegg"
 
-#: ../mail/e-mail-reader.c:2112
+#: ../mail/e-mail-reader.c:2219
 msgid "Remove attachments"
 msgstr "Fjern vedlegg"
 
-#: ../mail/e-mail-reader.c:2117
+#: ../mail/e-mail-reader.c:2224
 msgid "Remove Du_plicate Messages"
 msgstr "Fjern du_plikatmeldinger"
 
-#: ../mail/e-mail-reader.c:2119
+#: ../mail/e-mail-reader.c:2226
 msgid "Checks selected messages for duplicates"
 msgstr "Sjekk valgte meldinger for duplikater"
 
-#: ../mail/e-mail-reader.c:2124 ../mail/mail.error.xml.h:27
-#: ../modules/calendar/e-cal-shell-view-actions.c:1510
-#: ../modules/mail/e-mail-attachment-handler.c:181
+#: ../mail/e-mail-reader.c:2231 ../mail/mail.error.xml.h:27
+#: ../modules/calendar/e-cal-shell-view-actions.c:1552
+#: ../modules/mail/e-mail-attachment-handler.c:182
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: ../mail/e-mail-reader.c:2126
+#: ../mail/e-mail-reader.c:2233
 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:2131 ../mail/mail.error.xml.h:25
+#: ../mail/e-mail-reader.c:2238 ../mail/mail.error.xml.h:25
 msgid "Reply to _List"
 msgstr "Svar til _listen"
 
-#: ../mail/e-mail-reader.c:2133
+#: ../mail/e-mail-reader.c:2240
 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:2138
-#: ../modules/mail/e-mail-attachment-handler.c:188
+#: ../mail/e-mail-reader.c:2245
+#: ../modules/mail/e-mail-attachment-handler.c:189
 msgid "_Reply to Sender"
 msgstr "Sva_r til avsender"
 
-#: ../mail/e-mail-reader.c:2140
+#: ../mail/e-mail-reader.c:2247
 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:2145
+#: ../mail/e-mail-reader.c:2252
 msgid "_Save as mbox..."
 msgstr "Lagre _som mbox â"
 
-#: ../mail/e-mail-reader.c:2147
+#: ../mail/e-mail-reader.c:2254
 msgid "Save selected messages as an mbox file"
 msgstr "Lagre valgte meldinger som en mbox-fil"
 
-#: ../mail/e-mail-reader.c:2152
+#: ../mail/e-mail-reader.c:2259
 msgid "_Message Source"
 msgstr "_Meldingskilde"
 
-#: ../mail/e-mail-reader.c:2154
+#: ../mail/e-mail-reader.c:2261
 msgid "Show the raw email source of the message"
 msgstr "Vis e-post meldingen i sin rÃe form"
 
-#: ../mail/e-mail-reader.c:2166
+#: ../mail/e-mail-reader.c:2273
 msgid "_Undelete Message"
 msgstr "_Angre sletting av melding"
 
-#: ../mail/e-mail-reader.c:2168
+#: ../mail/e-mail-reader.c:2275
 msgid "Undelete the selected messages"
 msgstr "Angre sletting av valgte meldinger"
 
-#: ../mail/e-mail-reader.c:2173
+#: ../mail/e-mail-reader.c:2280
 msgid "_Normal Size"
 msgstr "_Normal stÃrrelse"
 
-#: ../mail/e-mail-reader.c:2175
+#: ../mail/e-mail-reader.c:2282
 msgid "Reset the text to its original size"
 msgstr "Ta teksten tilbake til sin opprinnelige stÃrrelse"
 
-#: ../mail/e-mail-reader.c:2180
+#: ../mail/e-mail-reader.c:2287
 msgid "_Zoom In"
 msgstr "_Zoom inn"
 
-#: ../mail/e-mail-reader.c:2182
+#: ../mail/e-mail-reader.c:2289
 msgid "Increase the text size"
 msgstr "StÃrre tekst"
 
-#: ../mail/e-mail-reader.c:2187
+#: ../mail/e-mail-reader.c:2294
 msgid "Zoom _Out"
 msgstr "Zoom _ut"
 
-#: ../mail/e-mail-reader.c:2189
+#: ../mail/e-mail-reader.c:2296
 msgid "Decrease the text size"
 msgstr "Mindre skrift"
 
-#: ../mail/e-mail-reader.c:2196
+#: ../mail/e-mail-reader.c:2303
 msgid "Create R_ule"
 msgstr "Opprett _regel"
 
-#: ../mail/e-mail-reader.c:2203
+#: ../mail/e-mail-reader.c:2310
 msgid "Ch_aracter Encoding"
 msgstr "Tegn_koding"
 
-#: ../mail/e-mail-reader.c:2210
+#: ../mail/e-mail-reader.c:2317
 msgid "F_orward As"
 msgstr "Videresend s_om"
 
-#: ../mail/e-mail-reader.c:2217
+#: ../mail/e-mail-reader.c:2324
 msgid "_Group Reply"
 msgstr "_Gruppesvar"
 
-#: ../mail/e-mail-reader.c:2224
+#: ../mail/e-mail-reader.c:2331
 msgid "_Go To"
 msgstr "_GÃ til"
 
-#: ../mail/e-mail-reader.c:2231
+#: ../mail/e-mail-reader.c:2338
 msgid "Mar_k As"
 msgstr "Mer_k som"
 
-#: ../mail/e-mail-reader.c:2238
+#: ../mail/e-mail-reader.c:2345
 msgid "_Message"
 msgstr "_Melding"
 
-#: ../mail/e-mail-reader.c:2245
+#: ../mail/e-mail-reader.c:2352
 msgid "_Zoom"
 msgstr "_Zoom"
 
-#: ../mail/e-mail-reader.c:2255
+#: ../mail/e-mail-reader.c:2362
 msgid "Search Folder from Mailing _List..."
 msgstr "SÃkemappe pÃ e-post_liste â"
 
-#: ../mail/e-mail-reader.c:2257
+#: ../mail/e-mail-reader.c:2364
 msgid "Create a search folder for this mailing list"
 msgstr "Lag en sÃkemappe for denne e-postlisten"
 
-#: ../mail/e-mail-reader.c:2262
+#: ../mail/e-mail-reader.c:2369
 msgid "Search Folder from Recipien_ts..."
 msgstr "SÃkemappe fra mo_ttakere â"
 
-#: ../mail/e-mail-reader.c:2264
+#: ../mail/e-mail-reader.c:2371
 msgid "Create a search folder for these recipients"
 msgstr "Lag en sÃkemappe for disse mottakerene"
 
-#: ../mail/e-mail-reader.c:2269
+#: ../mail/e-mail-reader.c:2376
 msgid "Search Folder from Sen_der..."
 msgstr "SÃkemappe for avsen_der â"
 
-#: ../mail/e-mail-reader.c:2271
+#: ../mail/e-mail-reader.c:2378
 msgid "Create a search folder for this sender"
 msgstr "Lag en sÃkemappe for denne avsenderen"
 
-#: ../mail/e-mail-reader.c:2276
+#: ../mail/e-mail-reader.c:2383
 msgid "Search Folder from S_ubject..."
 msgstr "SÃkemappe for _emne â"
 
-#: ../mail/e-mail-reader.c:2278
+#: ../mail/e-mail-reader.c:2385
 msgid "Create a search folder for this subject"
 msgstr "Lag en sÃkemappe for dette emnet"
 
-#: ../mail/e-mail-reader.c:2301
+#: ../mail/e-mail-reader.c:2408
 msgid "Mark for Follo_w Up..."
 msgstr "Merk for oppfÃl_ging â"
 
-#: ../mail/e-mail-reader.c:2309
+#: ../mail/e-mail-reader.c:2416
 msgid "Mark as _Important"
 msgstr "Merk som v_iktig"
 
-#: ../mail/e-mail-reader.c:2313
+#: ../mail/e-mail-reader.c:2420
 msgid "Mark as _Junk"
 msgstr "Merk som _uÃnsket e-post"
 
-#: ../mail/e-mail-reader.c:2317
+#: ../mail/e-mail-reader.c:2424
 msgid "Mark as _Not Junk"
 msgstr "Merk som _gyldig melding"
 
-#: ../mail/e-mail-reader.c:2321
+#: ../mail/e-mail-reader.c:2428
 msgid "Mar_k as Read"
 msgstr "Mer_k som lest"
 
-#: ../mail/e-mail-reader.c:2325
+#: ../mail/e-mail-reader.c:2432
 msgid "Mark as Uni_mportant"
 msgstr "_Merk som uviktig"
 
-#: ../mail/e-mail-reader.c:2329
+#: ../mail/e-mail-reader.c:2436
 msgid "Mark as _Unread"
 msgstr "Merk som _ulest"
 
-#: ../mail/e-mail-reader.c:2373
+#: ../mail/e-mail-reader.c:2480
 msgid "_Caret Mode"
 msgstr "MarkÃr_modus"
 
-#: ../mail/e-mail-reader.c:2375
+#: ../mail/e-mail-reader.c:2482
 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:2381
+#: ../mail/e-mail-reader.c:2488
 msgid "All Message _Headers"
 msgstr "Alle meldings_hoder"
 
-#: ../mail/e-mail-reader.c:2383
+#: ../mail/e-mail-reader.c:2490
 msgid "Show messages with all email headers"
 msgstr "Vis meldinger med alle meldingshoder"
 
-#: ../mail/e-mail-reader.c:2712
+#: ../mail/e-mail-reader.c:2815
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "Henter melding Â%sÂ"
 
-#: ../mail/e-mail-reader.c:3632
-#: ../modules/mail/e-mail-attachment-handler.c:174
+#: ../mail/e-mail-reader.c:2820
+msgid "Retrieving message"
+msgstr "Henter melding"
+
+#: ../mail/e-mail-reader.c:3133
+msgid "Parsing message"
+msgstr "Leser melding"
+
+#: ../mail/e-mail-reader.c:3838
+#: ../modules/mail/e-mail-attachment-handler.c:175
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: ../mail/e-mail-reader.c:3633
+#: ../mail/e-mail-reader.c:3839
 msgid "Forward the selected message to someone"
 msgstr "Videresend den valgte meldingen til noen"
 
-#: ../mail/e-mail-reader.c:3652
+#: ../mail/e-mail-reader.c:3858
 msgid "Group Reply"
 msgstr "Gruppesvar"
 
-#: ../mail/e-mail-reader.c:3653
+#: ../mail/e-mail-reader.c:3859
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "Svar til e-postlisten eller til alle mottakere"
 
-#: ../mail/e-mail-reader.c:3710 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:3916 ../mail/em-filter-i18n.h:14
 msgid "Delete"
 msgstr "Slett"
 
-#: ../mail/e-mail-reader.c:3743
-#: ../modules/calendar/e-cal-shell-view-actions.c:1356
+#: ../mail/e-mail-reader.c:3949
+#: ../modules/calendar/e-cal-shell-view-actions.c:1377
 #: ../widgets/misc/e-calendar.c:202
 msgid "Next"
 msgstr "Neste"
 
-#: ../mail/e-mail-reader.c:3747
-#: ../modules/calendar/e-cal-shell-view-actions.c:1349
+#: ../mail/e-mail-reader.c:3953
+#: ../modules/calendar/e-cal-shell-view-actions.c:1370
 #: ../widgets/misc/e-calendar.c:178
 msgid "Previous"
 msgstr "Forrige"
 
-#: ../mail/e-mail-reader.c:3756 ../mail/mail-dialogs.ui.h:20
+#: ../mail/e-mail-reader.c:3962 ../mail/mail-dialogs.ui.h:20
 msgid "Reply"
 msgstr "Svar"
 
-#: ../mail/e-mail-reader.c:4457
+#: ../mail/e-mail-reader.c:4671
 #, c-format
 msgid "Folder '%s'"
 msgstr "Mappe Â%sÂ"
 
-#: ../mail/e-mail-reader-utils.c:146
+#: ../mail/e-mail-reader-utils.c:147
 msgid "Do not warn me again"
 msgstr "Ikke varsle meg igjen"
 
+#: ../mail/e-mail-reader-utils.c:506
+msgid "Printing"
+msgstr "Skriver ut"
+
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:641
+#: ../mail/e-mail-reader-utils.c:635
 #, c-format
 msgid ""
 "Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -11895,7 +11998,7 @@ msgstr[1] ""
 "Mappen Â%sÂ inneholder %u duplikatmeldinger. Er du sikker pÃ at du vil "
 "slette dem?"
 
-#: ../mail/e-mail-reader-utils.c:1020
+#: ../mail/e-mail-reader-utils.c:1018
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Lagre melding"
@@ -11906,12 +12009,17 @@ 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:1041
+#: ../mail/e-mail-reader-utils.c:1039
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Melding"
 msgstr[1] "Meldinger"
 
+#: ../mail/e-mail-request.c:117
+#, c-format
+msgid "Failed to load part '%s'"
+msgstr "Klarte ikke Ã laste del Â%sÂ"
+
 #: ../mail/e-mail-tag-editor.c:293
 msgid "Flag to Follow Up"
 msgstr "Merk for oppfÃlging"
@@ -11920,7 +12028,7 @@ msgstr "Merk for oppfÃlging"
 #. * when quoting messages.  Each ${Variable} gets replaced
 #. * with a value.  To see a full list of available variables,
 #. * see mail/em-composer-utils.c:attribvars array.
-#: ../mail/em-composer-utils.c:1229
+#: ../mail/em-composer-utils.c:1255
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11928,19 +12036,23 @@ msgstr ""
 "${AbbrevWeekdayName}, ${Day}.${Month}.${Year} kl. ${24Hour}.${Minute} "
 "${TimeZone}, skrev ${Sender}:"
 
-#: ../mail/em-composer-utils.c:1240
+#: ../mail/em-composer-utils.c:1261
+msgid "-------- Forwarded Message --------"
+msgstr "---------Videresendt melding-------"
+
+#: ../mail/em-composer-utils.c:1266
 msgid "-----Original Message-----"
 msgstr "-----Opprinnelig melding-----"
 
-#: ../mail/em-composer-utils.c:2467
+#: ../mail/em-composer-utils.c:2500
 msgid "an unknown sender"
 msgstr "en ukjent avsender"
 
-#: ../mail/em-composer-utils.c:2862
+#: ../mail/em-composer-utils.c:2901
 msgid "Posting destination"
 msgstr "Destinasjon for post"
 
-#: ../mail/em-composer-utils.c:2863
+#: ../mail/em-composer-utils.c:2902
 msgid "Choose folders to post the message to."
 msgstr "Velg mapper meldingen skal postes til."
 
@@ -12263,37 +12375,37 @@ msgstr "%s (%u%s)"
 msgid "Mail Folder Tree"
 msgstr "Tre for e-postmapper"
 
-#: ../mail/em-folder-tree.c:2097 ../mail/em-folder-utils.c:115
+#: ../mail/em-folder-tree.c:2132 ../mail/em-folder-utils.c:115
 #, c-format
 msgid "Moving folder %s"
 msgstr "Flytter mappe %s"
 
-#: ../mail/em-folder-tree.c:2100 ../mail/em-folder-utils.c:117
+#: ../mail/em-folder-tree.c:2135 ../mail/em-folder-utils.c:117
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopierer mappe %s"
 
-#: ../mail/em-folder-tree.c:2107 ../mail/message-list.c:2304
+#: ../mail/em-folder-tree.c:2142 ../mail/message-list.c:2304
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Flytter meldinger til mappe %s"
 
-#: ../mail/em-folder-tree.c:2111 ../mail/message-list.c:2306
+#: ../mail/em-folder-tree.c:2146 ../mail/message-list.c:2306
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopierer meldinger til mappe %s"
 
-#: ../mail/em-folder-tree.c:2130
+#: ../mail/em-folder-tree.c:2165
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Kan ikke slippe melding(er) toppnivÃ for lageret"
 
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:161 ../mail/em-folder-tree-model.c:163
+#: ../mail/em-folder-tree-model.c:158 ../mail/em-folder-tree-model.c:160
 msgid "UNMATCHED"
 msgstr "UTEN TREFF"
 
-#: ../mail/em-folder-tree-model.c:789 ../mail/em-folder-tree-model.c:1077
+#: ../mail/em-folder-tree-model.c:775 ../mail/em-folder-tree-model.c:1060
 msgid "Loading..."
 msgstr "Laster â"
 
@@ -12313,106 +12425,57 @@ msgstr "Opprett mappe"
 msgid "Specify where to create the folder:"
 msgstr "Spesifiser hvor mappen skal opprettes:"
 
-#: ../mail/em-format-html.c:178
-msgid "Formatting message"
-msgstr "Formatterer melding"
-
-#: ../mail/em-format-html.c:393
-msgid "Formatting Message..."
-msgstr "Formatterer melding â"
+#: ../mail/em-format-html.c:385
+msgid "Malformed external-body part"
+msgstr "Feilutformet del for ekstern kropp"
 
-#: ../mail/em-format-html.c:1637 ../mail/em-format-html.c:1651
-#, c-format
-msgid "Retrieving '%s'"
-msgstr "Henter Â%sÂ"
-
-#: ../mail/em-format-html.c:1802 ../mail/em-format-html-display.c:97
-msgid "Unsigned"
-msgstr "Usignert"
-
-#: ../mail/em-format-html.c:1803 ../mail/em-format-html-display.c:98
-msgid "Valid signature"
-msgstr "Gyldig signatur"
-
-#: ../mail/em-format-html.c:1804 ../mail/em-format-html-display.c:99
-msgid "Invalid signature"
-msgstr "Ugyldig signatur"
-
-#: ../mail/em-format-html.c:1805 ../mail/em-format-html-display.c:100
-msgid "Valid signature, but cannot verify sender"
-msgstr "Gyldig signatur, men kan ikke verifisere avsender"
-
-#: ../mail/em-format-html.c:1806 ../mail/em-format-html-display.c:101
-msgid "Signature exists, but need public key"
-msgstr "Signatur eksisterer, men trenger offentlig nÃkkel"
-
-#: ../mail/em-format-html.c:1812 ../mail/em-format-html-display.c:108
-msgid "Unencrypted"
-msgstr "Ukryptert"
-
-#: ../mail/em-format-html.c:1813 ../mail/em-format-html-display.c:109
-msgid "Encrypted, weak"
-msgstr "Kryptert, svak"
-
-#: ../mail/em-format-html.c:1814 ../mail/em-format-html-display.c:110
-msgid "Encrypted"
-msgstr "Kryptert"
-
-#: ../mail/em-format-html.c:1815 ../mail/em-format-html-display.c:111
-msgid "Encrypted, strong"
-msgstr "Kryptert, sterk"
-
-#: ../mail/em-format-html.c:2210
-msgid "Unknown external-body part."
-msgstr "Ukjent del av ekstern kropp."
-
-#: ../mail/em-format-html.c:2220
-msgid "Malformed external-body part."
-msgstr "Feilutformet del for ekstern kropp."
-
-#: ../mail/em-format-html.c:2251
+#: ../mail/em-format-html.c:417
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Peker til FTP-tjener (%s)"
 
-#: ../mail/em-format-html.c:2262
+#: ../mail/em-format-html.c:428
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Peker til lokal fil (%s) gyldig pÃ nettsted Â%sÂ"
 
-#: ../mail/em-format-html.c:2264
+#: ../mail/em-format-html.c:430
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Peker til lokal fil (%s)"
 
-#: ../mail/em-format-html.c:2285
+#: ../mail/em-format-html.c:449
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Peker til eksterne data (%s)"
 
-#: ../mail/em-format-html.c:2300
+#: ../mail/em-format-html.c:462
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Peker til ukjente eksterne data (Â%sÂ-type)"
 
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user example com"
-#: ../mail/em-format-html.c:3008
+#: ../mail/em-format-html.c:2563
 #: ../plugins/mail-notification/mail-notification.c:395
 #, c-format
 msgid "From: %s"
 msgstr "Fra: %s"
 
-#: ../mail/em-format-html.c:3030
+#: ../mail/em-format-html.c:2583 ../mail/em-format-html.c:2588
 msgid "(no subject)"
 msgstr "(uten emne)"
 
-#: ../mail/em-format-html.c:3106
+#: ../mail/em-format-html.c:2731
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "Denne meldingen ble sendt av %s pÃ vegne av %s"
 
-#: ../mail/em-format-html-display.c:97
+#: ../mail/em-format-html-display.c:91
+msgid "Unsigned"
+msgstr "Usignert"
+
+#: ../mail/em-format-html-display.c:91
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -12420,7 +12483,11 @@ msgstr ""
 "Denne meldingen er ikke signert. Du har ingen garanti for at meldingen er "
 "autentisk."
 
-#: ../mail/em-format-html-display.c:98
+#: ../mail/em-format-html-display.c:92
+msgid "Valid signature"
+msgstr "Gyldig signatur"
+
+#: ../mail/em-format-html-display.c:92
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -12428,7 +12495,11 @@ msgstr ""
 "Denne meldingen er signert og gyldig hvilket betyr denne meldingen hÃyst "
 "sannsynlig er autentisk."
 
-#: ../mail/em-format-html-display.c:99
+#: ../mail/em-format-html-display.c:93
+msgid "Invalid signature"
+msgstr "Ugyldig signatur"
+
+#: ../mail/em-format-html-display.c:93
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -12436,7 +12507,11 @@ msgstr ""
 "Signaturen for denne meldingen kan ikke verifiseres. Den kan vÃre endret "
 "under overfÃring."
 
-#: ../mail/em-format-html-display.c:100
+#: ../mail/em-format-html-display.c:94
+msgid "Valid signature, but cannot verify sender"
+msgstr "Gyldig signatur, men kan ikke verifisere avsender"
+
+#: ../mail/em-format-html-display.c:94
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -12444,7 +12519,11 @@ msgstr ""
 "Denne meldingen er signert med en gyldig signatur, men avsender av meldingen "
 "kan ikke verifiseres."
 
-#: ../mail/em-format-html-display.c:101
+#: ../mail/em-format-html-display.c:95
+msgid "Signature exists, but need public key"
+msgstr "Signatur eksisterer, men trenger offentlig nÃkkel"
+
+#: ../mail/em-format-html-display.c:95
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -12452,7 +12531,11 @@ msgstr ""
 "Denne meldingen er signert med en gyldig signatur, men det finnes ingen "
 "tilhÃrende offentlig nÃkkel."
 
-#: ../mail/em-format-html-display.c:108
+#: ../mail/em-format-html-display.c:102
+msgid "Unencrypted"
+msgstr "Ukryptert"
+
+#: ../mail/em-format-html-display.c:102
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -12460,7 +12543,11 @@ msgstr ""
 "Denne meldingen er ikke kryptert. Innholdet kan vises under overfÃring over "
 "Internett."
 
-#: ../mail/em-format-html-display.c:109
+#: ../mail/em-format-html-display.c:103
+msgid "Encrypted, weak"
+msgstr "Kryptert, svak"
+
+#: ../mail/em-format-html-display.c:103
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -12470,7 +12557,11 @@ msgstr ""
 "vanskelig, men ikke umulig for en utenforstÃende Ã se innholdet i denne "
 "meldingen pÃ noenlunde kort tid."
 
-#: ../mail/em-format-html-display.c:110
+#: ../mail/em-format-html-display.c:104
+msgid "Encrypted"
+msgstr "Kryptert"
+
+#: ../mail/em-format-html-display.c:104
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -12478,7 +12569,11 @@ msgstr ""
 "Denne meldingen er kryptert. Det vil vÃre vanskelig for en utenforstÃende Ã "
 "se innholdet i denne meldingen."
 
-#: ../mail/em-format-html-display.c:111
+#: ../mail/em-format-html-display.c:105
+msgid "Encrypted, strong"
+msgstr "Kryptert, sterk"
+
+#: ../mail/em-format-html-display.c:105
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -12487,72 +12582,72 @@ msgstr ""
 "Denne meldingen er kryptert med en sterk algoritme. Det vil vÃre meget "
 "vanskelig for en utenforstÃende Ã se innholdet i denne meldingen pÃ kort tid."
 
-#: ../mail/em-format-html-display.c:259 ../smime/gui/smime-ui.ui.h:43
+#: ../mail/em-format-html-display.c:275 ../smime/gui/smime-ui.ui.h:43
 msgid "_View Certificate"
 msgstr "_Vis sertifikat"
 
-#: ../mail/em-format-html-display.c:274
+#: ../mail/em-format-html-display.c:290
 msgid "This certificate is not viewable"
 msgstr "Dette sertifikatet kan ikke vises"
 
-#: ../mail/em-format-html-display.c:589
+#: ../mail/em-format-html-display.c:633
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
-msgstr "Evolution kan ikke vise denne e-posten da den er for stor. Du kan vise den uformattert eller Ãpne den i et eksternt redigeringsprogram."
-
-#: ../mail/em-format-html-display.c:773
-msgid "Save Image"
-msgstr "Lagre bilde"
-
-#: ../mail/em-format-html-display.c:821
-msgid "Save _Image..."
-msgstr "Lagre b_ilde â"
-
-#: ../mail/em-format-html-display.c:823
-msgid "Save the image to a file"
-msgstr "Lagre bildet til en fil"
+msgstr ""
+"Evolution kan ikke vise denne e-posten da den er for stor. Du kan vise den "
+"uformattert eller Ãpne den i et eksternt redigeringsprogram."
 
-#: ../mail/em-format-html-display.c:1024
+#: ../mail/em-format-html-display.c:995
 msgid "Completed on"
 msgstr "FullfÃrt"
 
-#: ../mail/em-format-html-display.c:1036
+#: ../mail/em-format-html-display.c:1007
 msgid "Overdue:"
 msgstr "UtgÃtt:"
 
-#: ../mail/em-format-html-display.c:1044
+#: ../mail/em-format-html-display.c:1015
 msgid "by"
 msgstr "innen"
 
-#: ../mail/em-format-html-display.c:1325 ../mail/em-format-html-display.c:1376
+#: ../mail/em-format-html-display.c:1110 ../mail/em-format-html-display.c:1148
 msgid "View _Unformatted"
 msgstr "Vis uformattert"
 
-#: ../mail/em-format-html-display.c:1327
+#: ../mail/em-format-html-display.c:1112
 msgid "Hide _Unformatted"
 msgstr "Skjul _uformatterte"
 
-#: ../mail/em-format-html-display.c:1398
+#: ../mail/em-format-html-display.c:1170
 msgid "O_pen With"
 msgstr "Ã_pne med"
 
 #. Translators: Name of an Attachment button for a11y object
-#: ../mail/em-format-html-display.c:1407
+#: ../mail/em-format-html-display.c:1179
 msgctxt "Button"
 msgid "Attachment"
 msgstr "Vedlegg"
 
-#: ../mail/em-format-html-print.c:157
-#, c-format
-msgid "Page %d of %d"
-msgstr "Side %d av %d"
+#: ../mail/em-format-html-print.c:83 ../mail/message-list.etspec.h:10
+#: ../widgets/misc/e-attachment-tree-view.c:574
+msgid "Size"
+msgstr "StÃrrelse"
 
-#: ../mail/em-html-stream.c:82 ../mail/em-html-stream.c:104
-#: ../mail/em-html-stream.c:122
-#, c-format
-msgid "No HTML stream available"
-msgstr "Ingen HTML-strÃm tilgjengelig."
+#: ../mail/em-format-html-print.c:202
+msgid "GPG signed"
+msgstr "GPG-signert"
+
+#: ../mail/em-format-html-print.c:207
+msgid "GPG encrpyted"
+msgstr "GPG-kryptert"
+
+#: ../mail/em-format-html-print.c:213
+msgid "S/MIME signed"
+msgstr "Signert med S/MIME"
+
+#: ../mail/em-format-html-print.c:219
+msgid "S/MIME encrpyted"
+msgstr "Kryptert med S/MIME"
 
 #: ../mail/em-subscription-editor.c:870
 msgid "_Subscribe"
@@ -12567,7 +12662,7 @@ msgid "Subscribe To _All"
 msgstr "Abonner pÃ _alle"
 
 #: ../mail/em-subscription-editor.c:987 ../mail/em-subscription-editor.c:1840
-#: ../modules/mail/e-mail-shell-view-actions.c:1292
+#: ../modules/mail/e-mail-shell-view-actions.c:1320
 msgid "_Unsubscribe"
 msgstr "_Fjern abonnement"
 
@@ -12604,7 +12699,7 @@ msgid "Su_bscribe"
 msgstr "A_bonner"
 
 #: ../mail/em-subscription-editor.c:1839
-#: ../modules/mail/e-mail-shell-view-actions.c:1294
+#: ../modules/mail/e-mail-shell-view-actions.c:1322
 msgid "Unsubscribe from the selected folder"
 msgstr "Fjern abonnement pÃ valgt mappe"
 
@@ -12636,23 +12731,23 @@ msgstr "Stopp aktiv operasjon"
 #. * messages to be opened.  The %d is replaced with the actual
 #. * count of messages. If you need a '%' in your text, then
 #. * write it doubled, like '%%'.
-#: ../mail/em-utils.c:110
+#: ../mail/em-utils.c:112
 #, c-format
 msgid "Are you sure you want to open %d message at once?"
 msgid_plural "Are you sure you want to open %d messages at once?"
 msgstr[0] "Er du sikker pÃ at du vil Ãpne %d melding samtidig?"
 msgstr[1] "Er du sikker pÃ at du vil Ãpne %d meldinger samtidig?"
 
-#: ../mail/em-utils.c:166
+#: ../mail/em-utils.c:168
 #: ../modules/mailto-handler/evolution-mailto-handler.c:154
 msgid "_Do not show this message again"
 msgstr "Ikke vis _denne meldingen igjen"
 
-#: ../mail/em-utils.c:318
+#: ../mail/em-utils.c:320
 msgid "Message Filters"
 msgstr "Meldingsfiltre"
 
-#: ../mail/em-utils.c:979
+#: ../mail/em-utils.c:1004
 #, c-format
 msgid "Messages from %s"
 msgstr "Meldinger fra %s"
@@ -13521,10 +13616,6 @@ msgstr "Tabell med meldingshoder"
 msgid "Date/Time Format"
 msgstr "Fromat for dato ogklokkeslett"
 
-#: ../mail/mail-config.ui.h:107
-msgid "Headers"
-msgstr "Meldingshoder"
-
 #: ../mail/mail-config.ui.h:108
 msgid "Check incoming _messages for junk"
 msgstr "Sjekk om innkommende _meldinger er uÃnsket"
@@ -14110,7 +14201,7 @@ msgstr ""
 "permanent?"
 
 #: ../mail/mail.error.xml.h:39
-#: ../modules/mail/e-mail-shell-view-actions.c:1187
+#: ../modules/mail/e-mail-shell-view-actions.c:1215
 msgid "_Empty Trash"
 msgstr "_TÃm papirkurven"
 
@@ -14546,109 +14637,125 @@ msgid "N_ever"
 msgstr "A_ldri"
 
 #: ../mail/mail.error.xml.h:141
+msgid "Copy folder in folder tree."
+msgstr "Kopierer mappe i mappetre."
+
+#: ../mail/mail.error.xml.h:142
+msgid "Are you sure to copy folder '{0}' to folder '{1}'?"
+msgstr "Er du sikker pÃ at du vil kopiere mappe Â{0} til mappe Â{1}Â?"
+
+#: ../mail/mail.error.xml.h:143
+msgid "Move folder in folder tree."
+msgstr "Flytt mappe i mappetre."
+
+#: ../mail/mail.error.xml.h:144
+msgid "Are you sure to move folder '{0}' to folder '{1}'?"
+msgstr "Er du sikker pÃ at du vil flytte mappe Â{0}Â til mappe Â{1}Â?"
+
+#: ../mail/mail.error.xml.h:145
 msgid "Signature Already Exists"
 msgstr "Signaturen eksisterer allerede"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:146
 msgid ""
 "A signature already exists with the name \"{0}\". Please specify a different "
 "name."
 msgstr ""
 "En signatur med navn Â{0}Â eksisterer allerede. Vennligst bruk et annet navn."
 
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:147
 msgid "Blank Signature"
 msgstr "Tom signatur"
 
-#: ../mail/mail.error.xml.h:144
+#: ../mail/mail.error.xml.h:148
 msgid "Please provide an unique name to identify this signature."
 msgstr "Oppgi et unikt navn for Ã identifisere denne signaturen."
 
-#: ../mail/mail.error.xml.h:145
+#: ../mail/mail.error.xml.h:149
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr ""
 "Denne meldingen kan ikke sendes fordi kontoen du sender med ikke er aktiv"
 
-#: ../mail/mail.error.xml.h:146
+#: ../mail/mail.error.xml.h:150
 msgid "Please enable the account or send using another account."
 msgstr "Vennligst sjekk kontoen eller send fra en annen konto."
 
-#: ../mail/mail.error.xml.h:147
+#: ../mail/mail.error.xml.h:151
 msgid "Mail Deletion Failed"
 msgstr "Sletting av e-post feilet"
 
-#: ../mail/mail.error.xml.h:148
+#: ../mail/mail.error.xml.h:152
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Du har ikke tilstrekkelige rettigheter til Ã slette denne meldingen."
 
-#: ../mail/mail.error.xml.h:149
+#: ../mail/mail.error.xml.h:153
 msgid "\"Check Junk\" Failed"
 msgstr "Sjekk etter uÃnsket e-post feilet"
 
-#: ../mail/mail.error.xml.h:150
+#: ../mail/mail.error.xml.h:154
 msgid "\"Report Junk\" Failed"
 msgstr "Feil under rapportering av uÃnsket e-post"
 
-#: ../mail/mail.error.xml.h:151
+#: ../mail/mail.error.xml.h:155
 msgid "\"Report Not Junk\" Failed"
 msgstr "Feil under rapportering av e-post som Ãnsket"
 
-#: ../mail/mail.error.xml.h:152
+#: ../mail/mail.error.xml.h:156
 msgid "Remove duplicate messages?"
 msgstr "Fjern duplikatmeldinger?"
 
-#: ../mail/mail.error.xml.h:153
+#: ../mail/mail.error.xml.h:157
 msgid "No duplicate messages found."
 msgstr "Ingen duplikatmeldinger funnet."
 
 #. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:155
+#: ../mail/mail.error.xml.h:159
 msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr "Mappe Â{0}Â inneholder ingen duplikatmeldinger."
 
-#: ../mail/mail.error.xml.h:156
+#: ../mail/mail.error.xml.h:160
 msgid "Failed to unsubscribe from folder."
 msgstr "Klarte ikke Ã fjerne abonnement pÃ mappe."
 
-#: ../mail/mail.error.xml.h:158
+#: ../mail/mail.error.xml.h:162
 msgid "Unable to retrieve message."
 msgstr "Kunne ikke hente melding."
 
-#: ../mail/mail.error.xml.h:159
+#: ../mail/mail.error.xml.h:163
 msgid "{0}"
 msgstr "{0}"
 
-#: ../mail/mail.error.xml.h:160
+#: ../mail/mail.error.xml.h:164
 msgid "Failed to open folder."
 msgstr "Klarte ikke Ã Ãpne mappe."
 
-#: ../mail/mail.error.xml.h:161
+#: ../mail/mail.error.xml.h:165
 msgid "Failed to find duplicate messages."
 msgstr "Klarte ikke Ã finne duplikatmeldinger."
 
-#: ../mail/mail.error.xml.h:162
+#: ../mail/mail.error.xml.h:166
 msgid "Failed to retrieve messages."
 msgstr "Klarte ikke Ã hente meldinger."
 
-#: ../mail/mail.error.xml.h:163
+#: ../mail/mail.error.xml.h:167
 msgid "Failed to remove attachments from messages."
 msgstr "Klarte ikke Ã fjerne vedlegg fra meldinger."
 
-#: ../mail/mail.error.xml.h:164
+#: ../mail/mail.error.xml.h:168
 msgid "Failed to download messages for offline viewing."
 msgstr "Klarte ikke Ã laste ned meldinger for frakoblet visning."
 
-#: ../mail/mail.error.xml.h:165
+#: ../mail/mail.error.xml.h:169
 msgid "Failed to save messages to disk."
 msgstr "Klarte ikke Ã lagre meldinger til disk."
 
-#: ../mail/mail.error.xml.h:166
+#: ../mail/mail.error.xml.h:170
 msgid "Hidden file is attached."
 msgstr "Skjult fil er vedlagt."
 
-#: ../mail/mail.error.xml.h:167
+#: ../mail/mail.error.xml.h:171
 msgid ""
 "The attachment named {0} is a hidden file and may contain sensitive data. "
 "Please review it before sending."
@@ -14656,27 +14763,39 @@ msgstr ""
 "Vedleg med navn {0} er en skjult fil og kan inneholde sensitive data. "
 "Vennlist se gjennom den fÃr du sender meldingen."
 
-#: ../mail/mail-send-recv.c:207
+#: ../mail/mail.error.xml.h:172
+msgid "Printing failed."
+msgstr "Utskrift feilet."
+
+#: ../mail/mail.error.xml.h:173
+msgid "The printer replied &quot;{0}&quot;."
+msgstr "Skriveren svarte &quot;{0}&quot;."
+
+#: ../mail/mail.error.xml.h:174
+msgid "Could not perform this operation on {0}."
+msgstr "Kunne ikke utfÃre denne operasjonen pÃ {0}."
+
+#: ../mail/mail-send-recv.c:208
 msgid "Canceling..."
 msgstr "Avbryter â"
 
-#: ../mail/mail-send-recv.c:534
+#: ../mail/mail-send-recv.c:535
 msgid "Send & Receive Mail"
 msgstr "Send & motta e-post"
 
-#: ../mail/mail-send-recv.c:550
+#: ../mail/mail-send-recv.c:551
 msgid "Cancel _All"
 msgstr "Avbryt _alle"
 
-#: ../mail/mail-send-recv.c:650 ../mail/mail-send-recv.c:1029
+#: ../mail/mail-send-recv.c:651 ../mail/mail-send-recv.c:1036
 msgid "Updating..."
 msgstr "Oppdaterer â"
 
-#: ../mail/mail-send-recv.c:650 ../mail/mail-send-recv.c:736
+#: ../mail/mail-send-recv.c:651 ../mail/mail-send-recv.c:737
 msgid "Waiting..."
 msgstr "Venter â"
 
-#: ../mail/mail-send-recv.c:1009
+#: ../mail/mail-send-recv.c:1016
 #, c-format
 msgid "Checking for new mail"
 msgstr "Ser etter nye meldinger"
@@ -14735,7 +14854,7 @@ msgstr "?"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:1916 ../plugins/itip-formatter/itip-view.c:208
+#: ../mail/message-list.c:1916 ../plugins/itip-formatter/itip-view.c:225
 msgid "Today %l:%M %p"
 msgstr "I dag %l:%M %p"
 
@@ -14793,11 +14912,6 @@ msgstr "Merket"
 msgid "Received"
 msgstr "Mottatt"
 
-#: ../mail/message-list.etspec.h:10
-#: ../widgets/misc/e-attachment-tree-view.c:574
-msgid "Size"
-msgstr "StÃrrelse"
-
 #: ../mail/message-list.etspec.h:11
 msgid "Flag Status"
 msgstr "Status for merking"
@@ -14823,27 +14937,27 @@ msgid "Subject or Addresses contains"
 msgstr "Emne eller adresser inneholder"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1652
+#: ../modules/mail/e-mail-shell-view-actions.c:1680
 msgid "Recipients contain"
 msgstr "Mottakere inneholder"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1645
+#: ../modules/mail/e-mail-shell-view-actions.c:1673
 msgid "Message contains"
 msgstr "Melding inneholder"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1666
+#: ../modules/mail/e-mail-shell-view-actions.c:1694
 msgid "Subject contains"
 msgstr "Emne inneholder"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1659
+#: ../modules/mail/e-mail-shell-view-actions.c:1687
 msgid "Sender contains"
 msgstr "Avsender inneholder"
 
 #: ../mail/searchtypes.xml.h:6
-#: ../modules/mail/e-mail-shell-view-actions.c:1638
+#: ../modules/mail/e-mail-shell-view-actions.c:1666
 msgid "Body contains"
 msgstr "Kropp inneholder"
 
@@ -15047,7 +15161,7 @@ msgstr "Opprett en ny adressebok"
 #: ../modules/addressbook/e-book-shell-view.c:402
 #: ../modules/calendar/e-cal-shell-backend.c:121
 #: ../modules/calendar/e-cal-shell-migrate.c:63
-#: ../modules/online-accounts/e-online-accounts-google.c:376
+#: ../modules/online-accounts/e-online-accounts-google.c:378
 msgid "Contacts"
 msgstr "Kontakter"
 
@@ -15106,10 +15220,10 @@ msgid "Show map with all contacts from selected address book"
 msgstr "Vis kart med alle kontakter fra valgt adressebok"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:858
-#: ../modules/calendar/e-cal-shell-view-actions.c:1405
+#: ../modules/calendar/e-cal-shell-view-actions.c:1426
 #: ../modules/calendar/e-memo-shell-view-actions.c:640
 #: ../modules/calendar/e-task-shell-view-actions.c:764
-#: ../modules/mail/e-mail-shell-view-actions.c:1271
+#: ../modules/mail/e-mail-shell-view-actions.c:1299
 msgid "_Rename..."
 msgstr "End_re navn â"
 
@@ -15182,7 +15296,7 @@ msgid "Send a message to the selected contacts"
 msgstr "Send en melding til valgte kontakter"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:937
-#: ../modules/calendar/e-cal-shell-view-actions.c:1540
+#: ../modules/calendar/e-cal-shell-view-actions.c:1582
 #: ../modules/calendar/e-task-shell-view-actions.c:822
 msgid "_Actions"
 msgstr "H_andlinger"
@@ -15190,19 +15304,19 @@ msgstr "H_andlinger"
 #: ../modules/addressbook/e-book-shell-view-actions.c:944
 #: ../modules/calendar/e-memo-shell-view-actions.c:677
 #: ../modules/calendar/e-task-shell-view-actions.c:829
-#: ../modules/mail/e-mail-shell-view-actions.c:1429
+#: ../modules/mail/e-mail-shell-view-actions.c:1457
 msgid "_Preview"
 msgstr "_ForhÃndsvis"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:953
-#: ../modules/calendar/e-cal-shell-view-actions.c:1557
+#: ../modules/calendar/e-cal-shell-view-actions.c:1599
 #: ../modules/calendar/e-memo-shell-view-actions.c:690
 #: ../modules/calendar/e-task-shell-view-actions.c:842
 msgid "_Delete"
 msgstr "_Slett"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:957
-#: ../modules/mail/e-mail-shell-view-actions.c:1194
+#: ../modules/mail/e-mail-shell-view-actions.c:1222
 msgid "_Properties"
 msgstr "Egenska_per â"
 
@@ -15229,7 +15343,7 @@ msgstr "Vis kart i forhÃndsvisning av kontakter"
 #: ../modules/addressbook/e-book-shell-view-actions.c:1022
 #: ../modules/calendar/e-memo-shell-view-actions.c:747
 #: ../modules/calendar/e-task-shell-view-actions.c:911
-#: ../modules/mail/e-mail-shell-view-actions.c:1548
+#: ../modules/mail/e-mail-shell-view-actions.c:1576
 msgid "_Classic View"
 msgstr "_Klassisk visning"
 
@@ -15240,7 +15354,7 @@ msgstr "Vis forhÃndsvisning av kontakt under kontaktlisten"
 #: ../modules/addressbook/e-book-shell-view-actions.c:1029
 #: ../modules/calendar/e-memo-shell-view-actions.c:754
 #: ../modules/calendar/e-task-shell-view-actions.c:918
-#: ../modules/mail/e-mail-shell-view-actions.c:1555
+#: ../modules/mail/e-mail-shell-view-actions.c:1583
 msgid "_Vertical View"
 msgstr "_Vertikal visning"
 
@@ -15249,24 +15363,24 @@ msgid "Show contact preview alongside the contact list"
 msgstr "Vis forhÃndsvisning av kontakt ved siden av kontaktlisten"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1039
-#: ../modules/calendar/e-cal-shell-view-actions.c:1696
+#: ../modules/calendar/e-cal-shell-view-actions.c:1738
 #: ../modules/calendar/e-memo-shell-view-actions.c:764
 #: ../modules/calendar/e-task-shell-view-actions.c:935
 msgid "Any Category"
 msgstr "Enhver kategori"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1046
-#: ../modules/calendar/e-cal-shell-view-actions.c:1717
+#: ../modules/calendar/e-cal-shell-view-actions.c:1759
 #: ../modules/calendar/e-memo-shell-view-actions.c:771
 #: ../modules/calendar/e-task-shell-view-actions.c:970
 msgid "Unmatched"
 msgstr "Ingen treff"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1056
-#: ../modules/calendar/e-cal-shell-view-actions.c:1727
+#: ../modules/calendar/e-cal-shell-view-actions.c:1769
 #: ../modules/calendar/e-memo-shell-view-actions.c:781
 #: ../modules/calendar/e-task-shell-view-actions.c:980
-#: ../modules/mail/e-mail-shell-view-actions.c:1631
+#: ../modules/mail/e-mail-shell-view-actions.c:1659
 #: ../shell/e-shell-content.c:664
 msgid "Advanced Search"
 msgstr "Avansert sÃk"
@@ -15748,24 +15862,24 @@ msgstr ""
 "Denne har tre mulige verdier. 0 for feil. 1 for advarsler. 2 for "
 "feilsÃkingsmeldinger."
 
-#: ../modules/calendar/e-cal-attachment-handler.c:316
+#: ../modules/calendar/e-cal-attachment-handler.c:320
 #: ../smime/gui/smime-ui.ui.h:32
 msgid "I_mport"
 msgstr "I_mporter"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:397
+#: ../modules/calendar/e-cal-attachment-handler.c:401
 msgid "Select a Calendar"
 msgstr "Velg en kalender"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:424
+#: ../modules/calendar/e-cal-attachment-handler.c:428
 msgid "Select a Task List"
 msgstr "Velg en oppgaveliste"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:434
+#: ../modules/calendar/e-cal-attachment-handler.c:438
 msgid "I_mport to Calendar"
 msgstr "I_mporter til kalenderen"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:441
+#: ../modules/calendar/e-cal-attachment-handler.c:445
 msgid "I_mport to Tasks"
 msgstr "I_mporter til oppgaver"
 
@@ -15843,7 +15957,7 @@ msgid "_24 hour"
 msgstr "_24 timer"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:25
-#: ../modules/calendar/e-cal-shell-view-actions.c:1679
+#: ../modules/calendar/e-cal-shell-view-actions.c:1721
 msgid "Work Week"
 msgstr "Arbeidsuke"
 
@@ -16018,7 +16132,7 @@ msgid "_Appointment"
 msgstr "_Avtale"
 
 #: ../modules/calendar/e-cal-shell-backend.c:453
-#: ../modules/calendar/e-cal-shell-view-actions.c:1484
+#: ../modules/calendar/e-cal-shell-view-actions.c:1526
 msgid "Create a new appointment"
 msgstr "Opprett en ny avtale"
 
@@ -16046,7 +16160,7 @@ msgid "Cale_ndar"
 msgstr "Kale_nder"
 
 #: ../modules/calendar/e-cal-shell-backend.c:477
-#: ../modules/calendar/e-cal-shell-view-actions.c:1379
+#: ../modules/calendar/e-cal-shell-view-actions.c:1400
 msgid "Create a new calendar"
 msgstr "Opprett en ny kalender"
 
@@ -16072,11 +16186,6 @@ msgstr "Kalendervelger"
 msgid "Opening calendar at %s"
 msgstr "Ãpner kalender pÃ %s"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:232
-#: ../modules/calendar/e-cal-shell-view-actions.c:261
-msgid "Print"
-msgstr "Skriv ut"
-
 #: ../modules/calendar/e-cal-shell-view-actions.c:320
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -16092,21 +16201,21 @@ msgstr ""
 msgid "Purge events older than"
 msgstr "Slett hendelser eldre enn"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:564
+#: ../modules/calendar/e-cal-shell-view-actions.c:585
 msgid "Copying Items"
 msgstr "Kopierer oppfÃringer"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:848
+#: ../modules/calendar/e-cal-shell-view-actions.c:869
 msgid "Moving Items"
 msgstr "Flytter oppfÃringer"
 
 #. Translators: Default filename part saving an event to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-actions.c:1175
+#: ../modules/calendar/e-cal-shell-view-actions.c:1196
 msgid "event"
 msgstr "hendelse"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1177
+#: ../modules/calendar/e-cal-shell-view-actions.c:1198
 #: ../modules/calendar/e-cal-shell-view-memopad.c:219
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:286
 #: ../modules/calendar/e-memo-shell-view-actions.c:524
@@ -16114,111 +16223,135 @@ msgstr "hendelse"
 msgid "Save as iCalendar"
 msgstr "Lagre som iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1335
+#: ../modules/calendar/e-cal-shell-view-actions.c:1356
 #: ../modules/calendar/e-memo-shell-view-actions.c:605
 msgid "_Copy..."
 msgstr "_Kopier â"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1342
+#: ../modules/calendar/e-cal-shell-view-actions.c:1363
 msgid "D_elete Calendar"
 msgstr "Sl_ett kalender"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1344
+#: ../modules/calendar/e-cal-shell-view-actions.c:1365
 msgid "Delete the selected calendar"
 msgstr "Slett valgt kalender"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1351
+#: ../modules/calendar/e-cal-shell-view-actions.c:1372
 msgid "Go Back"
 msgstr "GÃ tilbake"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1358
+#: ../modules/calendar/e-cal-shell-view-actions.c:1379
 msgid "Go Forward"
 msgstr "GÃ fremover"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1365
+#: ../modules/calendar/e-cal-shell-view-actions.c:1386
 msgid "Select today"
 msgstr "Velg i dag"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1370
+#: ../modules/calendar/e-cal-shell-view-actions.c:1391
 msgid "Select _Date"
 msgstr "Velg _dato"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1372
+#: ../modules/calendar/e-cal-shell-view-actions.c:1393
 msgid "Select a specific date"
 msgstr "Velg en spesifikk dato"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1377
+#: ../modules/calendar/e-cal-shell-view-actions.c:1398
 msgid "_New Calendar"
 msgstr "_Ny kalender"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../modules/calendar/e-cal-shell-view-actions.c:1412
 #: ../modules/calendar/e-task-shell-view-actions.c:813
 msgid "Purg_e"
 msgstr "Fj_ern"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1393
+#: ../modules/calendar/e-cal-shell-view-actions.c:1414
 msgid "Purge old appointments and meetings"
 msgstr "Fjern gamle avtaler og mÃter"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1398
+#: ../modules/calendar/e-cal-shell-view-actions.c:1419
 #: ../modules/calendar/e-memo-shell-view-actions.c:633
 #: ../modules/calendar/e-task-shell-view-actions.c:757
 msgid "Re_fresh"
 msgstr "O_ppdater"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1400
+#: ../modules/calendar/e-cal-shell-view-actions.c:1421
 msgid "Refresh the selected calendar"
 msgstr "Oppdater valgt kalender"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1407
+#: ../modules/calendar/e-cal-shell-view-actions.c:1428
 msgid "Rename the selected calendar"
 msgstr "Endre navn pÃ valgt kalender"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1412
+#: ../modules/calendar/e-cal-shell-view-actions.c:1433
+msgid "Find _next"
+msgstr "Finn _neste"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1435
+msgid "Find next occurrence of the current search string"
+msgstr "Finn neste oppfÃring av aktiv sÃkestreng"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1440
+msgid "Find _previous"
+msgstr "Finn _forrige"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1442
+msgid "Find previous occurrence of the current search string"
+msgstr "Finn forrige oppfÃring av sÃkestrengen"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1447
+msgid "Stop _running search"
+msgstr "Stopp _aktivt sÃk"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1449
+msgid "Stop currently running search"
+msgstr "Stopp sÃk som kjÃrer nÃ"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1454
 msgid "Show _Only This Calendar"
 msgstr "Vis k_un denne kalenderen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+#: ../modules/calendar/e-cal-shell-view-actions.c:1461
 msgid "Cop_y to Calendar..."
 msgstr "Kop_ier til kalender â"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1426
+#: ../modules/calendar/e-cal-shell-view-actions.c:1468
 msgid "_Delegate Meeting..."
 msgstr "_Deleger mÃte â"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1433
+#: ../modules/calendar/e-cal-shell-view-actions.c:1475
 msgid "_Delete Appointment"
 msgstr "_Slett avtale"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1435
+#: ../modules/calendar/e-cal-shell-view-actions.c:1477
 msgid "Delete selected appointments"
 msgstr "Slett valgte avtaler"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1440
+#: ../modules/calendar/e-cal-shell-view-actions.c:1482
 msgid "Delete This _Occurrence"
 msgstr "Slett denne _hendelsen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1442
+#: ../modules/calendar/e-cal-shell-view-actions.c:1484
 msgid "Delete this occurrence"
 msgstr "Slett denne oppfÃringen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1447
+#: ../modules/calendar/e-cal-shell-view-actions.c:1489
 msgid "Delete All Occ_urrences"
 msgstr "Slett alle oppf_Ãringer"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1449
+#: ../modules/calendar/e-cal-shell-view-actions.c:1491
 msgid "Delete all occurrences"
 msgstr "Slett alle oppfÃringer"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1454
+#: ../modules/calendar/e-cal-shell-view-actions.c:1496
 msgid "New All Day _Event..."
 msgstr "Ny avtale som varer h_ele dagen â"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1456
+#: ../modules/calendar/e-cal-shell-view-actions.c:1498
 msgid "Create a new all day event"
 msgstr "Opprett en ny avtale for hele dagen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1461
+#: ../modules/calendar/e-cal-shell-view-actions.c:1503
 #: ../modules/calendar/e-cal-shell-view-memopad.c:253
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:326
 #: ../modules/calendar/e-memo-shell-view-actions.c:598
@@ -16226,127 +16359,127 @@ msgstr "Opprett en ny avtale for hele dagen"
 msgid "_Forward as iCalendar..."
 msgstr "_Videresend som iCalendar â"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1468
+#: ../modules/calendar/e-cal-shell-view-actions.c:1510
 msgid "New _Meeting..."
 msgstr "Nytt _mÃte â"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1470
+#: ../modules/calendar/e-cal-shell-view-actions.c:1512
 msgid "Create a new meeting"
 msgstr "Lag et nytt mÃte"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1475
+#: ../modules/calendar/e-cal-shell-view-actions.c:1517
 msgid "Mo_ve to Calendar..."
 msgstr "Fl_ytt til kalender â"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1482
+#: ../modules/calendar/e-cal-shell-view-actions.c:1524
 msgid "New _Appointment..."
 msgstr "Ny _avtale â"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1489
+#: ../modules/calendar/e-cal-shell-view-actions.c:1531
 msgid "Make this Occurrence _Movable"
 msgstr "GjÃr denne hendelsen _flyttbar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1496
+#: ../modules/calendar/e-cal-shell-view-actions.c:1538
 msgid "_Open Appointment"
 msgstr "_Ãpne avtale"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1498
+#: ../modules/calendar/e-cal-shell-view-actions.c:1540
 msgid "View the current appointment"
 msgstr "Vis denne avtalen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1503
+#: ../modules/calendar/e-cal-shell-view-actions.c:1545
 msgid "_Reply"
 msgstr "Sva_r"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1517
+#: ../modules/calendar/e-cal-shell-view-actions.c:1559
 msgid "_Schedule Meeting..."
 msgstr "_Sett opp mÃte â"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1519
+#: ../modules/calendar/e-cal-shell-view-actions.c:1561
 msgid "Converts an appointment to a meeting"
 msgstr "Konverter en avtale til et mÃte"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1524
+#: ../modules/calendar/e-cal-shell-view-actions.c:1566
 msgid "Conv_ert to Appointment..."
 msgstr "Konv_erter til avtale â"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1526
+#: ../modules/calendar/e-cal-shell-view-actions.c:1568
 msgid "Converts a meeting to an appointment"
 msgstr "Konverterer et mÃte til en avtale"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1531
+#: ../modules/calendar/e-cal-shell-view-actions.c:1573
 msgid "Quit"
 msgstr "Avslutt"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1651
+#: ../modules/calendar/e-cal-shell-view-actions.c:1693
 msgid "Day"
 msgstr "Dag"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1653
+#: ../modules/calendar/e-cal-shell-view-actions.c:1695
 msgid "Show one day"
 msgstr "Vis en dag"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1658
+#: ../modules/calendar/e-cal-shell-view-actions.c:1700
 msgid "List"
 msgstr "Liste"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1660
+#: ../modules/calendar/e-cal-shell-view-actions.c:1702
 msgid "Show as list"
 msgstr "Vis som liste"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1665
+#: ../modules/calendar/e-cal-shell-view-actions.c:1707
 msgid "Month"
 msgstr "MÃned"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1667
+#: ../modules/calendar/e-cal-shell-view-actions.c:1709
 msgid "Show one month"
 msgstr "Vis en mÃned"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1672
+#: ../modules/calendar/e-cal-shell-view-actions.c:1714
 msgid "Week"
 msgstr "Uke"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1674
+#: ../modules/calendar/e-cal-shell-view-actions.c:1716
 msgid "Show one week"
 msgstr "Vis en uke"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1681
+#: ../modules/calendar/e-cal-shell-view-actions.c:1723
 msgid "Show one work week"
 msgstr "Vis en arbeidsuke"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1689
+#: ../modules/calendar/e-cal-shell-view-actions.c:1731
 msgid "Active Appointments"
 msgstr "Aktive avtaler"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1703
+#: ../modules/calendar/e-cal-shell-view-actions.c:1745
 msgid "Next 7 Days' Appointments"
 msgstr "Avtaler for de neste syv dagene"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1710
+#: ../modules/calendar/e-cal-shell-view-actions.c:1752
 msgid "Occurs Less Than 5 Times"
 msgstr "Hender fÃrre enn fem ganger"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1741
+#: ../modules/calendar/e-cal-shell-view-actions.c:1783
 #: ../modules/calendar/e-memo-shell-view-actions.c:795
 #: ../modules/calendar/e-task-shell-view-actions.c:994
 msgid "Description contains"
 msgstr "Beskrivelse inneholder"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1748
+#: ../modules/calendar/e-cal-shell-view-actions.c:1790
 #: ../modules/calendar/e-memo-shell-view-actions.c:802
 #: ../modules/calendar/e-task-shell-view-actions.c:1001
 msgid "Summary contains"
 msgstr "Sammendrag inneholder"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1760
+#: ../modules/calendar/e-cal-shell-view-actions.c:1802
 msgid "Print this calendar"
 msgstr "Skriv ut denne kalenderen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1767
+#: ../modules/calendar/e-cal-shell-view-actions.c:1809
 msgid "Preview the calendar to be printed"
 msgstr "ForhÃndsvis kalenderen som skal skrives ut"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1789
+#: ../modules/calendar/e-cal-shell-view-actions.c:1831
 #: ../modules/calendar/e-cal-shell-view-memopad.c:294
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:381
 #: ../modules/calendar/e-memo-shell-view-actions.c:843
@@ -16354,7 +16487,7 @@ msgstr "ForhÃndsvis kalenderen som skal skrives ut"
 msgid "_Save as iCalendar..."
 msgstr "_Lagre som iCalendar â"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1866
+#: ../modules/calendar/e-cal-shell-view-actions.c:1908
 msgid "Go To"
 msgstr "GÃ til"
 
@@ -16398,6 +16531,32 @@ msgstr "_Ãpne nettside"
 msgid "Print the selected memo"
 msgstr "Skriv ut valgt notat"
 
+#: ../modules/calendar/e-cal-shell-view-private.c:1443
+msgid "Searching next matching event"
+msgstr "SÃker etter neste hendelsen som passer"
+
+#: ../modules/calendar/e-cal-shell-view-private.c:1444
+msgid "Searching previous matching event"
+msgstr "SÃker etter forrige hendelse som passer"
+
+#: ../modules/calendar/e-cal-shell-view-private.c:1462
+#, 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:1465
+#, 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:1486
+msgid "Cannot search with no active calendar"
+msgstr "Kan ikke sÃke uten en aktiv kalender"
+
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #. Translators: Default filename part saving a task to a file when
@@ -16751,7 +16910,7 @@ msgid_plural "%d tasks"
 msgstr[0] "%d oppgave"
 msgstr[1] "%d oppgaver"
 
-#: ../modules/mail/e-mail-attachment-handler.c:389
+#: ../modules/mail/e-mail-attachment-handler.c:390
 #, c-format
 msgid "%d attached message"
 msgid_plural "%d attached messages"
@@ -16809,300 +16968,300 @@ msgstr "Evolution kontoassistent"
 msgid "Account Editor"
 msgstr "Kontoredigering"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1180
+#: ../modules/mail/e-mail-shell-view-actions.c:1208
 #: ../modules/mail/e-mail-shell-view.c:947
 msgid "_Disable Account"
 msgstr "_Deaktiver konto"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1182
+#: ../modules/mail/e-mail-shell-view-actions.c:1210
 msgid "Disable this account"
 msgstr "Deaktiver denne kontoen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1189
+#: ../modules/mail/e-mail-shell-view-actions.c:1217
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "Fjern alle slettede meldinger fra alle mapper permanent"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1196
+#: ../modules/mail/e-mail-shell-view-actions.c:1224
 msgid "Edit properties of this account"
 msgstr "Rediger egenskaper for denne kontoen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1201
+#: ../modules/mail/e-mail-shell-view-actions.c:1229
 msgid "_Download Messages for Offline Usage"
 msgstr "Last ne_d meldinger for frakoblet bruk"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1203
+#: ../modules/mail/e-mail-shell-view-actions.c:1231
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr ""
 "Last ned meldinger fra kontoer og mapper som er merket for frakoblet bruk"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1208
+#: ../modules/mail/e-mail-shell-view-actions.c:1236
 msgid "Fl_ush Outbox"
 msgstr "T_Ãm utboks"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1215
+#: ../modules/mail/e-mail-shell-view-actions.c:1243
 msgid "_Copy Folder To..."
 msgstr "_Kopier mappe til â"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1217
+#: ../modules/mail/e-mail-shell-view-actions.c:1245
 msgid "Copy the selected folder into another folder"
 msgstr "Kopier valgt mappe til en annen mappe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1224
+#: ../modules/mail/e-mail-shell-view-actions.c:1252
 msgid "Permanently remove this folder"
 msgstr "Fjern denne mappen permanent"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1229
+#: ../modules/mail/e-mail-shell-view-actions.c:1257
 msgid "E_xpunge"
 msgstr "T_Ãm"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1231
+#: ../modules/mail/e-mail-shell-view-actions.c:1259
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Fjern alle slettede meldinger fra denne mappen permanent"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1236
+#: ../modules/mail/e-mail-shell-view-actions.c:1264
 msgid "Mar_k All Messages as Read"
 msgstr "Mer_k alle meldinger som lest"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1238
+#: ../modules/mail/e-mail-shell-view-actions.c:1266
 msgid "Mark all messages in the folder as read"
 msgstr "Merk alle meldinger i en mappe som lest"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1243
+#: ../modules/mail/e-mail-shell-view-actions.c:1271
 msgid "_Move Folder To..."
 msgstr "Flytt _mappe til â"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1245
+#: ../modules/mail/e-mail-shell-view-actions.c:1273
 msgid "Move the selected folder into another folder"
 msgstr "Flytt valgt mappe til en annen mappe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1250
+#: ../modules/mail/e-mail-shell-view-actions.c:1278
 msgid "_New..."
 msgstr "_Ny â"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1252
+#: ../modules/mail/e-mail-shell-view-actions.c:1280
 msgid "Create a new folder for storing mail"
 msgstr "Lag en ny mappe for lagring av meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1259
+#: ../modules/mail/e-mail-shell-view-actions.c:1287
 msgid "Change the properties of this folder"
 msgstr "Endre egenskaper for denne mappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1266
+#: ../modules/mail/e-mail-shell-view-actions.c:1294
 msgid "Refresh the folder"
 msgstr "Oppdater mappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1273
+#: ../modules/mail/e-mail-shell-view-actions.c:1301
 msgid "Change the name of this folder"
 msgstr "Endre navn pÃ denne mappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1278
+#: ../modules/mail/e-mail-shell-view-actions.c:1306
 msgid "Select Message _Thread"
 msgstr "Velg meldings_trÃd"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1280
+#: ../modules/mail/e-mail-shell-view-actions.c:1308
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Velg alle meldinger i samme trÃd som den valgte meldingen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1285
+#: ../modules/mail/e-mail-shell-view-actions.c:1313
 msgid "Select Message S_ubthread"
 msgstr "Velg _undertrÃd for melding"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1287
+#: ../modules/mail/e-mail-shell-view-actions.c:1315
 msgid "Select all replies to the currently selected message"
 msgstr "Velg alle svar til den valgt melding"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1299
+#: ../modules/mail/e-mail-shell-view-actions.c:1327
 msgid "Empty _Trash"
 msgstr "TÃm _papirkurven"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1301
+#: ../modules/mail/e-mail-shell-view-actions.c:1329
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "Fjern alle slettede meldinger fra alle kontoer permanent"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1306
+#: ../modules/mail/e-mail-shell-view-actions.c:1334
 msgid "_New Label"
 msgstr "_Ny etikett"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1315
+#: ../modules/mail/e-mail-shell-view-actions.c:1343
 msgid "N_one"
 msgstr "_Ingen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1329
+#: ../modules/mail/e-mail-shell-view-actions.c:1357
 msgid "_Manage Subscriptions"
 msgstr "_HÃndter abonnement"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1331
-#: ../modules/mail/e-mail-shell-view-actions.c:1408
+#: ../modules/mail/e-mail-shell-view-actions.c:1359
+#: ../modules/mail/e-mail-shell-view-actions.c:1436
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Abonner eller fjern abonnement pÃ mapper pÃ eksterne tjenere"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1336
-#: ../modules/mail/e-mail-shell-view-actions.c:1357
+#: ../modules/mail/e-mail-shell-view-actions.c:1364
+#: ../modules/mail/e-mail-shell-view-actions.c:1385
 msgid "Send / _Receive"
 msgstr "Send / _motta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1338
+#: ../modules/mail/e-mail-shell-view-actions.c:1366
 msgid "Send queued items and retrieve new items"
 msgstr "Send kÃlagte oppfÃringer og hent nye oppfÃringer"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1343
+#: ../modules/mail/e-mail-shell-view-actions.c:1371
 msgid "R_eceive All"
 msgstr "Motta all_e"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1345
+#: ../modules/mail/e-mail-shell-view-actions.c:1373
 msgid "Receive new items from all accounts"
 msgstr "Motta nye oppfÃringer fra alle kontoer"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1350
+#: ../modules/mail/e-mail-shell-view-actions.c:1378
 msgid "_Send All"
 msgstr "_Send alle"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1352
+#: ../modules/mail/e-mail-shell-view-actions.c:1380
 msgid "Send queued items in all accounts"
 msgstr "Send kÃlagte oppfÃringer i alle kontoer"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1378
+#: ../modules/mail/e-mail-shell-view-actions.c:1406
 #: ../widgets/misc/e-activity-proxy.c:313
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1380
+#: ../modules/mail/e-mail-shell-view-actions.c:1408
 msgid "Cancel the current mail operation"
 msgstr "Avbryt aktiv e-postoperasjon"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1385
+#: ../modules/mail/e-mail-shell-view-actions.c:1413
 msgid "Collapse All _Threads"
 msgstr "SlÃ sammen alle _trÃder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1387
+#: ../modules/mail/e-mail-shell-view-actions.c:1415
 msgid "Collapse all message threads"
 msgstr "SlÃ sammen alle meldingstrÃder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1392
+#: ../modules/mail/e-mail-shell-view-actions.c:1420
 msgid "E_xpand All Threads"
 msgstr "Ut_vid alle trÃder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1394
+#: ../modules/mail/e-mail-shell-view-actions.c:1422
 msgid "Expand all message threads"
 msgstr "Utvid alle meldingstrÃder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1399
+#: ../modules/mail/e-mail-shell-view-actions.c:1427
 msgid "_Message Filters"
 msgstr "_Meldingsfiltre"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1401
+#: ../modules/mail/e-mail-shell-view-actions.c:1429
 msgid "Create or edit rules for filtering new mail"
 msgstr "Opprett eller rediger regler for filtrering av ny e-post"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1406
+#: ../modules/mail/e-mail-shell-view-actions.c:1434
 msgid "_Subscriptions..."
 msgstr "_Abonnement â"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1415
+#: ../modules/mail/e-mail-shell-view-actions.c:1443
 msgid "F_older"
 msgstr "M_appe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1422
+#: ../modules/mail/e-mail-shell-view-actions.c:1450
 msgid "_Label"
 msgstr "_Etikett"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1439
+#: ../modules/mail/e-mail-shell-view-actions.c:1467
 msgid "C_reate Search Folder From Search..."
 msgstr "Opp_rett sÃkemappe fra sÃk â"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1446
+#: ../modules/mail/e-mail-shell-view-actions.c:1474
 msgid "Search F_olders"
 msgstr "SÃk i _mapper"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1448
+#: ../modules/mail/e-mail-shell-view-actions.c:1476
 msgid "Create or edit search folder definitions"
 msgstr "Opprett eller rediger sÃkemappedefinisjoner"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1483
+#: ../modules/mail/e-mail-shell-view-actions.c:1511
 msgid "_New Folder..."
 msgstr "_Ny mappe â"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1511
+#: ../modules/mail/e-mail-shell-view-actions.c:1539
 msgid "Show Message _Preview"
 msgstr "Vis _forhÃndsvisning av melding"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1513
+#: ../modules/mail/e-mail-shell-view-actions.c:1541
 msgid "Show message preview pane"
 msgstr "Vis omrÃde for forhÃndsvisning av melding"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1519
+#: ../modules/mail/e-mail-shell-view-actions.c:1547
 msgid "Show _Deleted Messages"
 msgstr "Vis slette_de meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1521
+#: ../modules/mail/e-mail-shell-view-actions.c:1549
 msgid "Show deleted messages with a line through them"
 msgstr "Vis slettede meldinger som gjennomstreket i meldingslisten."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1527
+#: ../modules/mail/e-mail-shell-view-actions.c:1555
 msgid "_Group By Threads"
 msgstr "_Grupper etter trÃder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1529
+#: ../modules/mail/e-mail-shell-view-actions.c:1557
 msgid "Threaded message list"
 msgstr "Meldingsliste med trÃder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1550
+#: ../modules/mail/e-mail-shell-view-actions.c:1578
 msgid "Show message preview below the message list"
 msgstr "Vis meldingen under meldingslisten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1557
+#: ../modules/mail/e-mail-shell-view-actions.c:1585
 msgid "Show message preview alongside the message list"
 msgstr "Vis meldingen ved siden av meldingslisten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1565
+#: ../modules/mail/e-mail-shell-view-actions.c:1593
 msgid "All Messages"
 msgstr "Alle meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1572
+#: ../modules/mail/e-mail-shell-view-actions.c:1600
 msgid "Important Messages"
 msgstr "Viktige meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1579
+#: ../modules/mail/e-mail-shell-view-actions.c:1607
 msgid "Last 5 Days' Messages"
 msgstr "Meldinger fra de siste 5 dagene"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1586
+#: ../modules/mail/e-mail-shell-view-actions.c:1614
 msgid "Messages Not Junk"
 msgstr "Meldinger som ikke er uÃnsket e-post"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1593
+#: ../modules/mail/e-mail-shell-view-actions.c:1621
 msgid "Messages with Attachments"
 msgstr "Meldinger med vedlegg"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1600
+#: ../modules/mail/e-mail-shell-view-actions.c:1628
 msgid "No Label"
 msgstr "Ingen etikett"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1607
+#: ../modules/mail/e-mail-shell-view-actions.c:1635
 msgid "Read Messages"
 msgstr "Leste meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1614
+#: ../modules/mail/e-mail-shell-view-actions.c:1642
 msgid "Recent Messages"
 msgstr "Nye meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1621
+#: ../modules/mail/e-mail-shell-view-actions.c:1649
 msgid "Unread Messages"
 msgstr "Uleste meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1673
+#: ../modules/mail/e-mail-shell-view-actions.c:1701
 msgid "Subject or Addresses contain"
 msgstr "Emne eller adresser inneholder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1683
+#: ../modules/mail/e-mail-shell-view-actions.c:1711
 msgid "All Accounts"
 msgstr "Alle konti"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1690
+#: ../modules/mail/e-mail-shell-view-actions.c:1718
 msgid "Current Account"
 msgstr "Denne kontoen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1697
+#: ../modules/mail/e-mail-shell-view-actions.c:1725
 msgid "Current Folder"
 msgstr "Denne mappen"
 
@@ -17118,68 +17277,68 @@ msgstr "SÃk i konto"
 msgid "Proxy _Logout"
 msgstr "_Logg ut proxy"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1023
+#: ../modules/mail/e-mail-shell-view-private.c:949
 #, 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:1034
+#: ../modules/mail/e-mail-shell-view-private.c:960
 #, 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:1040
-#: ../modules/mail/e-mail-shell-view-private.c:1047
+#: ../modules/mail/e-mail-shell-view-private.c:966
+#: ../modules/mail/e-mail-shell-view-private.c:973
 #, 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:1053
+#: ../modules/mail/e-mail-shell-view-private.c:979
 #, 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:1059
+#: ../modules/mail/e-mail-shell-view-private.c:985
 #, 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:1065
+#: ../modules/mail/e-mail-shell-view-private.c:991
 #, 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:1077
+#: ../modules/mail/e-mail-shell-view-private.c:1003
 #, 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:1080
+#: ../modules/mail/e-mail-shell-view-private.c:1006
 #, 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:1103
+#: ../modules/mail/e-mail-shell-view-private.c:1029
 msgid "Trash"
 msgstr "Papirkurv"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1579
+#: ../modules/mail/e-mail-shell-view-private.c:1505
 msgid "Send / Receive"
 msgstr "Send / motta"
 
@@ -17421,6 +17580,18 @@ msgstr "Velkommen"
 msgid "Loading accounts..."
 msgstr "Laster kontoer â"
 
+#: ../modules/web-inspector/evolution-web-inspector.c:88
+msgid "_Inspect..."
+msgstr "_Inspiser â"
+
+#: ../modules/web-inspector/evolution-web-inspector.c:90
+msgid "Inspect the HTML content (debugging feature)"
+msgstr "Inspiser HTML-innhold (feilsÃkingsfunksjon)"
+
+#: ../modules/web-inspector/evolution-web-inspector.c:102
+msgid "Evolution Web Inspector"
+msgstr "Evolution webinspektÃr"
+
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
 msgid "Local Address Books"
 msgstr "Lokal adressebok"
@@ -17429,11 +17600,11 @@ msgstr "Lokal adressebok"
 msgid "Add local address books to Evolution."
 msgstr "Legg til lokale adressebÃker i Evolution."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:136
+#: ../plugins/attachment-reminder/attachment-reminder.c:128
 msgid "_Do not show this message again."
 msgstr "Ikke vis _denne meldingen igjen."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:484
+#: ../plugins/attachment-reminder/attachment-reminder.c:588
 #: ../plugins/templates/templates.c:462
 msgid "Keywords"
 msgstr "NÃkkelord"
@@ -18258,8 +18429,8 @@ msgstr ""
 "%s"
 
 #: ../plugins/google-account-setup/google-source.c:564
-#: ../plugins/mail-to-task/mail-to-task.c:840
-#: ../plugins/mail-to-task/mail-to-task.c:1103
+#: ../plugins/mail-to-task/mail-to-task.c:839
+#: ../plugins/mail-to-task/mail-to-task.c:1100
 msgid "Unknown error."
 msgstr "Ukjent feil."
 
@@ -18348,151 +18519,151 @@ msgstr "Endre innstillinger for dine IMAP-kontoer."
 msgid "Failed to load the calendar '%s' (%s)"
 msgstr "Kunne ikke Ãpne kalender Â%sÂ (%s)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:665
+#: ../plugins/itip-formatter/itip-formatter.c:666
 #, 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"
 
-#: ../plugins/itip-formatter/itip-formatter.c:689
+#: ../plugins/itip-formatter/itip-formatter.c:690
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Fant avtalen i kalender Â%sÂ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:802
+#: ../plugins/itip-formatter/itip-formatter.c:804
 msgid "Unable to find any calendars"
 msgstr "Kan ikke finne noen kalendere"
 
-#: ../plugins/itip-formatter/itip-formatter.c:809
+#: ../plugins/itip-formatter/itip-formatter.c:812
 msgid "Unable to find this meeting in any calendar"
 msgstr "Kan ikke finne dette mÃtet i noen kalender"
 
-#: ../plugins/itip-formatter/itip-formatter.c:813
+#: ../plugins/itip-formatter/itip-formatter.c:817
 msgid "Unable to find this task in any task list"
 msgstr "Kan ikke finne denne oppgaven i noen oppgaveliste"
 
-#: ../plugins/itip-formatter/itip-formatter.c:817
+#: ../plugins/itip-formatter/itip-formatter.c:822
 msgid "Unable to find this memo in any memo list"
 msgstr "Kan ikke finne dette notatet i noen notatliste"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1119
+#: ../plugins/itip-formatter/itip-formatter.c:1128
 msgid "Opening the calendar. Please wait..."
 msgstr "Ãpner kalender. Vennligst vent â"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1122
+#: ../plugins/itip-formatter/itip-formatter.c:1132
 msgid "Searching for an existing version of this appointment"
 msgstr "SÃker etter en eksisterende versjon av denne avtalen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1484
+#: ../plugins/itip-formatter/itip-formatter.c:1502
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Kunne ikke sende oppfÃring til kalender Â%sÂ. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1498
+#: ../plugins/itip-formatter/itip-formatter.c:1517
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Sendt til kalender Â%sÂ som godtatt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1502
+#: ../plugins/itip-formatter/itip-formatter.c:1522
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Sendt til kalender Â%sÂ som tentativ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1507
+#: ../plugins/itip-formatter/itip-formatter.c:1528
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Sendt til kalender Â%sÂ som avslÃtt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1512
+#: ../plugins/itip-formatter/itip-formatter.c:1534
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Sendt til kalender Â%sÂ som avlyst"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1581
-#: ../plugins/itip-formatter/itip-formatter.c:1974
-#: ../plugins/itip-formatter/itip-formatter.c:2065
+#: ../plugins/itip-formatter/itip-formatter.c:1604
+#: ../plugins/itip-formatter/itip-formatter.c:2021
+#: ../plugins/itip-formatter/itip-formatter.c:2128
 msgid "Saving changes to the calendar. Please wait..."
 msgstr "Lagrer endringer i kalender. Vennligst vent â"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1620
+#: ../plugins/itip-formatter/itip-formatter.c:1643
 msgid "Unable to parse item"
 msgstr "Kunne ikke lese oppfÃring"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1800
+#: ../plugins/itip-formatter/itip-formatter.c:1829
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organisator har fjernet delegat %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1807
+#: ../plugins/itip-formatter/itip-formatter.c:1842
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Avlysningsvarsel sendt til delegat"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1809
+#: ../plugins/itip-formatter/itip-formatter.c:1846
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Kunne ikke sende avlysningsmelding til delegaten"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1855
+#: ../plugins/itip-formatter/itip-formatter.c:1895
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Kan ikke oppdatere deltaker. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1861
+#: ../plugins/itip-formatter/itip-formatter.c:1902
 msgid "Attendee status updated"
 msgstr "Deltakerstatus oppdatert"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1881
+#: ../plugins/itip-formatter/itip-formatter.c:1925
 msgid "The meeting is invalid and cannot be updated"
 msgstr "MÃtet er ugyldig og kan ikke oppdateres"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1947
+#: ../plugins/itip-formatter/itip-formatter.c:1994
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Deltakerstatus kunne ikke oppdateres pga ugyldig status"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2004
-#: ../plugins/itip-formatter/itip-formatter.c:2042
+#: ../plugins/itip-formatter/itip-formatter.c:2058
+#: ../plugins/itip-formatter/itip-formatter.c:2098
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Deltakerstatus kan ikke oppdateres fordi oppfÃringen ikke eksisterer lenger"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2086
+#: ../plugins/itip-formatter/itip-formatter.c:2157
 msgid "Meeting information sent"
 msgstr "Informasjon om mÃte sendt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2089
+#: ../plugins/itip-formatter/itip-formatter.c:2162
 msgid "Task information sent"
 msgstr "Informasjon om oppgave sendt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2092
+#: ../plugins/itip-formatter/itip-formatter.c:2167
 msgid "Memo information sent"
 msgstr "Informasjon om notat sendt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2101
+#: ../plugins/itip-formatter/itip-formatter.c:2178
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Kan ikke sende mÃteinformasjon. MÃtet eksisterer ikke"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2104
+#: ../plugins/itip-formatter/itip-formatter.c:2183
 msgid "Unable to send task information, the task does not exist"
 msgstr "Kan ikke sende informasjon om oppgave. Oppgaven eksisterer ikke"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2107
+#: ../plugins/itip-formatter/itip-formatter.c:2188
 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.
-#: ../plugins/itip-formatter/itip-formatter.c:2173
+#: ../plugins/itip-formatter/itip-formatter.c:2253
 msgid "calendar.ics"
 msgstr "kalender.ics"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2178
+#: ../plugins/itip-formatter/itip-formatter.c:2258
 msgid "Save Calendar"
 msgstr "Lagre kalender"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2241
-#: ../plugins/itip-formatter/itip-formatter.c:2252
+#: ../plugins/itip-formatter/itip-formatter.c:2310
+#: ../plugins/itip-formatter/itip-formatter.c:2322
 msgid "The calendar attached is not valid"
 msgstr "Vedlagt kalender er ugyldig"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2242
-#: ../plugins/itip-formatter/itip-formatter.c:2253
+#: ../plugins/itip-formatter/itip-formatter.c:2311
+#: ../plugins/itip-formatter/itip-formatter.c:2323
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -18500,15 +18671,15 @@ msgstr ""
 "Meldingen pÃstÃr at den inneholder en kalender, men kalenderen er ikke en "
 "gyldig iCalendar."
 
-#: ../plugins/itip-formatter/itip-formatter.c:2293
-#: ../plugins/itip-formatter/itip-formatter.c:2321
-#: ../plugins/itip-formatter/itip-formatter.c:2432
+#: ../plugins/itip-formatter/itip-formatter.c:2364
+#: ../plugins/itip-formatter/itip-formatter.c:2393
+#: ../plugins/itip-formatter/itip-formatter.c:2491
 msgid "The item in the calendar is not valid"
 msgstr "OppfÃringen i kalenderen er ikke gyldig"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2294
-#: ../plugins/itip-formatter/itip-formatter.c:2322
-#: ../plugins/itip-formatter/itip-formatter.c:2433
+#: ../plugins/itip-formatter/itip-formatter.c:2365
+#: ../plugins/itip-formatter/itip-formatter.c:2394
+#: ../plugins/itip-formatter/itip-formatter.c:2492
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -18516,11 +18687,11 @@ msgstr ""
 "Meldingen inneholder en kalender, men kalenderen inneholder ingen hendelser, "
 "oppgaver eller ledig/opptatt-informasjon"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2335
+#: ../plugins/itip-formatter/itip-formatter.c:2408
 msgid "The calendar attached contains multiple items"
 msgstr "Vedlagt kalender inneholder flere oppfÃringer"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2336
+#: ../plugins/itip-formatter/itip-formatter.c:2409
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -18528,235 +18699,235 @@ msgstr ""
 "Du mÃ lagre filen og importere kalenderen for Ã prosessere alle disse "
 "oppfÃringene"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2860
+#: ../plugins/itip-formatter/itip-formatter.c:2924
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Ingen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2876
+#: ../plugins/itip-formatter/itip-formatter.c:2940
 msgid "Tentatively Accepted"
 msgstr "Akseptert tentativt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2994
+#: ../plugins/itip-formatter/itip-formatter.c:3083
 msgid "This meeting recurs"
 msgstr "Dettee mÃtet gjeninntreffer"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2997
+#: ../plugins/itip-formatter/itip-formatter.c:3086
 msgid "This task recurs"
 msgstr "Denne oppgaven gjeninntreffer"
 
-#: ../plugins/itip-formatter/itip-formatter.c:3000
+#: ../plugins/itip-formatter/itip-formatter.c:3089
 msgid "This memo recurs"
 msgstr "Dette notatet gjeninntreffer"
 
-#: ../plugins/itip-formatter/itip-formatter.c:3231
+#: ../plugins/itip-formatter/itip-formatter.c:3394
 msgid "Meeting Invitations"
 msgstr "MÃteinvitasjoner"
 
-#: ../plugins/itip-formatter/itip-formatter.c:3257
+#: ../plugins/itip-formatter/itip-formatter.c:3420
 msgid "_Delete message after acting"
 msgstr "_Slett melding etter utfÃrt handling"
 
-#: ../plugins/itip-formatter/itip-formatter.c:3271
-#: ../plugins/itip-formatter/itip-formatter.c:3304
+#: ../plugins/itip-formatter/itip-formatter.c:3434
+#: ../plugins/itip-formatter/itip-formatter.c:3467
 msgid "Conflict Search"
 msgstr "SÃk etter konflikter"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:3286
+#: ../plugins/itip-formatter/itip-formatter.c:3449
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Velg kalendere som skal gjennomsÃkes for Ã finne mÃtekonflikter"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:199
+#: ../plugins/itip-formatter/itip-view.c:216
 msgid "Today %H:%M"
 msgstr "I dag %H:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:203
+#: ../plugins/itip-formatter/itip-view.c:220
 msgid "Today %H:%M:%S"
 msgstr "I dag %H:%M:%S"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:212
+#: ../plugins/itip-formatter/itip-view.c:229
 msgid "Today %l:%M:%S %p"
 msgstr "I dag %l:%M:%S %p"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:227
+#: ../plugins/itip-formatter/itip-view.c:244
 msgid "Tomorrow %H:%M"
 msgstr "I morgen %H.%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:231
+#: ../plugins/itip-formatter/itip-view.c:248
 msgid "Tomorrow %H:%M:%S"
 msgstr "I morgen %H.%M.%S"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:236
+#: ../plugins/itip-formatter/itip-view.c:253
 msgid "Tomorrow %l:%M %p"
 msgstr "I morgen %l.%M %p"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:240
+#: ../plugins/itip-formatter/itip-view.c:257
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "I morgen %l.%M.%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:259
+#: ../plugins/itip-formatter/itip-view.c:276
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. * time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:264
+#: ../plugins/itip-formatter/itip-view.c:281
 msgid "%A %H:%M"
 msgstr "%A %H.%M"
 
 #. strftime format of a weekday and a
 #. * time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:268
+#: ../plugins/itip-formatter/itip-view.c:285
 msgid "%A %H:%M:%S"
 msgstr "%A %H.%M.%S"
 
 #. strftime format of a weekday and a
 #. * time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:273
+#: ../plugins/itip-formatter/itip-view.c:290
 msgid "%A %l:%M %p"
 msgstr "%A %l.%M %p"
 
 #. strftime format of a weekday and a
 #. * time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:277
+#: ../plugins/itip-formatter/itip-view.c:294
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l.%M.%S %p"
 
 #. strftime format of a weekday and a date
 #. * without a year.
-#: ../plugins/itip-formatter/itip-view.c:286
+#: ../plugins/itip-formatter/itip-view.c:303
 msgid "%A, %B %e"
 msgstr "%A, %e %B"
 
 #. strftime format of a weekday, a date
 #. * without a year and a time,
 #. * in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:292
+#: ../plugins/itip-formatter/itip-view.c:309
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %e %B %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:296
+#: ../plugins/itip-formatter/itip-view.c:313
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %e %B %H.%M.%S"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:301
+#: ../plugins/itip-formatter/itip-view.c:318
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %e %B %l.%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:305
+#: ../plugins/itip-formatter/itip-view.c:322
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %e %B %l.%M.%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:311
+#: ../plugins/itip-formatter/itip-view.c:328
 msgid "%A, %B %e, %Y"
 msgstr "%A, %e %B, %Y"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:316
+#: ../plugins/itip-formatter/itip-view.c:333
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %e %B, %Y %H.%M"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:320
+#: ../plugins/itip-formatter/itip-view.c:337
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %e %B %Y %H.%M.%S"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:325
+#: ../plugins/itip-formatter/itip-view.c:342
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %e %B, %Y %l.%M %p"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:329
+#: ../plugins/itip-formatter/itip-view.c:346
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %e %B, %Y %l.%M.%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:367
-#: ../plugins/itip-formatter/itip-view.c:368
-#: ../plugins/itip-formatter/itip-view.c:455
-#: ../plugins/itip-formatter/itip-view.c:456
-#: ../plugins/itip-formatter/itip-view.c:543
+#: ../plugins/itip-formatter/itip-view.c:384
+#: ../plugins/itip-formatter/itip-view.c:385
+#: ../plugins/itip-formatter/itip-view.c:470
+#: ../plugins/itip-formatter/itip-view.c:471
+#: ../plugins/itip-formatter/itip-view.c:556
 msgid "An unknown person"
 msgstr "En ukjent person"
 
-#: ../plugins/itip-formatter/itip-view.c:372
-#: ../plugins/itip-formatter/itip-view.c:460
-#: ../plugins/itip-formatter/itip-view.c:547
+#: ../plugins/itip-formatter/itip-view.c:389
+#: ../plugins/itip-formatter/itip-view.c:475
+#: ../plugins/itip-formatter/itip-view.c:560
 #, c-format
 msgid "Please respond on behalf of %s"
 msgstr "Vennligst svar pÃ vegne av %s"
 
-#: ../plugins/itip-formatter/itip-view.c:374
-#: ../plugins/itip-formatter/itip-view.c:462
-#: ../plugins/itip-formatter/itip-view.c:549
+#: ../plugins/itip-formatter/itip-view.c:391
+#: ../plugins/itip-formatter/itip-view.c:477
+#: ../plugins/itip-formatter/itip-view.c:562
 #, c-format
 msgid "Received on behalf of %s"
 msgstr "Mottatt pÃ vegne av %s"
 
-#: ../plugins/itip-formatter/itip-view.c:379
+#: ../plugins/itip-formatter/itip-view.c:396
 #, c-format
 msgid "%s through %s has published the following meeting information:"
 msgstr "%s har publisert fÃlgende mÃteinformasjon gjennom %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:381
+#: ../plugins/itip-formatter/itip-view.c:398
 #, c-format
 msgid "%s has published the following meeting information:"
 msgstr "%s har publisert fÃlgende mÃteinformasjon:"
 
-#: ../plugins/itip-formatter/itip-view.c:386
+#: ../plugins/itip-formatter/itip-view.c:403
 #, c-format
 msgid "%s has delegated the following meeting to you:"
 msgstr "%s har delegert fÃlgende mÃte til deg:"
 
-#: ../plugins/itip-formatter/itip-view.c:389
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "%s through %s requests your presence at the following meeting:"
 msgstr "%s ber om din tilstedevÃrelse i et mÃte gjennom %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:391
+#: ../plugins/itip-formatter/itip-view.c:408
 #, c-format
 msgid "%s requests your presence at the following meeting:"
 msgstr "%s ber om din tilstedevÃrelse i fÃlgende mÃte:"
 
-#: ../plugins/itip-formatter/itip-view.c:397
+#: ../plugins/itip-formatter/itip-view.c:414
 #, c-format
 msgid "%s through %s wishes to add to an existing meeting:"
 msgstr "%s Ãnsker Ã legge til informasjon i et eksisterende mÃte gjennom %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:399
+#: ../plugins/itip-formatter/itip-view.c:416
 #, c-format
 msgid "%s wishes to add to an existing meeting:"
 msgstr "%s Ãnsker Ã legge til informasjon i et eksisterende mÃte:"
 
-#: ../plugins/itip-formatter/itip-view.c:403
+#: ../plugins/itip-formatter/itip-view.c:420
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
@@ -18764,87 +18935,87 @@ msgid ""
 msgstr ""
 "%s Ãnsker Ã motta den seneste informasjon for fÃlgende mÃte gjennom %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:405
+#: ../plugins/itip-formatter/itip-view.c:422
 #, c-format
 msgid "%s wishes to receive the latest information for the following meeting:"
 msgstr "%s Ãnsker Ã motta den seneste informasjon for fÃlgende mÃte:"
 
-#: ../plugins/itip-formatter/itip-view.c:409
+#: ../plugins/itip-formatter/itip-view.c:426
 #, c-format
 msgid "%s through %s has sent back the following meeting response:"
 msgstr "%s har sendt tilbake fÃlgende svar pÃ mÃteinnkalling gjennom %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:411
+#: ../plugins/itip-formatter/itip-view.c:428
 #, c-format
 msgid "%s has sent back the following meeting response:"
 msgstr "%s har sendt tilbake fÃlgende svar pÃ mÃteinnkalling:"
 
-#: ../plugins/itip-formatter/itip-view.c:415
+#: ../plugins/itip-formatter/itip-view.c:432
 #, c-format
 msgid "%s through %s has canceled the following meeting:"
 msgstr "%s har avlyst fÃlgende mÃte gjennom %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:417
+#: ../plugins/itip-formatter/itip-view.c:434
 #, c-format
 msgid "%s has canceled the following meeting:"
 msgstr "%s har avlyst fÃlgende mÃte:"
 
-#: ../plugins/itip-formatter/itip-view.c:421
+#: ../plugins/itip-formatter/itip-view.c:438
 #, c-format
 msgid "%s through %s has proposed the following meeting changes."
 msgstr "%s har foreslÃtt fÃlgende endringer i mÃte gjennom %s."
 
-#: ../plugins/itip-formatter/itip-view.c:423
+#: ../plugins/itip-formatter/itip-view.c:440
 #, c-format
 msgid "%s has proposed the following meeting changes:"
 msgstr "%s har foreslÃtt fÃlgende endringer i mÃte:"
 
-#: ../plugins/itip-formatter/itip-view.c:427
+#: ../plugins/itip-formatter/itip-view.c:444
 #, c-format
 msgid "%s through %s has declined the following meeting changes:"
 msgstr "%s har avslÃtt fÃlgende endringer for mÃte gjennom %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:429
+#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "%s has declined the following meeting changes:"
 msgstr "%s har avslÃtt fÃlgende endringer for mÃte:"
 
-#: ../plugins/itip-formatter/itip-view.c:467
+#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "%s through %s has published the following task:"
 msgstr "%s har publisert fÃlgende oppgave gjennom %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:469
+#: ../plugins/itip-formatter/itip-view.c:484
 #, c-format
 msgid "%s has published the following task:"
 msgstr "%s har publisert fÃlgende oppgave:"
 
-#: ../plugins/itip-formatter/itip-view.c:474
+#: ../plugins/itip-formatter/itip-view.c:489
 #, c-format
 msgid "%s requests the assignment of %s to the following task:"
 msgstr "%s ber om at %s tildeles fÃlgende oppgave:"
 
-#: ../plugins/itip-formatter/itip-view.c:477
+#: ../plugins/itip-formatter/itip-view.c:492
 #, c-format
 msgid "%s through %s has assigned you a task:"
 msgstr "%s har tildelt deg en oppgave gjennom %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:479
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "%s has assigned you a task:"
 msgstr "%s har tildelt deg en oppgave:"
 
-#: ../plugins/itip-formatter/itip-view.c:485
+#: ../plugins/itip-formatter/itip-view.c:500
 #, c-format
 msgid "%s through %s wishes to add to an existing task:"
 msgstr "%s forespÃr Ã legge til informasjon i eksisterende oppgave gjennom %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:487
+#: ../plugins/itip-formatter/itip-view.c:502
 #, c-format
 msgid "%s wishes to add to an existing task:"
 msgstr "%s Ãnsker Ã legge til informasjon i en eksisterende oppgave:"
 
-#: ../plugins/itip-formatter/itip-view.c:491
+#: ../plugins/itip-formatter/itip-view.c:506
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
@@ -18853,199 +19024,185 @@ msgstr ""
 "%s Ãnsker Ã motta den seneste informasjon for fÃlgende tildelt oppgave "
 "gjennom %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:493
+#: ../plugins/itip-formatter/itip-view.c:508
 #, c-format
 msgid ""
 "%s wishes to receive the latest information for the following assigned task:"
 msgstr ""
 "%s Ãnsker Ã motta den seneste informasjon for fÃlgende tildelt oppgave:"
 
-#: ../plugins/itip-formatter/itip-view.c:497
+#: ../plugins/itip-formatter/itip-view.c:512
 #, c-format
 msgid "%s through %s has sent back the following assigned task response:"
 msgstr "%s har sendt tilbake fÃlgende svar pÃ tildelt oppgave gjennom %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:499
+#: ../plugins/itip-formatter/itip-view.c:514
 #, c-format
 msgid "%s has sent back the following assigned task response:"
 msgstr "%s har sendt tilbake fÃlgende svar pÃ tildelt oppgave:"
 
-#: ../plugins/itip-formatter/itip-view.c:503
+#: ../plugins/itip-formatter/itip-view.c:518
 #, c-format
 msgid "%s through %s has canceled the following assigned task:"
 msgstr "%s har avlyst fÃlgende tildelt oppgave gjennom %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:505
+#: ../plugins/itip-formatter/itip-view.c:520
 #, c-format
 msgid "%s has canceled the following assigned task:"
 msgstr "%s har avlyst fÃlgende tildelt oppgave:"
 
-#: ../plugins/itip-formatter/itip-view.c:509
+#: ../plugins/itip-formatter/itip-view.c:524
 #, c-format
 msgid "%s through %s has proposed the following task assignment changes:"
 msgstr "%s har foreslÃtt fÃlgende endringer i oppgavetildeling gjennom %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:511
+#: ../plugins/itip-formatter/itip-view.c:526
 #, c-format
 msgid "%s has proposed the following task assignment changes:"
 msgstr "%s har foreslÃtt fÃlgende endringer i oppgavetildeling:"
 
-#: ../plugins/itip-formatter/itip-view.c:515
+#: ../plugins/itip-formatter/itip-view.c:530
 #, c-format
 msgid "%s through %s has declined the following assigned task:"
 msgstr "%s har avslÃtt fÃlgende tildelt oppgave gjennom %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:517
+#: ../plugins/itip-formatter/itip-view.c:532
 #, c-format
 msgid "%s has declined the following assigned task:"
 msgstr "%s har avslÃtt fÃlgende tildelt oppgave:"
 
-#: ../plugins/itip-formatter/itip-view.c:554
+#: ../plugins/itip-formatter/itip-view.c:567
 #, c-format
 msgid "%s through %s has published the following memo:"
 msgstr "%s har publisert fÃlgende notat gjennom %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:556
+#: ../plugins/itip-formatter/itip-view.c:569
 #, c-format
 msgid "%s has published the following memo:"
 msgstr "%s har publisert fÃlgende notat:"
 
-#: ../plugins/itip-formatter/itip-view.c:561
+#: ../plugins/itip-formatter/itip-view.c:574
 #, c-format
 msgid "%s through %s wishes to add to an existing memo:"
 msgstr "%s Ãnsker Ã legge til informasjon i et eksisterende notat gjennom %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:563
+#: ../plugins/itip-formatter/itip-view.c:576
 #, c-format
 msgid "%s wishes to add to an existing memo:"
 msgstr "%s Ãnsker Ã legge til informasjon i et eksisterende notat:"
 
-#: ../plugins/itip-formatter/itip-view.c:567
+#: ../plugins/itip-formatter/itip-view.c:580
 #, c-format
 msgid "%s through %s has canceled the following shared memo:"
 msgstr "%s har avlyst fÃlgende delt notat gjennom %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:569
+#: ../plugins/itip-formatter/itip-view.c:582
 #, c-format
 msgid "%s has canceled the following shared memo:"
 msgstr "%s har avlyst fÃlgende delt notat:"
 
-#: ../plugins/itip-formatter/itip-view.c:693
+#: ../plugins/itip-formatter/itip-view.c:652
 msgid "All day:"
 msgstr "Hele dagen:"
 
-#: ../plugins/itip-formatter/itip-view.c:703
+#: ../plugins/itip-formatter/itip-view.c:658
 msgid "Start day:"
 msgstr "Startdag:"
 
-#. Start time
-#: ../plugins/itip-formatter/itip-view.c:703
-#: ../plugins/itip-formatter/itip-view.c:1061
+#: ../plugins/itip-formatter/itip-view.c:658
+#: ../plugins/itip-formatter/itip-view.c:1164
 msgid "Start time:"
 msgstr "Start-tid:"
 
-#: ../plugins/itip-formatter/itip-view.c:715
+#: ../plugins/itip-formatter/itip-view.c:667
 msgid "End day:"
 msgstr "Sluttdag:"
 
-#. End time
-#: ../plugins/itip-formatter/itip-view.c:715
-#: ../plugins/itip-formatter/itip-view.c:1072
+#: ../plugins/itip-formatter/itip-view.c:667
+#: ../plugins/itip-formatter/itip-view.c:1165
 msgid "End time:"
 msgstr "Slutt-tid:"
 
-#. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:851
-msgid "_Open Calendar"
-msgstr "_Ãpne kalender"
-
-#: ../plugins/itip-formatter/itip-view.c:857
-#: ../plugins/itip-formatter/itip-view.c:861
-#: ../plugins/itip-formatter/itip-view.c:867
-#: ../plugins/itip-formatter/itip-view.c:884
-#: ../plugins/itip-formatter/itip-view.c:889
-msgid "_Decline"
-msgstr "Av_slÃ"
-
-#: ../plugins/itip-formatter/itip-view.c:858
-#: ../plugins/itip-formatter/itip-view.c:863
-#: ../plugins/itip-formatter/itip-view.c:870
-#: ../plugins/itip-formatter/itip-view.c:886
-#: ../plugins/itip-formatter/itip-view.c:891
-msgid "A_ccept"
-msgstr "_Godta"
-
-#: ../plugins/itip-formatter/itip-view.c:861
-msgid "_Decline all"
-msgstr "A_vslÃ alle"
-
-#: ../plugins/itip-formatter/itip-view.c:862
-msgid "_Tentative all"
-msgstr "GjÃr alle _tentative"
-
-#: ../plugins/itip-formatter/itip-view.c:862
-#: ../plugins/itip-formatter/itip-view.c:868
-#: ../plugins/itip-formatter/itip-view.c:885
-#: ../plugins/itip-formatter/itip-view.c:890
-msgid "_Tentative"
-msgstr "_Tentativ"
-
-#: ../plugins/itip-formatter/itip-view.c:863
-msgid "A_ccept all"
-msgstr "_Godta alle"
-
-#. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:874
-msgid "_Send Information"
-msgstr "_Send informasjon"
-
-#. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:878
-msgid "_Update Attendee Status"
-msgstr "_Oppdater status for deltaker"
-
-#: ../plugins/itip-formatter/itip-view.c:881
-msgid "_Update"
-msgstr "_Oppdater"
-
-#. Comment
-#: ../plugins/itip-formatter/itip-view.c:1092
-#: ../plugins/itip-formatter/itip-view.c:1148
+#: ../plugins/itip-formatter/itip-view.c:1099
+msgid "Open Calendar"
+msgstr "Ãpne kalender"
+
+#: ../plugins/itip-formatter/itip-view.c:1102
+msgid "Decline all"
+msgstr "AvslÃ alle"
+
+#: ../plugins/itip-formatter/itip-view.c:1105
+msgid "Decline"
+msgstr "AvslÃ"
+
+#: ../plugins/itip-formatter/itip-view.c:1108
+msgid "Tentative all"
+msgstr "GjÃr alle tentative"
+
+#: ../plugins/itip-formatter/itip-view.c:1114
+msgid "Accept all"
+msgstr "Godta alle"
+
+#: ../plugins/itip-formatter/itip-view.c:1117
+msgid "Accept"
+msgstr "Godta"
+
+#: ../plugins/itip-formatter/itip-view.c:1120
+msgid "Send Information"
+msgstr "Send informasjon"
+
+#: ../plugins/itip-formatter/itip-view.c:1123
+msgid "Update Attendee Status"
+msgstr "Oppdater status for deltaker"
+
+#: ../plugins/itip-formatter/itip-view.c:1126
+msgid "Update"
+msgstr "Oppdater"
+
+#: ../plugins/itip-formatter/itip-view.c:1167
+#: ../plugins/itip-formatter/itip-view.c:1209
+#: ../plugins/itip-formatter/itip-view.c:1275
 msgid "Comment:"
 msgstr "Kommentar:"
 
-#: ../plugins/itip-formatter/itip-view.c:1131
-msgid "Send _reply to sender"
-msgstr "Send sva_r til avsender"
+#. RSVP area
+#: ../plugins/itip-formatter/itip-view.c:1198
+msgid "Send reply to sender"
+msgstr "Send svar til avsender"
+
+#. Updates
+#: ../plugins/itip-formatter/itip-view.c:1212
+msgid "Send updates to attendees"
+msgstr "Send oppdateringer til deltakere"
 
-#: ../plugins/itip-formatter/itip-view.c:1171
-msgid "Send _updates to attendees"
-msgstr "Send _oppdateringer til deltakere"
+#. The recurrence check button
+#: ../plugins/itip-formatter/itip-view.c:1215
+msgid "Apply to all instances"
+msgstr "Bruk pÃ alle instanser"
 
-#: ../plugins/itip-formatter/itip-view.c:1180
-msgid "_Apply to all instances"
-msgstr "B_ruk pÃ alle instanser"
+#: ../plugins/itip-formatter/itip-view.c:1216
+msgid "Show time as free"
+msgstr "Vis tid som ledig"
 
-#: ../plugins/itip-formatter/itip-view.c:1191
-msgid "Show time as _free"
-msgstr "Vis tid som _ledig"
+#: ../plugins/itip-formatter/itip-view.c:1217
+msgid "Preserve my reminder"
+msgstr "Bevar min pÃminnelse"
 
-#: ../plugins/itip-formatter/itip-view.c:1194
-msgid "_Preserve my reminder"
-msgstr "_Bevar min pÃminnelse"
+#: ../plugins/itip-formatter/itip-view.c:1218
+msgid "Inherit reminder"
+msgstr "Arv pÃminnelse"
 
-#. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1200
-msgid "_Inherit reminder"
-msgstr "Arv pÃm_innelse"
+#: ../plugins/itip-formatter/itip-view.c:1542
+msgid "Tasks:"
+msgstr "Oppgaver:"
 
-#: ../plugins/itip-formatter/itip-view.c:1982
-msgid "_Tasks:"
-msgstr "_Oppgaver:"
+#: ../plugins/itip-formatter/itip-view.c:1545
+msgid "Memos:"
+msgstr "Notater:"
 
-#: ../plugins/itip-formatter/itip-view.c:1984
-msgid "_Memos:"
-msgstr "_Notater:"
+#: ../plugins/itip-formatter/itip-view.c:2862
+msgid "Save"
+msgstr "Lagre"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
 msgid "Itip Formatter"
@@ -19209,6 +19366,30 @@ msgstr ""
 "\n"
 "Hode: {0}"
 
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
+msgid "Play sound when new messages arrive."
+msgstr "Spill en lyd nÃr nye meldinger ankommer."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
+msgid "Whether play sound or beep when new messages arrive."
+msgstr "Om en lydfil eller et pip skal spilles av nÃr nye meldinger ankommer."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
+msgid "Beep or play sound file."
+msgstr "Pip eller spill av en lydfil."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
+msgid ""
+"If \"true\", then beep, otherwise will play sound file when new messages "
+"arrive."
+msgstr "Pip hvis ÂtrueÂ, eller spill en lydfil nÃr nye meldinger ankommer."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
+msgid "Sound file to be played when new messages arrive, if not in beep mode."
+msgstr ""
+"Lydfil som skal spilles av nÃr nye meldinger ankommer hvis pip-modus ikke er "
+"aktivert."
+
 #: ../plugins/mail-notification/mail-notification.c:384
 #, c-format
 msgid ""
@@ -19288,12 +19469,12 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "Varsler nÃr nye meldinger ankommer."
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john doe myco example>"
-#: ../plugins/mail-to-task/mail-to-task.c:243
+#: ../plugins/mail-to-task/mail-to-task.c:242
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "Opprettet av en e-post fra %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:618
+#: ../plugins/mail-to-task/mail-to-task.c:617
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
@@ -19302,7 +19483,7 @@ msgstr ""
 "Valgt kalender inneholder hendelsen Â%sÂ allerede. Vil du redigere den gamle "
 "hendelsen?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:621
+#: ../plugins/mail-to-task/mail-to-task.c:620
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
@@ -19311,7 +19492,7 @@ msgstr ""
 "Valgt oppgaveliste inneholder oppgave Â%sÂ allerede. Vil du redigere den "
 "gamle oppgaven?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:624
+#: ../plugins/mail-to-task/mail-to-task.c:623
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -19321,7 +19502,7 @@ msgstr ""
 "notatet?"
 
 #. Translators: Note there are always more than 10 mails selected
-#: ../plugins/mail-to-task/mail-to-task.c:643
+#: ../plugins/mail-to-task/mail-to-task.c:642
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to events. Do you really want to "
@@ -19337,7 +19518,7 @@ msgstr[1] ""
 "virkelig legge dem til?"
 
 #. Translators: Note there are always more than 10 mails selected
-#: ../plugins/mail-to-task/mail-to-task.c:649
+#: ../plugins/mail-to-task/mail-to-task.c:648
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to tasks. Do you really want to "
@@ -19353,7 +19534,7 @@ msgstr[1] ""
 "legge dem til?"
 
 #. Translators: Note there are always more than 10 mails selected
-#: ../plugins/mail-to-task/mail-to-task.c:655
+#: ../plugins/mail-to-task/mail-to-task.c:654
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to memos. Do you really want to "
@@ -19368,29 +19549,29 @@ msgstr[1] ""
 "Du har valgt %d meldinger som skal konverteres til notater. Vil du virkelig "
 "legge dem til?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:676
+#: ../plugins/mail-to-task/mail-to-task.c:675
 msgid "Do you wish to continue converting remaining mails?"
 msgstr "Vil du fortsette med konvertering av gjenstÃende meldinger?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:751
+#: ../plugins/mail-to-task/mail-to-task.c:750
 msgid "[No Summary]"
 msgstr "[Ingen sammendrag]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:763
+#: ../plugins/mail-to-task/mail-to-task.c:762
 msgid "Invalid object returned from a server"
 msgstr "Ugyldig objekt returnert fra en tjener"
 
-#: ../plugins/mail-to-task/mail-to-task.c:815
+#: ../plugins/mail-to-task/mail-to-task.c:814
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "En feil oppsto under prosessering: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:840
+#: ../plugins/mail-to-task/mail-to-task.c:839
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Kan ikke Ãpne kalender. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:847
+#: ../plugins/mail-to-task/mail-to-task.c:846
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
@@ -19398,7 +19579,7 @@ msgstr ""
 "Valgt kilde er skrivebeskyttet og hendelser kan ikke opprettes der. Velg en "
 "annen kilde."
 
-#: ../plugins/mail-to-task/mail-to-task.c:850
+#: ../plugins/mail-to-task/mail-to-task.c:849
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -19406,7 +19587,7 @@ msgstr ""
 "Valgt kilde er skrivebeskyttet og oppgaver kan ikke opprettes der. Velg en "
 "annen kilde."
 
-#: ../plugins/mail-to-task/mail-to-task.c:853
+#: ../plugins/mail-to-task/mail-to-task.c:852
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
@@ -19414,44 +19595,44 @@ msgstr ""
 "Valgt kilde er skrivebeskyttet og notater kan ikke opprettes der. Velg en "
 "annen kilde."
 
-#: ../plugins/mail-to-task/mail-to-task.c:1103
+#: ../plugins/mail-to-task/mail-to-task.c:1100
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "Fant ikke kildeliste %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1164
+#: ../plugins/mail-to-task/mail-to-task.c:1161
 msgid "No writable calendar is available."
 msgstr "Ingen skrivbar kalender tilgjengelig."
 
-#: ../plugins/mail-to-task/mail-to-task.c:1258
+#: ../plugins/mail-to-task/mail-to-task.c:1255
 msgid "Create an _Event"
 msgstr "Lag en h_endelse"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1260
+#: ../plugins/mail-to-task/mail-to-task.c:1257
 msgid "Create a new event from the selected message"
 msgstr " Lag en ny hendelse fra den valgte meldingen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1265
+#: ../plugins/mail-to-task/mail-to-task.c:1262
 msgid "Create a Mem_o"
 msgstr "Lag et n_otat"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1267
+#: ../plugins/mail-to-task/mail-to-task.c:1264
 msgid "Create a new memo from the selected message"
 msgstr "Lag et nytt notat fra den valgte meldingen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1272
+#: ../plugins/mail-to-task/mail-to-task.c:1269
 msgid "Create a _Task"
 msgstr "Lag en o_ppgave"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1274
+#: ../plugins/mail-to-task/mail-to-task.c:1271
 msgid "Create a new task from the selected message"
 msgstr "Lag en ny oppgave fra den valgte meldingen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1282
+#: ../plugins/mail-to-task/mail-to-task.c:1279
 msgid "Create a _Meeting"
 msgstr "Lag et _mÃte"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1284
+#: ../plugins/mail-to-task/mail-to-task.c:1281
 msgid "Create a new meeting from the selected message"
 msgstr "Lag et nytt mÃte fra den valgte meldingen"
 
@@ -19505,19 +19686,19 @@ 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."
 
-#: ../plugins/prefer-plain/prefer-plain.c:250
+#: ../plugins/prefer-plain/prefer-plain.c:246
 msgid "Show HTML if present"
 msgstr "Vis HTML hvis det finnes"
 
-#: ../plugins/prefer-plain/prefer-plain.c:251
+#: ../plugins/prefer-plain/prefer-plain.c:247
 msgid "Let Evolution choose the best part to show."
 msgstr "La Evolution velge den beste delen Ã vise."
 
-#: ../plugins/prefer-plain/prefer-plain.c:254
+#: ../plugins/prefer-plain/prefer-plain.c:250
 msgid "Show plain text if present"
 msgstr "Vis ren tekst hvis det finnes"
 
-#: ../plugins/prefer-plain/prefer-plain.c:255
+#: ../plugins/prefer-plain/prefer-plain.c:251
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
@@ -19525,22 +19706,22 @@ msgstr ""
 "Vis tekstdelen hvis den finnes. La Evolution velge hvilken del som skal "
 "vises ellers."
 
-#: ../plugins/prefer-plain/prefer-plain.c:259
+#: ../plugins/prefer-plain/prefer-plain.c:255
 msgid "Only ever show plain text"
 msgstr "Vis kun ren tekst"
 
-#: ../plugins/prefer-plain/prefer-plain.c:260
+#: ../plugins/prefer-plain/prefer-plain.c:256
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
 msgstr ""
 "Alltid vis ren tekst delen og vis de andre delene som vedlegg hvis forespurt."
 
-#: ../plugins/prefer-plain/prefer-plain.c:311
+#: ../plugins/prefer-plain/prefer-plain.c:307
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "Vis _undertrykte HTML-deler som vedlegg"
 
-#: ../plugins/prefer-plain/prefer-plain.c:333
+#: ../plugins/prefer-plain/prefer-plain.c:329
 msgid "HTML _Mode"
 msgstr "HTML-_modus"
 
@@ -19909,30 +20090,31 @@ msgstr "vCard i e-post"
 msgid "Show vCards directly in mail messages."
 msgstr "Vis vCard-vedlegg direkte i e-postmeldinger."
 
-#: ../plugins/vcard-inline/vcard-inline.c:208
-#: ../plugins/vcard-inline/vcard-inline.c:293
+#: ../plugins/vcard-inline/vcard-inline.c:236
+#: ../plugins/vcard-inline/vcard-inline.c:351
 msgid "Show Full vCard"
 msgstr "Vis alle data i vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:211
+#: ../plugins/vcard-inline/vcard-inline.c:243
+#: ../plugins/vcard-inline/vcard-inline.c:354
 msgid "Show Compact vCard"
 msgstr "Vis kompakt vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:272
+#: ../plugins/vcard-inline/vcard-inline.c:372
+msgid "Save To Addressbook"
+msgstr "Lagre i adressebok"
+
+#: ../plugins/vcard-inline/vcard-inline.c:381
 msgid "There is one other contact."
 msgstr "Det finnes en annen kontakt."
 
-#: ../plugins/vcard-inline/vcard-inline.c:281
+#: ../plugins/vcard-inline/vcard-inline.c:387
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "Det finnes %d annen kontakt."
 msgstr[1] "Det finnes %d andre kontakter."
 
-#: ../plugins/vcard-inline/vcard-inline.c:302
-msgid "Save in Address Book"
-msgstr "Lagre i adressebok"
-
 #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
 msgid "WebDAV contacts"
 msgstr "WebDAV-kontakter"
@@ -20463,7 +20645,7 @@ msgid "New"
 msgstr "Ny"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:577
+#: ../shell/e-shell-window-private.c:582
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
@@ -21426,49 +21608,49 @@ msgid "Attached message"
 msgstr "Vedlagt melding"
 
 #. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment.c:1811 ../widgets/misc/e-attachment.c:2349
+#: ../widgets/misc/e-attachment.c:1821 ../widgets/misc/e-attachment.c:2369
 #: ../widgets/misc/e-attachment-store.c:525
 msgid "attachment.dat"
 msgstr "vedlegg.dat"
 
-#: ../widgets/misc/e-attachment.c:1854 ../widgets/misc/e-attachment.c:2651
+#: ../widgets/misc/e-attachment.c:1869 ../widgets/misc/e-attachment.c:2671
 msgid "A load operation is already in progress"
 msgstr "En lasteoperasjon er allerede i gang"
 
-#: ../widgets/misc/e-attachment.c:1862 ../widgets/misc/e-attachment.c:2659
+#: ../widgets/misc/e-attachment.c:1877 ../widgets/misc/e-attachment.c:2679
 msgid "A save operation is already in progress"
 msgstr "En lagreoperasjon er allerede i gang"
 
-#: ../widgets/misc/e-attachment.c:1954
+#: ../widgets/misc/e-attachment.c:1974
 #, c-format
 msgid "Could not load '%s'"
 msgstr "Kunne ikke laste Â%sÂ"
 
-#: ../widgets/misc/e-attachment.c:1957
+#: ../widgets/misc/e-attachment.c:1977
 #, c-format
 msgid "Could not load the attachment"
 msgstr "Kunne ikke laste vedlegget"
 
-#: ../widgets/misc/e-attachment.c:2230
+#: ../widgets/misc/e-attachment.c:2250
 #, c-format
 msgid "Could not open '%s'"
 msgstr "Kunne ikke Ãpne Â%sÂ"
 
-#: ../widgets/misc/e-attachment.c:2233
+#: ../widgets/misc/e-attachment.c:2253
 #, c-format
 msgid "Could not open the attachment"
 msgstr "Kunne ikke Ãpne vedlegget"
 
-#: ../widgets/misc/e-attachment.c:2667
+#: ../widgets/misc/e-attachment.c:2687
 msgid "Attachment contents not loaded"
 msgstr "Vedleggets innhold ble ikke lastet"
 
-#: ../widgets/misc/e-attachment.c:2743
+#: ../widgets/misc/e-attachment.c:2763
 #, c-format
 msgid "Could not save '%s'"
 msgstr "Kunne ikke lagre Â%sÂ"
 
-#: ../widgets/misc/e-attachment.c:2746
+#: ../widgets/misc/e-attachment.c:2766
 #, c-format
 msgid "Could not save the attachment"
 msgstr "Kunne ikke lagre vedlegget"
@@ -21785,48 +21967,48 @@ msgstr "Evolution er frakoblet fordi nettverket ikke er tilgjengelig."
 msgid "Evolution Preferences"
 msgstr "Evolution brukervalg"
 
-#: ../widgets/misc/e-search-bar.c:85
+#: ../widgets/misc/e-search-bar.c:79
 #, c-format
-msgid "Matches: %d"
-msgstr "Treff pÃ: %d"
+msgid "Matches: %u"
+msgstr "Treff: %u"
 
-#: ../widgets/misc/e-search-bar.c:566
+#: ../widgets/misc/e-search-bar.c:527
 msgid "Close the find bar"
 msgstr "Lukk sÃkelinjen"
 
-#: ../widgets/misc/e-search-bar.c:574
+#: ../widgets/misc/e-search-bar.c:535
 msgid "Fin_d:"
 msgstr "Fin_n:"
 
-#: ../widgets/misc/e-search-bar.c:586
+#: ../widgets/misc/e-search-bar.c:547
 msgid "Clear the search"
 msgstr "TÃm sÃket"
 
-#: ../widgets/misc/e-search-bar.c:610
+#: ../widgets/misc/e-search-bar.c:571
 msgid "_Previous"
 msgstr "_Forrige"
 
-#: ../widgets/misc/e-search-bar.c:616
+#: ../widgets/misc/e-search-bar.c:577
 msgid "Find the previous occurrence of the phrase"
 msgstr "Finn forrige oppfÃring av teksten"
 
-#: ../widgets/misc/e-search-bar.c:629
+#: ../widgets/misc/e-search-bar.c:590
 msgid "_Next"
 msgstr "_Neste"
 
-#: ../widgets/misc/e-search-bar.c:635
+#: ../widgets/misc/e-search-bar.c:596
 msgid "Find the next occurrence of the phrase"
 msgstr "Finn neste oppfÃring av teksten"
 
-#: ../widgets/misc/e-search-bar.c:648
+#: ../widgets/misc/e-search-bar.c:609
 msgid "Mat_ch case"
 msgstr "Tre_ff pÃ smÃ/store bokstaver"
 
-#: ../widgets/misc/e-search-bar.c:676
+#: ../widgets/misc/e-search-bar.c:637
 msgid "Reached bottom of page, continued from top"
 msgstr "NÃdde bunnen av siden og fortsatte fra toppen"
 
-#: ../widgets/misc/e-search-bar.c:698
+#: ../widgets/misc/e-search-bar.c:659
 msgid "Reached top of page, continued from bottom"
 msgstr "NÃdde toppen av siden og fortsatte fra bunnen"
 
@@ -22018,49 +22200,53 @@ msgstr "Skriptfilen mÃ vÃre kjÃrbar."
 msgid "Click here to go to URL"
 msgstr "Klikk her for Ã vise URL"
 
-#: ../widgets/misc/e-web-view.c:410
+#: ../widgets/misc/e-web-view.c:275 ../widgets/misc/e-web-view-gtkhtml.c:409
 msgid "_Copy Link Location"
 msgstr "_Kopier adressen til lenke"
 
-#: ../widgets/misc/e-web-view.c:412
+#: ../widgets/misc/e-web-view.c:277 ../widgets/misc/e-web-view-gtkhtml.c:411
 msgid "Copy the link to the clipboard"
 msgstr "Kopier lenken til utklippstavlen"
 
-#: ../widgets/misc/e-web-view.c:420
+#: ../widgets/misc/e-web-view.c:285 ../widgets/misc/e-web-view-gtkhtml.c:419
 msgid "_Open Link in Browser"
 msgstr "_Ãpne lenke i nettleser"
 
-#: ../widgets/misc/e-web-view.c:422
+#: ../widgets/misc/e-web-view.c:287 ../widgets/misc/e-web-view-gtkhtml.c:421
 msgid "Open the link in a web browser"
 msgstr "Ãpne lenken i en nettleser"
 
-#: ../widgets/misc/e-web-view.c:430
+#: ../widgets/misc/e-web-view.c:295 ../widgets/misc/e-web-view-gtkhtml.c:429
 msgid "_Copy Email Address"
 msgstr "_Kopier e-postadresse"
 
-#: ../widgets/misc/e-web-view.c:447
+#: ../widgets/misc/e-web-view.c:312 ../widgets/misc/e-web-view-gtkhtml.c:446
 msgid "_Copy Image"
 msgstr "_Kopier bilde"
 
-#: ../widgets/misc/e-web-view.c:449
+#: ../widgets/misc/e-web-view.c:314 ../widgets/misc/e-web-view-gtkhtml.c:448
 msgid "Copy the image to the clipboard"
 msgstr "Kopier bildet til utklippstavlen"
 
-#: ../widgets/misc/e-web-view.c:469 ../widgets/misc/e-web-view.c:1318
+#: ../widgets/misc/e-web-view.c:334 ../widgets/misc/e-web-view.c:1410
+#: ../widgets/misc/e-web-view-gtkhtml.c:468
+#: ../widgets/misc/e-web-view-gtkhtml.c:1293
 msgid "Select all text and images"
 msgstr "Velg all tekst og alle bilder"
 
-#: ../widgets/misc/e-web-view.c:982 ../widgets/misc/e-web-view.c:984
-#: ../widgets/misc/e-web-view.c:986
+#: ../widgets/misc/e-web-view.c:1067 ../widgets/misc/e-web-view.c:1069
+#: ../widgets/misc/e-web-view.c:1071 ../widgets/misc/e-web-view-gtkhtml.c:957
+#: ../widgets/misc/e-web-view-gtkhtml.c:959
+#: ../widgets/misc/e-web-view-gtkhtml.c:961
 #, c-format
 msgid "Click to call %s"
 msgstr "Klikk for Ã ringe %s"
 
-#: ../widgets/misc/e-web-view.c:988
+#: ../widgets/misc/e-web-view.c:1073 ../widgets/misc/e-web-view-gtkhtml.c:963
 msgid "Click to hide/unhide addresses"
 msgstr "Klikk for Ã skjule/vise adresser"
 
-#: ../widgets/misc/e-web-view.c:990
+#: ../widgets/misc/e-web-view.c:1075 ../widgets/misc/e-web-view-gtkhtml.c:965
 #, c-format
 msgid "Click to open %s"
 msgstr "Klikk for Ã Ãpne %s"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]