[evolution/wip/gsettings] Updated Norwegian bokmÃl translation.

[Rodrigo Moya <rodrigo src gnome org>]

commit eba017f96ba029a5541c70df48a77cb6f28b0992
Author: Kjartan Maraas <kmaraas gnome org>
Date:   Tue Aug 16 17:07:34 2011 +0200

    Updated Norwegian bokmÃl translation.

 po/nb.po | 3329 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 1656 insertions(+), 1673 deletions(-)
---
diff --git a/po/nb.po b/po/nb.po
index f71c2bb..37a8f29 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution 3.1.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-18 13:25+0200\n"
-"PO-Revision-Date: 2011-07-18 13:30+0200\n"
+"POT-Creation-Date: 2011-08-16 16:45+0200\n"
+"PO-Revision-Date: 2011-08-16 17:07+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"
@@ -242,7 +242,7 @@ msgstr ""
 "Dine kontakter for {0} vil ikke vÃre tilgjengelige fÃr Evolution startes pà "
 "nytt."
 
-#: ../addressbook/addressbook.error.xml.h:44 ../mail/em-vfolder-rule.c:604
+#: ../addressbook/addressbook.error.xml.h:44 ../mail/em-vfolder-rule.c:608
 #: ../widgets/table/e-table-config.ui.h:18
 msgid "_Add"
 msgstr "_Legg til"
@@ -264,7 +264,7 @@ msgid "_Use as it is"
 msgstr "Br_uk som den er"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:706
+#: ../addressbook/gui/widgets/eab-contact-display.c:705
 #: ../calendar/gui/e-calendar-view.c:2078
 msgid "Anniversary"
 msgstr "Bryllupsdag"
@@ -275,7 +275,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:2
-#: ../addressbook/gui/widgets/eab-contact-display.c:705
+#: ../addressbook/gui/widgets/eab-contact-display.c:704
 #: ../calendar/gui/e-calendar-view.c:2077 ../capplet/anjal-settings-main.c:79
 #: ../shell/main.c:140
 msgid "Birthday"
@@ -287,7 +287,7 @@ msgid "Blog:"
 msgstr "Blogg:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../calendar/gui/dialogs/event-page.ui.h:4
+#: ../calendar/gui/dialogs/event-page.ui.h:3
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
 msgstr "Kate_gorier â"
@@ -302,18 +302,18 @@ msgid "Contact"
 msgstr "Kontakt"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:646
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:666
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2865
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:653
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:675
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2910
 msgid "Contact Editor"
 msgstr "Kontaktredigering"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/merging/eab-contact-merging.c:358
+#: ../addressbook/gui/merging/eab-contact-merging.c:382
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:626
-#: ../addressbook/gui/widgets/eab-contact-display.c:634
-#: ../addressbook/gui/widgets/eab-contact-display.c:1000
+#: ../addressbook/gui/widgets/eab-contact-display.c:625
+#: ../addressbook/gui/widgets/eab-contact-display.c:633
+#: ../addressbook/gui/widgets/eab-contact-display.c:999
 #: ../smime/lib/e-cert.c:832
 msgid "Email"
 msgstr "E-post"
@@ -329,7 +329,7 @@ msgstr "Fullt _navn â"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:198
 #: ../addressbook/gui/widgets/eab-contact-display.c:78
-#: ../addressbook/gui/widgets/eab-contact-display.c:1302
+#: ../addressbook/gui/widgets/eab-contact-display.c:1301
 #: ../widgets/misc/e-contact-map.c:295
 msgid "Home"
 msgstr "Hjemme"
@@ -364,7 +364,6 @@ msgid "Nic_kname:"
 msgstr "_Kallenavn:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
-#: ../modules/calendar/e-memo-shell-migrate.c:265
 msgid "Notes"
 msgstr "Notater"
 
@@ -399,8 +398,8 @@ msgstr "Nettadresser"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:197
 #: ../addressbook/gui/widgets/eab-contact-display.c:77
-#: ../addressbook/gui/widgets/eab-contact-display.c:686
-#: ../addressbook/gui/widgets/eab-contact-display.c:1299
+#: ../addressbook/gui/widgets/eab-contact-display.c:685
+#: ../addressbook/gui/widgets/eab-contact-display.c:1298
 #: ../widgets/misc/e-contact-map.c:303
 msgid "Work"
 msgstr "Arbeid"
@@ -427,7 +426,7 @@ msgstr "_Blogg:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
 #: ../calendar/gui/dialogs/event-page.c:708
-#: ../calendar/gui/dialogs/event-page.ui.h:11
+#: ../calendar/gui/dialogs/event-page.ui.h:10
 #: ../plugins/itip-formatter/itip-view.c:1923
 msgid "_Calendar:"
 msgstr "_Kalender:"
@@ -507,47 +506,47 @@ msgid "_Zip/Postal Code:"
 msgstr "_Zip/postnummer:"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:648
+#: ../addressbook/gui/widgets/eab-contact-display.c:647
 msgid "AIM"
 msgstr "AIM"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-display.c:651
+#: ../addressbook/gui/widgets/eab-contact-display.c:650
 msgid "Jabber"
 msgstr "Jabber"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:180
-#: ../addressbook/gui/widgets/eab-contact-display.c:653
+#: ../addressbook/gui/widgets/eab-contact-display.c:652
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:181
-#: ../addressbook/gui/widgets/eab-contact-display.c:654
+#: ../addressbook/gui/widgets/eab-contact-display.c:653
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:182
-#: ../addressbook/gui/widgets/eab-contact-display.c:652
+#: ../addressbook/gui/widgets/eab-contact-display.c:651
 msgid "MSN"
 msgstr "MSN"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:183
-#: ../addressbook/gui/widgets/eab-contact-display.c:650
+#: ../addressbook/gui/widgets/eab-contact-display.c:649
 msgid "ICQ"
 msgstr "ICQ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:184
-#: ../addressbook/gui/widgets/eab-contact-display.c:649
+#: ../addressbook/gui/widgets/eab-contact-display.c:648
 msgid "GroupWise"
 msgstr "GroupWise"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:185
-#: ../addressbook/gui/widgets/eab-contact-display.c:655
+#: ../addressbook/gui/widgets/eab-contact-display.c:654
 msgid "Skype"
 msgstr "Skype"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:220
-#: ../addressbook/gui/widgets/eab-gui-util.c:447
+#: ../addressbook/gui/widgets/eab-gui-util.c:451
 msgid "Error adding contact"
 msgstr "Feil under innlegging av kontakt"
 
@@ -559,21 +558,21 @@ msgstr "Feil under endring av kontakt"
 msgid "Error removing contact"
 msgstr "Feil under fjerning av kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:661
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2859
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:669
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2904
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Kontaktredigering - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3301
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3383
 msgid "Please select an image for this contact"
 msgstr "Vennligst velg et bilde for denne kontakten"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3302
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3384
 msgid "_No image"
 msgstr "_Uten bilde"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3615
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3714
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -581,43 +580,43 @@ msgstr ""
 "Kontaktdata er ugyldig:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3619
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3719
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "Â%s har ugyldig format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3626
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3727
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%sÂ%s har ugyldig format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3638
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3649
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3740
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3754
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%sÂ%s er tom"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3664
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3769
 msgid "Invalid contact."
 msgstr "Ugyldig kontakt."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:411
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:431
 msgid "Contact Quick-Add"
 msgstr "Hurtigkontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:414
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:434
 msgid "_Edit Full"
 msgstr "R_ediger alt"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:462
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:482
 msgid "_Full name"
 msgstr "_Fullt navn"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:473
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:493
 msgid "E_mail"
 msgstr "E-_post"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:484
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:504
 msgid "_Select Address Book"
 msgstr "_Velg adressebok"
 
@@ -687,7 +686,7 @@ msgid "_Suffix:"
 msgstr "_Suffiks:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:729
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:740
 msgid "Contact List Editor"
 msgstr "Kontaktlisteredigering"
 
@@ -712,23 +711,23 @@ msgstr "_Velg â"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Skriv en e-post adresse eller dra en kontakt inn i feltet under:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:852
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:863
 msgid "Contact List Members"
 msgstr "Kontaktlistemedlemmer"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1422
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1438
 msgid "Error adding list"
 msgstr "Feil under innlegging av liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1437
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1453
 msgid "Error modifying list"
 msgstr "Feil ved endring av liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1452
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1468
 msgid "Error removing list"
 msgstr "Feil under fjerning av liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1583
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1599
 msgid "_Members"
 msgstr "_Medlemmer"
 
@@ -771,11 +770,11 @@ msgstr ""
 "i denne mappen. Vil du legge den til likevel?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:304
+#: ../addressbook/gui/merging/eab-contact-merging.c:328
 msgid "_Merge"
 msgstr "_Flett"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:287
+#: ../addressbook/gui/merging/eab-contact-merging.c:311
 msgid "Merge Contact"
 msgstr "Flett kontakt"
 
@@ -783,9 +782,9 @@ msgstr "Flett kontakt"
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
 #: ../modules/addressbook/e-book-shell-view-actions.c:1059
-#: ../modules/calendar/e-cal-shell-view-actions.c:1694
-#: ../modules/calendar/e-memo-shell-view-actions.c:775
-#: ../modules/calendar/e-task-shell-view-actions.c:974
+#: ../modules/calendar/e-cal-shell-view-actions.c:1726
+#: ../modules/calendar/e-memo-shell-view-actions.c:789
+#: ../modules/calendar/e-task-shell-view-actions.c:988
 msgid "Any field contains"
 msgstr "Et felt inneholder"
 
@@ -799,22 +798,22 @@ msgstr "E-post begynner med"
 msgid "Name contains"
 msgstr "Navn inneholder"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:155
+#: ../addressbook/gui/widgets/e-addressbook-model.c:158
 msgid "No contacts"
 msgstr "Ingen kontakter"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:159
+#: ../addressbook/gui/widgets/e-addressbook-model.c:162
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d kontakt"
 msgstr[1] "%d kontakter"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:340
+#: ../addressbook/gui/widgets/e-addressbook-model.c:361
 msgid "Error getting book view"
 msgstr "Feil under henting av bokvisning"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:751
+#: ../addressbook/gui/widgets/e-addressbook-model.c:775
 msgid "Search Interrupted"
 msgstr "SÃk avbrutt"
 
@@ -843,34 +842,34 @@ msgstr "Slett valgte kontakter"
 msgid "Select all visible contacts"
 msgstr "Velg alle synlige kontakter"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1317
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1321
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "Er du sikker pà at du vil slette disse kontaktlistene?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1321
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1325
 msgid "Are you sure you want to delete this contact list?"
 msgstr "Er du sikker pà at du vil slette denne kontaktlisten?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1325
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1329
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "Er du sikker pà at du vil slette denne kontaktlisten (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1331
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1335
 msgid "Are you sure you want to delete these contacts?"
 msgstr "Er du sikker pà at du vil slette disse kontaktene?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1335
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1339
 msgid "Are you sure you want to delete this contact?"
 msgstr "Er du sikker pà at du vil slette denne kontakten?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1339
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1343
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "Er du sikker pà at du vil slette denne kontakten (%s)?"
 
 #. Translators: This is shown for > 5 contacts.
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1488
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1498
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -885,16 +884,16 @@ msgstr[1] ""
 "Hvis du Ãpner %d kontakter vil dette Ãpne %d vinduer ogsÃ.\n"
 "Vil du virkelig vise alle disse kontaktene?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1496
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1506
 msgid "_Don't Display"
 msgstr "Ikke _vis"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1497
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1507
 msgid "Display _All Contacts"
 msgstr "Vis _alle kontakter"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:677
+#: ../addressbook/gui/widgets/eab-contact-display.c:676
 msgid "Assistant"
 msgstr "Assistent"
 
@@ -923,7 +922,7 @@ msgid "Car Phone"
 msgstr "Biltelefon"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.ui.h:5
+#: ../calendar/gui/dialogs/event-page.ui.h:4
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -931,7 +930,7 @@ msgid "Categories"
 msgstr "Kategorier"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:672
+#: ../addressbook/gui/widgets/eab-contact-display.c:671
 msgid "Company"
 msgstr "Firma"
 
@@ -980,22 +979,22 @@ msgid "Journal"
 msgstr "Journal"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:676
+#: ../addressbook/gui/widgets/eab-contact-display.c:675
 msgid "Manager"
 msgstr "Leder"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:703
+#: ../addressbook/gui/widgets/eab-contact-display.c:702
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:641
+#: ../addressbook/gui/widgets/eab-contact-display.c:640
 msgid "Nickname"
 msgstr "Kallenavn"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:729
+#: ../addressbook/gui/widgets/eab-contact-display.c:728
 msgid "Note"
 msgstr "Kommentar"
 
@@ -1030,7 +1029,7 @@ msgid "Role"
 msgstr "Rolle"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:707
+#: ../addressbook/gui/widgets/eab-contact-display.c:706
 msgid "Spouse"
 msgstr "Ektefelle"
 
@@ -1173,17 +1172,17 @@ msgid "Copy _Email Address"
 msgstr "Kopier _e-postadresse"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:184
-#: ../widgets/misc/e-web-view.c:430
+#: ../widgets/misc/e-web-view.c:432
 msgid "Copy the email address to the clipboard"
 msgstr "Kopier e-postadresser til utklippstavlen"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:189
-#: ../widgets/misc/e-web-view.c:435
+#: ../widgets/misc/e-web-view.c:437
 msgid "_Send New Message To..."
 msgstr "_Send ny melding til â"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:191
-#: ../widgets/misc/e-web-view.c:437
+#: ../widgets/misc/e-web-view.c:439
 msgid "Send a mail message to this address"
 msgstr "Send en e-postmelding til denne adressen"
 
@@ -1196,34 +1195,34 @@ msgstr "Ãpne kart"
 msgid "List Members:"
 msgstr "Listemedlemmer:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:673
+#: ../addressbook/gui/widgets/eab-contact-display.c:672
 msgid "Department"
 msgstr "Avdeling"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:674
+#: ../addressbook/gui/widgets/eab-contact-display.c:673
 msgid "Profession"
 msgstr "Yrke"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:675
+#: ../addressbook/gui/widgets/eab-contact-display.c:674
 msgid "Position"
 msgstr "Stilling"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:678
+#: ../addressbook/gui/widgets/eab-contact-display.c:677
 msgid "Video Chat"
 msgstr "Videosamtale"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:679
+#: ../addressbook/gui/widgets/eab-contact-display.c:678
 #: ../calendar/gui/dialogs/calendar-setup.c:396
-#: ../modules/calendar/e-cal-shell-view-actions.c:222
-#: ../modules/calendar/e-cal-shell-view-actions.c:251
-#: ../modules/calendar/e-cal-shell-view.c:507
-#: ../modules/online-accounts/e-online-accounts-google.c:292
+#: ../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:511
+#: ../modules/online-accounts/e-online-accounts-google.c:294
 #: ../plugins/publish-calendar/publish-calendar.ui.h:1
 #: ../widgets/misc/e-send-options.c:519
 msgid "Calendar"
 msgstr "Kalender"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:680
+#: ../addressbook/gui/widgets/eab-contact-display.c:679
 #: ../calendar/gui/dialogs/event-editor.c:123
 #: ../calendar/gui/dialogs/event-editor.c:350
 #: ../modules/calendar/e-calendar-preferences.ui.h:17
@@ -1231,25 +1230,25 @@ msgstr "Kalender"
 msgid "Free/Busy"
 msgstr "Ledig/opptatt"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:681
-#: ../addressbook/gui/widgets/eab-contact-display.c:702
+#: ../addressbook/gui/widgets/eab-contact-display.c:680
+#: ../addressbook/gui/widgets/eab-contact-display.c:701
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:682
+#: ../addressbook/gui/widgets/eab-contact-display.c:681
 msgid "Fax"
 msgstr "Faks"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:683
-#: ../addressbook/gui/widgets/eab-contact-display.c:704
+#: ../addressbook/gui/widgets/eab-contact-display.c:682
+#: ../addressbook/gui/widgets/eab-contact-display.c:703
 msgid "Address"
 msgstr "Adresse"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:699
+#: ../addressbook/gui/widgets/eab-contact-display.c:698
 msgid "Home Page"
 msgstr "Hjemmeside"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:700
+#: ../addressbook/gui/widgets/eab-contact-display.c:699
 msgid "Web Log"
 msgstr "Nettdagbok"
 
@@ -1257,37 +1256,37 @@ msgstr "Nettdagbok"
 #. Create the default Person calendar
 #. Create the default Person memo list
 #. Create the default Person task list
-#: ../addressbook/gui/widgets/eab-contact-display.c:709
-#: ../capplet/settings/mail-capplet-shell.c:376
-#: ../modules/addressbook/e-book-shell-backend.c:116
+#: ../addressbook/gui/widgets/eab-contact-display.c:708
+#: ../capplet/settings/mail-capplet-shell.c:380
+#: ../modules/addressbook/e-book-shell-backend.c:120
 #: ../modules/addressbook/e-book-shell-migrate.c:144
-#: ../modules/calendar/e-cal-shell-backend.c:134
+#: ../modules/calendar/e-cal-shell-backend.c:138
 #: ../modules/calendar/e-cal-shell-migrate.c:165
-#: ../modules/calendar/e-memo-shell-backend.c:118
+#: ../modules/calendar/e-memo-shell-backend.c:122
 #: ../modules/calendar/e-memo-shell-migrate.c:120
-#: ../modules/calendar/e-task-shell-backend.c:118
+#: ../modules/calendar/e-task-shell-backend.c:122
 #: ../modules/calendar/e-task-shell-migrate.c:132
 msgid "Personal"
 msgstr "Personlig"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:967
+#: ../addressbook/gui/widgets/eab-contact-display.c:966
 msgid "List Members"
 msgstr "Listemedlemmer"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:985
+#: ../addressbook/gui/widgets/eab-contact-display.c:984
 msgid "Job Title"
 msgstr "Jobbtittel"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1022
+#: ../addressbook/gui/widgets/eab-contact-display.c:1021
 msgid "Home page"
 msgstr "Hjemmeside"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1031
+#: ../addressbook/gui/widgets/eab-contact-display.c:1030
 msgid "Blog"
 msgstr "Weblogg"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1229
-#: ../widgets/misc/e-web-view.c:954
+#: ../addressbook/gui/widgets/eab-contact-display.c:1228
+#: ../widgets/misc/e-web-view.c:980
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klikk for à sende melding til %s"
@@ -1388,19 +1387,19 @@ msgstr "Velg adressebok"
 msgid "list"
 msgstr "liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:525
+#: ../addressbook/gui/widgets/eab-gui-util.c:533
 msgid "Move contact to"
 msgstr "Flytt kontakt til"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:527
+#: ../addressbook/gui/widgets/eab-gui-util.c:535
 msgid "Copy contact to"
 msgstr "Kopier kontakt til"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:530
+#: ../addressbook/gui/widgets/eab-gui-util.c:538
 msgid "Move contacts to"
 msgstr "Flytt kontakter til"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:532
+#: ../addressbook/gui/widgets/eab-gui-util.c:540
 msgid "Copy contacts to"
 msgstr "Kopier kontakter til"
 
@@ -1408,44 +1407,44 @@ msgstr "Kopier kontakter til"
 msgid "Card View"
 msgstr "Kortvisning"
 
-#: ../addressbook/importers/evolution-csv-importer.c:740
+#: ../addressbook/importers/evolution-csv-importer.c:741
 #: ../addressbook/importers/evolution-ldif-importer.c:539
 #: ../addressbook/importers/evolution-vcard-importer.c:282
-#: ../calendar/importers/icalendar-importer.c:380
-#: ../calendar/importers/icalendar-importer.c:847
-#: ../calendar/importers/icalendar-importer.c:877 ../shell/shell.error.xml.h:6
+#: ../calendar/importers/icalendar-importer.c:401
+#: ../calendar/importers/icalendar-importer.c:868
+#: ../calendar/importers/icalendar-importer.c:907 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "Importerer â"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1041
+#: ../addressbook/importers/evolution-csv-importer.c:1040
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV eller Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1042
+#: ../addressbook/importers/evolution-csv-importer.c:1041
 msgid "Outlook CSV and Tab Importer"
 msgstr "Outlook CSV og Tab-import"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1050
+#: ../addressbook/importers/evolution-csv-importer.c:1049
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV eller Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1051
+#: ../addressbook/importers/evolution-csv-importer.c:1050
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Mozilla CSV og Tab-import"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1059
+#: ../addressbook/importers/evolution-csv-importer.c:1058
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV eller Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1060
+#: ../addressbook/importers/evolution-csv-importer.c:1059
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution CSV og Tab-import"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:779
+#: ../addressbook/importers/evolution-ldif-importer.c:777
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP Data Interchange Format (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:780
+#: ../addressbook/importers/evolution-ldif-importer.c:778
 msgid "Evolution LDIF importer"
 msgstr "LDIF-import for Evolution"
 
@@ -1459,7 +1458,7 @@ msgstr "Evolution vCard-import"
 
 #. Uncomment next if it is successful to get total number if pages in list view
 #. * g_object_get (operation, "n-pages", &n_pages, NULL)
-#: ../addressbook/printing/e-contact-print.c:714
+#: ../addressbook/printing/e-contact-print.c:716
 #, c-format
 msgid "Page %d"
 msgstr "Side %d"
@@ -1479,11 +1478,11 @@ msgstr "Kunne ikke hente liste med adressebÃker: %s"
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
 #: ../calendar/gui/dialogs/event-page.c:2893
 #: ../calendar/gui/dialogs/memo-page.c:926
-#: ../calendar/gui/dialogs/task-page.c:1810 ../em-format/em-format.c:2314
-#: ../mail/em-folder-tree.c:678 ../mail/mail-ops.c:657
+#: ../calendar/gui/dialogs/task-page.c:1739 ../em-format/em-format.c:2316
+#: ../mail/em-folder-tree.c:692 ../mail/mail-ops.c:658
 #: ../plugins/caldav/caldav-browse-server.c:209
 #: ../plugins/caldav/caldav-browse-server.c:1406 ../plugins/face/face.c:169
-#: ../smime/gui/certificate-manager.c:313
+#: ../smime/gui/certificate-manager.c:312
 msgid "Unknown error"
 msgstr "Ukjent feil"
 
@@ -1952,7 +1951,7 @@ msgid "_Save Changes"
 msgstr "_Lagre endringer"
 
 #: ../calendar/calendar.error.xml.h:86
-#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:164
+#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:165
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "_Send"
@@ -1977,7 +1976,7 @@ msgstr[1] "timer"
 #. (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:129
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/dialogs/recurrence-page.c:1125
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dag"
@@ -1997,8 +1996,8 @@ msgstr "Lukk _alle"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1672
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1682
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1734
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1744
 #: ../plugins/itip-formatter/itip-view.c:1045
 msgid "Location:"
 msgstr "Sted:"
@@ -2020,7 +2019,7 @@ msgstr "_Utsett"
 #. * "Purge events older than <<spin-button>> days"
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:428
-#: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:340
+#: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:350
 #: ../plugins/google-account-setup/google-contacts-source.c:379
 #: ../plugins/publish-calendar/publish-calendar.ui.h:30
 msgid "days"
@@ -2047,33 +2046,33 @@ msgstr "sted for avtalen"
 msgid "minutes"
 msgstr "minutter"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1526
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1653
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1586
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1715
 msgid "No summary available."
 msgstr "Sammendrag er ikke tilgjengelig."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1535
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1537
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1595
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1597
 msgid "No description available."
 msgstr "Ingen beskrivelse tilgjengelig."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1545
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
 msgid "No location information available."
 msgstr "Stedsinformasjon er ikke tilgjengelig."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1589
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1649
 #, c-format
-msgid "You have %d alarm"
-msgid_plural "You have %d alarms"
-msgstr[0] "Du har %d alarm"
-msgstr[1] "Du har %d alarmer"
+msgid "You have %d reminder"
+msgid_plural "You have %d reminders"
+msgstr[0] "Du har %d pÃminnelse"
+msgstr[1] "Du har %d pÃminnelser"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1780
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1813
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1848
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1882
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1784
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1852
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -2085,7 +2084,7 @@ msgstr ""
 "er konfigurert til à sende e-post. Evolution vil vise\n"
 "en vanlig dialog med pÃminnelsen i stedet."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1819
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1888
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2101,7 +2100,7 @@ msgstr ""
 "\n"
 "Er du sikker pà at du vil kjÃre dette programmet?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1834
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1903
 msgid "Do not ask me about this program again."
 msgstr "Ikke spÃr meg om dette programmet igjen."
 
@@ -2180,7 +2179,7 @@ msgid "Classification"
 msgstr "Klassifisering"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:240
-#: ../calendar/gui/e-cal-model.c:769 ../calendar/gui/e-task-table.c:492
+#: ../calendar/gui/e-cal-model.c:774 ../calendar/gui/e-task-table.c:495
 #: ../calendar/gui/memotypes.xml.h:6 ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
 msgstr "Konfidensiell"
@@ -2212,7 +2211,7 @@ msgstr "Eksisterer"
 #: ../calendar/gui/e-cal-list-view.etspec.h:6 ../mail/message-list.etspec.h:9
 #: ../plugins/publish-calendar/publish-calendar.c:835
 #: ../plugins/publish-calendar/publish-calendar.ui.h:8
-#: ../plugins/save-calendar/csv-format.c:384
+#: ../plugins/save-calendar/csv-format.c:386
 msgid "Location"
 msgstr "Lokasjon"
 
@@ -2222,14 +2221,14 @@ msgid "Organizer"
 msgstr "Organisator"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:239
-#: ../calendar/gui/e-cal-model.c:767 ../calendar/gui/e-task-table.c:491
+#: ../calendar/gui/e-cal-model.c:772 ../calendar/gui/e-task-table.c:494
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Privat"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:238
-#: ../calendar/gui/e-cal-model.c:758 ../calendar/gui/e-cal-model.c:765
-#: ../calendar/gui/e-task-table.c:490 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/e-cal-model.c:763 ../calendar/gui/e-cal-model.c:770
+#: ../calendar/gui/e-task-table.c:493 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Offentlig"
 
@@ -2245,7 +2244,7 @@ msgstr "Gjeninntreffelse"
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:22
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "Summary"
 msgstr "Sammendrag"
 
@@ -2275,8 +2274,8 @@ msgid "is not"
 msgstr "er ikke"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:626
-msgid "Edit Alarm"
-msgstr "Rediger varsel"
+msgid "Edit Reminder"
+msgstr "Rediger pÃminnelse"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:817
 #: ../calendar/gui/e-alarm-list.c:438
@@ -2299,30 +2298,30 @@ msgid "Send an email"
 msgstr "Send en melding"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:1
-msgid "Add Alarm"
-msgstr "Legg til varsel"
+msgid "Add Reminder"
+msgstr "Legg til pÃminnelse"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
-#: ../calendar/gui/dialogs/event-editor.c:360
-msgid "Alarm"
-msgstr "Alarm"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
 msgid "Custom _message"
 msgstr "Tilpasset _beskjed"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
-msgid "Custom alarm sound"
-msgstr "Egendefinert lyd for varsel"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
+msgid "Custom reminder sound"
+msgstr "Egendefinert lyd for pÃminnelse"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
 msgid "Mes_sage:"
 msgstr "Be_skjed:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:75
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5 ../mail/mail-config.ui.h:75
 msgid "Options"
 msgstr "Alternativer"
 
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6
+#: ../calendar/gui/dialogs/event-editor.c:360
+msgid "Reminder"
+msgstr "PÃminnelse"
+
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
 msgid "Repeat"
 msgstr "Gjenta"
@@ -2344,8 +2343,8 @@ msgid "_Program:"
 msgstr "_Program:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
-msgid "_Repeat the alarm"
-msgstr "_Gjenta alarmen"
+msgid "_Repeat the reminder"
+msgstr "_Gjenta pÃminnelse"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:13
 msgid "_Sound:"
@@ -2367,7 +2366,7 @@ msgstr "dag(er)"
 msgid "end of appointment"
 msgstr "slutt pà avtalen"
 
-#. This is part of the sentence: 'Repeat the alarm %d extra times every %d minutes'. Where %d are numbers.
+#. This is part of the sentence: 'Repeat the reminder %d extra times every %d minutes'. Where %d are numbers.
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
 msgid "extra times every"
 msgstr "ekstra ganger hver"
@@ -2393,10 +2392,10 @@ msgid "A_dd"
 msgstr "Le_gg til"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
-#: ../calendar/gui/dialogs/event-page.ui.h:1
-#: ../modules/calendar/e-calendar-preferences.ui.h:9
-msgid "Alarms"
-msgstr "Varsel"
+#: ../calendar/gui/dialogs/event-page.ui.h:8
+#: ../modules/calendar/e-calendar-preferences.ui.h:24
+msgid "Reminders"
+msgstr "PÃminnelser"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:164
 msgid "Type:"
@@ -2435,15 +2434,16 @@ msgstr "Fa_rge:"
 #: ../calendar/gui/dialogs/calendar-setup.c:417
 #: ../mail/em-folder-properties.c:233 ../mail/mail-config.ui.h:52
 #: ../modules/addressbook/addressbook-config.c:1052
+#: ../modules/addressbook/autocompletion-config.c:218
 #: ../modules/calendar/e-calendar-preferences.ui.h:19
-#: ../plugins/itip-formatter/itip-formatter.c:2960
+#: ../plugins/itip-formatter/itip-formatter.c:3001
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
 #: ../smime/gui/smime-ui.ui.h:21
 msgid "General"
 msgstr "Generelt"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:407
-#: ../modules/calendar/e-calendar-preferences.ui.h:40
+#: ../modules/calendar/e-calendar-preferences.ui.h:41
 msgid "Task List"
 msgstr "Oppgaveliste"
 
@@ -2451,27 +2451,27 @@ msgstr "Oppgaveliste"
 msgid "Memo List"
 msgstr "Notatliste"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:503
+#: ../calendar/gui/dialogs/calendar-setup.c:506
 msgid "Calendar Properties"
 msgstr "Kalenderegenskaper"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:503
+#: ../calendar/gui/dialogs/calendar-setup.c:506
 msgid "New Calendar"
 msgstr "Ny kalender"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:559
+#: ../calendar/gui/dialogs/calendar-setup.c:565
 msgid "Task List Properties"
 msgstr "Egenskaper for oppgaveliste"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:559
+#: ../calendar/gui/dialogs/calendar-setup.c:565
 msgid "New Task List"
 msgstr "Ny oppgaveliste"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:615
+#: ../calendar/gui/dialogs/calendar-setup.c:624
 msgid "Memo List Properties"
 msgstr "Egenskaper for notatliste"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:615
+#: ../calendar/gui/dialogs/calendar-setup.c:624
 msgid "New Memo List"
 msgstr "Ny notatliste"
 
@@ -2526,255 +2526,257 @@ msgstr "%s  Du har ikke gjort endringer. Oppdater redigering?"
 msgid "Validation error: %s"
 msgstr "Valideringsfeil: %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:267
+#: ../calendar/gui/dialogs/comp-editor.c:273
 msgid "Could not save attachments"
 msgstr "Kunne ikke lagre vedlegg"
 
-#: ../calendar/gui/dialogs/comp-editor.c:589
+#: ../calendar/gui/dialogs/comp-editor.c:611
 msgid "Could not update object"
 msgstr "Kunne ikke oppdatere objekt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:715
+#: ../calendar/gui/dialogs/comp-editor.c:739
 msgid "Edit Appointment"
 msgstr "Rediger avtale"
 
-#: ../calendar/gui/dialogs/comp-editor.c:722
+#: ../calendar/gui/dialogs/comp-editor.c:746
 #, c-format
 msgid "Meeting - %s"
 msgstr "MÃte- %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:724
+#: ../calendar/gui/dialogs/comp-editor.c:748
 #, c-format
 msgid "Appointment - %s"
 msgstr "Avtale - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:730
+#: ../calendar/gui/dialogs/comp-editor.c:754
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tildelt oppgave - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:732
+#: ../calendar/gui/dialogs/comp-editor.c:756
 #, c-format
 msgid "Task - %s"
 msgstr "Oppgave - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:737
+#: ../calendar/gui/dialogs/comp-editor.c:761
 #, c-format
 msgid "Memo - %s"
 msgstr "Notat - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:753
+#: ../calendar/gui/dialogs/comp-editor.c:777
 msgid "No Summary"
 msgstr "Ingen sammendrag"
 
-#: ../calendar/gui/dialogs/comp-editor.c:874
+#: ../calendar/gui/dialogs/comp-editor.c:898
 msgid "Keep original item?"
 msgstr "Behold opprinnelig oppfÃring?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1071
-msgid "Click here to close the current window"
-msgstr "Klikk her for à lukke dette vinduet"
+#: ../calendar/gui/dialogs/comp-editor.c:1099
+msgid "Close the current window"
+msgstr "Lukk aktiv vindu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1078 ../mail/e-mail-browser.c:141
-#: ../shell/e-shell-window-actions.c:1474
+#: ../calendar/gui/dialogs/comp-editor.c:1106 ../mail/e-mail-browser.c:141
+#: ../shell/e-shell-window-actions.c:1455
 #: ../widgets/misc/e-focus-tracker.c:117 ../widgets/misc/e-focus-tracker.c:555
-#: ../widgets/misc/e-web-view.c:457 ../widgets/misc/e-web-view.c:1280
+#: ../widgets/misc/e-web-view.c:459 ../widgets/misc/e-web-view.c:1306
 msgid "Copy the selection"
 msgstr "Kopier utvalget"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1085 ../mail/e-mail-browser.c:148
-#: ../shell/e-shell-window-actions.c:1481
+#: ../calendar/gui/dialogs/comp-editor.c:1113 ../mail/e-mail-browser.c:148
+#: ../shell/e-shell-window-actions.c:1462
 #: ../widgets/misc/e-focus-tracker.c:110 ../widgets/misc/e-focus-tracker.c:550
-#: ../widgets/misc/e-web-view.c:1274
+#: ../widgets/misc/e-web-view.c:1300
 msgid "Cut the selection"
 msgstr "Klipp ut utvalget"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1092
-#: ../shell/e-shell-window-actions.c:1488
+#: ../calendar/gui/dialogs/comp-editor.c:1120
+#: ../shell/e-shell-window-actions.c:1469
 #: ../widgets/misc/e-focus-tracker.c:131 ../widgets/misc/e-focus-tracker.c:565
 msgid "Delete the selection"
 msgstr "Slett utvalget"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1099
-msgid "Click here to view help available"
-msgstr "klikk her for à vise tilgjengelig hjelp"
+#: ../calendar/gui/dialogs/comp-editor.c:1127
+msgid "View help"
+msgstr "Vis hjelp"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1106 ../mail/e-mail-browser.c:155
-#: ../shell/e-shell-window-actions.c:1523
+#: ../calendar/gui/dialogs/comp-editor.c:1134 ../mail/e-mail-browser.c:155
+#: ../shell/e-shell-window-actions.c:1497
 #: ../widgets/misc/e-focus-tracker.c:124 ../widgets/misc/e-focus-tracker.c:560
-#: ../widgets/misc/e-web-view.c:1286
+#: ../widgets/misc/e-web-view.c:1312
 msgid "Paste the clipboard"
 msgstr "Lim inn fra utklippstavlen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1127
-msgid "Click here to save the current window"
-msgstr "Klikk her for à lagre dette vinduet"
+#: ../calendar/gui/dialogs/comp-editor.c:1155
+msgid "Save current changes"
+msgstr "Lagre endringer"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1134 ../mail/e-mail-browser.c:162
-#: ../shell/e-shell-window-actions.c:1600
+#: ../calendar/gui/dialogs/comp-editor.c:1162 ../mail/e-mail-browser.c:162
+#: ../shell/e-shell-window-actions.c:1574
 #: ../widgets/misc/e-focus-tracker.c:138 ../widgets/misc/e-focus-tracker.c:570
 msgid "Select all text"
 msgstr "Velg all tekst"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1141
+#: ../calendar/gui/dialogs/comp-editor.c:1169
 msgid "_Classification"
 msgstr "K_lassifisering"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1148
+#: ../calendar/gui/dialogs/comp-editor.c:1176
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
 #: ../mail/e-mail-browser.c:176
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1628
+#: ../shell/e-shell-window-actions.c:1602
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "R_ediger"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1155 ../mail/e-mail-browser.c:169
-#: ../shell/e-shell-window-actions.c:1635
+#: ../calendar/gui/dialogs/comp-editor.c:1183 ../mail/e-mail-browser.c:169
+#: ../shell/e-shell-window-actions.c:1609
 #: ../widgets/misc/e-signature-editor.c:221
 msgid "_File"
 msgstr "_Fil"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1162
-#: ../shell/e-shell-window-actions.c:1642
+#: ../calendar/gui/dialogs/comp-editor.c:1190
+#: ../shell/e-shell-window-actions.c:1616
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1169
+#: ../calendar/gui/dialogs/comp-editor.c:1197
 msgid "_Insert"
 msgstr "Sett _inn"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1176
+#: ../calendar/gui/dialogs/comp-editor.c:1204
 #: ../composer/e-composer-actions.c:340
 msgid "_Options"
 msgstr "_Alternativer"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1183 ../mail/e-mail-browser.c:183
-#: ../shell/e-shell-window-actions.c:1677 ../smime/gui/smime-ui.ui.h:46
+#: ../calendar/gui/dialogs/comp-editor.c:1211 ../mail/e-mail-browser.c:183
+#: ../shell/e-shell-window-actions.c:1651 ../smime/gui/smime-ui.ui.h:46
 msgid "_View"
 msgstr "_Vis"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1193
+#: ../calendar/gui/dialogs/comp-editor.c:1221
 #: ../composer/e-composer-actions.c:289
 msgid "_Attachment..."
 msgstr "_Vedlegg â"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1195
-msgid "Click here to attach a file"
-msgstr "klikk her for à legge ved en fil"
+#: ../calendar/gui/dialogs/comp-editor.c:1223
+#: ../composer/e-composer-actions.c:291
+#: ../widgets/misc/e-attachment-view.c:439
+msgid "Attach a file"
+msgstr "Legg ved en fil"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1203
+#: ../calendar/gui/dialogs/comp-editor.c:1231
 msgid "_Categories"
 msgstr "_Kategorier"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1205
+#: ../calendar/gui/dialogs/comp-editor.c:1233
 msgid "Toggles whether to display categories"
 msgstr "SlÃr av/pà visning av kategorier"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1211
+#: ../calendar/gui/dialogs/comp-editor.c:1239
 msgid "Time _Zone"
 msgstr "Tids_sone"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1213
+#: ../calendar/gui/dialogs/comp-editor.c:1241
 msgid "Toggles whether the time zone is displayed"
 msgstr "SlÃr av/pà visning av tidssone"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1222
+#: ../calendar/gui/dialogs/comp-editor.c:1250
 msgid "Pu_blic"
 msgstr "O_ffentlig"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1224
+#: ../calendar/gui/dialogs/comp-editor.c:1252
 msgid "Classify as public"
 msgstr "Klassifiser som offentlig"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1229
+#: ../calendar/gui/dialogs/comp-editor.c:1257
 msgid "_Private"
 msgstr "_Privat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1231
+#: ../calendar/gui/dialogs/comp-editor.c:1259
 msgid "Classify as private"
 msgstr "Klassifiser som privat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1236
+#: ../calendar/gui/dialogs/comp-editor.c:1264
 msgid "_Confidential"
 msgstr "_Konfidensiell"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1238
+#: ../calendar/gui/dialogs/comp-editor.c:1266
 msgid "Classify as confidential"
 msgstr "Klassifiser som konfidensiell"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1246
+#: ../calendar/gui/dialogs/comp-editor.c:1274
 msgid "R_ole Field"
 msgstr "R_olle-felt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1248
+#: ../calendar/gui/dialogs/comp-editor.c:1276
 msgid "Toggles whether the Role field is displayed"
 msgstr "SlÃr av/pà visning av rolle-feltet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1254
+#: ../calendar/gui/dialogs/comp-editor.c:1282
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1256
+#: ../calendar/gui/dialogs/comp-editor.c:1284
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "SlÃr av/pà visning av RSVP-feltet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1262
+#: ../calendar/gui/dialogs/comp-editor.c:1290
 msgid "_Status Field"
 msgstr "_Status-felt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1264
+#: ../calendar/gui/dialogs/comp-editor.c:1292
 msgid "Toggles whether the Status field is displayed"
 msgstr "SlÃr av/pà visning av status-feltet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1270
+#: ../calendar/gui/dialogs/comp-editor.c:1298
 msgid "_Type Field"
 msgstr "_Type felt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1272
+#: ../calendar/gui/dialogs/comp-editor.c:1300
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "SlÃr av/pà visning av deltakertype-feltet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1296
+#: ../calendar/gui/dialogs/comp-editor.c:1324
 #: ../composer/e-composer-private.c:77
 msgid "Recent _Documents"
 msgstr "Siste _dokumenter"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2018
+#: ../calendar/gui/dialogs/comp-editor.c:2053
 #: ../composer/e-composer-actions.c:508
 msgid "Attach"
 msgstr "Legg ved"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2354
-#: ../calendar/gui/dialogs/comp-editor.c:2517
-#: ../calendar/gui/dialogs/comp-editor.c:3495
+#: ../calendar/gui/dialogs/comp-editor.c:2389
+#: ../calendar/gui/dialogs/comp-editor.c:2552
+#: ../calendar/gui/dialogs/comp-editor.c:3533
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Endringer som gjÃres i denne oppfÃringen kan bli forkastet hvis det kommer "
 "enoppdatering"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3459
+#: ../calendar/gui/dialogs/comp-editor.c:3497
 #: ../plugins/prefer-plain/prefer-plain.c:64
 msgid "attachment"
 msgstr "vedlegg"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3527
+#: ../calendar/gui/dialogs/comp-editor.c:3565
 msgid "Unable to use current version!"
 msgstr "Kan ikke bruke denne versjonen!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:108
+#: ../calendar/gui/dialogs/copy-source-dialog.c:111
 msgid "Could not open destination"
 msgstr "Kunne ikke Ãpne destinasjon"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:123
+#: ../calendar/gui/dialogs/copy-source-dialog.c:127
 msgid "Destination is read only"
 msgstr "Destinasjonen er skrivebeskyttet"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:157
+#: ../calendar/gui/dialogs/copy-source-dialog.c:161
 msgid "Cannot create object"
 msgstr "Kan ikke lage objekt"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:183
+#: ../calendar/gui/dialogs/copy-source-dialog.c:190
 msgid "Could not open source"
 msgstr "Kunne ikke Ãpne kilde"
 
@@ -2863,12 +2865,12 @@ msgid "Enter Delegate"
 msgstr "Skriv inn delegat"
 
 #: ../calendar/gui/dialogs/event-editor.c:212
-msgid "_Alarms"
-msgstr "V_arsel"
+msgid "_Reminders"
+msgstr "_PÃminnelser"
 
 #: ../calendar/gui/dialogs/event-editor.c:214
-msgid "Click here to set or unset alarms for this event"
-msgstr "Klikk her for à sette eller fjerne varsling for denne hendelsen"
+msgid "Set or unset reminders for this event"
+msgstr "Sett eller fjern pÃminnelser for denne hendelsen"
 
 #: ../calendar/gui/dialogs/event-editor.c:222
 msgid "Show Time as _Busy"
@@ -2912,12 +2914,12 @@ msgstr "_Ledig/opptatt"
 msgid "Query free / busy information for the attendees"
 msgstr "Slà opp ledig/opptatt informasjon for deltakerene"
 
-#: ../calendar/gui/dialogs/event-editor.c:314 ../calendar/gui/print.c:3185
+#: ../calendar/gui/dialogs/event-editor.c:314 ../calendar/gui/print.c:3184
 msgid "Appointment"
 msgstr "Avtale"
 
 #: ../calendar/gui/dialogs/event-editor.c:384
-#: ../calendar/gui/dialogs/event-page.ui.h:3
+#: ../calendar/gui/dialogs/event-page.ui.h:2
 #: ../calendar/gui/e-meeting-list-view.c:160
 msgid "Attendees"
 msgstr "Deltakere"
@@ -2940,11 +2942,11 @@ msgstr "Hendelsen kan ikke redigeres i sin helhet fordi du ikke er organisator"
 
 #: ../calendar/gui/dialogs/event-page.c:649
 #: ../calendar/gui/dialogs/event-page.c:3021
-msgid "This event has alarms"
-msgstr "Denne hendelsen har varsel"
+msgid "This event has reminders"
+msgstr "Denne hendelsen har pÃminnelser"
 
 #: ../calendar/gui/dialogs/event-page.c:716
-#: ../calendar/gui/dialogs/event-page.ui.h:8
+#: ../calendar/gui/dialogs/event-page.ui.h:7
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
 msgid "Or_ganizer:"
 msgstr "Or_ganisator:"
@@ -2959,7 +2961,7 @@ msgstr "Hendelse uten sluttdato"
 
 #: ../calendar/gui/dialogs/event-page.c:1430
 #: ../calendar/gui/dialogs/memo-page.c:695
-#: ../calendar/gui/dialogs/task-page.c:843
+#: ../calendar/gui/dialogs/task-page.c:811
 msgid "Start date is wrong"
 msgstr "Startdato er feil"
 
@@ -2977,12 +2979,12 @@ msgstr "Tid for slutt er feil"
 
 #: ../calendar/gui/dialogs/event-page.c:1635
 #: ../calendar/gui/dialogs/memo-page.c:736
-#: ../calendar/gui/dialogs/task-page.c:905
+#: ../calendar/gui/dialogs/task-page.c:865
 msgid "An organizer is required."
 msgstr "En organisator kreves."
 
 #: ../calendar/gui/dialogs/event-page.c:1669
-#: ../calendar/gui/dialogs/task-page.c:939
+#: ../calendar/gui/dialogs/task-page.c:899
 msgid "At least one attendee is required."
 msgstr "Minst en deltaker kreves."
 
@@ -3007,7 +3009,7 @@ msgstr "Kan ikke Ãpne kalenderen Â%sÂ: %s"
 #. on behalf of some other user
 #: ../calendar/gui/dialogs/event-page.c:2939
 #: ../calendar/gui/dialogs/memo-page.c:967
-#: ../calendar/gui/dialogs/task-page.c:1855
+#: ../calendar/gui/dialogs/task-page.c:1784
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Du opptrer pà vegne av %s"
@@ -3037,47 +3039,47 @@ msgstr[1] "%d minutter fÃr avtalen"
 msgid "Customize"
 msgstr "Tilpass"
 
-#. Translators: "None" for "No alarm set"
+#. Translators: "None" for "No reminder set"
 #: ../calendar/gui/dialogs/event-page.c:3287
-msgctxt "cal-alarms"
+msgctxt "cal-reminders"
 msgid "None"
 msgstr "Ingen"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:2
+#: ../calendar/gui/dialogs/event-page.ui.h:1
 #: ../calendar/gui/dialogs/task-page.ui.h:1
 #: ../calendar/gui/e-meeting-time-sel.c:563
 msgid "Atte_ndees..."
 msgstr "De_ltakere â"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:6
-msgid "Custom Alarm:"
-msgstr "Egendefinert varsel:"
+#: ../calendar/gui/dialogs/event-page.ui.h:5
+msgid "Custom Reminder:"
+msgstr "Egendefinert pÃminnelse:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:7
+#: ../calendar/gui/dialogs/event-page.ui.h:6
 msgid "Event Description"
 msgstr "Beskrivelse av hendelse"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:9
-#: ../modules/calendar/e-calendar-preferences.ui.h:44
+#: ../modules/calendar/e-calendar-preferences.ui.h:45
 msgid "Time _zone:"
 msgstr "Tids_sone:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:10
-msgid "_Alarm"
-msgstr "_Varsel"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:12
+#: ../calendar/gui/dialogs/event-page.ui.h:11
 #: ../calendar/gui/dialogs/memo-page.ui.h:6
 #: ../calendar/gui/dialogs/task-page.ui.h:8
 #: ../widgets/misc/e-attachment-dialog.c:347
 msgid "_Description:"
 msgstr "_Beskrivelse:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:13
+#: ../calendar/gui/dialogs/event-page.ui.h:12
 #: ../plugins/calendar-weather/calendar-weather.c:366
 msgid "_Location:"
 msgstr "_Sted:"
 
+#: ../calendar/gui/dialogs/event-page.ui.h:13
+msgid "_Reminder"
+msgstr "_PÃminnelse"
+
 #: ../calendar/gui/dialogs/event-page.ui.h:14
 msgid "_Summary:"
 msgstr "_Sammendrag:"
@@ -3086,19 +3088,19 @@ msgstr "_Sammendrag:"
 msgid "_Time:"
 msgstr "_Tid:"
 
-#. TRANSLATORS: Predefined alarm's description
+#. TRANSLATORS: Predefined reminder's description
 #: ../calendar/gui/dialogs/event-page.ui.h:17
 msgctxt "eventpage"
 msgid "1 day before appointment"
 msgstr "1 dag fÃr avtalen"
 
-#. TRANSLATORS: Predefined alarm's description
+#. TRANSLATORS: Predefined reminder's description
 #: ../calendar/gui/dialogs/event-page.ui.h:19
 msgctxt "eventpage"
 msgid "1 hour before appointment"
 msgstr "1 time fÃr avtalen"
 
-#. TRANSLATORS: Predefined alarm's description
+#. TRANSLATORS: Predefined reminder's description
 #: ../calendar/gui/dialogs/event-page.ui.h:21
 msgctxt "eventpage"
 msgid "15 minutes before appointment"
@@ -3165,7 +3167,7 @@ msgid "Select Date"
 msgstr "Velg dato"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:13
-#: ../modules/calendar/e-cal-shell-view-actions.c:1330
+#: ../modules/calendar/e-cal-shell-view-actions.c:1362
 msgid "Select _Today"
 msgstr "Velg i _dag"
 
@@ -3173,7 +3175,7 @@ msgstr "Velg i _dag"
 msgid "September"
 msgstr "September"
 
-#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3189
+#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3188
 msgid "Memo"
 msgstr "Notat"
 
@@ -3199,8 +3201,8 @@ msgid "Unable to open memos in '%s': %s"
 msgstr "Kan ikke Ãpne notater i Â%sÂ: %s"
 
 #: ../calendar/gui/dialogs/memo-page.c:1099 ../em-format/em-format-quote.c:319
-#: ../em-format/em-format.c:1056 ../mail/em-format-html.c:2563
-#: ../mail/em-format-html.c:2628 ../mail/em-format-html.c:2652
+#: ../em-format/em-format.c:1056 ../mail/em-format-html.c:2573
+#: ../mail/em-format-html.c:2638 ../mail/em-format-html.c:2662
 #: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:74
 msgid "To"
 msgstr "Til"
@@ -3222,8 +3224,8 @@ msgstr "T_il:"
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
 #: ../calendar/gui/dialogs/task-page.c:331
 #: ../calendar/gui/dialogs/task-page.ui.h:9
-msgid "_Group:"
-msgstr "_Gruppe:"
+msgid "_List:"
+msgstr "_Liste:"
 
 #: ../calendar/gui/dialogs/recur-comp.c:54
 #, c-format
@@ -3261,22 +3263,22 @@ msgstr "Denne og fremtidige instanser"
 msgid "All Instances"
 msgstr "Alle instanser"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:563
+#: ../calendar/gui/dialogs/recurrence-page.c:573
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Denne avtalen har gjeninntreffelser som ikke kan redigeres av Evolution."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:894
+#: ../calendar/gui/dialogs/recurrence-page.c:904
 msgid "Recurrence date is invalid"
 msgstr "Gjenintreffingsdato er ugyldig"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:934
+#: ../calendar/gui/dialogs/recurrence-page.c:944
 msgid "End time of the recurrence was before event's start"
 msgstr "Tid for slutt av gjentakelse var fÃr hendelsens start"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:964
+#: ../calendar/gui/dialogs/recurrence-page.c:974
 msgid "on"
 msgstr "pÃ"
 
@@ -3284,7 +3286,7 @@ msgstr "pÃ"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1022
+#: ../calendar/gui/dialogs/recurrence-page.c:1032
 msgid "first"
 msgstr "fÃrste"
 
@@ -3293,7 +3295,7 @@ msgstr "fÃrste"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1028
+#: ../calendar/gui/dialogs/recurrence-page.c:1038
 msgid "second"
 msgstr "sekund"
 
@@ -3301,7 +3303,7 @@ msgstr "sekund"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1033
+#: ../calendar/gui/dialogs/recurrence-page.c:1043
 msgid "third"
 msgstr "tredje"
 
@@ -3309,7 +3311,7 @@ msgstr "tredje"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1038
+#: ../calendar/gui/dialogs/recurrence-page.c:1048
 msgid "fourth"
 msgstr "fjerde"
 
@@ -3317,7 +3319,7 @@ msgstr "fjerde"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1043
+#: ../calendar/gui/dialogs/recurrence-page.c:1053
 msgid "fifth"
 msgstr "femte"
 
@@ -3325,13 +3327,13 @@ msgstr "femte"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1048
+#: ../calendar/gui/dialogs/recurrence-page.c:1058
 msgid "last"
 msgstr "siste"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1072
+#: ../calendar/gui/dialogs/recurrence-page.c:1082
 msgid "Other Date"
 msgstr "Annen dato"
 
@@ -3339,7 +3341,7 @@ msgstr "Annen dato"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1078
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
 msgid "1st to 10th"
 msgstr "FÃrste til tiende"
 
@@ -3347,7 +3349,7 @@ msgstr "FÃrste til tiende"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../calendar/gui/dialogs/recurrence-page.c:1094
 msgid "11th to 20th"
 msgstr "ellevte til tjuende"
 
@@ -3355,73 +3357,73 @@ msgstr "ellevte til tjuende"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1090
+#: ../calendar/gui/dialogs/recurrence-page.c:1100
 msgid "21st to 31st"
 msgstr "tjuefÃrste til trettifÃrste"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/dialogs/recurrence-page.c:1126
 #: ../modules/calendar/e-calendar-preferences.ui.h:22
 msgid "Monday"
 msgstr "Mandag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
-#: ../modules/calendar/e-calendar-preferences.ui.h:46
+#: ../calendar/gui/dialogs/recurrence-page.c:1127
+#: ../modules/calendar/e-calendar-preferences.ui.h:47
 msgid "Tuesday"
 msgstr "Tirsdag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
-#: ../modules/calendar/e-calendar-preferences.ui.h:48
+#: ../calendar/gui/dialogs/recurrence-page.c:1128
+#: ../modules/calendar/e-calendar-preferences.ui.h:49
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1119
-#: ../modules/calendar/e-calendar-preferences.ui.h:42
+#: ../calendar/gui/dialogs/recurrence-page.c:1129
+#: ../modules/calendar/e-calendar-preferences.ui.h:43
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1120
+#: ../calendar/gui/dialogs/recurrence-page.c:1130
 #: ../modules/calendar/e-calendar-preferences.ui.h:18
 msgid "Friday"
 msgstr "Fredag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1121
-#: ../modules/calendar/e-calendar-preferences.ui.h:26
+#: ../calendar/gui/dialogs/recurrence-page.c:1131
+#: ../modules/calendar/e-calendar-preferences.ui.h:27
 msgid "Saturday"
 msgstr "LÃrdag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1122
-#: ../modules/calendar/e-calendar-preferences.ui.h:36
+#: ../calendar/gui/dialogs/recurrence-page.c:1132
+#: ../modules/calendar/e-calendar-preferences.ui.h:37
 msgid "Sunday"
 msgstr "SÃndag"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1244
+#: ../calendar/gui/dialogs/recurrence-page.c:1254
 msgid "on the"
 msgstr "den"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1418
+#: ../calendar/gui/dialogs/recurrence-page.c:1428
 msgid "occurrences"
 msgstr "gjentakelser"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2128
+#: ../calendar/gui/dialogs/recurrence-page.c:2140
 msgid "Add exception"
 msgstr "Legg til unntak"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2169
+#: ../calendar/gui/dialogs/recurrence-page.c:2181
 msgid "Could not get a selection to modify."
 msgstr "Fant ikke et utvalg à endre."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2175
+#: ../calendar/gui/dialogs/recurrence-page.c:2187
 msgid "Modify exception"
 msgstr "Endre unntak"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2219
+#: ../calendar/gui/dialogs/recurrence-page.c:2231
 msgid "Could not get a selection to delete."
 msgstr "Fant ikke et utvalg à slette."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2353
+#: ../calendar/gui/dialogs/recurrence-page.c:2365
 msgid "Date/Time"
 msgstr "Dato/klokkeslett"
 
@@ -3484,8 +3486,8 @@ msgid "year(s)"
 msgstr "Ãr"
 
 #: ../calendar/gui/dialogs/send-comp.c:192
-msgid "Send my alarms with this event"
-msgstr "Send mine alarmer med denne hendelsen"
+msgid "Send my reminders with this event"
+msgstr "Send mine pÃminnelser med denne hendelsen"
 
 #: ../calendar/gui/dialogs/send-comp.c:194
 msgid "Notify new attendees _only"
@@ -3502,11 +3504,11 @@ msgstr "Nettside"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:298
+#: ../calendar/gui/e-cal-component-preview.c:300
 #: ../calendar/gui/e-cal-model-tasks.c:439
 #: ../calendar/gui/e-cal-model-tasks.c:713 ../calendar/gui/e-task-table.c:210
-#: ../calendar/gui/e-task-table.c:225 ../calendar/gui/e-task-table.c:594
-#: ../calendar/gui/print.c:3275 ../mail/em-sync-stream.c:152
+#: ../calendar/gui/e-task-table.c:225 ../calendar/gui/e-task-table.c:597
+#: ../calendar/gui/print.c:3274 ../mail/em-sync-stream.c:152
 #: ../mail/em-sync-stream.c:180 ../mail/em-sync-stream.c:202
 #, c-format
 msgid "Canceled"
@@ -3514,47 +3516,47 @@ msgstr "Avbrutt"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
-#: ../calendar/gui/e-cal-component-preview.c:295
+#: ../calendar/gui/e-cal-component-preview.c:297
 #: ../calendar/gui/e-cal-model-tasks.c:437
 #: ../calendar/gui/e-cal-model-tasks.c:711
 #: ../calendar/gui/e-meeting-store.c:206 ../calendar/gui/e-meeting-store.c:229
 #: ../calendar/gui/e-task-table.c:208 ../calendar/gui/e-task-table.c:223
-#: ../calendar/gui/e-task-table.c:593 ../calendar/gui/print.c:3272
-#: ../calendar/gui/tasktypes.xml.h:9 ../plugins/save-calendar/csv-format.c:374
+#: ../calendar/gui/e-task-table.c:596 ../calendar/gui/print.c:3271
+#: ../calendar/gui/tasktypes.xml.h:9 ../plugins/save-calendar/csv-format.c:376
 msgid "Completed"
 msgstr "FullfÃrt"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
-#: ../calendar/gui/e-cal-component-preview.c:317
-#: ../calendar/gui/e-task-table.c:514 ../calendar/gui/tasktypes.xml.h:14
+#: ../calendar/gui/e-cal-component-preview.c:319
+#: ../calendar/gui/e-task-table.c:517 ../calendar/gui/tasktypes.xml.h:14
 #: ../mail/message-list.c:1224 ../widgets/misc/e-send-options.ui.h:13
 msgid "High"
 msgstr "HÃy"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:8
-#: ../calendar/gui/e-cal-component-preview.c:292
+#: ../calendar/gui/e-cal-component-preview.c:294
 #: ../calendar/gui/e-cal-model-tasks.c:435
 #: ../calendar/gui/e-cal-model-tasks.c:709
 #: ../calendar/gui/e-cal-model-tasks.c:786 ../calendar/gui/e-task-table.c:206
-#: ../calendar/gui/e-task-table.c:221 ../calendar/gui/e-task-table.c:592
-#: ../calendar/gui/print.c:3269
+#: ../calendar/gui/e-task-table.c:221 ../calendar/gui/e-task-table.c:595
+#: ../calendar/gui/print.c:3268
 msgid "In Progress"
 msgstr "Under arbeid"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:321
-#: ../calendar/gui/e-task-table.c:516 ../calendar/gui/tasktypes.xml.h:16
+#: ../calendar/gui/e-cal-component-preview.c:323
+#: ../calendar/gui/e-task-table.c:519 ../calendar/gui/tasktypes.xml.h:16
 #: ../mail/message-list.c:1222 ../widgets/misc/e-send-options.ui.h:14
 msgid "Low"
 msgstr "Lav"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
-#: ../calendar/gui/e-cal-component-preview.c:319
-#: ../calendar/gui/e-cal-model.c:1528 ../calendar/gui/e-task-table.c:515
+#: ../calendar/gui/e-cal-component-preview.c:321
+#: ../calendar/gui/e-cal-model.c:1533 ../calendar/gui/e-task-table.c:518
 #: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1223
 #: ../widgets/misc/e-send-options.ui.h:16
 msgid "Normal"
@@ -3562,11 +3564,11 @@ msgstr "Normal"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:15
-#: ../calendar/gui/e-cal-component-preview.c:302
+#: ../calendar/gui/e-cal-component-preview.c:304
 #: ../calendar/gui/e-cal-model-tasks.c:433
 #: ../calendar/gui/e-cal-model-tasks.c:707 ../calendar/gui/e-task-table.c:204
-#: ../calendar/gui/e-task-table.c:219 ../calendar/gui/e-task-table.c:591
-#: ../calendar/gui/print.c:3266 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/e-task-table.c:219 ../calendar/gui/e-task-table.c:594
+#: ../calendar/gui/print.c:3265 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "Ikke startet"
 
@@ -3592,7 +3594,7 @@ msgstr "Status"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:517 ../calendar/gui/tasktypes.xml.h:24
+#: ../calendar/gui/e-task-table.c:520 ../calendar/gui/tasktypes.xml.h:24
 #: ../widgets/misc/e-send-options.ui.h:27
 msgid "Undefined"
 msgstr "Udefinert"
@@ -3622,16 +3624,16 @@ msgstr "Klikk for à endre/vise detaljer om status for oppgaven"
 msgid "_Send Options"
 msgstr "Alternativer for _sending"
 
-#: ../calendar/gui/dialogs/task-editor.c:319 ../calendar/gui/print.c:3187
+#: ../calendar/gui/dialogs/task-editor.c:321 ../calendar/gui/print.c:3186
 #: ../widgets/misc/e-send-options.c:526
 msgid "Task"
 msgstr "Oppgave"
 
-#: ../calendar/gui/dialogs/task-editor.c:322
+#: ../calendar/gui/dialogs/task-editor.c:324
 msgid "Task Details"
 msgstr "Oppgavedetaljer"
 
-#: ../calendar/gui/dialogs/task-editor.c:364
+#: ../calendar/gui/dialogs/task-editor.c:366
 msgid "Print this task"
 msgstr "Skriv ut denne oppgaven"
 
@@ -3657,11 +3659,11 @@ msgstr "Oppgaven kan ikke redigeres i sin helhet fordi du ikke er organisator"
 msgid "Organi_zer:"
 msgstr "Organi_sator:"
 
-#: ../calendar/gui/dialogs/task-page.c:816
+#: ../calendar/gui/dialogs/task-page.c:793
 msgid "Due date is wrong"
 msgstr "Ferdigdato er feil"
 
-#: ../calendar/gui/dialogs/task-page.c:1808
+#: ../calendar/gui/dialogs/task-page.c:1737
 #, c-format
 msgid "Unable to open tasks in '%s': %s"
 msgstr "Kan ikke Ãpne oppgaver i Â%sÂ: %s"
@@ -3754,49 +3756,49 @@ msgstr "%s ved %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s for en ukjent utlÃsertype"
 
-#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:669
+#: ../calendar/gui/e-cal-component-preview.c:194 ../filter/e-filter-rule.c:669
 msgid "Untitled"
 msgstr "Uten navn"
 
-#: ../calendar/gui/e-cal-component-preview.c:198
+#: ../calendar/gui/e-cal-component-preview.c:200
 msgid "Categories:"
 msgstr "Kategorier:"
 
-#: ../calendar/gui/e-cal-component-preview.c:237
+#: ../calendar/gui/e-cal-component-preview.c:239
 msgid "Summary:"
 msgstr "Sammendrag:"
 
-#: ../calendar/gui/e-cal-component-preview.c:247
-#: ../calendar/gui/e-cal-component-preview.c:261
+#: ../calendar/gui/e-cal-component-preview.c:249
+#: ../calendar/gui/e-cal-component-preview.c:263
 msgid "Start Date:"
 msgstr "Startdato:"
 
-#: ../calendar/gui/e-cal-component-preview.c:275
+#: ../calendar/gui/e-cal-component-preview.c:277
 msgid "Due Date:"
 msgstr "Ferdig-dato:"
 
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:288
+#: ../calendar/gui/e-cal-component-preview.c:290
 #: ../plugins/itip-formatter/itip-view.c:1076
 msgid "Status:"
 msgstr "Status:"
 
-#: ../calendar/gui/e-cal-component-preview.c:315
+#: ../calendar/gui/e-cal-component-preview.c:317
 msgid "Priority:"
 msgstr "Prioritet:"
 
-#: ../calendar/gui/e-cal-component-preview.c:340 ../mail/mail-config.ui.h:37
+#: ../calendar/gui/e-cal-component-preview.c:342 ../mail/mail-config.ui.h:37
 msgid "Description:"
 msgstr "Beskrivelse:"
 
-#: ../calendar/gui/e-cal-component-preview.c:371
+#: ../calendar/gui/e-cal-component-preview.c:373
 msgid "Web Page:"
 msgstr "Nettside:"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 #: ../calendar/gui/e-calendar-table.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/save-calendar/csv-format.c:377
 msgid "Created"
 msgstr "Opprettet"
 
@@ -3816,12 +3818,12 @@ msgid "Start Date"
 msgstr "Startdato"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-task-table.c:568
+#: ../calendar/gui/e-task-table.c:571
 msgid "Free"
 msgstr "Ledig"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:546 ../calendar/gui/e-task-table.c:569
+#: ../calendar/gui/e-meeting-time-sel.c:546 ../calendar/gui/e-task-table.c:572
 msgid "Busy"
 msgstr "Opptatt"
 
@@ -3841,39 +3843,39 @@ msgctxt "cal-task-status"
 msgid "None"
 msgstr "Ingen"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1061 ../calendar/gui/e-cal-model.c:1534
+#: ../calendar/gui/e-cal-model-tasks.c:1061 ../calendar/gui/e-cal-model.c:1539
 #: ../calendar/gui/e-meeting-list-view.c:201
 #: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:188
 #: ../calendar/gui/e-meeting-store.c:1028
 msgid "Yes"
 msgstr "Ja"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1061 ../calendar/gui/e-cal-model.c:1534
+#: ../calendar/gui/e-cal-model-tasks.c:1061 ../calendar/gui/e-cal-model.c:1539
 #: ../calendar/gui/e-meeting-list-view.c:202
 #: ../calendar/gui/e-meeting-store.c:190
 msgid "No"
 msgstr "Nei"
 
-#: ../calendar/gui/e-cal-model.c:771 ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-cal-model.c:776 ../calendar/gui/e-meeting-list-view.c:177
 #: ../calendar/gui/e-meeting-list-view.c:191
 #: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:171
 #: ../calendar/gui/e-meeting-store.c:234 ../calendar/gui/print.c:1098
 #: ../calendar/gui/print.c:1115 ../e-util/e-charset.c:52
 #: ../modules/plugin-manager/evolution-plugin-manager.c:101
 #: ../plugins/itip-formatter/itip-formatter.c:462
-#: ../plugins/itip-formatter/itip-formatter.c:2617
+#: ../plugins/itip-formatter/itip-formatter.c:2658
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: ../calendar/gui/e-cal-model.c:1530
+#: ../calendar/gui/e-cal-model.c:1535
 msgid "Recurring"
 msgstr "Gjeninntreffer"
 
-#: ../calendar/gui/e-cal-model.c:1532
+#: ../calendar/gui/e-cal-model.c:1537
 msgid "Assigned"
 msgstr "Tildelt"
 
-#: ../calendar/gui/e-cal-model.c:2714
+#: ../calendar/gui/e-cal-model.c:2811
 #, c-format
 msgid "Opening %s"
 msgstr "Ãpner %s"
@@ -3901,7 +3903,7 @@ msgstr "Ferdigdato"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:20
-#: ../plugins/save-calendar/csv-format.c:381
+#: ../plugins/save-calendar/csv-format.c:383
 msgid "Priority"
 msgstr "Prioritet"
 
@@ -3938,22 +3940,22 @@ msgstr "Slett valgte hendelser"
 msgid "Deleting selected objects"
 msgstr "Sletter valgte objekter"
 
-#: ../calendar/gui/e-calendar-view.c:648 ../calendar/gui/e-memo-table.c:852
-#: ../calendar/gui/e-task-table.c:1082
+#: ../calendar/gui/e-calendar-view.c:648 ../calendar/gui/e-memo-table.c:855
+#: ../calendar/gui/e-task-table.c:1086
 msgid "Updating objects"
 msgstr "Oppdaterer objekter"
 
 #: ../calendar/gui/e-calendar-view.c:1778
 #: ../calendar/gui/e-meeting-list-view.c:213
 #: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
-#: ../plugins/itip-formatter/itip-formatter.c:2605
+#: ../plugins/itip-formatter/itip-formatter.c:2646
 msgid "Accepted"
 msgstr "Godtatt"
 
 #: ../calendar/gui/e-calendar-view.c:1779
 #: ../calendar/gui/e-meeting-list-view.c:214
 #: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
-#: ../plugins/itip-formatter/itip-formatter.c:2611
+#: ../plugins/itip-formatter/itip-formatter.c:2652
 msgid "Declined"
 msgstr "AvslÃtt"
 
@@ -3967,7 +3969,7 @@ msgstr "Tentativ"
 #: ../calendar/gui/e-calendar-view.c:1781
 #: ../calendar/gui/e-meeting-list-view.c:216
 #: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
-#: ../plugins/itip-formatter/itip-formatter.c:2614
+#: ../plugins/itip-formatter/itip-formatter.c:2655
 msgid "Delegated"
 msgstr "Delegert"
 
@@ -3978,8 +3980,8 @@ msgstr "Krever handling"
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
 #. To Translators: It will display
 #. * "Organizer: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-view.c:1926 ../calendar/gui/e-memo-table.c:537
-#: ../calendar/gui/e-task-table.c:758
+#: ../calendar/gui/e-calendar-view.c:1926 ../calendar/gui/e-memo-table.c:539
+#: ../calendar/gui/e-task-table.c:761
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organisator: %s <%s>"
@@ -3987,14 +3989,14 @@ msgstr "Organisator: %s <%s>"
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in
 #. * organizer.value.
-#: ../calendar/gui/e-calendar-view.c:1930 ../calendar/gui/e-memo-table.c:542
-#: ../calendar/gui/e-task-table.c:762
+#: ../calendar/gui/e-calendar-view.c:1930 ../calendar/gui/e-memo-table.c:544
+#: ../calendar/gui/e-task-table.c:765
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organisator: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1946 ../calendar/gui/print.c:3221
+#: ../calendar/gui/e-calendar-view.c:1946 ../calendar/gui/print.c:3220
 #, c-format
 msgid "Location: %s"
 msgstr "Sted: %s"
@@ -4039,7 +4041,7 @@ msgstr "Vis den andre tidssonen"
 
 #. Translators: "None" indicates no second time zone set for a day view
 #: ../calendar/gui/e-day-view-time-item.c:844
-#: ../modules/calendar/e-calendar-preferences.ui.h:76
+#: ../modules/calendar/e-calendar-preferences.ui.h:77
 #: ../modules/calendar/e-calendar-preferences.c:179
 #: ../modules/calendar/e-calendar-preferences.c:228
 msgctxt "cal-second-zone"
@@ -4072,7 +4074,7 @@ msgstr "%A %d %B"
 #: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1810
 #: ../calendar/gui/e-week-view-main-item.c:224
 #: ../calendar/gui/ea-gnome-calendar.c:204
-#: ../modules/calendar/e-cal-shell-view-private.c:1015
+#: ../modules/calendar/e-cal-shell-view-private.c:1053
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -4084,7 +4086,7 @@ msgstr "%a %d %b"
 #: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1826
 #: ../calendar/gui/e-week-view-main-item.c:238
 #: ../calendar/gui/ea-gnome-calendar.c:234
-#: ../modules/calendar/e-cal-shell-view-private.c:1051
+#: ../modules/calendar/e-cal-shell-view-private.c:1089
 msgid "%d %b"
 msgstr "%d %b"
 
@@ -4193,21 +4195,21 @@ msgstr "RSVP"
 msgid "In Process"
 msgstr "Under arbeid"
 
-#: ../calendar/gui/e-meeting-store.c:1834
+#: ../calendar/gui/e-meeting-store.c:1841
 #, c-format
 msgid "Enter password to access free/busy information on server %s as user %s"
 msgstr ""
 "Oppgi passord for à se pà ledig-/opptatt-informasjon pà tjener %s som bruker "
 "%s"
 
-#: ../calendar/gui/e-meeting-store.c:1844
+#: ../calendar/gui/e-meeting-store.c:1851
 #, c-format
 msgid "Failure reason: %s"
 msgstr "FeilÃrsak: %s"
 
-#: ../calendar/gui/e-meeting-store.c:1849
+#: ../calendar/gui/e-meeting-store.c:1856
 #: ../plugins/caldav/caldav-browse-server.c:920
-#: ../plugins/google-account-setup/google-source.c:444
+#: ../plugins/google-account-setup/google-source.c:448
 #: ../plugins/publish-calendar/publish-calendar.c:332
 #: ../smime/gui/component.c:49
 msgid "Enter password"
@@ -4319,47 +4321,47 @@ msgstr "SprÃk"
 msgid "Member"
 msgstr "Medlem"
 
-#: ../calendar/gui/e-memo-table.c:418
+#: ../calendar/gui/e-memo-table.c:420
 #: ../modules/calendar/e-cal-shell-content.c:472
-#: ../modules/calendar/e-memo-shell-view-actions.c:222
-#: ../modules/calendar/e-memo-shell-view-actions.c:237
+#: ../modules/calendar/e-memo-shell-view-actions.c:231
+#: ../modules/calendar/e-memo-shell-view-actions.c:246
 #: ../modules/calendar/e-memo-shell-view.c:293
 #: ../plugins/caldav/caldav-browse-server.c:437
 msgid "Memos"
 msgstr "Notater"
 
-#: ../calendar/gui/e-memo-table.c:499 ../calendar/gui/e-task-table.c:721
+#: ../calendar/gui/e-memo-table.c:501 ../calendar/gui/e-task-table.c:724
 msgid "* No Summary *"
 msgstr "* Ingen sammendrag *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:584 ../calendar/gui/e-task-table.c:803
+#: ../calendar/gui/e-memo-table.c:586 ../calendar/gui/e-task-table.c:806
 msgid "Start: "
 msgstr "Start: "
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:603 ../calendar/gui/e-task-table.c:821
+#: ../calendar/gui/e-memo-table.c:605 ../calendar/gui/e-task-table.c:824
 msgid "Due: "
 msgstr "Ferdig: "
 
-#: ../calendar/gui/e-memo-table.c:717
+#: ../calendar/gui/e-memo-table.c:720
 msgid "Cut selected memos to the clipboard"
 msgstr "Klipp ut valgte notater til utklippstavlen"
 
-#: ../calendar/gui/e-memo-table.c:723
+#: ../calendar/gui/e-memo-table.c:726
 msgid "Copy selected memos to the clipboard"
 msgstr "Kopier valgte notater til utklippstavlen"
 
-#: ../calendar/gui/e-memo-table.c:729
+#: ../calendar/gui/e-memo-table.c:732
 msgid "Paste memos from the clipboard"
 msgstr "Lim inn notater fra utklippstavlen"
 
-#: ../calendar/gui/e-memo-table.c:735
-#: ../modules/calendar/e-memo-shell-view-actions.c:573
+#: ../calendar/gui/e-memo-table.c:738
+#: ../modules/calendar/e-memo-shell-view-actions.c:587
 msgid "Delete selected memos"
 msgstr "Slett valgt notat"
 
-#: ../calendar/gui/e-memo-table.c:741
+#: ../calendar/gui/e-memo-table.c:744
 msgid "Select all visible memos"
 msgstr "Velg alle synlige notater"
 
@@ -4371,40 +4373,40 @@ msgstr "Klikk for à legge til et notat"
 #. %d is the actual value, %% is replaced with a percent sign.
 #. Result values will be 0%, 10%, 20%, ... 100%
 #.
-#: ../calendar/gui/e-task-table.c:543
+#: ../calendar/gui/e-task-table.c:546
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:640 ../calendar/gui/print.c:2168
+#: ../calendar/gui/e-task-table.c:643 ../calendar/gui/print.c:2168
 #: ../calendar/importers/icalendar-importer.c:85
-#: ../calendar/importers/icalendar-importer.c:971
+#: ../calendar/importers/icalendar-importer.c:1003
 #: ../modules/calendar/e-cal-shell-content.c:433
-#: ../modules/calendar/e-task-shell-view-actions.c:245
-#: ../modules/calendar/e-task-shell-view-actions.c:260
+#: ../modules/calendar/e-task-shell-view-actions.c:254
+#: ../modules/calendar/e-task-shell-view-actions.c:269
 #: ../modules/calendar/e-task-shell-view.c:448
 #: ../plugins/caldav/caldav-browse-server.c:435
 msgid "Tasks"
 msgstr "Oppgaver"
 
-#: ../calendar/gui/e-task-table.c:947
+#: ../calendar/gui/e-task-table.c:951
 msgid "Cut selected tasks to the clipboard"
 msgstr "Klipp ut valgte oppgaver til utklippstavlen"
 
-#: ../calendar/gui/e-task-table.c:953
+#: ../calendar/gui/e-task-table.c:957
 msgid "Copy selected tasks to the clipboard"
 msgstr "Kopier valgte oppgaver til utklippstavlen"
 
-#: ../calendar/gui/e-task-table.c:959
+#: ../calendar/gui/e-task-table.c:963
 msgid "Paste tasks from the clipboard"
 msgstr "Lim inn oppgaver fra utklippstavlen"
 
-#: ../calendar/gui/e-task-table.c:965
-#: ../modules/calendar/e-task-shell-view-actions.c:697
+#: ../calendar/gui/e-task-table.c:969
+#: ../modules/calendar/e-task-shell-view-actions.c:711
 msgid "Delete selected tasks"
 msgstr "Slett valgte oppgaver"
 
-#: ../calendar/gui/e-task-table.c:971
+#: ../calendar/gui/e-task-table.c:975
 msgid "Select all visible tasks"
 msgstr "Velg alle synlige oppgaver"
 
@@ -4420,8 +4422,8 @@ msgid "%d %B"
 msgstr "%d %B"
 
 #: ../calendar/gui/ea-cal-view-event.c:290
-msgid "It has alarms."
-msgstr "Har alarmer."
+msgid "It has reminders."
+msgstr "Har pÃminnelser."
 
 #: ../calendar/gui/ea-cal-view-event.c:293
 msgid "It has recurrences."
@@ -4512,21 +4514,21 @@ msgstr "kalendervisning for en eller flere dager"
 
 #: ../calendar/gui/ea-gnome-calendar.c:50
 #: ../calendar/gui/ea-gnome-calendar.c:58
-#: ../calendar/importers/icalendar-importer.c:1003
+#: ../calendar/importers/icalendar-importer.c:1035
 msgid "Gnome Calendar"
 msgstr "GNOME kalender"
 
 #: ../calendar/gui/ea-gnome-calendar.c:201
-#: ../modules/calendar/e-cal-shell-view-private.c:1011
+#: ../modules/calendar/e-cal-shell-view-private.c:1049
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
 #: ../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:1018
-#: ../modules/calendar/e-cal-shell-view-private.c:1024
-#: ../modules/calendar/e-cal-shell-view-private.c:1027
+#: ../modules/calendar/e-cal-shell-view-private.c:1056
+#: ../modules/calendar/e-cal-shell-view-private.c:1062
+#: ../modules/calendar/e-cal-shell-view-private.c:1065
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -4534,10 +4536,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:1044
-#: ../modules/calendar/e-cal-shell-view-private.c:1055
-#: ../modules/calendar/e-cal-shell-view-private.c:1062
-#: ../modules/calendar/e-cal-shell-view-private.c:1065
+#: ../modules/calendar/e-cal-shell-view-private.c:1082
+#: ../modules/calendar/e-cal-shell-view-private.c:1093
+#: ../modules/calendar/e-cal-shell-view-private.c:1100
+#: ../modules/calendar/e-cal-shell-view-private.c:1103
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -4567,36 +4569,36 @@ msgstr "kalendervisning for en mÃned"
 msgid "calendar view for one or more weeks"
 msgstr "kalendervisning for en eller flere uker"
 
-#: ../calendar/gui/gnome-cal.c:2209
+#: ../calendar/gui/gnome-cal.c:2235
 msgid "Purging"
 msgstr "TÃmmer"
 
-#: ../calendar/gui/itip-utils.c:503 ../calendar/gui/itip-utils.c:558
-#: ../calendar/gui/itip-utils.c:661
+#: ../calendar/gui/itip-utils.c:510 ../calendar/gui/itip-utils.c:565
+#: ../calendar/gui/itip-utils.c:668
 msgid "An organizer must be set."
 msgstr "En organisator mà oppgis."
 
-#: ../calendar/gui/itip-utils.c:550
+#: ../calendar/gui/itip-utils.c:557
 msgid "At least one attendee is necessary"
 msgstr "Minst en deltaker kreves"
 
-#: ../calendar/gui/itip-utils.c:747 ../calendar/gui/itip-utils.c:908
+#: ../calendar/gui/itip-utils.c:754 ../calendar/gui/itip-utils.c:915
 msgid "Event information"
 msgstr "Hendelsesinformasjon"
 
-#: ../calendar/gui/itip-utils.c:750 ../calendar/gui/itip-utils.c:911
+#: ../calendar/gui/itip-utils.c:757 ../calendar/gui/itip-utils.c:918
 msgid "Task information"
 msgstr "Oppgaveinformasjon"
 
-#: ../calendar/gui/itip-utils.c:753 ../calendar/gui/itip-utils.c:914
+#: ../calendar/gui/itip-utils.c:760 ../calendar/gui/itip-utils.c:921
 msgid "Memo information"
 msgstr "Informasjon om notat"
 
-#: ../calendar/gui/itip-utils.c:756 ../calendar/gui/itip-utils.c:932
+#: ../calendar/gui/itip-utils.c:763 ../calendar/gui/itip-utils.c:939
 msgid "Free/Busy information"
 msgstr "Ledig/opptatt-informasjon"
 
-#: ../calendar/gui/itip-utils.c:759
+#: ../calendar/gui/itip-utils.c:766
 msgid "Calendar information"
 msgstr "Kalenderinformasjon"
 
@@ -4604,7 +4606,7 @@ msgstr "Kalenderinformasjon"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:796
+#: ../calendar/gui/itip-utils.c:803
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Godtatt"
@@ -4613,7 +4615,7 @@ msgstr "Godtatt"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:803
+#: ../calendar/gui/itip-utils.c:810
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Akseptert tentativt"
@@ -4625,7 +4627,7 @@ msgstr "Akseptert tentativt"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:810 ../calendar/gui/itip-utils.c:858
+#: ../calendar/gui/itip-utils.c:817 ../calendar/gui/itip-utils.c:865
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "AvslÃtt"
@@ -4634,7 +4636,7 @@ msgstr "AvslÃtt"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:817
+#: ../calendar/gui/itip-utils.c:824
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Delegert"
@@ -4642,7 +4644,7 @@ msgstr "Delegert"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:830
+#: ../calendar/gui/itip-utils.c:837
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Oppdatert"
@@ -4650,7 +4652,7 @@ msgstr "Oppdatert"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:837
+#: ../calendar/gui/itip-utils.c:844
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Avbryt"
@@ -4658,7 +4660,7 @@ msgstr "Avbryt"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:844
+#: ../calendar/gui/itip-utils.c:851
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Oppdater"
@@ -4666,30 +4668,30 @@ msgstr "Oppdater"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:851
+#: ../calendar/gui/itip-utils.c:858
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Motforslag"
 
-#: ../calendar/gui/itip-utils.c:929
+#: ../calendar/gui/itip-utils.c:936
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Ledig/opptatt-informasjon (%s til %s)"
 
-#: ../calendar/gui/itip-utils.c:937
+#: ../calendar/gui/itip-utils.c:944
 msgid "iCalendar information"
 msgstr "iCalendar-informasjon"
 
-#: ../calendar/gui/itip-utils.c:962
+#: ../calendar/gui/itip-utils.c:969
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr ""
 "Klarer ikke à booke en ressurs. Den nye hendelsen er i konflikt med en annen."
 
-#: ../calendar/gui/itip-utils.c:966
+#: ../calendar/gui/itip-utils.c:973
 msgid "Unable to book a resource, error: "
 msgstr "Kan ikke booke en ressurs. Feil: "
 
-#: ../calendar/gui/itip-utils.c:1127
+#: ../calendar/gui/itip-utils.c:1134
 msgid "You must be an attendee of the event."
 msgstr "Du mà vÃre en deltager i hendelsen."
 
@@ -4848,71 +4850,71 @@ msgstr "LÃ."
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:3014
+#: ../calendar/gui/print.c:3013
 msgid " to "
 msgstr " til "
 
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../calendar/gui/print.c:3024
+#: ../calendar/gui/print.c:3023
 msgid " (Completed "
 msgstr " (FullfÃrt "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3030
+#: ../calendar/gui/print.c:3029
 msgid "Completed "
 msgstr "FullfÃrt "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3040
+#: ../calendar/gui/print.c:3039
 msgid " (Due "
 msgstr " (Ferdig "
 
 #. Translators: This is part of "Due DUE",
 #. * where DUE is a date/time due the event
 #. * should be finished.
-#: ../calendar/gui/print.c:3047
+#: ../calendar/gui/print.c:3046
 msgid "Due "
 msgstr "Ferdig "
 
-#: ../calendar/gui/print.c:3212
+#: ../calendar/gui/print.c:3211
 #, c-format
 msgid "Summary: %s"
 msgstr "Sammendrag: %s"
 
-#: ../calendar/gui/print.c:3239
+#: ../calendar/gui/print.c:3238
 msgid "Attendees: "
 msgstr "Deltakere: "
 
-#: ../calendar/gui/print.c:3282
+#: ../calendar/gui/print.c:3281
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: ../calendar/gui/print.c:3297
+#: ../calendar/gui/print.c:3296
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioritet: %s"
 
-#: ../calendar/gui/print.c:3315
+#: ../calendar/gui/print.c:3314
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Prosent fullfÃrt: %i"
 
-#: ../calendar/gui/print.c:3326
+#: ../calendar/gui/print.c:3325
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:3339
+#: ../calendar/gui/print.c:3338
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorier: %s"
 
-#: ../calendar/gui/print.c:3350
+#: ../calendar/gui/print.c:3349
 msgid "Contacts: "
 msgstr "Kontakter: "
 
@@ -4941,181 +4943,181 @@ msgstr "er mindre enn"
 msgid "Appointments and Meetings"
 msgstr "Avtaler og mÃter"
 
-#: ../calendar/importers/icalendar-importer.c:407
-#: ../calendar/importers/icalendar-importer.c:817
-#: ../plugins/itip-formatter/itip-formatter.c:2094
+#: ../calendar/importers/icalendar-importer.c:421
+#: ../calendar/importers/icalendar-importer.c:834
+#: ../plugins/itip-formatter/itip-formatter.c:2135
 msgid "Opening calendar"
 msgstr "Ãpner kalender"
 
-#: ../calendar/importers/icalendar-importer.c:547
+#: ../calendar/importers/icalendar-importer.c:561
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar-filer (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:548
+#: ../calendar/importers/icalendar-importer.c:562
 msgid "Evolution iCalendar importer"
 msgstr "Evolution iCalendar-import"
 
-#: ../calendar/importers/icalendar-importer.c:636
+#: ../calendar/importers/icalendar-importer.c:650
 msgid "Reminder!"
 msgstr "PÃminnelse!"
 
-#: ../calendar/importers/icalendar-importer.c:716
+#: ../calendar/importers/icalendar-importer.c:730
 msgid "vCalendar files (.vcs)"
 msgstr "vCalendar-filer (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:717
+#: ../calendar/importers/icalendar-importer.c:731
 msgid "Evolution vCalendar importer"
 msgstr "Evolution vCalendar-import"
 
-#: ../calendar/importers/icalendar-importer.c:966
+#: ../calendar/importers/icalendar-importer.c:998
 msgid "Calendar Events"
 msgstr "Hendlelser i kalenderen"
 
-#: ../calendar/importers/icalendar-importer.c:1004
+#: ../calendar/importers/icalendar-importer.c:1036
 msgid "Evolution Calendar intelligent importer"
 msgstr "Intelligent import for Evolution kalender"
 
-#: ../calendar/importers/icalendar-importer.c:1069
-#: ../calendar/importers/icalendar-importer.c:1386
+#: ../calendar/importers/icalendar-importer.c:1101
+#: ../calendar/importers/icalendar-importer.c:1418
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "MÃte"
 
-#: ../calendar/importers/icalendar-importer.c:1069
-#: ../calendar/importers/icalendar-importer.c:1386
+#: ../calendar/importers/icalendar-importer.c:1101
+#: ../calendar/importers/icalendar-importer.c:1418
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "Hendelse"
 
-#: ../calendar/importers/icalendar-importer.c:1072
-#: ../calendar/importers/icalendar-importer.c:1387
+#: ../calendar/importers/icalendar-importer.c:1104
+#: ../calendar/importers/icalendar-importer.c:1419
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "Oppgave"
 
-#: ../calendar/importers/icalendar-importer.c:1075
-#: ../calendar/importers/icalendar-importer.c:1388
+#: ../calendar/importers/icalendar-importer.c:1107
+#: ../calendar/importers/icalendar-importer.c:1420
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "Notat"
 
-#: ../calendar/importers/icalendar-importer.c:1084
+#: ../calendar/importers/icalendar-importer.c:1116
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "har gjeninntreffelse"
 
-#: ../calendar/importers/icalendar-importer.c:1089
+#: ../calendar/importers/icalendar-importer.c:1121
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "er en instans"
 
-#: ../calendar/importers/icalendar-importer.c:1094
+#: ../calendar/importers/icalendar-importer.c:1126
 msgctxt "iCalImp"
-msgid "has alarms"
-msgstr "har alarmer"
+msgid "has reminders"
+msgstr "har pÃminnelser"
 
-#: ../calendar/importers/icalendar-importer.c:1099
+#: ../calendar/importers/icalendar-importer.c:1131
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "har vedlegg"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1112
+#: ../calendar/importers/icalendar-importer.c:1144
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "Offentlig"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1115
+#: ../calendar/importers/icalendar-importer.c:1147
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "Privat"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1118
+#: ../calendar/importers/icalendar-importer.c:1150
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "Konfidensiell"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:1122
+#: ../calendar/importers/icalendar-importer.c:1154
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "Klassifisering"
 
 #. Translators: Appointment's summary
 #. Translators: Column header for a component summary
-#: ../calendar/importers/icalendar-importer.c:1127
-#: ../calendar/importers/icalendar-importer.c:1427
+#: ../calendar/importers/icalendar-importer.c:1159
+#: ../calendar/importers/icalendar-importer.c:1459
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "Sammendrag"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:1133
+#: ../calendar/importers/icalendar-importer.c:1165
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "Plassering"
 
 #. Translators: Appointment's start time
 #. Translators: Column header for a component start date/time
-#: ../calendar/importers/icalendar-importer.c:1141
-#: ../calendar/importers/icalendar-importer.c:1423
+#: ../calendar/importers/icalendar-importer.c:1173
+#: ../calendar/importers/icalendar-importer.c:1455
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "Start"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1152
+#: ../calendar/importers/icalendar-importer.c:1184
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "Ferdig"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1164
+#: ../calendar/importers/icalendar-importer.c:1196
 msgctxt "iCalImp"
 msgid "End"
 msgstr "Slutt"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1174
+#: ../calendar/importers/icalendar-importer.c:1206
 msgctxt "iCalImp"
 msgid "Categories"
 msgstr "Kategorier"
 
 #. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
-#: ../calendar/importers/icalendar-importer.c:1198
+#: ../calendar/importers/icalendar-importer.c:1230
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "FullfÃrt"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1206
+#: ../calendar/importers/icalendar-importer.c:1238
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URL"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1217
-#: ../calendar/importers/icalendar-importer.c:1220
+#: ../calendar/importers/icalendar-importer.c:1249
+#: ../calendar/importers/icalendar-importer.c:1252
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "Organisator"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1240
-#: ../calendar/importers/icalendar-importer.c:1243
+#: ../calendar/importers/icalendar-importer.c:1272
+#: ../calendar/importers/icalendar-importer.c:1275
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "Deltakere"
 
-#: ../calendar/importers/icalendar-importer.c:1257
+#: ../calendar/importers/icalendar-importer.c:1289
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "Beskrivelse"
 
 #. Translators: Column header for a component type; it can be Event, Task or Memo
-#: ../calendar/importers/icalendar-importer.c:1419
+#: ../calendar/importers/icalendar-importer.c:1451
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "Type"
@@ -6673,11 +6675,6 @@ msgstr "Stillahavet/Yap"
 msgid "Save as..."
 msgstr "Lagre som â"
 
-#: ../composer/e-composer-actions.c:291
-#: ../widgets/misc/e-attachment-view.c:439
-msgid "Attach a file"
-msgstr "Legg ved en fil"
-
 #: ../composer/e-composer-actions.c:296
 #: ../widgets/misc/e-signature-editor.c:207
 msgid "_Close"
@@ -6695,7 +6692,7 @@ msgstr "Ny _melding"
 msgid "Open New Message window"
 msgstr "Ãpne nytt meldingsvindu"
 
-#: ../composer/e-composer-actions.c:312 ../shell/e-shell-window-actions.c:1537
+#: ../composer/e-composer-actions.c:312 ../shell/e-shell-window-actions.c:1511
 msgid "Configure Evolution"
 msgstr "Konfigurer Evolution"
 
@@ -6839,35 +6836,35 @@ msgstr ""
 "Skriv inn adressene som skal motta en kopi av meldingen uten à vises i "
 "mottakerlisten for meldingen."
 
-#: ../composer/e-composer-header-table.c:1020
+#: ../composer/e-composer-header-table.c:1021
 msgid "Fr_om:"
 msgstr "Fr_a:"
 
-#: ../composer/e-composer-header-table.c:1029
+#: ../composer/e-composer-header-table.c:1030
 msgid "_Reply-To:"
 msgstr "Sva_r-til:"
 
-#: ../composer/e-composer-header-table.c:1033
+#: ../composer/e-composer-header-table.c:1034
 msgid "_To:"
 msgstr "_Til:"
 
-#: ../composer/e-composer-header-table.c:1038
+#: ../composer/e-composer-header-table.c:1039
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:1043
+#: ../composer/e-composer-header-table.c:1044
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-composer-header-table.c:1048
+#: ../composer/e-composer-header-table.c:1049
 msgid "_Post To:"
 msgstr "_Post til:"
 
-#: ../composer/e-composer-header-table.c:1052
+#: ../composer/e-composer-header-table.c:1053
 msgid "S_ubject:"
 msgstr "Em_ne:"
 
-#: ../composer/e-composer-header-table.c:1061
+#: ../composer/e-composer-header-table.c:1062
 msgid "Si_gnature:"
 msgstr "Si_gnatur:"
 
@@ -6920,13 +6917,13 @@ msgstr ""
 msgid "Compose Message"
 msgstr "Skriv melding"
 
-#: ../composer/e-msg-composer.c:4155
+#: ../composer/e-msg-composer.c:4213
 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:4860
+#: ../composer/e-msg-composer.c:4918
 msgid "Untitled Message"
 msgstr "Melding uten navn"
 
@@ -7034,7 +7031,7 @@ msgstr "Lagrer melding til Utboks."
 msgid "The file '{0}' is not a regular file and cannot be sent in a message."
 msgstr "Filen Â{0}Â er ikke en vanlig fil og kan ikke sendes i en melding."
 
-#: ../composer/mail-composer.error.xml.h:21 ../mail/mail.error.xml.h:123
+#: ../composer/mail-composer.error.xml.h:21 ../mail/mail.error.xml.h:124
 msgid "The reported error was &quot;{0}&quot;."
 msgstr "Feilen som ble rapportert var &quot;{0}&quot;."
 
@@ -7113,65 +7110,65 @@ msgid "Please enter your password."
 msgstr "Vennligst oppgi ditt passord."
 
 #: ../capplet/settings/mail-account-view.c:259
-#: ../plugins/caldav/caldav-source.c:68
+#: ../plugins/caldav/caldav-source.c:67
 msgid "CalDAV"
 msgstr "CalDAV"
 
 #: ../capplet/settings/mail-account-view.c:361
 #: ../capplet/settings/mail-account-view.c:413
-#: ../modules/online-accounts/e-online-accounts-google.c:285
-#: ../modules/online-accounts/e-online-accounts-google.c:357
+#: ../modules/online-accounts/e-online-accounts-google.c:287
+#: ../modules/online-accounts/e-online-accounts-google.c:359
 #: ../plugins/google-account-setup/google-contacts-source.c:55
-#: ../plugins/google-account-setup/google-source.c:83
+#: ../plugins/google-account-setup/google-source.c:87
 msgid "Google"
 msgstr "Google"
 
-#: ../capplet/settings/mail-account-view.c:483
+#: ../capplet/settings/mail-account-view.c:480
 msgid "Personal details:"
 msgstr "Personlige detaljer:"
 
-#: ../capplet/settings/mail-account-view.c:490
+#: ../capplet/settings/mail-account-view.c:487
 msgid "Name:"
 msgstr "Navn:"
 
-#: ../capplet/settings/mail-account-view.c:499
+#: ../capplet/settings/mail-account-view.c:496
 msgid "Email address:"
 msgstr "E-postadresse:"
 
-#: ../capplet/settings/mail-account-view.c:509
+#: ../capplet/settings/mail-account-view.c:506
 msgid "Details:"
 msgstr "Detaljer:"
 
-#: ../capplet/settings/mail-account-view.c:517
+#: ../capplet/settings/mail-account-view.c:514
 msgid "Receiving"
 msgstr "Mottar"
 
-#: ../capplet/settings/mail-account-view.c:524
+#: ../capplet/settings/mail-account-view.c:521
 msgid "Server type:"
 msgstr "Tjenertype:"
 
-#: ../capplet/settings/mail-account-view.c:533
+#: ../capplet/settings/mail-account-view.c:530
 msgid "Server address:"
 msgstr "Tjeneradresse:"
 
-#: ../capplet/settings/mail-account-view.c:542
+#: ../capplet/settings/mail-account-view.c:539
 msgid "Username:"
 msgstr "Brukernavn:"
 
-#: ../capplet/settings/mail-account-view.c:551
+#: ../capplet/settings/mail-account-view.c:548
 msgid "Use encryption:"
 msgstr "Bruk kryptering:"
 
-#: ../capplet/settings/mail-account-view.c:556
-#: ../capplet/settings/mail-account-view.c:591
+#: ../capplet/settings/mail-account-view.c:553
+#: ../capplet/settings/mail-account-view.c:588
 msgid "never"
 msgstr "aldri"
 
-#: ../capplet/settings/mail-account-view.c:568
+#: ../capplet/settings/mail-account-view.c:565
 msgid "Sending"
 msgstr "Sender"
 
-#: ../capplet/settings/mail-account-view.c:610
+#: ../capplet/settings/mail-account-view.c:607
 msgid ""
 "To use the email application you'll need to setup an account. Put your email "
 "address and password in below and we'll try and work out all the settings. "
@@ -7181,7 +7178,7 @@ msgstr ""
 "postadresse og passord under sà skal vi prÃve ut alle innstillingene. Hvis "
 "det ikke lar seg gjÃre automatisk mà du oppgi detaljer for tjeneren ogsÃ."
 
-#: ../capplet/settings/mail-account-view.c:612
+#: ../capplet/settings/mail-account-view.c:609
 msgid ""
 "Sorry, we can't work out the settings to get your mail automatically. Please "
 "enter them below. We've tried to make a start with the details you just "
@@ -7191,11 +7188,11 @@ msgstr ""
 "automatisk. Vennligst oppgi dem nedenfor. Har forsÃkt à lage et utgangspunkt "
 "med detaljene du nettopp oppga, men du mà kanskje endre dem."
 
-#: ../capplet/settings/mail-account-view.c:614
+#: ../capplet/settings/mail-account-view.c:611
 msgid "You can specify more options to configure the account."
 msgstr "Du kan oppgi flere alternativer for à konfigurere kontoen."
 
-#: ../capplet/settings/mail-account-view.c:616
+#: ../capplet/settings/mail-account-view.c:613
 msgid ""
 "Now we need your settings for sending mail. We've tried to make some guesses "
 "but you should check them over to make sure."
@@ -7203,11 +7200,11 @@ msgstr ""
 "Nà trengs innstillingene for à sende e-post. Har prÃvd à gjette litt men du "
 "bÃr se over dem for à vÃre sikker."
 
-#: ../capplet/settings/mail-account-view.c:617
+#: ../capplet/settings/mail-account-view.c:614
 msgid "You can specify your default settings for your account."
 msgstr "Du kan oppgi forvalgte innstillinger for kontoen."
 
-#: ../capplet/settings/mail-account-view.c:618
+#: ../capplet/settings/mail-account-view.c:615
 msgid ""
 "Time to check things over before we try and connect to the server and fetch "
 "your mail."
@@ -7215,100 +7212,100 @@ msgstr ""
 "Se over innstillingene fÃr forsÃk pà à koble til tjeneren for à hente e-"
 "posten din."
 
-#: ../capplet/settings/mail-account-view.c:633
-#: ../mail/em-account-editor.c:2181 ../mail/em-account-editor.c:2313
+#: ../capplet/settings/mail-account-view.c:630
+#: ../mail/em-account-editor.c:2229 ../mail/em-account-editor.c:2362
 msgid "Identity"
 msgstr "Identitet"
 
-#: ../capplet/settings/mail-account-view.c:633
+#: ../capplet/settings/mail-account-view.c:630
 msgid "Next - Receiving mail"
 msgstr "Neste - mottak av e-post"
 
-#: ../capplet/settings/mail-account-view.c:634
+#: ../capplet/settings/mail-account-view.c:631
 msgid "Receiving mail"
 msgstr "Mottak av e-post"
 
-#: ../capplet/settings/mail-account-view.c:634
-#: ../capplet/settings/mail-account-view.c:635
+#: ../capplet/settings/mail-account-view.c:631
+#: ../capplet/settings/mail-account-view.c:632
 msgid "Next - Sending mail"
 msgstr "Neste - Utsendelse av e-post"
 
-#: ../capplet/settings/mail-account-view.c:634
+#: ../capplet/settings/mail-account-view.c:631
 msgid "Back - Identity"
 msgstr "Tilbake - Identitet"
 
-#: ../capplet/settings/mail-account-view.c:634
+#: ../capplet/settings/mail-account-view.c:631
 msgid "Next - Receiving options"
 msgstr "Neste - Alternativer for mottak"
 
-#: ../capplet/settings/mail-account-view.c:635
+#: ../capplet/settings/mail-account-view.c:632
 msgid "Receiving options"
 msgstr "Alternativer for mottak"
 
-#: ../capplet/settings/mail-account-view.c:635
-#: ../capplet/settings/mail-account-view.c:637
+#: ../capplet/settings/mail-account-view.c:632
+#: ../capplet/settings/mail-account-view.c:634
 msgid "Back - Receiving mail"
 msgstr "Tilbake - Mottak av e-post"
 
-#: ../capplet/settings/mail-account-view.c:637
+#: ../capplet/settings/mail-account-view.c:634
 msgid "Sending mail"
 msgstr "Utsendelse av e-post"
 
-#: ../capplet/settings/mail-account-view.c:637
-#: ../capplet/settings/mail-account-view.c:638
+#: ../capplet/settings/mail-account-view.c:634
+#: ../capplet/settings/mail-account-view.c:635
 msgid "Next - Review account"
 msgstr "Neste - Se over konto"
 
-#: ../capplet/settings/mail-account-view.c:637
+#: ../capplet/settings/mail-account-view.c:634
 msgid "Next - Defaults"
 msgstr "Neste - Forvalg"
 
-#: ../capplet/settings/mail-account-view.c:637
+#: ../capplet/settings/mail-account-view.c:634
 msgid "Back - Receiving options"
 msgstr "Tilbake - Alternativer for mottak"
 
-#: ../capplet/settings/mail-account-view.c:638
-#: ../mail/em-account-editor.c:3200
+#: ../capplet/settings/mail-account-view.c:635
+#: ../mail/em-account-editor.c:3222
 msgid "Defaults"
 msgstr "Forvalg"
 
-#: ../capplet/settings/mail-account-view.c:638
+#: ../capplet/settings/mail-account-view.c:635
 msgid "Back - Sending mail"
 msgstr "Tilbake - Utsendelse av e-post"
 
-#: ../capplet/settings/mail-account-view.c:640
+#: ../capplet/settings/mail-account-view.c:637
 msgid "Review account"
 msgstr "Se over konto"
 
-#: ../capplet/settings/mail-account-view.c:640
+#: ../capplet/settings/mail-account-view.c:637
 msgid "Finish"
 msgstr "FullfÃr"
 
-#: ../capplet/settings/mail-account-view.c:640
+#: ../capplet/settings/mail-account-view.c:637
 msgid "Back - Sending"
 msgstr "Tilbake - Utsendelse"
 
-#: ../capplet/settings/mail-account-view.c:760
+#: ../capplet/settings/mail-account-view.c:757
 msgid "Setup Google contacts with Evolution"
 msgstr "Sett opp Google-kontakter i Evolution"
 
-#: ../capplet/settings/mail-account-view.c:761
+#: ../capplet/settings/mail-account-view.c:758
 msgid "Setup Google calendar with Evolution"
 msgstr "Sett opp Google-kalender i Evolution."
 
-#: ../capplet/settings/mail-account-view.c:766
+#: ../capplet/settings/mail-account-view.c:763
 msgid "You may need to enable IMAP access."
 msgstr "Du mà kanskje slà pà IMAP-tilgang."
 
-#: ../capplet/settings/mail-account-view.c:774
+#: ../capplet/settings/mail-account-view.c:771
 msgid "Google account settings:"
 msgstr "Innstillinger for Google-konto:"
 
-#: ../capplet/settings/mail-account-view.c:800
+#: ../capplet/settings/mail-account-view.c:797
 msgid "Setup Yahoo calendar with Evolution"
 msgstr "Sett opp Yahoo-kalender i Evolution"
 
-#: ../capplet/settings/mail-account-view.c:804
+#: ../capplet/settings/mail-account-view.c:801
 msgid ""
 "Yahoo calendars are named as firstname_lastname. We have tried to form the "
 "calendar name. So please confirm and re-enter the calendar name if it is not "
@@ -7318,24 +7315,24 @@ msgstr ""
 "kalendernavnet. Vennligst bekreft og oppgi kalendernavnet pà nytt hvis det "
 "ikke er korrekt."
 
-#: ../capplet/settings/mail-account-view.c:813
+#: ../capplet/settings/mail-account-view.c:810
 msgid "Yahoo account settings:"
 msgstr "Innstillinger for Yahoo-konto:"
 
-#: ../capplet/settings/mail-account-view.c:827
+#: ../capplet/settings/mail-account-view.c:824
 msgid "Yahoo Calendar name:"
 msgstr "Navn pà Yahoo-kalender"
 
-#: ../capplet/settings/mail-account-view.c:1099
+#: ../capplet/settings/mail-account-view.c:1094
 msgid "Password:"
 msgstr "Passord:"
 
-#: ../capplet/settings/mail-account-view.c:1150
+#: ../capplet/settings/mail-account-view.c:1145
 #: ../capplet/settings/mail-settings-view.c:248
 msgid "Close Tab"
 msgstr "Lukk fane"
 
-#: ../capplet/settings/mail-account-view.c:1160
+#: ../capplet/settings/mail-account-view.c:1155
 msgid "Account Wizard"
 msgstr "Kontoveiviser"
 
@@ -7344,19 +7341,19 @@ msgid "Evolution account assistant"
 msgstr "Evolution kontoassistent"
 
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:368 ../mail/e-mail-migrate.c:744
-#: ../mail/e-mail-store.c:234 ../mail/em-folder-tree-model.c:146
-#: ../mail/em-folder-tree-model.c:149 ../mail/em-folder-tree-model.c:152
-#: ../mail/em-folder-tree-model.c:154 ../mail/em-folder-tree-model.c:161
-#: ../mail/em-folder-tree-model.c:163 ../mail/mail-vfolder.c:235
+#: ../capplet/settings/mail-capplet-shell.c:372 ../mail/e-mail-migrate.c:744
+#: ../mail/e-mail-store.c:234 ../mail/em-folder-tree-model.c:149
+#: ../mail/em-folder-tree-model.c:152 ../mail/em-folder-tree-model.c:155
+#: ../mail/em-folder-tree-model.c:157 ../mail/em-folder-tree-model.c:164
+#: ../mail/em-folder-tree-model.c:166 ../mail/mail-vfolder.c:235
 #: ../mail/message-list.c:1714
-#: ../modules/addressbook/e-book-shell-backend.c:96
+#: ../modules/addressbook/e-book-shell-backend.c:100
 #: ../modules/addressbook/e-book-shell-migrate.c:136
-#: ../modules/calendar/e-cal-shell-backend.c:109
+#: ../modules/calendar/e-cal-shell-backend.c:113
 #: ../modules/calendar/e-cal-shell-migrate.c:154
-#: ../modules/calendar/e-memo-shell-backend.c:98
+#: ../modules/calendar/e-memo-shell-backend.c:102
 #: ../modules/calendar/e-memo-shell-migrate.c:109
-#: ../modules/calendar/e-task-shell-backend.c:98
+#: ../modules/calendar/e-task-shell-backend.c:102
 #: ../modules/calendar/e-task-shell-migrate.c:121
 msgid "On This Computer"
 msgstr "PÃ denne datamaskinen"
@@ -7396,7 +7393,7 @@ msgstr "Evolution"
 msgid "Evolution Mail and Calendar"
 msgstr "Evolution e-post og kalender"
 
-#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:657
+#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:654
 msgid "Groupware Suite"
 msgstr "GruppevarelÃsning"
 
@@ -7526,7 +7523,7 @@ msgstr "Synlig"
 
 #. strftime format of a weekday and a date.
 #: ../e-util/e-datetime-format.c:199
-#: ../modules/calendar/e-cal-shell-view-actions.c:1823
+#: ../modules/calendar/e-cal-shell-view-actions.c:1855
 #: ../plugins/itip-formatter/itip-view.c:191
 #: ../widgets/table/e-cell-date-edit.c:307
 msgid "Today"
@@ -7666,7 +7663,7 @@ msgstr "Vil du overskrive den?"
 msgid "File exists \"{0}\"."
 msgstr "Filen Â{0}Â eksisterer."
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:163
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:164
 msgid "_Overwrite"
 msgstr "_Overskriv"
 
@@ -7678,12 +7675,12 @@ msgstr "Kunne ikke Ãpne lenken."
 msgid "Could not display help for Evolution."
 msgstr "Kunne ikke vise hjelp for Evolution."
 
-#: ../e-util/gconf-bridge.c:1318
+#: ../e-util/gconf-bridge.c:1332
 #, c-format
 msgid "GConf error: %s"
 msgstr "GConf-feil: %s"
 
-#: ../e-util/gconf-bridge.c:1329
+#: ../e-util/gconf-bridge.c:1343
 msgid "All further errors shown only on terminal."
 msgstr "Alle videre feil blir kun vist pà konsollet."
 
@@ -7699,14 +7696,14 @@ msgid "Reply-To"
 msgstr "Svar-til"
 
 #: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1057
-#: ../mail/em-format-html.c:2564 ../mail/em-format-html.c:2632
-#: ../mail/em-format-html.c:2655 ../modules/mail/em-mailer-prefs.c:75
+#: ../mail/em-format-html.c:2574 ../mail/em-format-html.c:2642
+#: ../mail/em-format-html.c:2665 ../modules/mail/em-mailer-prefs.c:75
 msgid "Cc"
 msgstr "Cc"
 
 #: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1058
-#: ../mail/em-format-html.c:2565 ../mail/em-format-html.c:2636
-#: ../mail/em-format-html.c:2658 ../modules/mail/em-mailer-prefs.c:76
+#: ../mail/em-format-html.c:2575 ../mail/em-format-html.c:2646
+#: ../mail/em-format-html.c:2668 ../modules/mail/em-mailer-prefs.c:76
 msgid "Bcc"
 msgstr "Bcc"
 
@@ -7718,12 +7715,12 @@ msgid "Subject"
 msgstr "Emne"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:474 ../mail/em-format-html.c:2757
+#: ../em-format/em-format-quote.c:474 ../mail/em-format-html.c:2767
 #: ../modules/mail/em-mailer-prefs.c:1008
 msgid "Mailer"
 msgstr "E-postprogram"
 
-#: ../em-format/em-format-quote.c:564 ../mail/em-composer-utils.c:1189
+#: ../em-format/em-format-quote.c:564 ../mail/em-composer-utils.c:1197
 msgid "-------- Forwarded Message --------"
 msgstr "---------Videresendt melding-------"
 
@@ -7751,36 +7748,36 @@ msgstr "%s-vedlegg"
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Kunne ikke lese S/MIME-melding: Ukjent feil"
 
-#: ../em-format/em-format.c:1769 ../em-format/em-format.c:1995
+#: ../em-format/em-format.c:1771 ../em-format/em-format.c:1997
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Kunne ikke lese MIME-melding. Viser ren meldingstekst."
 
-#: ../em-format/em-format.c:1780
+#: ../em-format/em-format.c:1782
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Krypteringstype for multipart/encrypted som ikke er stÃttet"
 
-#: ../em-format/em-format.c:1800
+#: ../em-format/em-format.c:1802
 msgid "Could not parse PGP/MIME message"
 msgstr "Kunne ikke lese PGP/MIME-melding"
 
-#: ../em-format/em-format.c:1801
+#: ../em-format/em-format.c:1803
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "Kunne ikke lese PGP/MIME-melding: Ukjent feil"
 
-#: ../em-format/em-format.c:2020
+#: ../em-format/em-format.c:2022
 msgid "Unsupported signature format"
 msgstr "UstÃttet signaturformat"
 
-#: ../em-format/em-format.c:2033 ../em-format/em-format.c:2215
+#: ../em-format/em-format.c:2035 ../em-format/em-format.c:2217
 msgid "Error verifying signature"
 msgstr "Feil under verifisering av signatur"
 
-#: ../em-format/em-format.c:2034 ../em-format/em-format.c:2200
-#: ../em-format/em-format.c:2216
+#: ../em-format/em-format.c:2036 ../em-format/em-format.c:2202
+#: ../em-format/em-format.c:2218
 msgid "Unknown error verifying signature"
 msgstr "Ukjent feil under verifisering av signatur"
 
-#: ../em-format/em-format.c:2308
+#: ../em-format/em-format.c:2310
 msgid "Could not parse PGP message: "
 msgstr "Kunne ikke lese PGP-melding:"
 
@@ -7949,8 +7946,8 @@ msgid "No reply or parent"
 msgstr "Ingen svar eller opphav"
 
 #: ../filter/e-filter-rule.c:759
-msgid "I_nclude threads"
-msgstr "Ta _med trÃder"
+msgid "I_nclude threads:"
+msgstr "Ta _med trÃder:"
 
 #: ../filter/e-filter-rule.c:784
 msgid "A_dd Condition"
@@ -7993,7 +7990,7 @@ msgstr "Mangler dato."
 msgid "Missing file name."
 msgstr "Mangler filnavn."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:89
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:90
 msgid "Missing name."
 msgstr "Mangler navn."
 
@@ -8086,68 +8083,45 @@ msgstr "tiden du oppgir"
 msgid "years"
 msgstr "Ãr"
 
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:568 ../mail/mail-config.ui.h:72
-#: ../modules/addressbook/ldap-config.ui.h:9
-msgid "No encryption"
-msgstr "Ingen kryptering"
-
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. TLS (Transport Layer Security) is commonly known by
-#. this abbreviation.
-#: ../mail/em-account-editor.c:572 ../mail/mail-config.ui.h:130
-#: ../modules/addressbook/ldap-config.ui.h:20
-msgid "TLS encryption"
-msgstr "TLS-kryptering"
-
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
-#. abbreviation.
-#: ../mail/em-account-editor.c:576 ../mail/mail-config.ui.h:94
-#: ../modules/addressbook/ldap-config.ui.h:12
-msgid "SSL encryption"
-msgstr "SSL-kryptering"
-
 #. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:839 ../widgets/misc/e-signature-combo-box.c:75
+#: ../mail/em-account-editor.c:845 ../widgets/misc/e-signature-combo-box.c:75
 msgctxt "mail-signature"
 msgid "None"
 msgstr "Ingen"
 
-#: ../mail/em-account-editor.c:920
+#: ../mail/em-account-editor.c:926
 msgid "Never"
 msgstr "Aldri"
 
-#: ../mail/em-account-editor.c:921
+#: ../mail/em-account-editor.c:927
 msgid "Always"
 msgstr "Alltid"
 
-#: ../mail/em-account-editor.c:922
+#: ../mail/em-account-editor.c:928
 msgid "Ask for each message"
 msgstr "SpÃr for hver melding"
 
 #. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1742 ../widgets/misc/e-account-tree-view.c:131
+#: ../mail/em-account-editor.c:1787 ../widgets/misc/e-account-tree-view.c:131
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "Ingen"
 
-#: ../mail/em-account-editor.c:2178
+#: ../mail/em-account-editor.c:2226
 msgid "Mail Configuration"
 msgstr "E-post-konfigurasjon"
 
-#: ../mail/em-account-editor.c:2179
+#: ../mail/em-account-editor.c:2227
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
-"Click \"Forward\" to begin."
+"Click \"Continue\" to begin."
 msgstr ""
 "Velkommen til assistenten for konfigurasjon av Evolution e-post.\n"
 "\n"
-"Klikk ÂFramover for à begynne."
+"Klikk ÂFortsett for à begynne."
 
-#: ../mail/em-account-editor.c:2182
+#: ../mail/em-account-editor.c:2230
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -8157,19 +8131,19 @@ msgstr ""
 "under mà ikke nÃdvendigvis fylles ut, hvis du ikke Ãnsker à inkludere denne "
 "informasjonen i meldingene du sender."
 
-#: ../mail/em-account-editor.c:2184 ../mail/em-account-editor.c:2372
+#: ../mail/em-account-editor.c:2232 ../mail/em-account-editor.c:2421
 msgid "Receiving Email"
 msgstr "Innkommende e-post"
 
-#: ../mail/em-account-editor.c:2185
+#: ../mail/em-account-editor.c:2233
 msgid "Please configure the following account settings."
 msgstr "Vennligst konfigurer fÃlgende kontoinnstillinger."
 
-#: ../mail/em-account-editor.c:2187 ../mail/em-account-editor.c:2896
+#: ../mail/em-account-editor.c:2235 ../mail/em-account-editor.c:3018
 msgid "Sending Email"
 msgstr "UtgÃende e-post"
 
-#: ../mail/em-account-editor.c:2188
+#: ../mail/em-account-editor.c:2236
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -8177,11 +8151,11 @@ msgstr ""
 "Vennligst skriv inn informasjon om mÃten du sender e-post. Hvis du ikke er "
 "sikker, kontakt din systemadministrator eller din Internett tjenestetilbyder."
 
-#: ../mail/em-account-editor.c:2190 ../mail/mail-config.ui.h:1
+#: ../mail/em-account-editor.c:2238 ../mail/mail-config.ui.h:1
 msgid "Account Information"
 msgstr "Kontoinformasjon"
 
-#: ../mail/em-account-editor.c:2191
+#: ../mail/em-account-editor.c:2239
 msgid ""
 "Please enter a descriptive name for this account below.\n"
 "This name will be used for display purposes only."
@@ -8189,11 +8163,11 @@ msgstr ""
 "Vennligst oppgi et beskrivende navn for denne kontoen i feltet under.\n"
 "Dette navnet vil kun bli brukt som et visningsnavn."
 
-#: ../mail/em-account-editor.c:2195
+#: ../mail/em-account-editor.c:2243
 msgid "Done"
 msgstr "Ferdig"
 
-#: ../mail/em-account-editor.c:2196
+#: ../mail/em-account-editor.c:2244
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -8207,34 +8181,30 @@ msgstr ""
 "\n"
 "Klikk ÂBruk for à lagre dine innstillinger."
 
-#: ../mail/em-account-editor.c:2694
+#: ../mail/em-account-editor.c:2780
 msgid "Check for _new messages every"
 msgstr "Se etter _nye meldinger hver(t)"
 
-#: ../mail/em-account-editor.c:2702
+#: ../mail/em-account-editor.c:2788
 msgid "minu_tes"
 msgstr "minu_tter"
 
-#: ../mail/em-account-editor.c:3013
-msgid "Please select a folder from the current account."
-msgstr "Vennligst velg en mappe fra valgt konto."
-
-#: ../mail/em-account-editor.c:3339 ../mail/mail-config.ui.h:101
+#: ../mail/em-account-editor.c:3361 ../mail/mail-config.ui.h:101
 msgid "Security"
 msgstr "Sikkerhet"
 
 #. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:3393 ../mail/em-account-editor.c:3476
+#: ../mail/em-account-editor.c:3415 ../mail/em-account-editor.c:3498
 msgid "Receiving Options"
 msgstr "Alternativer for mottak"
 
-#: ../mail/em-account-editor.c:3394 ../mail/em-account-editor.c:3477
+#: ../mail/em-account-editor.c:3416 ../mail/em-account-editor.c:3499
 msgid "Checking for New Messages"
 msgstr "Ser etter nye meldinger"
 
 #: ../mail/e-mail-attachment-bar.c:90 ../mail/e-mail-attachment-bar.c:95
-#: ../mail/em-format-html-display.c:1217 ../mail/mail-config.ui.h:14
+#: ../mail/em-format-html-display.c:1395 ../mail/mail-config.ui.h:14
 #: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:128
 #: ../widgets/misc/e-attachment-paned.c:133
 msgid "Attachment"
@@ -8252,9 +8222,9 @@ msgstr "Ikonvisning"
 msgid "List View"
 msgstr "Listevisning"
 
-#: ../mail/e-mail-browser.c:134 ../shell/e-shell-window-actions.c:1446
-#: ../shell/e-shell-window-actions.c:1453
-#: ../shell/e-shell-window-actions.c:1460
+#: ../mail/e-mail-browser.c:134 ../shell/e-shell-window-actions.c:1427
+#: ../shell/e-shell-window-actions.c:1434
+#: ../shell/e-shell-window-actions.c:1441
 msgid "Close this window"
 msgstr "Lukk dette vinduet"
 
@@ -8306,32 +8276,32 @@ msgid_plural "Retrieving %d messages"
 msgstr[0] "Henter %d melding"
 msgstr[1] "Henter %d melding(er)"
 
-#: ../mail/e-mail-folder-utils.c:824
+#: ../mail/e-mail-folder-utils.c:833
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "Fjerner mappe Â%sÂ"
 
-#: ../mail/e-mail-folder-utils.c:948
+#: ../mail/e-mail-folder-utils.c:967
 #, c-format
 msgid "File \"%s\" has been removed."
 msgstr "Filen Â%s ble fjernet."
 
-#: ../mail/e-mail-folder-utils.c:952
+#: ../mail/e-mail-folder-utils.c:971
 msgid "File has been removed."
 msgstr "Filen er fjernet."
 
-#: ../mail/e-mail-folder-utils.c:1011
+#: ../mail/e-mail-folder-utils.c:1030
 msgid "Removing attachments"
 msgstr "Fjerner vedlegg"
 
-#: ../mail/e-mail-folder-utils.c:1175
+#: ../mail/e-mail-folder-utils.c:1194
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "Lagrer %d melding"
 msgstr[1] "Lagrer %d meldinger"
 
-#: ../mail/e-mail-folder-utils.c:1519 ../mail/em-folder-utils.c:577
+#: ../mail/e-mail-folder-utils.c:1538 ../mail/em-folder-utils.c:588
 #, c-format
 msgid "Invalid folder URI '%s'"
 msgstr "Ugyldig URI for mappe Â%sÂ"
@@ -8400,29 +8370,29 @@ msgid "Name"
 msgstr "Navn"
 
 #: ../mail/e-mail-local.c:41 ../mail/em-folder-properties.c:310
-#: ../mail/em-folder-tree-model.c:722
-#: ../modules/mail/e-mail-shell-view-private.c:1065
-#: ../modules/mail/e-mail-shell-view-private.c:1076
+#: ../mail/em-folder-tree-model.c:725
+#: ../modules/mail/e-mail-shell-view-private.c:1066
+#: ../modules/mail/e-mail-shell-view-private.c:1077
 msgid "Inbox"
 msgstr "Innboks"
 
-#: ../mail/e-mail-local.c:42 ../mail/em-folder-tree-model.c:715
-#: ../modules/mail/e-mail-shell-view-private.c:1063
+#: ../mail/e-mail-local.c:42 ../mail/em-folder-tree-model.c:718
+#: ../modules/mail/e-mail-shell-view-private.c:1064
 msgid "Drafts"
 msgstr "Skisser"
 
-#: ../mail/e-mail-local.c:43 ../mail/em-folder-tree-model.c:726
-#: ../modules/mail/e-mail-shell-view-private.c:1067
+#: ../mail/e-mail-local.c:43 ../mail/em-folder-tree-model.c:729
+#: ../modules/mail/e-mail-shell-view-private.c:1068
 msgid "Outbox"
 msgstr "Utboks"
 
-#: ../mail/e-mail-local.c:44 ../mail/em-folder-tree-model.c:730
-#: ../modules/mail/e-mail-shell-view-private.c:1069
+#: ../mail/e-mail-local.c:44 ../mail/em-folder-tree-model.c:733
+#: ../modules/mail/e-mail-shell-view-private.c:1070
 msgid "Sent"
 msgstr "Sendt"
 
-#: ../mail/e-mail-local.c:45 ../mail/em-folder-tree-model.c:718
-#: ../modules/mail/e-mail-shell-view-private.c:1071
+#: ../mail/e-mail-local.c:45 ../mail/em-folder-tree-model.c:721
+#: ../modules/mail/e-mail-shell-view-private.c:1072
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 #: ../plugins/templates/templates.c:1006 ../plugins/templates/templates.c:1283
 #: ../plugins/templates/templates.c:1293
@@ -8458,7 +8428,7 @@ msgstr ""
 "\n"
 "Vennligst vent mens Evolution migrere dine mapper â"
 
-#: ../mail/e-mail-migrate.c:1279
+#: ../mail/e-mail-migrate.c:1523
 #, c-format
 msgid "Unable to create local mail folders at '%s': %s"
 msgstr "Kunne ikke opprette lokale e-postmapper i Â%sÂ: %s"
@@ -8467,634 +8437,634 @@ 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:304 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:308 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Kopier til mappe"
 
-#: ../mail/e-mail-reader.c:304 ../mail/em-folder-utils.c:480
+#: ../mail/e-mail-reader.c:308 ../mail/em-folder-utils.c:486
 msgid "C_opy"
 msgstr "K_opier"
 
-#: ../mail/e-mail-reader.c:806 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:814 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "Flytt til mappe"
 
-#: ../mail/e-mail-reader.c:806 ../mail/em-folder-utils.c:480
+#: ../mail/e-mail-reader.c:814 ../mail/em-folder-utils.c:486
 msgid "_Move"
 msgstr "_Flytt"
 
-#: ../mail/e-mail-reader.c:1167 ../mail/e-mail-reader.c:1355
-#: ../mail/e-mail-reader.c:1395
+#: ../mail/e-mail-reader.c:1175 ../mail/e-mail-reader.c:1363
+#: ../mail/e-mail-reader.c:1403
 msgid "_Do not ask me again."
 msgstr "_Ikke spÃr meg igjen."
 
-#: ../mail/e-mail-reader.c:1401
+#: ../mail/e-mail-reader.c:1409
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Alltid ignorer Reply-To: for e-postlister."
 
-#: ../mail/e-mail-reader.c:1767
+#: ../mail/e-mail-reader.c:1775
 msgid "A_dd Sender to Address Book"
 msgstr "L_egg til avsender i adressebok"
 
-#: ../mail/e-mail-reader.c:1769
+#: ../mail/e-mail-reader.c:1777
 msgid "Add sender to address book"
 msgstr "Legg til avsender i adressebok"
 
-#: ../mail/e-mail-reader.c:1774
+#: ../mail/e-mail-reader.c:1782
 msgid "Check for _Junk"
 msgstr "Sjekk etter _uÃnsket e-post"
 
-#: ../mail/e-mail-reader.c:1776
+#: ../mail/e-mail-reader.c:1784
 msgid "Filter the selected messages for junk status"
 msgstr "Filtrer valgte meldinger etter uÃnsket e-poststatus"
 
-#: ../mail/e-mail-reader.c:1781
+#: ../mail/e-mail-reader.c:1789
 msgid "_Copy to Folder..."
 msgstr "K_opier til mappe â"
 
-#: ../mail/e-mail-reader.c:1783
+#: ../mail/e-mail-reader.c:1791
 msgid "Copy selected messages to another folder"
 msgstr "Kopier valgte meldinger til en annen mappe"
 
-#: ../mail/e-mail-reader.c:1788
+#: ../mail/e-mail-reader.c:1796
 msgid "_Delete Message"
 msgstr "_Slett melding"
 
-#: ../mail/e-mail-reader.c:1790
+#: ../mail/e-mail-reader.c:1798
 msgid "Mark the selected messages for deletion"
 msgstr "Merk valgte meldinger for sletting"
 
-#: ../mail/e-mail-reader.c:1795
+#: ../mail/e-mail-reader.c:1803
 msgid "Filter on Mailing _List..."
 msgstr "Filtrer pà e-post_liste â"
 
-#: ../mail/e-mail-reader.c:1797
+#: ../mail/e-mail-reader.c:1805
 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:1802
+#: ../mail/e-mail-reader.c:1810
 msgid "Filter on _Recipients..."
 msgstr "Filtrer pà mottake_re â"
 
-#: ../mail/e-mail-reader.c:1804
+#: ../mail/e-mail-reader.c:1812
 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:1809
+#: ../mail/e-mail-reader.c:1817
 msgid "Filter on Se_nder..."
 msgstr "Filtrer pà se_nder â"
 
-#: ../mail/e-mail-reader.c:1811
+#: ../mail/e-mail-reader.c:1819
 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:1816
+#: ../mail/e-mail-reader.c:1824
 msgid "Filter on _Subject..."
 msgstr "Filtrer pà e_mne â"
 
-#: ../mail/e-mail-reader.c:1818
+#: ../mail/e-mail-reader.c:1826
 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:1823
+#: ../mail/e-mail-reader.c:1831
 msgid "A_pply Filters"
 msgstr "_PÃfÃr filtre"
 
-#: ../mail/e-mail-reader.c:1825
+#: ../mail/e-mail-reader.c:1833
 msgid "Apply filter rules to the selected messages"
 msgstr "Aktiver filterregler pà de valgte meldingene"
 
-#: ../mail/e-mail-reader.c:1830
+#: ../mail/e-mail-reader.c:1838
 msgid "_Find in Message..."
 msgstr "_Finn i melding â"
 
-#: ../mail/e-mail-reader.c:1832
+#: ../mail/e-mail-reader.c:1840
 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:1837
+#: ../mail/e-mail-reader.c:1845
 msgid "_Clear Flag"
 msgstr "F_jern flagg"
 
-#: ../mail/e-mail-reader.c:1839
+#: ../mail/e-mail-reader.c:1847
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Fjern flagg for oppfÃlging fra valgte meldinger"
 
-#: ../mail/e-mail-reader.c:1844
+#: ../mail/e-mail-reader.c:1852
 msgid "_Flag Completed"
 msgstr "Merk som _fullfÃrt"
 
-#: ../mail/e-mail-reader.c:1846
+#: ../mail/e-mail-reader.c:1854
 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:1851
+#: ../mail/e-mail-reader.c:1859
 msgid "Follow _Up..."
 msgstr "FÃlg _opp â"
 
-#: ../mail/e-mail-reader.c:1853
+#: ../mail/e-mail-reader.c:1861
 msgid "Flag the selected messages for follow-up"
 msgstr "Merk valgte meldinger for oppfÃlging"
 
-#: ../mail/e-mail-reader.c:1858
+#: ../mail/e-mail-reader.c:1866
 msgid "_Attached"
 msgstr "L_agt ved"
 
-#: ../mail/e-mail-reader.c:1860 ../mail/e-mail-reader.c:1867
+#: ../mail/e-mail-reader.c:1868 ../mail/e-mail-reader.c:1875
 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:1865
+#: ../mail/e-mail-reader.c:1873
 msgid "Forward As _Attached"
 msgstr "Videresend s_om vedlegg"
 
-#: ../mail/e-mail-reader.c:1872
+#: ../mail/e-mail-reader.c:1880
 msgid "_Inline"
 msgstr "_I meldingen"
 
-#: ../mail/e-mail-reader.c:1874 ../mail/e-mail-reader.c:1881
+#: ../mail/e-mail-reader.c:1882 ../mail/e-mail-reader.c:1889
 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:1879
+#: ../mail/e-mail-reader.c:1887
 msgid "Forward As _Inline"
 msgstr "V_ideresend som vedlegg"
 
-#: ../mail/e-mail-reader.c:1886
+#: ../mail/e-mail-reader.c:1894
 msgid "_Quoted"
 msgstr "_Sitert"
 
-#: ../mail/e-mail-reader.c:1888 ../mail/e-mail-reader.c:1895
+#: ../mail/e-mail-reader.c:1896 ../mail/e-mail-reader.c:1903
 msgid "Forward the selected message quoted like a reply"
 msgstr "Videresend den valgte meldingen sitert som et svar"
 
-#: ../mail/e-mail-reader.c:1893
+#: ../mail/e-mail-reader.c:1901
 msgid "Forward As _Quoted"
 msgstr "Videresend s_om sitat"
 
-#: ../mail/e-mail-reader.c:1900
+#: ../mail/e-mail-reader.c:1908
 msgid "_Load Images"
 msgstr "_Last bilder"
 
-#: ../mail/e-mail-reader.c:1902
+#: ../mail/e-mail-reader.c:1910
 msgid "Force images in HTML mail to be loaded"
 msgstr "Tvungen lasting av bilder i HTML e-post"
 
-#: ../mail/e-mail-reader.c:1907
+#: ../mail/e-mail-reader.c:1915
 msgid "_Important"
 msgstr "V_iktig"
 
-#: ../mail/e-mail-reader.c:1909
+#: ../mail/e-mail-reader.c:1917
 msgid "Mark the selected messages as important"
 msgstr "Merk valgte meldinger som viktige"
 
-#: ../mail/e-mail-reader.c:1914
+#: ../mail/e-mail-reader.c:1922
 msgid "_Junk"
 msgstr "_UÃnsket e-post"
 
-#: ../mail/e-mail-reader.c:1916
+#: ../mail/e-mail-reader.c:1924
 msgid "Mark the selected messages as junk"
 msgstr "Merk valgte meldinger som uÃnsket e-post"
 
-#: ../mail/e-mail-reader.c:1921
+#: ../mail/e-mail-reader.c:1929
 msgid "_Not Junk"
 msgstr "_Ikke uÃnsket e-post"
 
-#: ../mail/e-mail-reader.c:1923
+#: ../mail/e-mail-reader.c:1931
 msgid "Mark the selected messages as not being junk"
 msgstr "Merk valgte meldinger som Ãnsket e-post"
 
-#: ../mail/e-mail-reader.c:1928
+#: ../mail/e-mail-reader.c:1936
 msgid "_Read"
 msgstr "_Les"
 
-#: ../mail/e-mail-reader.c:1930
+#: ../mail/e-mail-reader.c:1938
 msgid "Mark the selected messages as having been read"
 msgstr "Merk valgte meldinger som lest"
 
-#: ../mail/e-mail-reader.c:1935
+#: ../mail/e-mail-reader.c:1943
 msgid "Uni_mportant"
 msgstr "_Ikke viktig"
 
-#: ../mail/e-mail-reader.c:1937
+#: ../mail/e-mail-reader.c:1945
 msgid "Mark the selected messages as unimportant"
 msgstr "Merk valgte meldinger som uviktige"
 
-#: ../mail/e-mail-reader.c:1942
+#: ../mail/e-mail-reader.c:1950
 msgid "_Unread"
 msgstr "_Ulest"
 
-#: ../mail/e-mail-reader.c:1944
+#: ../mail/e-mail-reader.c:1952
 msgid "Mark the selected messages as not having been read"
 msgstr "Merk valgte meldinger som ulest"
 
-#: ../mail/e-mail-reader.c:1949
+#: ../mail/e-mail-reader.c:1957
 msgid "_Edit as New Message..."
 msgstr "R_ediger som ny melding â"
 
-#: ../mail/e-mail-reader.c:1951
+#: ../mail/e-mail-reader.c:1959
 msgid "Open the selected messages in the composer for editing"
 msgstr "Ãpne valgte meldinger i redigeringskomponenten"
 
-#: ../mail/e-mail-reader.c:1956
+#: ../mail/e-mail-reader.c:1964
 msgid "Compose _New Message"
 msgstr "Skriv _ny melding"
 
-#: ../mail/e-mail-reader.c:1958
+#: ../mail/e-mail-reader.c:1966
 msgid "Open a window for composing a mail message"
 msgstr "Ãpne et vindu for à skrive en e-post melding"
 
-#: ../mail/e-mail-reader.c:1963
+#: ../mail/e-mail-reader.c:1971
 msgid "_Open in New Window"
 msgstr "_Ãpne i _nytt vindu"
 
-#: ../mail/e-mail-reader.c:1965
+#: ../mail/e-mail-reader.c:1973
 msgid "Open the selected messages in a new window"
 msgstr "Ãpne valgte meldinger i et nytt vindu"
 
-#: ../mail/e-mail-reader.c:1970
+#: ../mail/e-mail-reader.c:1978
 msgid "_Move to Folder..."
 msgstr "Fl_ytt til mappe â"
 
-#: ../mail/e-mail-reader.c:1972
+#: ../mail/e-mail-reader.c:1980
 msgid "Move selected messages to another folder"
 msgstr "Flytt valgte meldinger til en annen mappe"
 
-#: ../mail/e-mail-reader.c:1977
+#: ../mail/e-mail-reader.c:1985
 msgid "_Switch to Folder"
 msgstr "_Bytt til mappe"
 
-#: ../mail/e-mail-reader.c:1979
+#: ../mail/e-mail-reader.c:1987
 msgid "Display the parent folder"
 msgstr "Vis opphavsmappe"
 
-#: ../mail/e-mail-reader.c:1984
+#: ../mail/e-mail-reader.c:1992
 msgid "Switch to _next tab"
 msgstr "Bytt til _neste fane"
 
-#: ../mail/e-mail-reader.c:1986
+#: ../mail/e-mail-reader.c:1994
 msgid "Switch to the next tab"
 msgstr "Bytt til neste fane"
 
-#: ../mail/e-mail-reader.c:1991
+#: ../mail/e-mail-reader.c:1999
 msgid "Switch to _previous tab"
 msgstr "Bytt til _forrige fane"
 
-#: ../mail/e-mail-reader.c:1993
+#: ../mail/e-mail-reader.c:2001
 msgid "Switch to the previous tab"
 msgstr "Bytt til forrige fane"
 
-#: ../mail/e-mail-reader.c:1998
+#: ../mail/e-mail-reader.c:2006
 msgid "Cl_ose current tab"
 msgstr "L_ukk aktiv fane"
 
-#: ../mail/e-mail-reader.c:2000
+#: ../mail/e-mail-reader.c:2008
 msgid "Close current tab"
 msgstr "Lukk aktiv fane"
 
-#: ../mail/e-mail-reader.c:2005
+#: ../mail/e-mail-reader.c:2013
 msgid "_Next Message"
 msgstr "_Neste melding"
 
-#: ../mail/e-mail-reader.c:2007
+#: ../mail/e-mail-reader.c:2015
 msgid "Display the next message"
 msgstr "Vis neste melding"
 
-#: ../mail/e-mail-reader.c:2012
+#: ../mail/e-mail-reader.c:2020
 msgid "Next _Important Message"
 msgstr "Neste v_iktige melding"
 
-#: ../mail/e-mail-reader.c:2014
+#: ../mail/e-mail-reader.c:2022
 msgid "Display the next important message"
 msgstr "Vis neste viktige melding"
 
-#: ../mail/e-mail-reader.c:2019
+#: ../mail/e-mail-reader.c:2027
 msgid "Next _Thread"
 msgstr "Neste _trÃd"
 
-#: ../mail/e-mail-reader.c:2021
+#: ../mail/e-mail-reader.c:2029
 msgid "Display the next thread"
 msgstr "Vis neste trÃd"
 
-#: ../mail/e-mail-reader.c:2026
+#: ../mail/e-mail-reader.c:2034
 msgid "Next _Unread Message"
 msgstr "Neste _uleste melding"
 
-#: ../mail/e-mail-reader.c:2028
+#: ../mail/e-mail-reader.c:2036
 msgid "Display the next unread message"
 msgstr "Vis neste uleste melding"
 
-#: ../mail/e-mail-reader.c:2033
+#: ../mail/e-mail-reader.c:2041
 msgid "_Previous Message"
 msgstr "_Forrige melding"
 
-#: ../mail/e-mail-reader.c:2035
+#: ../mail/e-mail-reader.c:2043
 msgid "Display the previous message"
 msgstr "Vis forrige melding"
 
-#: ../mail/e-mail-reader.c:2040
+#: ../mail/e-mail-reader.c:2048
 msgid "Pr_evious Important Message"
 msgstr "Forrig_e viktige melding"
 
-#: ../mail/e-mail-reader.c:2042
+#: ../mail/e-mail-reader.c:2050
 msgid "Display the previous important message"
 msgstr "Vis forrige viktige melding"
 
-#: ../mail/e-mail-reader.c:2047
+#: ../mail/e-mail-reader.c:2055
 msgid "Previous T_hread"
 msgstr "Forrige trÃ_d"
 
-#: ../mail/e-mail-reader.c:2049
+#: ../mail/e-mail-reader.c:2057
 msgid "Display the previous thread"
 msgstr "Vis forrige trÃd"
 
-#: ../mail/e-mail-reader.c:2054
+#: ../mail/e-mail-reader.c:2062
 msgid "P_revious Unread Message"
 msgstr "Fo_rrige uleste melding"
 
-#: ../mail/e-mail-reader.c:2056
+#: ../mail/e-mail-reader.c:2064
 msgid "Display the previous unread message"
 msgstr "Vis forrige uleste melding"
 
-#: ../mail/e-mail-reader.c:2063
+#: ../mail/e-mail-reader.c:2071
 msgid "Print this message"
 msgstr "Skriv ut denne meldingen"
 
-#: ../mail/e-mail-reader.c:2070
+#: ../mail/e-mail-reader.c:2078
 msgid "Preview the message to be printed"
 msgstr "ForhÃndsvis meldingen som skal skrives ut"
 
-#: ../mail/e-mail-reader.c:2075
+#: ../mail/e-mail-reader.c:2083
 msgid "Re_direct"
 msgstr "Om_diriger"
 
-#: ../mail/e-mail-reader.c:2077
+#: ../mail/e-mail-reader.c:2085
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Omdiriger (bounce) den valgte meldingen til noen"
 
-#: ../mail/e-mail-reader.c:2082
+#: ../mail/e-mail-reader.c:2090
 msgid "Remo_ve Attachments"
 msgstr "Fjern _vedlegg"
 
-#: ../mail/e-mail-reader.c:2084
+#: ../mail/e-mail-reader.c:2092
 msgid "Remove attachments"
 msgstr "Fjern vedlegg"
 
-#: ../mail/e-mail-reader.c:2089
+#: ../mail/e-mail-reader.c:2097
 msgid "Remove Du_plicate Messages"
 msgstr "Fjern du_plikatmeldinger"
 
-#: ../mail/e-mail-reader.c:2091
+#: ../mail/e-mail-reader.c:2099
 msgid "Checks selected messages for duplicates"
 msgstr "Sjekk valgte meldinger for duplikater"
 
-#: ../mail/e-mail-reader.c:2096 ../mail/mail.error.xml.h:108
-#: ../modules/calendar/e-cal-shell-view-actions.c:1477
+#: ../mail/e-mail-reader.c:2104 ../mail/mail.error.xml.h:109
+#: ../modules/calendar/e-cal-shell-view-actions.c:1509
 #: ../modules/mail/e-mail-attachment-handler.c:177
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: ../mail/e-mail-reader.c:2098
+#: ../mail/e-mail-reader.c:2106
 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:2103 ../mail/mail.error.xml.h:109
+#: ../mail/e-mail-reader.c:2111 ../mail/mail.error.xml.h:110
 msgid "Reply to _List"
 msgstr "Svar til _listen"
 
-#: ../mail/e-mail-reader.c:2105
+#: ../mail/e-mail-reader.c:2113
 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:2110
+#: ../mail/e-mail-reader.c:2118
 #: ../modules/mail/e-mail-attachment-handler.c:184
 msgid "_Reply to Sender"
 msgstr "Sva_r til avsender"
 
-#: ../mail/e-mail-reader.c:2112
+#: ../mail/e-mail-reader.c:2120
 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:2117
+#: ../mail/e-mail-reader.c:2125
 msgid "_Save as mbox..."
 msgstr "Lagre _som mbox â"
 
-#: ../mail/e-mail-reader.c:2119
+#: ../mail/e-mail-reader.c:2127
 msgid "Save selected messages as an mbox file"
 msgstr "Lagre valgte meldinger som en mbox-fil"
 
-#: ../mail/e-mail-reader.c:2124
+#: ../mail/e-mail-reader.c:2132
 msgid "_Message Source"
 msgstr "_Meldingskilde"
 
-#: ../mail/e-mail-reader.c:2126
+#: ../mail/e-mail-reader.c:2134
 msgid "Show the raw email source of the message"
 msgstr "Vis e-post meldingen i sin rÃe form"
 
-#: ../mail/e-mail-reader.c:2138
+#: ../mail/e-mail-reader.c:2146
 msgid "_Undelete Message"
 msgstr "_Angre sletting av melding"
 
-#: ../mail/e-mail-reader.c:2140
+#: ../mail/e-mail-reader.c:2148
 msgid "Undelete the selected messages"
 msgstr "Angre sletting av valgte meldinger"
 
-#: ../mail/e-mail-reader.c:2145
+#: ../mail/e-mail-reader.c:2153
 msgid "_Normal Size"
 msgstr "_Normal stÃrrelse"
 
-#: ../mail/e-mail-reader.c:2147
+#: ../mail/e-mail-reader.c:2155
 msgid "Reset the text to its original size"
 msgstr "Ta teksten tilbake til sin opprinnelige stÃrrelse"
 
-#: ../mail/e-mail-reader.c:2152
+#: ../mail/e-mail-reader.c:2160
 msgid "_Zoom In"
 msgstr "_Zoom inn"
 
-#: ../mail/e-mail-reader.c:2154
+#: ../mail/e-mail-reader.c:2162
 msgid "Increase the text size"
 msgstr "StÃrre tekst"
 
-#: ../mail/e-mail-reader.c:2159
+#: ../mail/e-mail-reader.c:2167
 msgid "Zoom _Out"
 msgstr "Zoom _ut"
 
-#: ../mail/e-mail-reader.c:2161
+#: ../mail/e-mail-reader.c:2169
 msgid "Decrease the text size"
 msgstr "Mindre skrift"
 
-#: ../mail/e-mail-reader.c:2168
+#: ../mail/e-mail-reader.c:2176
 msgid "Create R_ule"
 msgstr "Opprett _regel"
 
-#: ../mail/e-mail-reader.c:2175
+#: ../mail/e-mail-reader.c:2183
 msgid "Ch_aracter Encoding"
 msgstr "Tegn_koding"
 
-#: ../mail/e-mail-reader.c:2182
+#: ../mail/e-mail-reader.c:2190
 msgid "F_orward As"
 msgstr "Videresend s_om"
 
-#: ../mail/e-mail-reader.c:2189
+#: ../mail/e-mail-reader.c:2197
 msgid "_Group Reply"
 msgstr "_Gruppesvar"
 
-#: ../mail/e-mail-reader.c:2196
+#: ../mail/e-mail-reader.c:2204
 msgid "_Go To"
 msgstr "_GÃ til"
 
-#: ../mail/e-mail-reader.c:2203
+#: ../mail/e-mail-reader.c:2211
 msgid "Mar_k As"
 msgstr "Mer_k som"
 
-#: ../mail/e-mail-reader.c:2210
+#: ../mail/e-mail-reader.c:2218
 msgid "_Message"
 msgstr "_Melding"
 
-#: ../mail/e-mail-reader.c:2217
+#: ../mail/e-mail-reader.c:2225
 msgid "_Zoom"
 msgstr "_Zoom"
 
-#: ../mail/e-mail-reader.c:2227
+#: ../mail/e-mail-reader.c:2235
 msgid "Search Folder from Mailing _List..."
 msgstr "SÃkemappe pà e-post_liste â"
 
-#: ../mail/e-mail-reader.c:2229
+#: ../mail/e-mail-reader.c:2237
 msgid "Create a search folder for this mailing list"
 msgstr "Lag en sÃkemappe for denne e-postlisten"
 
-#: ../mail/e-mail-reader.c:2234
+#: ../mail/e-mail-reader.c:2242
 msgid "Search Folder from Recipien_ts..."
 msgstr "SÃkemappe fra mo_ttakere â"
 
-#: ../mail/e-mail-reader.c:2236
+#: ../mail/e-mail-reader.c:2244
 msgid "Create a search folder for these recipients"
 msgstr "Lag en sÃkemappe for disse mottakerene"
 
-#: ../mail/e-mail-reader.c:2241
+#: ../mail/e-mail-reader.c:2249
 msgid "Search Folder from Sen_der..."
 msgstr "SÃkemappe for avsen_der â"
 
-#: ../mail/e-mail-reader.c:2243
+#: ../mail/e-mail-reader.c:2251
 msgid "Create a search folder for this sender"
 msgstr "Lag en sÃkemappe for denne avsenderen"
 
-#: ../mail/e-mail-reader.c:2248
+#: ../mail/e-mail-reader.c:2256
 msgid "Search Folder from S_ubject..."
 msgstr "SÃkemappe for _emne â"
 
-#: ../mail/e-mail-reader.c:2250
+#: ../mail/e-mail-reader.c:2258
 msgid "Create a search folder for this subject"
 msgstr "Lag en sÃkemappe for dette emnet"
 
-#: ../mail/e-mail-reader.c:2273
+#: ../mail/e-mail-reader.c:2281
 msgid "Mark for Follo_w Up..."
 msgstr "Merk for oppfÃl_ging â"
 
-#: ../mail/e-mail-reader.c:2281
+#: ../mail/e-mail-reader.c:2289
 msgid "Mark as _Important"
 msgstr "Merk som v_iktig"
 
-#: ../mail/e-mail-reader.c:2285
+#: ../mail/e-mail-reader.c:2293
 msgid "Mark as _Junk"
 msgstr "Merk som _uÃnsket e-post"
 
-#: ../mail/e-mail-reader.c:2289
+#: ../mail/e-mail-reader.c:2297
 msgid "Mark as _Not Junk"
 msgstr "Merk som _gyldig melding"
 
-#: ../mail/e-mail-reader.c:2293
+#: ../mail/e-mail-reader.c:2301
 msgid "Mar_k as Read"
 msgstr "Mer_k som lest"
 
-#: ../mail/e-mail-reader.c:2297
+#: ../mail/e-mail-reader.c:2305
 msgid "Mark as Uni_mportant"
 msgstr "_Merk som uviktig"
 
-#: ../mail/e-mail-reader.c:2301
+#: ../mail/e-mail-reader.c:2309
 msgid "Mark as _Unread"
 msgstr "Merk som _ulest"
 
-#: ../mail/e-mail-reader.c:2345
+#: ../mail/e-mail-reader.c:2353
 msgid "_Caret Mode"
 msgstr "MarkÃr_modus"
 
-#: ../mail/e-mail-reader.c:2347
+#: ../mail/e-mail-reader.c:2355
 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:2353
+#: ../mail/e-mail-reader.c:2361
 msgid "All Message _Headers"
 msgstr "Alle meldings_hoder"
 
-#: ../mail/e-mail-reader.c:2355
+#: ../mail/e-mail-reader.c:2363
 msgid "Show messages with all email headers"
 msgstr "Vis meldinger med alle meldingshoder"
 
-#: ../mail/e-mail-reader.c:2651
+#: ../mail/e-mail-reader.c:2659
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "Henter melding Â%sÂ"
 
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:3229 ../mail/mail-config.ui.h:32
-#: ../plugins/google-account-setup/google-source.c:306
-#: ../plugins/google-account-setup/google-source.c:549
-#: ../plugins/google-account-setup/google-source.c:688
+#: ../mail/e-mail-reader.c:3237 ../mail/mail-config.ui.h:32
+#: ../plugins/google-account-setup/google-source.c:310
+#: ../plugins/google-account-setup/google-source.c:553
+#: ../plugins/google-account-setup/google-source.c:692
 #: ../widgets/misc/e-account-tree-view.c:253
 msgid "Default"
 msgstr "Forvalgt"
 
-#: ../mail/e-mail-reader.c:3396
+#: ../mail/e-mail-reader.c:3404
 #: ../modules/mail/e-mail-attachment-handler.c:170
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: ../mail/e-mail-reader.c:3397
+#: ../mail/e-mail-reader.c:3405
 msgid "Forward the selected message to someone"
 msgstr "Videresend den valgte meldingen til noen"
 
-#: ../mail/e-mail-reader.c:3416
+#: ../mail/e-mail-reader.c:3424
 msgid "Group Reply"
 msgstr "Gruppesvar"
 
-#: ../mail/e-mail-reader.c:3417
+#: ../mail/e-mail-reader.c:3425
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "Svar til e-postlisten eller til alle mottakere"
 
-#: ../mail/e-mail-reader.c:3470 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:3478 ../mail/em-filter-i18n.h:14
 msgid "Delete"
 msgstr "Slett"
 
-#: ../mail/e-mail-reader.c:3503
-#: ../modules/calendar/e-cal-shell-view-actions.c:1323
+#: ../mail/e-mail-reader.c:3511
+#: ../modules/calendar/e-cal-shell-view-actions.c:1355
 #: ../widgets/misc/e-calendar.c:202
 msgid "Next"
 msgstr "Neste"
 
-#: ../mail/e-mail-reader.c:3507
-#: ../modules/calendar/e-cal-shell-view-actions.c:1316
+#: ../mail/e-mail-reader.c:3515
+#: ../modules/calendar/e-cal-shell-view-actions.c:1348
 #: ../widgets/misc/e-calendar.c:178
 msgid "Previous"
 msgstr "Forrige"
 
-#: ../mail/e-mail-reader.c:3516 ../mail/mail-dialogs.ui.h:16
+#: ../mail/e-mail-reader.c:3524 ../mail/mail-dialogs.ui.h:17
 msgid "Reply"
 msgstr "Svar"
 
-#: ../mail/e-mail-reader.c:4186
+#: ../mail/e-mail-reader.c:4194
 #, c-format
 msgid "Folder '%s'"
 msgstr "Mappe Â%sÂ"
 
-#: ../mail/e-mail-reader-utils.c:139
+#: ../mail/e-mail-reader-utils.c:145
 msgid "Do not warn me again"
 msgstr "Ikke varsle meg igjen"
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:663
+#: ../mail/e-mail-reader-utils.c:669
 #, c-format
 msgid ""
 "Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -9109,7 +9079,7 @@ msgstr[1] ""
 "Mappen Â%s inneholder %u duplikatmeldinger. Er du sikker pà at du vil "
 "slette dem?"
 
-#: ../mail/e-mail-reader-utils.c:960
+#: ../mail/e-mail-reader-utils.c:1046
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Lagre melding"
@@ -9120,42 +9090,42 @@ 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:981
+#: ../mail/e-mail-reader-utils.c:1067
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Melding"
 msgstr[1] "Meldinger"
 
-#: ../mail/e-mail-session.c:833
+#: ../mail/e-mail-session.c:861
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Skriv inn passord for %s"
 
-#: ../mail/e-mail-session.c:837
+#: ../mail/e-mail-session.c:865
 msgid "Enter Passphrase"
 msgstr "Skriv inn passord"
 
-#: ../mail/e-mail-session.c:841
+#: ../mail/e-mail-session.c:869
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Skriv inn passord for %s"
 
-#: ../mail/e-mail-session.c:845
+#: ../mail/e-mail-session.c:873
 msgid "Enter Password"
 msgstr "Skriv inn passord"
 
-#: ../mail/e-mail-session.c:896
+#: ../mail/e-mail-session.c:924
 #, c-format
 msgid "User canceled operation."
 msgstr "Operasjon avbrutt av bruker."
 
-#: ../mail/e-mail-session.c:1009
+#: ../mail/e-mail-session.c:1037
 #, c-format
 msgid ""
 "No destination address provided, forward of the message has been cancelled."
 msgstr "Ingen mÃladresse oppgitt. Videresending av meldingen ble avbrutt."
 
-#: ../mail/e-mail-session.c:1018
+#: ../mail/e-mail-session.c:1046
 #, 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."
@@ -9165,13 +9135,13 @@ msgstr "Fant ingen konto à bruke. Videresending av meldingen ble avbrutt."
 msgid "Cannot get transport for account '%s'"
 msgstr "Kan ikke hente transport for konto Â%sÂ"
 
-#: ../mail/e-mail-session-utils.c:506 ../mail/mail-ops.c:633
+#: ../mail/e-mail-session-utils.c:508 ../mail/mail-ops.c:634
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Feil under pÃfÃring av utgÃende filtre: %s"
 
-#: ../mail/e-mail-session-utils.c:530 ../mail/e-mail-session-utils.c:564
-#: ../mail/mail-ops.c:652 ../mail/mail-ops.c:686
+#: ../mail/e-mail-session-utils.c:532 ../mail/e-mail-session-utils.c:566
+#: ../mail/mail-ops.c:653 ../mail/mail-ops.c:687
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -9180,32 +9150,32 @@ msgstr ""
 "Kunne ikke legge til i %s: %s\n"
 "Legger til i lokal ÂSendtÂ-mappe i stedet."
 
-#: ../mail/e-mail-session-utils.c:584 ../mail/mail-ops.c:706
+#: ../mail/e-mail-session-utils.c:586 ../mail/mail-ops.c:707
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "Kunne ikke legge til i lokal Sendt-mappe: %s"
 
-#: ../mail/e-mail-session-utils.c:795 ../mail/mail-ops.c:809
-#: ../mail/mail-ops.c:905
+#: ../mail/e-mail-session-utils.c:797 ../mail/mail-ops.c:810
+#: ../mail/mail-ops.c:906
 msgid "Sending message"
 msgstr "Sender melding"
 
-#: ../mail/e-mail-session-utils.c:871
+#: ../mail/e-mail-session-utils.c:873
 #, c-format
 msgid "Unsubscribing from folder '%s'"
 msgstr "Fjerner abonnement pà mappe Â%sÂ"
 
-#: ../mail/e-mail-store-utils.c:167
+#: ../mail/e-mail-store-utils.c:168
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "Kobler fra Â%sÂ"
 
-#: ../mail/e-mail-store-utils.c:258
+#: ../mail/e-mail-store-utils.c:259
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "Kobler til Â%s pà nytt"
 
-#: ../mail/e-mail-store-utils.c:333
+#: ../mail/e-mail-store-utils.c:334
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Forbereder konto Â%s for frakoblet bruk"
@@ -9218,7 +9188,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:1183
+#: ../mail/em-composer-utils.c:1191
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -9226,31 +9196,31 @@ msgstr ""
 "${AbbrevWeekdayName}, ${Day}.${Month}.${Year} kl. ${24Hour}.${Minute} "
 "${TimeZone}, skrev ${Sender}:"
 
-#: ../mail/em-composer-utils.c:1194
+#: ../mail/em-composer-utils.c:1202
 msgid "-----Original Message-----"
 msgstr "-----Opprinnelig melding-----"
 
 #. Translators: First %s is an email address, second %s
 #. * is the subject of the email, third %s is the date.
-#: ../mail/em-composer-utils.c:1975
+#: ../mail/em-composer-utils.c:1983
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr "Din melding til %s om Â%s den %s er har blitt lest."
 
-#: ../mail/em-composer-utils.c:2034
+#: ../mail/em-composer-utils.c:2042
 #, c-format
 msgid "Delivery Notification for: \"%s\""
 msgstr "Varsling om ny e-post for Â%sÂ"
 
-#: ../mail/em-composer-utils.c:2536
+#: ../mail/em-composer-utils.c:2565
 msgid "an unknown sender"
 msgstr "en ukjent avsender"
 
-#: ../mail/em-composer-utils.c:2937
+#: ../mail/em-composer-utils.c:2970
 msgid "Posting destination"
 msgstr "Destinasjon for post"
 
-#: ../mail/em-composer-utils.c:2938
+#: ../mail/em-composer-utils.c:2971
 msgid "Choose folders to post the message to."
 msgstr "Velg mapper meldingen skal postes til."
 
@@ -9420,7 +9390,7 @@ msgid "Play Sound"
 msgstr "Spill lyd"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:15
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:16
 msgid "Read"
 msgstr "Les"
 
@@ -9535,190 +9505,190 @@ msgstr "Bruk av kvote"
 msgid "Folder Properties"
 msgstr "Egenskaper for mappe"
 
-#: ../mail/em-folder-selection-button.c:77
+#: ../mail/em-folder-selection-button.c:80
 msgid "<click here to select a folder>"
 msgstr "<klikk her for à velge en mappe>"
 
-#: ../mail/em-folder-selector.c:385
+#: ../mail/em-folder-selector.c:432
 msgid "C_reate"
 msgstr "Opp_rett"
 
-#: ../mail/em-folder-selector.c:391
+#: ../mail/em-folder-selector.c:438
 msgid "Folder _name:"
 msgstr "Mappe_navn:"
 
-#: ../mail/em-folder-tree.c:647
+#: ../mail/em-folder-tree.c:661
 msgid "Folder names cannot contain '/'"
 msgstr "Mappenavn kan ikke inneholde tegnet Â/Â"
 
-#: ../mail/em-folder-tree.c:1331
+#: ../mail/em-folder-tree.c:781
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1568
+#: ../mail/em-folder-tree.c:1603
 msgid "Mail Folder Tree"
 msgstr "Tre for e-postmapper"
 
-#: ../mail/em-folder-tree.c:2068 ../mail/em-folder-utils.c:114
+#: ../mail/em-folder-tree.c:2082 ../mail/em-folder-utils.c:114
 #, c-format
 msgid "Moving folder %s"
 msgstr "Flytter mappe %s"
 
-#: ../mail/em-folder-tree.c:2071 ../mail/em-folder-utils.c:116
+#: ../mail/em-folder-tree.c:2085 ../mail/em-folder-utils.c:116
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopierer mappe %s"
 
-#: ../mail/em-folder-tree.c:2078 ../mail/message-list.c:2218
+#: ../mail/em-folder-tree.c:2092 ../mail/message-list.c:2218
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Flytter meldinger til mappe %s"
 
-#: ../mail/em-folder-tree.c:2082 ../mail/message-list.c:2220
+#: ../mail/em-folder-tree.c:2096 ../mail/message-list.c:2220
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopierer meldinger til mappe %s"
 
-#: ../mail/em-folder-tree.c:2101
+#: ../mail/em-folder-tree.c:2115
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Kan ikke slippe melding(er) toppnivà for lageret"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:147 ../mail/em-folder-tree-model.c:150
-#: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:158
-#: ../mail/em-folder-tree-model.c:165 ../mail/em-folder-tree-model.c:167
+#: ../mail/em-folder-tree-model.c:150 ../mail/em-folder-tree-model.c:153
+#: ../mail/em-folder-tree-model.c:159 ../mail/em-folder-tree-model.c:161
+#: ../mail/em-folder-tree-model.c:168 ../mail/em-folder-tree-model.c:170
 #: ../mail/mail-vfolder.c:1165 ../mail/mail-vfolder.c:1240
 msgid "Search Folders"
 msgstr "SÃkemapper"
 
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:172 ../mail/em-folder-tree-model.c:174
+#: ../mail/em-folder-tree-model.c:175 ../mail/em-folder-tree-model.c:177
 msgid "UNMATCHED"
 msgstr "UTEN TREFF"
 
-#: ../mail/em-folder-tree-model.c:792 ../mail/em-folder-tree-model.c:1061
+#: ../mail/em-folder-tree-model.c:795 ../mail/em-folder-tree-model.c:1064
 msgid "Loading..."
 msgstr "Laster â"
 
-#: ../mail/em-folder-utils.c:481
+#: ../mail/em-folder-utils.c:487
 msgid "Move Folder To"
 msgstr "Flytt mappe til"
 
-#: ../mail/em-folder-utils.c:481
+#: ../mail/em-folder-utils.c:487
 msgid "Copy Folder To"
 msgstr "Kopier mappe til"
 
-#: ../mail/em-folder-utils.c:556
+#: ../mail/em-folder-utils.c:567
 msgid "Create Folder"
 msgstr "Opprett mappe"
 
-#: ../mail/em-folder-utils.c:557
+#: ../mail/em-folder-utils.c:568
 msgid "Specify where to create the folder:"
 msgstr "Spesifiser hvor mappen skal opprettes:"
 
-#: ../mail/em-format-html.c:165
+#: ../mail/em-format-html.c:166
 msgid "Formatting message"
 msgstr "Formatterer melding"
 
-#: ../mail/em-format-html.c:368
+#: ../mail/em-format-html.c:378
 msgid "Formatting Message..."
 msgstr "Formatterer melding â"
 
-#: ../mail/em-format-html.c:1541 ../mail/em-format-html.c:1551
+#: ../mail/em-format-html.c:1551 ../mail/em-format-html.c:1561
 #, c-format
 msgid "Retrieving '%s'"
 msgstr "Henter Â%sÂ"
 
-#: ../mail/em-format-html.c:1697 ../mail/em-format-html-display.c:85
+#: ../mail/em-format-html.c:1707 ../mail/em-format-html-display.c:89
 msgid "Unsigned"
 msgstr "Usignert"
 
-#: ../mail/em-format-html.c:1698 ../mail/em-format-html-display.c:86
+#: ../mail/em-format-html.c:1708 ../mail/em-format-html-display.c:90
 msgid "Valid signature"
 msgstr "Gyldig signatur"
 
-#: ../mail/em-format-html.c:1699 ../mail/em-format-html-display.c:87
+#: ../mail/em-format-html.c:1709 ../mail/em-format-html-display.c:91
 msgid "Invalid signature"
 msgstr "Ugyldig signatur"
 
-#: ../mail/em-format-html.c:1700 ../mail/em-format-html-display.c:88
+#: ../mail/em-format-html.c:1710 ../mail/em-format-html-display.c:92
 msgid "Valid signature, but cannot verify sender"
 msgstr "Gyldig signatur, men kan ikke verifisere avsender"
 
-#: ../mail/em-format-html.c:1701 ../mail/em-format-html-display.c:89
+#: ../mail/em-format-html.c:1711 ../mail/em-format-html-display.c:93
 msgid "Signature exists, but need public key"
 msgstr "Signatur eksisterer, men trenger offentlig nÃkkel"
 
-#: ../mail/em-format-html.c:1707 ../mail/em-format-html-display.c:96
+#: ../mail/em-format-html.c:1717 ../mail/em-format-html-display.c:100
 msgid "Unencrypted"
 msgstr "Ukryptert"
 
-#: ../mail/em-format-html.c:1708 ../mail/em-format-html-display.c:97
+#: ../mail/em-format-html.c:1718 ../mail/em-format-html-display.c:101
 msgid "Encrypted, weak"
 msgstr "Kryptert, svak"
 
-#: ../mail/em-format-html.c:1709 ../mail/em-format-html-display.c:98
+#: ../mail/em-format-html.c:1719 ../mail/em-format-html-display.c:102
 msgid "Encrypted"
 msgstr "Kryptert"
 
-#: ../mail/em-format-html.c:1710 ../mail/em-format-html-display.c:99
+#: ../mail/em-format-html.c:1720 ../mail/em-format-html-display.c:103
 msgid "Encrypted, strong"
 msgstr "Kryptert, sterk"
 
-#: ../mail/em-format-html.c:2110
+#: ../mail/em-format-html.c:2120
 msgid "Unknown external-body part."
 msgstr "Ukjent del av ekstern kropp."
 
-#: ../mail/em-format-html.c:2120
+#: ../mail/em-format-html.c:2130
 msgid "Malformed external-body part."
 msgstr "Feilutformet del for ekstern kropp."
 
-#: ../mail/em-format-html.c:2151
+#: ../mail/em-format-html.c:2161
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Peker til FTP-tjener (%s)"
 
-#: ../mail/em-format-html.c:2162
+#: ../mail/em-format-html.c:2172
 #, 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:2164
+#: ../mail/em-format-html.c:2174
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Peker til lokal fil (%s)"
 
-#: ../mail/em-format-html.c:2185
+#: ../mail/em-format-html.c:2195
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Peker til eksterne data (%s)"
 
-#: ../mail/em-format-html.c:2200
+#: ../mail/em-format-html.c:2210
 #, 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:2905
+#: ../mail/em-format-html.c:2915
 #: ../plugins/mail-notification/mail-notification.c:405
 #, c-format
 msgid "From: %s"
 msgstr "Fra: %s"
 
-#: ../mail/em-format-html.c:2927
+#: ../mail/em-format-html.c:2937
 msgid "(no subject)"
 msgstr "(uten emne)"
 
-#: ../mail/em-format-html.c:3003
+#: ../mail/em-format-html.c:3013
 #, 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:85
+#: ../mail/em-format-html-display.c:89
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -9726,7 +9696,7 @@ msgstr ""
 "Denne meldingen er ikke signert. Du har ingen garanti for at meldingen er "
 "autentisk."
 
-#: ../mail/em-format-html-display.c:86
+#: ../mail/em-format-html-display.c:90
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -9734,7 +9704,7 @@ msgstr ""
 "Denne meldingen er signert og gyldig hvilket betyr denne meldingen hÃyst "
 "sannsynlig er autentisk."
 
-#: ../mail/em-format-html-display.c:87
+#: ../mail/em-format-html-display.c:91
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -9742,7 +9712,7 @@ msgstr ""
 "Signaturen for denne meldingen kan ikke verifiseres. Den kan vÃre endret "
 "under overfÃring."
 
-#: ../mail/em-format-html-display.c:88
+#: ../mail/em-format-html-display.c:92
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -9750,7 +9720,7 @@ msgstr ""
 "Denne meldingen er signert med en gyldig signatur, men avsender av meldingen "
 "kan ikke verifiseres."
 
-#: ../mail/em-format-html-display.c:89
+#: ../mail/em-format-html-display.c:93
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -9758,7 +9728,7 @@ msgstr ""
 "Denne meldingen er signert med en gyldig signatur, men det finnes ingen "
 "tilhÃrende offentlig nÃkkel."
 
-#: ../mail/em-format-html-display.c:96
+#: ../mail/em-format-html-display.c:100
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -9766,7 +9736,7 @@ msgstr ""
 "Denne meldingen er ikke kryptert. Innholdet kan vises under overfÃring over "
 "Internett."
 
-#: ../mail/em-format-html-display.c:97
+#: ../mail/em-format-html-display.c:101
 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 "
@@ -9776,7 +9746,7 @@ msgstr ""
 "vanskelig, men ikke umulig for en utenforstÃende à se innholdet i denne "
 "meldingen pà noenlunde kort tid."
 
-#: ../mail/em-format-html-display.c:98
+#: ../mail/em-format-html-display.c:102
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -9784,7 +9754,7 @@ 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:99
+#: ../mail/em-format-html-display.c:103
 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 "
@@ -9793,15 +9763,15 @@ 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:237 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/em-format-html-display.c:241 ../smime/gui/smime-ui.ui.h:47
 msgid "_View Certificate"
 msgstr "_Vis sertifikat"
 
-#: ../mail/em-format-html-display.c:250
+#: ../mail/em-format-html-display.c:254
 msgid "This certificate is not viewable"
 msgstr "Dette sertifikatet kan ikke vises"
 
-#: ../mail/em-format-html-display.c:552
+#: ../mail/em-format-html-display.c:556
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -9809,27 +9779,39 @@ msgstr ""
 "Evolution kan ikke rendre 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:848
+#: ../mail/em-format-html-display.c:746
+msgid "Save Image"
+msgstr "Lagre bilde"
+
+#: ../mail/em-format-html-display.c:794
+msgid "Save _Image..."
+msgstr "Lagre b_ilde â"
+
+#: ../mail/em-format-html-display.c:796
+msgid "Save the image to a file"
+msgstr "Lagre bildet til en fil"
+
+#: ../mail/em-format-html-display.c:1024
 msgid "Completed on"
 msgstr "FullfÃrt"
 
-#: ../mail/em-format-html-display.c:860
+#: ../mail/em-format-html-display.c:1036
 msgid "Overdue:"
 msgstr "UtgÃtt:"
 
-#: ../mail/em-format-html-display.c:868
+#: ../mail/em-format-html-display.c:1044
 msgid "by"
 msgstr "innen"
 
-#: ../mail/em-format-html-display.c:1142 ../mail/em-format-html-display.c:1189
+#: ../mail/em-format-html-display.c:1320 ../mail/em-format-html-display.c:1367
 msgid "View _Unformatted"
 msgstr "Vis uformattert"
 
-#: ../mail/em-format-html-display.c:1144
+#: ../mail/em-format-html-display.c:1322
 msgid "Hide _Unformatted"
 msgstr "Skjul _uformatterte"
 
-#: ../mail/em-format-html-display.c:1209
+#: ../mail/em-format-html-display.c:1387
 msgid "O_pen With"
 msgstr "Ã_pne med"
 
@@ -9844,61 +9826,61 @@ msgstr "Side %d av %d"
 msgid "No HTML stream available"
 msgstr "Ingen HTML-strÃm tilgjengelig."
 
-#: ../mail/em-subscription-editor.c:1138
+#: ../mail/em-subscription-editor.c:1146
 msgid "Folder Subscriptions"
 msgstr "Abonnement pà mapper"
 
-#: ../mail/em-subscription-editor.c:1177
+#: ../mail/em-subscription-editor.c:1185
 msgid "_Account:"
 msgstr "K_onto:"
 
-#: ../mail/em-subscription-editor.c:1192
+#: ../mail/em-subscription-editor.c:1200
 msgid "Clear Search"
 msgstr "TÃm sÃk"
 
-#: ../mail/em-subscription-editor.c:1210
+#: ../mail/em-subscription-editor.c:1218
 msgid "Sho_w items that contain:"
 msgstr "_Vis oppfÃringer som inneholder:"
 
-#: ../mail/em-subscription-editor.c:1249
+#: ../mail/em-subscription-editor.c:1257
 msgid "Subscribe to the selected folder"
 msgstr "Abonner pà valgt mappe"
 
-#: ../mail/em-subscription-editor.c:1250
+#: ../mail/em-subscription-editor.c:1258
 msgid "Su_bscribe"
 msgstr "A_bonner"
 
-#: ../mail/em-subscription-editor.c:1261
+#: ../mail/em-subscription-editor.c:1269
 #: ../modules/mail/e-mail-shell-view-actions.c:1224
 msgid "Unsubscribe from the selected folder"
 msgstr "Fjern abonnement pà valgt mappe"
 
-#: ../mail/em-subscription-editor.c:1262
+#: ../mail/em-subscription-editor.c:1270
 #: ../modules/mail/e-mail-shell-view-actions.c:1222
 msgid "_Unsubscribe"
 msgstr "_Fjern abonnement"
 
-#: ../mail/em-subscription-editor.c:1273
+#: ../mail/em-subscription-editor.c:1281
 msgid "Collapse all folders"
 msgstr "Slà sammen alle mapper"
 
-#: ../mail/em-subscription-editor.c:1274
+#: ../mail/em-subscription-editor.c:1282
 msgid "C_ollapse All"
 msgstr "Slà sammen _alle"
 
-#: ../mail/em-subscription-editor.c:1284
+#: ../mail/em-subscription-editor.c:1292
 msgid "Expand all folders"
 msgstr "Utvid alle mapper"
 
-#: ../mail/em-subscription-editor.c:1285
+#: ../mail/em-subscription-editor.c:1293
 msgid "E_xpand All"
 msgstr "Ut_vid alle"
 
-#: ../mail/em-subscription-editor.c:1295
+#: ../mail/em-subscription-editor.c:1303
 msgid "Refresh the folder list"
 msgstr "Oppdater mappelisten"
 
-#: ../mail/em-subscription-editor.c:1307
+#: ../mail/em-subscription-editor.c:1315
 msgid "Stop the current operation"
 msgstr "Stopp aktiv operasjon"
 
@@ -9931,7 +9913,7 @@ msgstr "Meldinger fra %s"
 msgid "Search _Folders"
 msgstr "SÃke_mapper"
 
-#: ../mail/em-vfolder-rule.c:604
+#: ../mail/em-vfolder-rule.c:608
 msgid "Add Folder"
 msgstr "Legg til mappe"
 
@@ -9988,7 +9970,7 @@ msgid "Always request read receipt"
 msgstr "Alltid be om lesekvittering"
 
 #: ../mail/evolution-mail.schemas.in.h:14
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:2
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:1
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "Antall sekunder feilen skal vises i statuslinjen."
 
@@ -10124,7 +10106,7 @@ msgstr "Forvalgt bredde for e-postleservinduet."
 
 #: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
-"Describes wheter message headers in paned view should be collapsed or "
+"Describes whether message headers in paned view should be collapsed or "
 "expanded by default. \"0\" = expanded \"1\" = collapsed"
 msgstr ""
 
@@ -10500,7 +10482,7 @@ msgid "Layout style"
 msgstr "Stil for utforming"
 
 #: ../mail/evolution-mail.schemas.in.h:106
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
 msgid "Level beyond which the message should be logged."
 msgstr "Over dette nivÃet skal meldingen logges."
 
@@ -11160,8 +11142,8 @@ msgstr "Bredde pà e-postlistefeltet."
 msgid "Importing Elm data"
 msgstr "Importerer data fra Elm"
 
-#: ../mail/importers/elm-importer.c:341 ../mail/importers/pine-importer.c:446
-#: ../modules/mail/e-mail-shell-view.c:1036
+#: ../mail/importers/elm-importer.c:341 ../mail/importers/pine-importer.c:453
+#: ../modules/mail/e-mail-shell-view.c:1040
 #: ../widgets/misc/e-send-options.c:511
 msgid "Mail"
 msgstr "E-post"
@@ -11181,13 +11163,13 @@ msgstr "_MÃlmappe:"
 
 #: ../mail/importers/evolution-mbox-importer.c:142
 #: ../plugins/dbx-import/dbx-importer.c:259
-#: ../plugins/pst-import/pst-importer.c:318
+#: ../plugins/pst-import/pst-importer.c:446
 msgid "Select folder"
 msgstr "Velg mappe"
 
 #: ../mail/importers/evolution-mbox-importer.c:143
 #: ../plugins/dbx-import/dbx-importer.c:260
-#: ../plugins/pst-import/pst-importer.c:319
+#: ../plugins/pst-import/pst-importer.c:447
 msgid "Select folder to import into"
 msgstr "Velg mappe à importere til"
 
@@ -11217,8 +11199,7 @@ msgstr "Importerer postboks"
 #. Destination folder, was set in our widget
 #: ../mail/importers/mail-importer.c:153
 #: ../plugins/dbx-import/dbx-importer.c:603
-#: ../plugins/pst-import/pst-importer.c:500
-#: ../plugins/pst-import/pst-importer.c:609
+#: ../plugins/pst-import/pst-importer.c:629
 #, c-format
 msgid "Importing '%s'"
 msgstr "Importerer Â%sÂ"
@@ -11228,20 +11209,20 @@ msgstr "Importerer Â%sÂ"
 msgid "Scanning %s"
 msgstr "SÃker i %s"
 
-#: ../mail/importers/pine-importer.c:250
+#: ../mail/importers/pine-importer.c:257
 msgid "Importing Pine data"
 msgstr "Importerer data fra Pine"
 
-#: ../mail/importers/pine-importer.c:451
+#: ../mail/importers/pine-importer.c:458
 #: ../modules/addressbook/addressbook-config.c:1053
 msgid "Address Book"
 msgstr "Adressebok"
 
-#: ../mail/importers/pine-importer.c:493
+#: ../mail/importers/pine-importer.c:500
 msgid "Evolution Pine importer"
 msgstr "Import fra Pine for Evolutions"
 
-#: ../mail/importers/pine-importer.c:494
+#: ../mail/importers/pine-importer.c:501
 msgid "Import mail from Pine."
 msgstr "Importer e-post fra Pine."
 
@@ -11407,7 +11388,7 @@ msgid "Confirmations"
 msgstr "Bekreftelser"
 
 #: ../mail/mail-config.ui.h:31
-#: ../modules/addressbook/autocompletion-config.c:159
+#: ../modules/addressbook/autocompletion-config.c:178
 #: ../modules/calendar/e-calendar-preferences.ui.h:11
 msgid "Date/Time Format"
 msgstr "Fromat for dato ogklokkeslett"
@@ -11552,6 +11533,10 @@ msgstr "Meldingsmottakere"
 msgid "No _Proxy for:"
 msgstr "Ingen _proxy for:"
 
+#: ../mail/mail-config.ui.h:72 ../modules/addressbook/ldap-config.ui.h:9
+msgid "No encryption"
+msgstr "Ingen kryptering"
+
 #: ../mail/mail-config.ui.h:73
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr ""
@@ -11632,6 +11617,10 @@ msgstr "SHA384"
 msgid "SHA512"
 msgstr "SHA512"
 
+#: ../mail/mail-config.ui.h:94 ../modules/addressbook/ldap-config.ui.h:12
+msgid "SSL encryption"
+msgstr "SSL-kryptering"
+
 #: ../mail/mail-config.ui.h:95
 msgid "SSL is not supported in this build of Evolution"
 msgstr "SSL er ikke stÃttet i denne versjonen av Evolution  "
@@ -11753,6 +11742,10 @@ msgstr "S_tart skriving under meldingen ved svar"
 msgid "Start up"
 msgstr "Oppstart"
 
+#: ../mail/mail-config.ui.h:130 ../modules/addressbook/ldap-config.ui.h:20
+msgid "TLS encryption"
+msgstr "TLS-kryptering"
+
 #: ../mail/mail-config.ui.h:131
 msgid "T_ype:"
 msgstr "T_ype:"
@@ -11901,8 +11894,8 @@ msgstr "Vi_s bilde av avsender i forhÃndsvisning av meldingen"
 msgid "_Trash Folder:"
 msgstr "Mappe for _papirkurv:"
 
-#: ../mail/mail-config.ui.h:169
-msgid "_Use Secure Connection:"
+#: ../mail/mail-config.ui.h:169 ../modules/addressbook/ldap-config.ui.h:31
+msgid "_Use secure connection:"
 msgstr "Br_uk sikker forbindelse:"
 
 #: ../mail/mail-config.ui.h:170
@@ -11945,63 +11938,64 @@ msgstr "Alle lokale mapper"
 msgid "Call"
 msgstr "Ring"
 
-#: ../mail/mail-dialogs.ui.h:5
+#. Translators: Flag Completed
+#: ../mail/mail-dialogs.ui.h:6
 msgid "Co_mpleted"
 msgstr "Fu_llfÃrt"
 
-#: ../mail/mail-dialogs.ui.h:6
+#: ../mail/mail-dialogs.ui.h:7
 msgid "Digital Signature"
 msgstr "Digital signatur"
 
-#: ../mail/mail-dialogs.ui.h:7
+#: ../mail/mail-dialogs.ui.h:8
 msgid "Do Not Forward"
 msgstr "Ikke videresend"
 
-#: ../mail/mail-dialogs.ui.h:8
+#: ../mail/mail-dialogs.ui.h:9
 msgid "Encryption"
 msgstr "Kryptering"
 
-#: ../mail/mail-dialogs.ui.h:9
+#: ../mail/mail-dialogs.ui.h:10
 msgid "Follow-Up"
 msgstr "FÃlg opp"
 
-#: ../mail/mail-dialogs.ui.h:10
+#: ../mail/mail-dialogs.ui.h:11
 msgid "For Your Information"
 msgstr "Til din informasjon"
 
-#: ../mail/mail-dialogs.ui.h:11
+#: ../mail/mail-dialogs.ui.h:12
 msgid "Forward"
 msgstr "Videresend"
 
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:13
 msgid "License Agreement"
 msgstr "Lisensavtale"
 
-#: ../mail/mail-dialogs.ui.h:13
+#: ../mail/mail-dialogs.ui.h:14
 msgid "No Response Necessary"
 msgstr "Ingen respons nÃdvendig"
 
-#: ../mail/mail-dialogs.ui.h:17
+#: ../mail/mail-dialogs.ui.h:18
 msgid "Reply to All"
 msgstr "Svar til alle"
 
-#: ../mail/mail-dialogs.ui.h:18
+#: ../mail/mail-dialogs.ui.h:19
 msgid "Review"
 msgstr "GjennomgÃ"
 
-#: ../mail/mail-dialogs.ui.h:19
+#: ../mail/mail-dialogs.ui.h:20
 msgid "Search Folder Sources"
 msgstr "Kilder for sÃkemapper"
 
-#: ../mail/mail-dialogs.ui.h:20
+#: ../mail/mail-dialogs.ui.h:21
 msgid "Security Information"
 msgstr "Sikkerhetsinformasjon"
 
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:22
 msgid "Specific folders"
 msgstr "Spesifikke mapper"
 
-#: ../mail/mail-dialogs.ui.h:22
+#: ../mail/mail-dialogs.ui.h:23
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -12009,23 +12003,23 @@ msgstr ""
 "Meldingene du har valgt for oppfÃlging er listet under.\n"
 "Vennligst velg en handling for oppfÃlging fra menyen ÂFlaggÂ."
 
-#: ../mail/mail-dialogs.ui.h:24
+#: ../mail/mail-dialogs.ui.h:25
 msgid "_Accept License"
 msgstr "Godt_a lisensen"
 
-#: ../mail/mail-dialogs.ui.h:25
+#: ../mail/mail-dialogs.ui.h:26
 msgid "_Due By:"
 msgstr "_Ferdig til:"
 
-#: ../mail/mail-dialogs.ui.h:26
+#: ../mail/mail-dialogs.ui.h:27
 msgid "_Flag:"
 msgstr "_Flagg:"
 
-#: ../mail/mail-dialogs.ui.h:27
+#: ../mail/mail-dialogs.ui.h:28
 msgid "_Tick this to accept the license agreement"
 msgstr "_Kryss av her for à godta lisensen"
 
-#: ../mail/mail-folder-cache.c:767
+#: ../mail/mail-folder-cache.c:769
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinger %s"
@@ -12038,69 +12032,69 @@ msgstr "Filtrerer valgte meldinger"
 msgid "Fetching Mail"
 msgstr "Henter e-post"
 
-#: ../mail/mail-ops.c:820
+#: ../mail/mail-ops.c:821
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sender melding %d av %d"
 
-#: ../mail/mail-ops.c:868
+#: ../mail/mail-ops.c:869
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Feil under sending av %d av %d meldinger"
 
-#: ../mail/mail-ops.c:872 ../mail/mail-send-recv.c:824
+#: ../mail/mail-ops.c:873 ../mail/mail-send-recv.c:824
 msgid "Canceled."
 msgstr "Avbrutt."
 
-#: ../mail/mail-ops.c:874 ../mail/mail-send-recv.c:826
+#: ../mail/mail-ops.c:875 ../mail/mail-send-recv.c:826
 msgid "Complete."
 msgstr "FullfÃrt."
 
-#: ../mail/mail-ops.c:984
+#: ../mail/mail-ops.c:985
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Flytter meldinger til Â%sÂ"
 
-#: ../mail/mail-ops.c:985
+#: ../mail/mail-ops.c:986
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Kopierer meldinger til Â%sÂ"
 
-#: ../mail/mail-ops.c:1102
+#: ../mail/mail-ops.c:1103
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Lagrer mappe Â%sÂ"
 
-#: ../mail/mail-ops.c:1176
+#: ../mail/mail-ops.c:1177
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "TÃmmer og lagrer konto Â%sÂ"
 
-#: ../mail/mail-ops.c:1177
+#: ../mail/mail-ops.c:1178
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Lagrer konto Â%sÂ"
 
-#: ../mail/mail-ops.c:1239
+#: ../mail/mail-ops.c:1240
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "Oppdaterer mappe Â%sÂ"
 
-#: ../mail/mail-ops.c:1417
+#: ../mail/mail-ops.c:1418
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "TÃmmer mappe Â%sÂ"
 
-#: ../mail/mail-ops.c:1490
+#: ../mail/mail-ops.c:1491
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "TÃmmer sÃppel i Â%sÂ"
 
-#: ../mail/mail-ops.c:1491
+#: ../mail/mail-ops.c:1492
 msgid "Local Folders"
 msgstr "Lokale mapper"
 
-#: ../mail/mail-ops.c:1589
+#: ../mail/mail-ops.c:1590
 #, c-format
 msgid "Disconnecting %s"
 msgstr "Kobler fra %s"
@@ -12478,39 +12472,44 @@ msgid "Failed to open folder."
 msgstr "Klarte ikke à Ãpne mappe."
 
 #: ../mail/mail.error.xml.h:66
+msgid ""
+"Failed to query server for a list of supported authentication mechanisms."
+msgstr "Klarte ikke à spÃrre tjener etter en liste med stÃttede autentiseringsmekanismer."
+
+#: ../mail/mail.error.xml.h:67
 msgid "Failed to remove attachments from messages."
 msgstr "Klarte ikke à fjerne vedlegg fra meldinger."
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:68
 msgid "Failed to retrieve messages."
 msgstr "Klarte ikke à hente meldinger."
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:69
 msgid "Failed to save messages to disk."
 msgstr "Klarte ikke à lagre meldinger til disk."
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:70
 msgid "Failed to unsubscribe from folder."
 msgstr "Klarte ikke à fjerne abonnement pà mappe."
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:71
 msgid "File exists but cannot overwrite it."
 msgstr "Filen eksisterer men kan ikke overskrives."
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:72
 msgid "File exists but is not a regular file."
 msgstr "Filen eksisterer, men den er ikke en vanlig fil."
 
 #. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:74
 msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr "Mappe Â{0}Â inneholder ingen duplikatmeldinger."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:75
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Hvis du fortsetter vil du ikke kunne gjenopprette disse meldingene."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:76
 msgid ""
 "If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
@@ -12518,16 +12517,16 @@ msgstr ""
 "Hvis du sletter mappen vil alt innhold i denne og undermapper slettes "
 "permanent."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:77
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
 msgstr "Hvis du sletter mappen vil alt innhold i denne bli slettet permanent."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:78
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "Hvis du fortsetter vil stedfortrederkontoer bli slettet permanent."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:79
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -12535,11 +12534,11 @@ msgstr ""
 "Hvis du fortsetter vil all kontoinformasjon og\n"
 "mellomtjenerinformasjon bli slettet permanent."
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:81
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Hvis du fortsetter vil kontoinformasjonen bli slettet permanent."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:82
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -12547,23 +12546,23 @@ msgstr ""
 "Hvis du avslutter vil ikke disse meldingene sendes fÃr Evolution startes "
 "igjen."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:83
 msgid "Ignore"
 msgstr "Ignorer"
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:84
 msgid "Invalid authentication"
 msgstr "Ugyldig autentisering"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:85
 msgid "Mail Deletion Failed"
 msgstr "Sletting av e-post feilet"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:86
 msgid "Mail filters automatically updated."
 msgstr "E-postfiltre oppdatert automatisk."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:87
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -12575,7 +12574,7 @@ msgstr ""
 "meldingen likevel. For à unngà dette bÃr du legge inn minst en mottaker i "
 "Til: eller Cc:."
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:88
 msgid ""
 "Messages shown in Search Folders are not copies. Deleting them from a Search "
 "Folder will delete the actual messages from the folder or folders in which "
@@ -12585,35 +12584,35 @@ msgstr ""
 "sÃkemappe sletter du de faktiske meldingene fra dine lokale eller eksterne "
 "mapper. Vil du virkelig slette disse meldingene?"
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:89
 msgid "Missing folder."
 msgstr "Mangler mappe."
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:91
 msgid "N_ever"
 msgstr "A_ldri"
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:92
 msgid "No duplicate messages found."
 msgstr "Ingen duplikatmeldinger funnet."
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:93
 msgid "No sources selected."
 msgstr "Ingen kilder valgt."
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:94
 msgid "Opening too many messages at once may take a long time."
 msgstr "Hvis du Ãpner for mange meldinger pà en gang kan dette ta lang tid."
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:95
 msgid "Please check your account settings and try again."
 msgstr "Vennligst sjekk innstillingene for kontoen og prÃv igjen."
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:96
 msgid "Please enable the account or send using another account."
 msgstr "Vennligst sjekk kontoen eller send fra en annen konto."
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:97
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
@@ -12621,7 +12620,7 @@ msgstr ""
 "Vennligst oppgi en gyldig e-postadresse i Til:-feltet. Du kan sÃke etter e-"
 "postadresser ved à klikke pà Til:-knappen ved siden av inntastingsfeltet."
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -12630,63 +12629,63 @@ msgstr ""
 "Sjekk at fÃlgende mottakere kan og Ãnsker à motta e-post som HTML:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:100
 msgid "Please provide an unique name to identify this signature."
 msgstr "Oppgi et unikt navn for à identifisere denne signaturen."
 
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:101
 msgid "Please wait."
 msgstr "Vennligst vent."
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:102
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Det oppsto et problem under migrering av gammel meldingsmappe Â{0}Â."
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:103
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "SpÃr tjener etter en liste med stÃttede autentiseringsmekanismer."
 
-#: ../mail/mail.error.xml.h:103
+#: ../mail/mail.error.xml.h:104
 msgid "Read receipt requested."
 msgstr "Lesekvittering etterspurt."
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:105
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "Vil du virkelig slette mappen Â{0}Â og alle undermapper?"
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:106
 msgid "Really delete folder \"{0}\"?"
 msgstr "Vil du virkelig slette mappen Â{0}Â?"
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:107
 msgid "Remove duplicate messages?"
 msgstr "Fjern duplikatmeldinger?"
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:108
 msgid "Reply _Privately"
 msgstr "Svar _privat"
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:111
 msgid "Search Folders automatically updated."
 msgstr "SÃkemapper oppdatert automatisk."
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:112
 msgid "Send private reply?"
 msgstr "Send privat svar?"
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:113
 msgid "Send reply to all recipients?"
 msgstr "Send svar til alle mottakere?"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:114
 msgid "Signature Already Exists"
 msgstr "Signaturen eksisterer allerede"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:115
 msgid "Synchronize folders locally for offline usage?"
 msgstr "Synkroniser mapper lokalt for frakoblet bruk?"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:116
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -12694,7 +12693,7 @@ msgstr ""
 "Systemmapper kreves for at Evolution skal fungere korrekt og du kan ikke "
 "endre navn pÃ, flytte eller slette disse."
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:117
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -12710,7 +12709,7 @@ msgstr ""
 "meldingen likevel. For à unngà dette bÃr du legge inn minst en mottaker i "
 "Til: eller Cc:."
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:120
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -12718,7 +12717,7 @@ msgstr ""
 "FÃlgende mottaker ble ikke gjenkjent som en gyldig e-postadresse:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:122
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
@@ -12726,15 +12725,15 @@ msgstr ""
 "FÃlgende mottakere ble ikke gjenkjent som gyldige e-postadresser:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:125
 msgid "The script file must exist and be executable."
 msgstr "Skriptfilen mà eksistere og vÃre kjÃrbar."
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:126
 msgid "These messages are not copies."
 msgstr "Disse meldingene er ikke kopier."
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:127
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -12742,20 +12741,20 @@ msgstr ""
 "Denne mappen er lagt til implisitt. GÃ til redigering av sÃkemapper og legg "
 "den inn eksplisitt hvis det er nÃdvendig."
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:129
 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:129
+#: ../mail/mail.error.xml.h:130
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr ""
 "Denne meldingen kan ikke sendes fordi du ikke har oppgitt noen mottakere"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:131
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -12763,25 +12762,25 @@ msgstr ""
 "Tjener stÃtter ikke denne typen autentisering. Det kan hende den ikke "
 "stÃtter autentisering i det hele tatt."
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:132
 msgid "This signature has been changed, but has not been saved."
 msgstr "Denne signaturen er endret, men er ikke lagret."
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:133
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
 msgstr "Dette vil merke alle meldinger i valgt mappe med undermapper som lest."
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:134
 msgid "This will mark all messages as read in the selected folder."
 msgstr "Dette vil merke alle meldinger i valgt mappe som lest."
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:135
 msgid "Unable to connect to the GroupWise server."
 msgstr "Kunne ikke koble til GroupWise-tjener."
 
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:136
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -12789,27 +12788,27 @@ msgstr ""
 "Kan ikke Ãpne skisse-mappen for denne kontoen. Vil du bruke forvalgt mappe "
 "for skisser i stedet?"
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:137
 msgid "Unable to read license file."
 msgstr "Kan ikke lese lisensfilen."
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:138
 msgid "Unable to retrieve message."
 msgstr "Kunne ikke hente melding."
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:139
 msgid "Use _Default"
 msgstr "Bruk _forvalg"
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:140
 msgid "Use default drafts folder?"
 msgstr "Bruk forvalgt mappe for skisser?"
 
-#: ../mail/mail.error.xml.h:140
+#: ../mail/mail.error.xml.h:141
 msgid "Would you like to close the message window?"
 msgstr "Vil du lukke meldingsvinduet?"
 
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:142
 msgid ""
 "You are replying privately to a message which arrived via a mailing list, "
 "but the list is trying to redirect your reply to go back to the list. Are "
@@ -12819,7 +12818,7 @@ msgstr ""
 "à omdirigere ditt svar tilbake til listen. Er du sikker pà at du vil "
 "fortsette?"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:143
 msgid ""
 "You are replying to a message which arrived via a mailing list, but you are "
 "replying privately to the sender; not to the list. Are you sure you want to "
@@ -12828,7 +12827,7 @@ msgstr ""
 "Du svarer pà en melding som kom via en e-postliste, men du svarer privat til "
 "avsender og ikke til listen. Er du sikker pà at du vil fortsette?"
 
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:144
 msgid ""
 "You are replying to a message which was sent to many recipients. Are you "
 "sure you want to reply to ALL of them?"
@@ -12836,31 +12835,31 @@ msgstr ""
 "Du svarer pà en melding som ble sendt til mange mottakere. Er du sikker pà "
 "at du vil svare til ALLE mottakerene?"
 
-#: ../mail/mail.error.xml.h:144
+#: ../mail/mail.error.xml.h:145
 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:145
+#: ../mail/mail.error.xml.h:146
 msgid "You have not filled in all of the required information."
 msgstr "Du har ikke fylt ut all nÃdvendig informasjon."
 
-#: ../mail/mail.error.xml.h:146
+#: ../mail/mail.error.xml.h:147
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Du har usendte meldinger. Vil du avslutte likevel?"
 
-#: ../mail/mail.error.xml.h:147
+#: ../mail/mail.error.xml.h:148
 msgid "You may not create two accounts with the same name."
 msgstr "Du kan ikke opprette to kontoer med samme navn."
 
-#: ../mail/mail.error.xml.h:148
+#: ../mail/mail.error.xml.h:149
 msgid "You must name this Search Folder."
 msgstr "Du mà gi navn til denne sÃkemappen."
 
-#: ../mail/mail.error.xml.h:149
+#: ../mail/mail.error.xml.h:150
 msgid "You must specify a folder."
 msgstr "Du mà oppgi en mappe."
 
-#: ../mail/mail.error.xml.h:150
+#: ../mail/mail.error.xml.h:151
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -12870,65 +12869,65 @@ msgstr ""
 "Enten ved à velge mappene individuelt og/eller à velge alle lokale mapper, "
 "alle eksterne mapper eller begge deler."
 
-#: ../mail/mail.error.xml.h:152
+#: ../mail/mail.error.xml.h:153
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "Din pÃlogging pà tjener Â{0} som Â{0} feilet."
 
-#: ../mail/mail.error.xml.h:153
+#: ../mail/mail.error.xml.h:154
 msgid "_Always"
 msgstr "_Alltid"
 
-#: ../mail/mail.error.xml.h:154
+#: ../mail/mail.error.xml.h:155
 msgid "_Append"
 msgstr "_Legg til"
 
-#: ../mail/mail.error.xml.h:155
+#: ../mail/mail.error.xml.h:156
 #: ../plugins/publish-calendar/publish-calendar.c:600
 msgid "_Disable"
 msgstr "_Deaktiver"
 
-#: ../mail/mail.error.xml.h:156
+#: ../mail/mail.error.xml.h:157
 msgid "_Discard changes"
 msgstr "_Forkast endringene"
 
-#: ../mail/mail.error.xml.h:157
+#: ../mail/mail.error.xml.h:158
 #: ../modules/mail/e-mail-shell-view-actions.c:1124
 msgid "_Empty Trash"
 msgstr "_TÃm papirkurven"
 
-#: ../mail/mail.error.xml.h:158
+#: ../mail/mail.error.xml.h:159
 msgid "_Exit Evolution"
 msgstr "Avslutt _Evolution"
 
-#: ../mail/mail.error.xml.h:159
+#: ../mail/mail.error.xml.h:160
 msgid "_Expunge"
 msgstr "T_Ãm"
 
-#: ../mail/mail.error.xml.h:160
+#: ../mail/mail.error.xml.h:161
 msgid "_Migrate Now"
 msgstr "_Migrer nÃ"
 
-#: ../mail/mail.error.xml.h:161
+#: ../mail/mail.error.xml.h:162
 msgid "_No"
 msgstr "_Nei"
 
-#: ../mail/mail.error.xml.h:162
+#: ../mail/mail.error.xml.h:163
 msgid "_Open Messages"
 msgstr "_Ãpne meldinger"
 
-#: ../mail/mail.error.xml.h:165
+#: ../mail/mail.error.xml.h:166
 msgid "_Send Receipt"
 msgstr "_Send kvittering"
 
-#: ../mail/mail.error.xml.h:166
+#: ../mail/mail.error.xml.h:167
 msgid "_Synchronize"
 msgstr "_Synkroniser"
 
-#: ../mail/mail.error.xml.h:167
+#: ../mail/mail.error.xml.h:168
 msgid "_Yes"
 msgstr "_Ja"
 
-#: ../mail/mail.error.xml.h:168
+#: ../mail/mail.error.xml.h:169
 msgid "{0}"
 msgstr "{0}"
 
@@ -13173,11 +13172,11 @@ msgstr "SÃker"
 msgid "Downloading"
 msgstr "Laster ned"
 
-#: ../modules/addressbook/addressbook-config.c:1272
+#: ../modules/addressbook/addressbook-config.c:1275
 msgid "Address Book Properties"
 msgstr "Egenskaper for adressebok"
 
-#: ../modules/addressbook/addressbook-config.c:1274
+#: ../modules/addressbook/addressbook-config.c:1277
 msgid "New Address Book"
 msgstr "Ny adressebok"
 
@@ -13278,65 +13277,65 @@ msgid "Whether to show the preview pane."
 msgstr "Om forhÃndsvisningsomrÃdet skal vises."
 
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
-#: ../modules/addressbook/autocompletion-config.c:165
+#: ../modules/addressbook/autocompletion-config.c:184
 #: ../modules/mail/em-mailer-prefs.c:1029
 msgid "_Table column:"
 msgstr "Kolonne i _tabell:"
 
-#: ../modules/addressbook/autocompletion-config.c:168
+#: ../modules/addressbook/autocompletion-config.c:187
 msgid "Autocompletion"
 msgstr "AutofullfÃring"
 
-#: ../modules/addressbook/autocompletion-config.c:171
+#: ../modules/addressbook/autocompletion-config.c:190
 msgid "Always _show address of the autocompleted contact"
 msgstr "Alltid vi_s adresse for automatisk fullfÃrt kontakt"
 
 #. Create the LDAP source group
-#: ../modules/addressbook/e-book-shell-backend.c:98
+#: ../modules/addressbook/e-book-shell-backend.c:102
 #: ../modules/addressbook/e-book-shell-migrate.c:154
 msgid "On LDAP Servers"
 msgstr "PÃ LDAP-tjenere"
 
-#: ../modules/addressbook/e-book-shell-backend.c:284
+#: ../modules/addressbook/e-book-shell-backend.c:302
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: ../modules/addressbook/e-book-shell-backend.c:286
+#: ../modules/addressbook/e-book-shell-backend.c:304
 #: ../modules/addressbook/e-book-shell-view-actions.c:905
 msgid "Create a new contact"
 msgstr "Opprett en ny kontakt"
 
-#: ../modules/addressbook/e-book-shell-backend.c:291
+#: ../modules/addressbook/e-book-shell-backend.c:309
 msgctxt "New"
 msgid "Contact _List"
 msgstr "Kontakt_liste"
 
-#: ../modules/addressbook/e-book-shell-backend.c:293
+#: ../modules/addressbook/e-book-shell-backend.c:311
 #: ../modules/addressbook/e-book-shell-view-actions.c:912
 msgid "Create a new contact list"
 msgstr "Opprett en ny kontaktliste"
 
-#: ../modules/addressbook/e-book-shell-backend.c:301
+#: ../modules/addressbook/e-book-shell-backend.c:319
 msgctxt "New"
 msgid "Address _Book"
 msgstr "Adresse_bok"
 
-#: ../modules/addressbook/e-book-shell-backend.c:303
+#: ../modules/addressbook/e-book-shell-backend.c:321
 #: ../modules/addressbook/e-book-shell-view-actions.c:835
 msgid "Create a new address book"
 msgstr "Opprett en ny adressebok"
 
 #. Create the contacts group
-#: ../modules/addressbook/e-book-shell-backend.c:320
+#: ../modules/addressbook/e-book-shell-backend.c:338
 #: ../modules/addressbook/e-book-shell-view.c:405
-#: ../modules/calendar/e-cal-shell-backend.c:111
+#: ../modules/calendar/e-cal-shell-backend.c:115
 #: ../modules/calendar/e-cal-shell-migrate.c:63
-#: ../modules/online-accounts/e-online-accounts-google.c:364
+#: ../modules/online-accounts/e-online-accounts-google.c:366
 msgid "Contacts"
 msgstr "Kontakter"
 
-#: ../modules/addressbook/e-book-shell-backend.c:330
+#: ../modules/addressbook/e-book-shell-backend.c:348
 msgid "Certificates"
 msgstr "Sertifikater"
 
@@ -13391,9 +13390,9 @@ 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:854
-#: ../modules/calendar/e-cal-shell-view-actions.c:1372
-#: ../modules/calendar/e-memo-shell-view-actions.c:627
-#: ../modules/calendar/e-task-shell-view-actions.c:751
+#: ../modules/calendar/e-cal-shell-view-actions.c:1404
+#: ../modules/calendar/e-memo-shell-view-actions.c:641
+#: ../modules/calendar/e-task-shell-view-actions.c:765
 #: ../modules/mail/e-mail-shell-view-actions.c:1201
 msgid "_Rename..."
 msgstr "End_re navn â"
@@ -13467,22 +13466,22 @@ msgid "Send a message to the selected contacts"
 msgstr "Send en melding til valgte kontakter"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:933
-#: ../modules/calendar/e-cal-shell-view-actions.c:1507
-#: ../modules/calendar/e-task-shell-view-actions.c:809
+#: ../modules/calendar/e-cal-shell-view-actions.c:1539
+#: ../modules/calendar/e-task-shell-view-actions.c:823
 msgid "_Actions"
 msgstr "H_andlinger"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:940
-#: ../modules/calendar/e-memo-shell-view-actions.c:664
-#: ../modules/calendar/e-task-shell-view-actions.c:816
+#: ../modules/calendar/e-memo-shell-view-actions.c:678
+#: ../modules/calendar/e-task-shell-view-actions.c:830
 #: ../modules/mail/e-mail-shell-view-actions.c:1359
 msgid "_Preview"
 msgstr "_ForhÃndsvis"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:949
-#: ../modules/calendar/e-cal-shell-view-actions.c:1524
-#: ../modules/calendar/e-memo-shell-view-actions.c:677
-#: ../modules/calendar/e-task-shell-view-actions.c:829
+#: ../modules/calendar/e-cal-shell-view-actions.c:1556
+#: ../modules/calendar/e-memo-shell-view-actions.c:691
+#: ../modules/calendar/e-task-shell-view-actions.c:843
 msgid "_Delete"
 msgstr "_Slett"
 
@@ -13511,8 +13510,8 @@ msgid "Show maps in contact preview window"
 msgstr "Vis kart i forhÃndsvisning av kontakter"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1018
-#: ../modules/calendar/e-memo-shell-view-actions.c:734
-#: ../modules/calendar/e-task-shell-view-actions.c:898
+#: ../modules/calendar/e-memo-shell-view-actions.c:748
+#: ../modules/calendar/e-task-shell-view-actions.c:912
 #: ../modules/mail/e-mail-shell-view-actions.c:1474
 msgid "_Classic View"
 msgstr "_Klassisk visning"
@@ -13522,8 +13521,8 @@ msgid "Show contact preview below the contact list"
 msgstr "Vis forhÃndsvisning av kontakt under kontaktlisten"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1025
-#: ../modules/calendar/e-memo-shell-view-actions.c:741
-#: ../modules/calendar/e-task-shell-view-actions.c:905
+#: ../modules/calendar/e-memo-shell-view-actions.c:755
+#: ../modules/calendar/e-task-shell-view-actions.c:919
 #: ../modules/mail/e-mail-shell-view-actions.c:1481
 msgid "_Vertical View"
 msgstr "_Vertikal visning"
@@ -13533,23 +13532,23 @@ 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:1035
-#: ../modules/calendar/e-cal-shell-view-actions.c:1663
-#: ../modules/calendar/e-memo-shell-view-actions.c:751
-#: ../modules/calendar/e-task-shell-view-actions.c:922
+#: ../modules/calendar/e-cal-shell-view-actions.c:1695
+#: ../modules/calendar/e-memo-shell-view-actions.c:765
+#: ../modules/calendar/e-task-shell-view-actions.c:936
 msgid "Any Category"
 msgstr "Enhver kategori"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1042
-#: ../modules/calendar/e-cal-shell-view-actions.c:1677
-#: ../modules/calendar/e-memo-shell-view-actions.c:758
-#: ../modules/calendar/e-task-shell-view-actions.c:957
+#: ../modules/calendar/e-cal-shell-view-actions.c:1709
+#: ../modules/calendar/e-memo-shell-view-actions.c:772
+#: ../modules/calendar/e-task-shell-view-actions.c:971
 msgid "Unmatched"
 msgstr "Ingen treff"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1052
-#: ../modules/calendar/e-cal-shell-view-actions.c:1687
-#: ../modules/calendar/e-memo-shell-view-actions.c:768
-#: ../modules/calendar/e-task-shell-view-actions.c:967
+#: ../modules/calendar/e-cal-shell-view-actions.c:1719
+#: ../modules/calendar/e-memo-shell-view-actions.c:782
+#: ../modules/calendar/e-task-shell-view-actions.c:981
 #: ../modules/mail/e-mail-shell-view-actions.c:1557
 #: ../shell/e-shell-content.c:666
 msgid "Advanced Search"
@@ -13710,10 +13709,6 @@ msgstr "_SÃkeomrÃde:"
 msgid "_Timeout:"
 msgstr "_Tidsavbrudd:"
 
-#: ../modules/addressbook/ldap-config.ui.h:31
-msgid "_Use secure connection:"
-msgstr "Br_uk sikker forbindelse:"
-
 #: ../modules/addressbook/ldap-config.ui.h:32
 msgid "cards"
 msgstr "kort"
@@ -13784,6 +13779,10 @@ msgstr "30 minutter"
 msgid "60 minutes"
 msgstr "60 minutter"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:9
+msgid "Alarms"
+msgstr "Varsel"
+
 #: ../modules/calendar/e-calendar-preferences.ui.h:10
 msgid "Alerts"
 msgstr "Varsel"
@@ -13805,7 +13804,7 @@ msgid "Display"
 msgstr "Vis"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:16
-msgid "Display alarms in _notification area only"
+msgid "Display reminders in _notification area only"
 msgstr "Vis alarmer kun i varsli_ngsomrÃdet"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:20
@@ -13817,289 +13816,285 @@ msgid "Minutes"
 msgstr "Minutter"
 
 #. Sunday
-#: ../modules/calendar/e-calendar-preferences.ui.h:25
+#: ../modules/calendar/e-calendar-preferences.ui.h:26
 msgid "S_un"
 msgstr "S_Ã."
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:27
+#: ../modules/calendar/e-calendar-preferences.ui.h:28
 msgid "Sc_roll Month View by a week"
 msgstr "_Rull mÃnedsvisning en uke om gangen"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:28
+#: ../modules/calendar/e-calendar-preferences.ui.h:29
 msgid "Se_cond zone:"
 msgstr "Se_kundÃr sone:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:29
-msgid "Select the calendars for alarm notification"
-msgstr "Velg kalendere for varsling"
+#: ../modules/calendar/e-calendar-preferences.ui.h:30
+msgid "Select the calendars for reminder notification"
+msgstr "Velg kalendere for varsling av pÃminnelser"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:31
+#: ../modules/calendar/e-calendar-preferences.ui.h:32
 msgid "Sh_ow a reminder"
 msgstr "_Vis en pÃminnelse"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:33
+#: ../modules/calendar/e-calendar-preferences.ui.h:34
 msgid "Show a _reminder"
 msgstr "Vis en _pÃminnelse"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:34
+#: ../modules/calendar/e-calendar-preferences.ui.h:35
 msgid "Show r_ecurring events in italic in bottom left calendar"
 msgstr "Vis r_epeterende hendelser i kursiv i kalender nede til venstre"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:35
+#: ../modules/calendar/e-calendar-preferences.ui.h:36
 msgid "Show week _numbers"
 msgstr "Vis uke_nummer"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:37
+#: ../modules/calendar/e-calendar-preferences.ui.h:38
 msgid "T_asks due today:"
 msgstr "Oppg_aver som gÃr ut i dag:"
 
 #. Thursday
-#: ../modules/calendar/e-calendar-preferences.ui.h:39
+#: ../modules/calendar/e-calendar-preferences.ui.h:40
 msgid "T_hu"
 msgstr "T_o."
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:41
+#: ../modules/calendar/e-calendar-preferences.ui.h:42
 msgid "Template:"
 msgstr "Mal:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:43
+#: ../modules/calendar/e-calendar-preferences.ui.h:44
 #: ../widgets/misc/e-dateedit.c:592
 msgid "Time"
 msgstr "Tid"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:45
+#: ../modules/calendar/e-calendar-preferences.ui.h:46
 msgid "Time format:"
 msgstr "Tidformat:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:47
+#: ../modules/calendar/e-calendar-preferences.ui.h:48
 msgid "Use s_ystem time zone"
 msgstr "Bruk s_ystemets tidssone"
 
 #. A weekday like "Monday" follows
-#: ../modules/calendar/e-calendar-preferences.ui.h:50
+#: ../modules/calendar/e-calendar-preferences.ui.h:51
 msgid "Wee_k starts on:"
 msgstr "Uk_en starter pÃ:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:51
-#: ../modules/calendar/e-cal-shell-view-actions.c:1646
+#: ../modules/calendar/e-calendar-preferences.ui.h:52
+#: ../modules/calendar/e-cal-shell-view-actions.c:1678
 msgid "Work Week"
 msgstr "Arbeidsuke"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:52
+#: ../modules/calendar/e-calendar-preferences.ui.h:53
 msgid "Work days:"
 msgstr "Arbeidsdager:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:53
+#: ../modules/calendar/e-calendar-preferences.ui.h:54
 msgid "_12 hour (AM/PM)"
 msgstr "_12 timer (AM/PM)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:54
+#: ../modules/calendar/e-calendar-preferences.ui.h:55
 msgid "_24 hour"
 msgstr "_24 timer"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:55
+#: ../modules/calendar/e-calendar-preferences.ui.h:56
 msgid "_Ask for confirmation when deleting items"
 msgstr "SpÃr etter bekreftelse ved sletting _av oppfÃringer"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:56
+#: ../modules/calendar/e-calendar-preferences.ui.h:57
 msgid "_Compress weekends in month view"
 msgstr "_Komprimer helger i mÃnedsvisning"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:57
+#: ../modules/calendar/e-calendar-preferences.ui.h:58
 msgid "_Day begins:"
 msgstr "_Dagen begynner:"
 
 #. Friday
-#: ../modules/calendar/e-calendar-preferences.ui.h:59
+#: ../modules/calendar/e-calendar-preferences.ui.h:60
 msgid "_Fri"
 msgstr "_Fr."
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:60
+#: ../modules/calendar/e-calendar-preferences.ui.h:61
 msgid "_Hide completed tasks after"
 msgstr "Sk_jul utfÃrte oppgaver etter"
 
 #. Monday
-#: ../modules/calendar/e-calendar-preferences.ui.h:62
+#: ../modules/calendar/e-calendar-preferences.ui.h:63
 msgid "_Mon"
 msgstr "_Ma."
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:63
+#: ../modules/calendar/e-calendar-preferences.ui.h:64
 msgid "_Overdue tasks:"
 msgstr "UtgÃtte _oppgaver:"
 
 #. Saturday
-#: ../modules/calendar/e-calendar-preferences.ui.h:65
+#: ../modules/calendar/e-calendar-preferences.ui.h:66
 msgid "_Sat"
 msgstr "L_Ã."
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:66
+#: ../modules/calendar/e-calendar-preferences.ui.h:67
 msgid "_Show appointment end times in week and month view"
 msgstr "Vi_s tid for avtalers slutt i ukes- og mÃnedsvisning"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:67
+#: ../modules/calendar/e-calendar-preferences.ui.h:68
 msgid "_Time divisions:"
 msgstr "Oppdeling av _tid:"
 
 #. Tuesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:69
+#: ../modules/calendar/e-calendar-preferences.ui.h:70
 msgid "_Tue"
 msgstr "_Ti."
 
 #. Wednesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:71
+#: ../modules/calendar/e-calendar-preferences.ui.h:72
 msgid "_Wed"
 msgstr "_On."
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:73
+#: ../modules/calendar/e-calendar-preferences.ui.h:74
 msgid "before every anniversary/birthday"
 msgstr "fÃr hvert jubileum/bursdag"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:75
+#: ../modules/calendar/e-calendar-preferences.ui.h:76
 msgid "before every appointment"
 msgstr "fÃr hver avtale"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:1
-msgid "Alarm programs"
-msgstr "Varslingsprogrammer"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:2
 msgid "Ask for confirmation when deleting items"
 msgstr "SpÃr etter bekreftelse ved sletting av oppfÃringer"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:4
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
 msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
 msgstr "Farge for oppgaver som gÃr ut i dag i Â#rrggbbÂ-format."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:4
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
 msgstr "Farge for oppgaver som har gÃtt ut i Â#rrggbbÂ-format."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
 msgid "Birthday and anniversary reminder"
 msgstr "PÃminnelse om fÃdselsdager og jubileum"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:7
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
 msgid "Birthday and anniversary reminder units"
 msgstr "Enhet for pÃminnelse om fÃdselsdager og jubileum"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:8
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:7
 msgid "Birthday and anniversary reminder value"
 msgstr "Verdi for pÃminnelse om fÃdselsdager og jubileum"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:9
-msgid "Calendars to run alarms for"
-msgstr "Kalendere det skal kjÃres alarmer for"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:8
+msgid "Calendars to run reminders for"
+msgstr "Kalendere det skal kjÃres pÃminnelser for"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:9
 msgid ""
 "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr "Farge pà Marcus Bains-linjen i tidslinjen (tom for forvalg)."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "Farge pà Marcus Bains-linjen i dagsvisningen."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:12
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
 msgid "Compress weekends in month view"
 msgstr "Komprimer helger i mÃnedsvisning"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:12
 msgid "Confirm expunge"
 msgstr "Bekreft tÃmming av mappe"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:14
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr "Dager som starten og slutten pà arbeidstid skal vÃre indikert."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:15
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:14
 msgid "Default appointment reminder"
 msgstr "Forvalgt pÃminnelse for avtale"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:16
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:15
 msgid "Default reminder units"
 msgstr "Forvalgt enhet for pÃminnelser"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:17
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:16
 msgid "Default reminder value"
 msgstr "Forvalgt verdi for pÃminnelse"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:18
-msgid "Directory for saving alarm audio files"
-msgstr "Katalog for lagring av lydfiler for alarm"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:17
+msgid "Directory for saving reminder audio files"
+msgstr "Katalog for lagring av lydfiler for pÃminnelser"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:19
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:18
 msgid "Free/busy server URLs"
 msgstr "Tjener-URLer for ledig/opptatt-informasjon"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:20
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:19
 msgid "Free/busy template URL"
 msgstr "Ledig/opptatt mal-URL"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:21
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:20
 msgid "Hide completed tasks"
 msgstr "Skjul fullfÃrte oppgaver"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:22
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:21
 msgid "Hide task units"
 msgstr "Skjul enheter for oppgaver"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:23
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:22
 msgid "Hide task value"
 msgstr "Skjul oppgaveverdi"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:24
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:23
 msgid "Horizontal pane position"
 msgstr "Plassering pà horisontalt felt"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:25
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:24
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "Klokkeslett arbeidsdagen slutter pà i 24-timers format, 0 til 23."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:26
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:25
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "Klokkeslett arbeidsdagen starter i 24-timers format, 0 til 23."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:26
 msgid "If \"true\", show the memo preview pane in the main window."
 msgstr "Vis forhÃndsvisningsomrÃdet for notater i hovedvinduet hvis ÂtrueÂ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
 msgid "If \"true\", show the task preview pane in the main window."
 msgstr "Vis forhÃndsvisningsomrÃdet for oppgaver i hovedvinduet hvis ÂtrueÂ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:29
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "Intervaller i minutter som vises i dag- og arbeidsukevisningene."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
-msgid "Last alarm time"
-msgstr "Siste varslingstid"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:29
+msgid "Last reminder time"
+msgstr "Siste pÃminnelsestid"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:32
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
 msgid "List of recently used second time zones in a Day View."
 msgstr "Liste med nylig brukte sekundÃrtidssoner i en dagvisning."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:33
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:32
 msgid "List of server URLs for free/busy publishing."
 msgstr "Liste over tjener-URLer for publisering av ledig/opptatt tid."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:34
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:33
 msgid "Marcus Bains Line"
 msgstr "Marcus Bains-linje"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:35
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:34
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Farge pà Marcus Bains-linje - Dagsvisning"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:36
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:35
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Farge pà Marcus Bains-linje - tidslinje"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:36
 msgid ""
 "Maximum number of recently used timezones to remember in a "
 "'day_second_zones' list."
@@ -14107,56 +14102,56 @@ msgstr ""
 "Maksimalt antall nylig brukte tidssoner som skal huskes i en liste med "
 "Âday_second_zonesÂ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
 msgid "Maximum number of recently used timezones to remember."
 msgstr "Maksimalt antall nylig brukte tidssoner som skal huskes."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:39
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
 msgid "Memo layout style"
 msgstr "Stil for utforming av notat"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:40
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:39
 msgid "Memo preview pane position (horizontal)"
 msgstr "Posisjon for forhÃndsvisningsomrÃde for notater (horisontal)"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:41
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:40
 msgid "Memo preview pane position (vertical)"
 msgstr "Plassering av vertikalt felt for forhÃndsvisning"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:42
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:41
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Minutt arbeidsdagen slutter pà fra 0 til 59."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:43
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:42
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Minutt arbeidsdagen starter pà fra 0 til 59."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:44
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:43
 msgid "Month view horizontal pane position"
 msgstr "Plassering pà horisontal mÃnedsvisningsfelt"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:45
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:44
 msgid "Month view vertical pane position"
 msgstr "Plassering av vertikalt felt for mÃnedsvisning"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:46
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:45
 msgid "Number of units for determining a birthday or anniversary reminder."
 msgstr ""
 "Antall enheter for à bestemme en pÃminnelse om fÃdselsdag eller jubileum."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:47
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:46
 msgid "Number of units for determining a default reminder."
 msgstr "Antall enheter for à bestemme en forvalgt pÃminnelse."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:48
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:47
 msgid "Number of units for determining when to hide tasks."
 msgstr "Antall enheter for à bestemme nÃr oppgaver skal skjules"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:49
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:48
 msgid "Overdue tasks color"
 msgstr "Farge for utgÃtte oppgaver"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:49
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -14164,7 +14159,7 @@ msgstr ""
 "Posisjonen til det horisontale feltet mellom minikalenderen og oppgavelisten "
 "utenom mÃnedsvisning, i piksler."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:51
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -14172,29 +14167,29 @@ msgstr ""
 "Posisjonen til det horisontale feltet mellom visning, minikalender og "
 "oppgavelisten i mÃnedsvisning, i piksler."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:51
 msgid "Position of the memo preview pane when oriented vertically."
 msgstr ""
 "Posisjon for forhÃndsvisningsomrÃdet for notater med vertikal orientering."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:53
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
 msgid "Position of the task preview pane when oriented horizontally."
 msgstr ""
 "Posisjon for forhÃndsvisningsomrÃdet for oppgaver med horisontall "
 "orientering."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:53
 msgid "Position of the task preview pane when oriented vertically."
 msgstr ""
 "Posisjon for forhÃndsvisningsomrÃdet for oppgaver med vertikal orientering."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
 msgstr "Plassering av vertikalt felt mellom kalenderlisten og minikalenderen."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -14202,7 +14197,7 @@ msgstr ""
 "Posisjonen til det vertikale feltet mellom visning, minikalenderen og "
 "oppgavelisten i mÃnedsvisning, i piksler."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
@@ -14210,33 +14205,37 @@ msgstr ""
 "Posisjonen til det vertikale feltet mellom visning, minikalenderen og "
 "oppgavelisten utenom mÃnedsvisning, i piksler."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
 msgid "Primary calendar"
 msgstr "PrimÃr kalender"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:59
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
 msgid "Primary memo list"
 msgstr "PrimÃr notatliste"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:59
 msgid "Primary task list"
 msgstr "PrimÃr oppgaveliste"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
-msgid "Programs that are allowed to be run by alarms."
-msgstr "Programmer som er tillat à kjÃres av alarmer."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
+msgid "Programs that are allowed to be run by reminders."
+msgstr "Programmer som er tillat à kjÃres av pÃminnelser."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:62
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
 msgid "Recently used second time zones in a Day View"
 msgstr "Sist brukte sekundÃrtidssoner i en dagvisning"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:63
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:62
 msgid "Recurrent Events in Italic"
 msgstr "Repeterende hendelser i kursiv"
 
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:63
+msgid "Reminder programs"
+msgstr "Programmer for pÃminnelse"
+
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:64
-msgid "Save directory for alarm audio"
-msgstr "Katalog for lagring av alarmlyd"
+msgid "Save directory for reminder audio"
+msgstr "Lagre katalog for pÃminnelseslyd"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:65
 msgid "Scroll Month View by a week"
@@ -14265,8 +14264,8 @@ msgstr ""
 "venstre."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:71
-msgid "Show display alarms in notification tray"
-msgstr "Vis alarmer i varslingsomrÃdet pà panelet"
+msgid "Show display reminders in notification tray"
+msgstr "Vis pÃminnelser i varslingsomrÃdet pà panelet"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:72
 msgid "Show status field in the event/task/meeting editor"
@@ -14382,8 +14381,8 @@ msgid "Time divisions"
 msgstr "Oppdeling av tid"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:94
-msgid "Time the last alarm ran, in time_t."
-msgstr "Tid for forrige alarm, som time_t."
+msgid "Time the last reminder ran, in time_t."
+msgstr "Tid for forrige pÃminnelse, som time_t."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:95
 msgid "Timezone"
@@ -14433,8 +14432,8 @@ msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "Dag uken starter pÃ. Fra sÃndag (0) til lÃrdag (6)."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:105
-msgid "Whether or not to use the notification tray for display alarms."
-msgstr "Om varslingsfeltet skal brukes for alarmer."
+msgid "Whether or not to use the notification tray for display reminders."
+msgstr "Hvorvidt varslingsfeltet skal brukes for pÃminnelser pà skjermen."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:106
 msgid "Whether to ask for confirmation when deleting an appointment or task."
@@ -14535,30 +14534,30 @@ msgstr "Hvilken time arbeidsdagen starter"
 msgid "Workday start minute"
 msgstr "Hvilket minutt arbeidsdagen starter"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:286
+#: ../modules/calendar/e-cal-attachment-handler.c:312
 #: ../smime/gui/smime-ui.ui.h:22
 msgid "I_mport"
 msgstr "I_mporter"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:367
+#: ../modules/calendar/e-cal-attachment-handler.c:393
 msgid "Select a Calendar"
 msgstr "Velg en kalender"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:394
+#: ../modules/calendar/e-cal-attachment-handler.c:420
 msgid "Select a Task List"
 msgstr "Velg en oppgaveliste"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:404
+#: ../modules/calendar/e-cal-attachment-handler.c:430
 msgid "I_mport to Calendar"
 msgstr "I_mporter til kalenderen"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:411
+#: ../modules/calendar/e-cal-attachment-handler.c:437
 msgid "I_mport to Tasks"
 msgstr "I_mporter til oppgaver"
 
 #: ../modules/calendar/e-calendar-preferences.c:441
-msgid "Selected Calendars for Alarms"
-msgstr "Kalendere valgt for varsel"
+msgid "Selected Calendars for Reminders"
+msgstr "Kalendere valgt for pÃminnelse"
 
 #: ../modules/calendar/e-calendar-preferences.c:840
 msgid "Ti_me and date:"
@@ -14569,92 +14568,91 @@ msgid "_Date only:"
 msgstr "Kun _dato:"
 
 #. Create the Webcal source group
-#: ../modules/calendar/e-cal-shell-backend.c:113
+#: ../modules/calendar/e-cal-shell-backend.c:117
 #: ../modules/calendar/e-cal-shell-migrate.c:198
-#: ../modules/calendar/e-memo-shell-backend.c:100
+#: ../modules/calendar/e-memo-shell-backend.c:104
 #: ../modules/calendar/e-memo-shell-migrate.c:152
-#: ../modules/calendar/e-task-shell-backend.c:100
+#: ../modules/calendar/e-task-shell-backend.c:104
 #: ../modules/calendar/e-task-shell-migrate.c:164
 msgid "On The Web"
 msgstr "PÃ nettet"
 
-#: ../modules/calendar/e-cal-shell-backend.c:115
+#: ../modules/calendar/e-cal-shell-backend.c:119
 #: ../plugins/calendar-weather/calendar-weather.c:125
 msgid "Weather"
 msgstr "VÃr"
 
-#: ../modules/calendar/e-cal-shell-backend.c:202
+#: ../modules/calendar/e-cal-shell-backend.c:206
 #: ../modules/calendar/e-cal-shell-migrate.c:66
 msgid "Birthdays & Anniversaries"
 msgstr "FÃdselsdager og jubileum"
 
-#: ../modules/calendar/e-cal-shell-backend.c:423
+#: ../modules/calendar/e-cal-shell-backend.c:439
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Avtale"
 
-#: ../modules/calendar/e-cal-shell-backend.c:425
-#: ../modules/calendar/e-cal-shell-view-actions.c:1451
+#: ../modules/calendar/e-cal-shell-backend.c:441
+#: ../modules/calendar/e-cal-shell-view-actions.c:1483
 msgid "Create a new appointment"
 msgstr "Opprett en ny avtale"
 
-#: ../modules/calendar/e-cal-shell-backend.c:430
+#: ../modules/calendar/e-cal-shell-backend.c:446
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Avtale for hele _dagen"
 
-#: ../modules/calendar/e-cal-shell-backend.c:432
+#: ../modules/calendar/e-cal-shell-backend.c:448
 msgid "Create a new all-day appointment"
 msgstr "Opprett en ny avtale for hele dagen"
 
-#: ../modules/calendar/e-cal-shell-backend.c:437
+#: ../modules/calendar/e-cal-shell-backend.c:453
 msgctxt "New"
 msgid "M_eeting"
 msgstr "MÃt_e"
 
-#: ../modules/calendar/e-cal-shell-backend.c:439
+#: ../modules/calendar/e-cal-shell-backend.c:455
 msgid "Create a new meeting request"
 msgstr "Opprett en ny mÃteforespÃrsel"
 
-#: ../modules/calendar/e-cal-shell-backend.c:447
+#: ../modules/calendar/e-cal-shell-backend.c:463
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Kale_nder"
 
-#: ../modules/calendar/e-cal-shell-backend.c:449
-#: ../modules/calendar/e-cal-shell-view-actions.c:1346
+#: ../modules/calendar/e-cal-shell-backend.c:465
+#: ../modules/calendar/e-cal-shell-view-actions.c:1378
 msgid "Create a new calendar"
 msgstr "Opprett en ny kalender"
 
-#: ../modules/calendar/e-cal-shell-backend.c:755
-#: ../plugins/itip-formatter/itip-formatter.c:2951
+#: ../modules/calendar/e-cal-shell-backend.c:788
 msgid "Calendar and Tasks"
 msgstr "Kalender og oppgaver"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:180
+#: ../modules/calendar/e-cal-shell-sidebar.c:184
 msgid "Loading calendars"
 msgstr "Laster kalendere"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:721
+#: ../modules/calendar/e-cal-shell-sidebar.c:755
 msgid "_New Calendar..."
 msgstr "_Ny kalender â"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:738
+#: ../modules/calendar/e-cal-shell-sidebar.c:772
 msgid "Calendar Selector"
 msgstr "Kalendervelger"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:1087
+#: ../modules/calendar/e-cal-shell-sidebar.c:1123
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Ãpner kalender pà %s"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:222
-#: ../modules/calendar/e-cal-shell-view-actions.c:251
+#: ../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:310
+#: ../modules/calendar/e-cal-shell-view-actions.c:320
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -14665,306 +14663,306 @@ msgstr ""
 
 #. Translators: This is the first part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../modules/calendar/e-cal-shell-view-actions.c:327
+#: ../modules/calendar/e-cal-shell-view-actions.c:337
 msgid "Purge events older than"
 msgstr "Slett hendelser eldre enn"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:541
+#: ../modules/calendar/e-cal-shell-view-actions.c:564
 msgid "Copying Items"
 msgstr "Kopierer oppfÃringer"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:816
+#: ../modules/calendar/e-cal-shell-view-actions.c:848
 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:1143
+#: ../modules/calendar/e-cal-shell-view-actions.c:1175
 msgid "event"
 msgstr "hendelse"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1145
+#: ../modules/calendar/e-cal-shell-view-actions.c:1177
 #: ../modules/calendar/e-cal-shell-view-memopad.c:220
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:287
-#: ../modules/calendar/e-memo-shell-view-actions.c:511
-#: ../modules/calendar/e-task-shell-view-actions.c:628
+#: ../modules/calendar/e-memo-shell-view-actions.c:525
+#: ../modules/calendar/e-task-shell-view-actions.c:642
 msgid "Save as iCalendar"
 msgstr "Lagre som iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1302
-#: ../modules/calendar/e-memo-shell-view-actions.c:592
+#: ../modules/calendar/e-cal-shell-view-actions.c:1334
+#: ../modules/calendar/e-memo-shell-view-actions.c:606
 msgid "_Copy..."
 msgstr "_Kopier â"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1309
+#: ../modules/calendar/e-cal-shell-view-actions.c:1341
 msgid "D_elete Calendar"
 msgstr "Sl_ett kalender"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1311
+#: ../modules/calendar/e-cal-shell-view-actions.c:1343
 msgid "Delete the selected calendar"
 msgstr "Slett valgt kalender"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1318
+#: ../modules/calendar/e-cal-shell-view-actions.c:1350
 msgid "Go Back"
 msgstr "GÃ tilbake"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1325
+#: ../modules/calendar/e-cal-shell-view-actions.c:1357
 msgid "Go Forward"
 msgstr "GÃ fremover"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1332
+#: ../modules/calendar/e-cal-shell-view-actions.c:1364
 msgid "Select today"
 msgstr "Velg i dag"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1337
+#: ../modules/calendar/e-cal-shell-view-actions.c:1369
 msgid "Select _Date"
 msgstr "Velg _dato"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1339
+#: ../modules/calendar/e-cal-shell-view-actions.c:1371
 msgid "Select a specific date"
 msgstr "Velg en spesifikk dato"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1344
+#: ../modules/calendar/e-cal-shell-view-actions.c:1376
 msgid "_New Calendar"
 msgstr "_Ny kalender"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1358
-#: ../modules/calendar/e-task-shell-view-actions.c:800
+#: ../modules/calendar/e-cal-shell-view-actions.c:1390
+#: ../modules/calendar/e-task-shell-view-actions.c:814
 msgid "Purg_e"
 msgstr "Fj_ern"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1360
+#: ../modules/calendar/e-cal-shell-view-actions.c:1392
 msgid "Purge old appointments and meetings"
 msgstr "Fjern gamle avtaler og mÃter"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1365
-#: ../modules/calendar/e-memo-shell-view-actions.c:620
-#: ../modules/calendar/e-task-shell-view-actions.c:744
+#: ../modules/calendar/e-cal-shell-view-actions.c:1397
+#: ../modules/calendar/e-memo-shell-view-actions.c:634
+#: ../modules/calendar/e-task-shell-view-actions.c:758
 msgid "Re_fresh"
 msgstr "O_ppdater"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1367
+#: ../modules/calendar/e-cal-shell-view-actions.c:1399
 msgid "Refresh the selected calendar"
 msgstr "Oppdater valgt kalender"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1374
+#: ../modules/calendar/e-cal-shell-view-actions.c:1406
 msgid "Rename the selected calendar"
 msgstr "Endre navn pà valgt kalender"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1379
+#: ../modules/calendar/e-cal-shell-view-actions.c:1411
 msgid "Show _Only This Calendar"
 msgstr "Vis k_un denne kalenderen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1386
+#: ../modules/calendar/e-cal-shell-view-actions.c:1418
 msgid "Cop_y to Calendar..."
 msgstr "Kop_ier til kalender â"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1393
+#: ../modules/calendar/e-cal-shell-view-actions.c:1425
 msgid "_Delegate Meeting..."
 msgstr "_Deleger mÃte â"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1400
+#: ../modules/calendar/e-cal-shell-view-actions.c:1432
 msgid "_Delete Appointment"
 msgstr "_Slett avtale"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1402
+#: ../modules/calendar/e-cal-shell-view-actions.c:1434
 msgid "Delete selected appointments"
 msgstr "Slett valgte avtaler"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1407
+#: ../modules/calendar/e-cal-shell-view-actions.c:1439
 msgid "Delete This _Occurrence"
 msgstr "Slett denne _hendelsen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1409
+#: ../modules/calendar/e-cal-shell-view-actions.c:1441
 msgid "Delete this occurrence"
 msgstr "Slett denne oppfÃringen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1414
+#: ../modules/calendar/e-cal-shell-view-actions.c:1446
 msgid "Delete All Occ_urrences"
 msgstr "Slett alle oppf_Ãringer"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1416
+#: ../modules/calendar/e-cal-shell-view-actions.c:1448
 msgid "Delete all occurrences"
 msgstr "Slett alle oppfÃringer"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1421
+#: ../modules/calendar/e-cal-shell-view-actions.c:1453
 msgid "New All Day _Event..."
 msgstr "Ny avtale som varer h_ele dagen â"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1423
+#: ../modules/calendar/e-cal-shell-view-actions.c:1455
 msgid "Create a new all day event"
 msgstr "Opprett en ny avtale for hele dagen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1428
+#: ../modules/calendar/e-cal-shell-view-actions.c:1460
 #: ../modules/calendar/e-cal-shell-view-memopad.c:254
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:327
-#: ../modules/calendar/e-memo-shell-view-actions.c:585
-#: ../modules/calendar/e-task-shell-view-actions.c:709
+#: ../modules/calendar/e-memo-shell-view-actions.c:599
+#: ../modules/calendar/e-task-shell-view-actions.c:723
 msgid "_Forward as iCalendar..."
 msgstr "_Videresend som iCalendar â"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1435
+#: ../modules/calendar/e-cal-shell-view-actions.c:1467
 msgid "New _Meeting..."
 msgstr "Nytt _mÃte â"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1437
+#: ../modules/calendar/e-cal-shell-view-actions.c:1469
 msgid "Create a new meeting"
 msgstr "Lag et nytt mÃte"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1442
+#: ../modules/calendar/e-cal-shell-view-actions.c:1474
 msgid "Mo_ve to Calendar..."
 msgstr "Fl_ytt til kalender â"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1449
+#: ../modules/calendar/e-cal-shell-view-actions.c:1481
 msgid "New _Appointment..."
 msgstr "Ny _avtale â"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1456
+#: ../modules/calendar/e-cal-shell-view-actions.c:1488
 msgid "Make this Occurrence _Movable"
 msgstr "GjÃr denne hendelsen _flyttbar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1463
+#: ../modules/calendar/e-cal-shell-view-actions.c:1495
 msgid "_Open Appointment"
 msgstr "_Ãpne avtale"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1465
+#: ../modules/calendar/e-cal-shell-view-actions.c:1497
 msgid "View the current appointment"
 msgstr "Vis denne avtalen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1470
+#: ../modules/calendar/e-cal-shell-view-actions.c:1502
 msgid "_Reply"
 msgstr "Sva_r"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1484
+#: ../modules/calendar/e-cal-shell-view-actions.c:1516
 msgid "_Schedule Meeting..."
 msgstr "_Sett opp mÃte â"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1486
+#: ../modules/calendar/e-cal-shell-view-actions.c:1518
 msgid "Converts an appointment to a meeting"
 msgstr "Konverter en avtale til et mÃte"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1491
+#: ../modules/calendar/e-cal-shell-view-actions.c:1523
 msgid "Conv_ert to Appointment..."
 msgstr "Konv_erter til avtale â"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1493
+#: ../modules/calendar/e-cal-shell-view-actions.c:1525
 msgid "Converts a meeting to an appointment"
 msgstr "Konverterer et mÃte til en avtale"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1498
+#: ../modules/calendar/e-cal-shell-view-actions.c:1530
 msgid "Quit"
 msgstr "Avslutt"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1618
+#: ../modules/calendar/e-cal-shell-view-actions.c:1650
 msgid "Day"
 msgstr "Dag"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1620
+#: ../modules/calendar/e-cal-shell-view-actions.c:1652
 msgid "Show one day"
 msgstr "Vis en dag"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1625
+#: ../modules/calendar/e-cal-shell-view-actions.c:1657
 msgid "List"
 msgstr "Liste"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1627
+#: ../modules/calendar/e-cal-shell-view-actions.c:1659
 msgid "Show as list"
 msgstr "Vis som liste"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1632
+#: ../modules/calendar/e-cal-shell-view-actions.c:1664
 msgid "Month"
 msgstr "MÃned"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1634
+#: ../modules/calendar/e-cal-shell-view-actions.c:1666
 msgid "Show one month"
 msgstr "Vis en mÃned"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1639
+#: ../modules/calendar/e-cal-shell-view-actions.c:1671
 msgid "Week"
 msgstr "Uke"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1641
+#: ../modules/calendar/e-cal-shell-view-actions.c:1673
 msgid "Show one week"
 msgstr "Vis en uke"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1648
+#: ../modules/calendar/e-cal-shell-view-actions.c:1680
 msgid "Show one work week"
 msgstr "Vis en arbeidsuke"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1656
+#: ../modules/calendar/e-cal-shell-view-actions.c:1688
 msgid "Active Appointments"
 msgstr "Aktive avtaler"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1670
+#: ../modules/calendar/e-cal-shell-view-actions.c:1702
 msgid "Next 7 Days' Appointments"
 msgstr "Avtaler for de neste 7 dagene"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1701
-#: ../modules/calendar/e-memo-shell-view-actions.c:782
-#: ../modules/calendar/e-task-shell-view-actions.c:981
+#: ../modules/calendar/e-cal-shell-view-actions.c:1733
+#: ../modules/calendar/e-memo-shell-view-actions.c:796
+#: ../modules/calendar/e-task-shell-view-actions.c:995
 msgid "Description contains"
 msgstr "Beskrivelse inneholder"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1708
-#: ../modules/calendar/e-memo-shell-view-actions.c:789
-#: ../modules/calendar/e-task-shell-view-actions.c:988
+#: ../modules/calendar/e-cal-shell-view-actions.c:1740
+#: ../modules/calendar/e-memo-shell-view-actions.c:803
+#: ../modules/calendar/e-task-shell-view-actions.c:1002
 msgid "Summary contains"
 msgstr "Sammendrag inneholder"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1720
+#: ../modules/calendar/e-cal-shell-view-actions.c:1752
 msgid "Print this calendar"
 msgstr "Skriv ut denne kalenderen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1727
+#: ../modules/calendar/e-cal-shell-view-actions.c:1759
 msgid "Preview the calendar to be printed"
 msgstr "ForhÃndsvis kalenderen som skal skrives ut"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1749
+#: ../modules/calendar/e-cal-shell-view-actions.c:1781
 #: ../modules/calendar/e-cal-shell-view-memopad.c:295
 msgid "Save as iCalendar..."
 msgstr "Lagre som iCalendar â"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1826
+#: ../modules/calendar/e-cal-shell-view-actions.c:1858
 msgid "Go To"
 msgstr "GÃ til"
 
 #. Translators: Default filename part saving a memo to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #: ../modules/calendar/e-cal-shell-view-memopad.c:218
-#: ../modules/calendar/e-memo-shell-view-actions.c:509
+#: ../modules/calendar/e-memo-shell-view-actions.c:523
 msgid "memo"
 msgstr "notat"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:261
-#: ../modules/calendar/e-memo-shell-view-actions.c:641
+#: ../modules/calendar/e-memo-shell-view-actions.c:655
 msgid "New _Memo"
 msgstr "Nytt _notat"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:263
-#: ../modules/calendar/e-memo-shell-backend.c:287
-#: ../modules/calendar/e-memo-shell-view-actions.c:643
+#: ../modules/calendar/e-memo-shell-backend.c:300
+#: ../modules/calendar/e-memo-shell-view-actions.c:657
 msgid "Create a new memo"
 msgstr "Lag et nytt notat"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:268
-#: ../modules/calendar/e-memo-shell-view-actions.c:648
+#: ../modules/calendar/e-memo-shell-view-actions.c:662
 msgid "_Open Memo"
 msgstr "_Ãpne notat"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:270
-#: ../modules/calendar/e-memo-shell-view-actions.c:650
+#: ../modules/calendar/e-memo-shell-view-actions.c:664
 msgid "View the selected memo"
 msgstr "Vis valgt notat"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:275
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:362
-#: ../modules/calendar/e-memo-shell-view-actions.c:655
-#: ../modules/calendar/e-task-shell-view-actions.c:793
+#: ../modules/calendar/e-memo-shell-view-actions.c:669
+#: ../modules/calendar/e-task-shell-view-actions.c:807
 msgid "Open _Web Page"
 msgstr "_Ãpne nettside"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:287
-#: ../modules/calendar/e-memo-shell-view-actions.c:815
+#: ../modules/calendar/e-memo-shell-view-actions.c:829
 msgid "Print the selected memo"
 msgstr "Skriv ut valgt notat"
 
@@ -14973,22 +14971,22 @@ msgstr "Skriv ut valgt notat"
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:285
-#: ../modules/calendar/e-task-shell-view-actions.c:626
+#: ../modules/calendar/e-task-shell-view-actions.c:640
 msgid "task"
 msgstr "oppgave"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:320
-#: ../modules/calendar/e-task-shell-view-actions.c:688
+#: ../modules/calendar/e-task-shell-view-actions.c:702
 msgid "_Assign Task"
 msgstr "Tildel oppg_ave"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:334
-#: ../modules/calendar/e-task-shell-view-actions.c:765
+#: ../modules/calendar/e-task-shell-view-actions.c:779
 msgid "_Mark as Complete"
 msgstr "_Merk som fullfÃrt"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:336
-#: ../modules/calendar/e-task-shell-view-actions.c:767
+#: ../modules/calendar/e-task-shell-view-actions.c:781
 msgid "Mark selected tasks as complete"
 msgstr "Merk valgte oppgaver som fullfÃrt"
 
@@ -14997,142 +14995,142 @@ msgid "_Mark as Incomplete"
 msgstr "_Merk som ikke fullfÃrt"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:343
-#: ../modules/calendar/e-task-shell-view-actions.c:774
+#: ../modules/calendar/e-task-shell-view-actions.c:788
 msgid "Mark selected tasks as incomplete"
 msgstr "Merk valgte oppgaver som ikke fullfÃrt"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:348
-#: ../modules/calendar/e-task-shell-view-actions.c:779
+#: ../modules/calendar/e-task-shell-view-actions.c:793
 msgid "New _Task"
 msgstr "Ny _oppgave"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:350
-#: ../modules/calendar/e-task-shell-backend.c:286
-#: ../modules/calendar/e-task-shell-view-actions.c:781
+#: ../modules/calendar/e-task-shell-backend.c:299
+#: ../modules/calendar/e-task-shell-view-actions.c:795
 msgid "Create a new task"
 msgstr "Opprett en ny oppgave"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:355
-#: ../modules/calendar/e-task-shell-view-actions.c:786
+#: ../modules/calendar/e-task-shell-view-actions.c:800
 msgid "_Open Task"
 msgstr "_Ãpne oppgave"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:357
-#: ../modules/calendar/e-task-shell-view-actions.c:788
+#: ../modules/calendar/e-task-shell-view-actions.c:802
 msgid "View the selected task"
 msgstr "Vis valgt oppgave"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:374
-#: ../modules/calendar/e-task-shell-view-actions.c:1014
+#: ../modules/calendar/e-task-shell-view-actions.c:1028
 msgid "Print the selected task"
 msgstr "Skriv ut valgt oppgave"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:382
-#: ../modules/calendar/e-memo-shell-view-actions.c:830
-#: ../modules/calendar/e-task-shell-view-actions.c:1029
+#: ../modules/calendar/e-memo-shell-view-actions.c:844
+#: ../modules/calendar/e-task-shell-view-actions.c:1043
 msgid "_Save as iCalendar..."
 msgstr "_Lagre som iCalendar â"
 
-#: ../modules/calendar/e-memo-shell-backend.c:285
+#: ../modules/calendar/e-memo-shell-backend.c:298
 msgctxt "New"
 msgid "Mem_o"
 msgstr "N_otat"
 
-#: ../modules/calendar/e-memo-shell-backend.c:292
+#: ../modules/calendar/e-memo-shell-backend.c:305
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "_Delt notat"
 
-#: ../modules/calendar/e-memo-shell-backend.c:294
+#: ../modules/calendar/e-memo-shell-backend.c:307
 msgid "Create a new shared memo"
 msgstr "Lag et nytt delt notat"
 
-#: ../modules/calendar/e-memo-shell-backend.c:302
+#: ../modules/calendar/e-memo-shell-backend.c:315
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "Notatli_ste"
 
-#: ../modules/calendar/e-memo-shell-backend.c:304
-#: ../modules/calendar/e-memo-shell-view-actions.c:608
+#: ../modules/calendar/e-memo-shell-backend.c:317
+#: ../modules/calendar/e-memo-shell-view-actions.c:622
 msgid "Create a new memo list"
 msgstr "Lag en ny notatliste"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:175
+#: ../modules/calendar/e-memo-shell-sidebar.c:179
 msgid "Loading memos"
 msgstr "Laster notater"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:662
+#: ../modules/calendar/e-memo-shell-sidebar.c:696
 msgid "Memo List Selector"
 msgstr "Valgt av notatliste"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:973
+#: ../modules/calendar/e-memo-shell-sidebar.c:1009
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Ãpner notat pà %s"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:222
-#: ../modules/calendar/e-memo-shell-view-actions.c:237
+#: ../modules/calendar/e-memo-shell-view-actions.c:231
+#: ../modules/calendar/e-memo-shell-view-actions.c:246
 msgid "Print Memos"
 msgstr "Skriv ut notater"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:571
+#: ../modules/calendar/e-memo-shell-view-actions.c:585
 msgid "_Delete Memo"
 msgstr "_Slett notat"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:578
+#: ../modules/calendar/e-memo-shell-view-actions.c:592
 msgid "_Find in Memo..."
 msgstr "_Finn i notat â"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:580
+#: ../modules/calendar/e-memo-shell-view-actions.c:594
 msgid "Search for text in the displayed memo"
 msgstr "SÃk etter tekst i kroppen av vist notat"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:599
+#: ../modules/calendar/e-memo-shell-view-actions.c:613
 msgid "D_elete Memo List"
 msgstr "Sl_ett notatliste"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:601
+#: ../modules/calendar/e-memo-shell-view-actions.c:615
 msgid "Delete the selected memo list"
 msgstr "Slett valgt notatliste"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:606
+#: ../modules/calendar/e-memo-shell-view-actions.c:620
 msgid "_New Memo List"
 msgstr "_Ny notatliste"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:622
+#: ../modules/calendar/e-memo-shell-view-actions.c:636
 msgid "Refresh the selected memo list"
 msgstr "Oppdater valgt notatliste"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:629
+#: ../modules/calendar/e-memo-shell-view-actions.c:643
 msgid "Rename the selected memo list"
 msgstr "Endre navn pà valgt notatliste"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:634
+#: ../modules/calendar/e-memo-shell-view-actions.c:648
 msgid "Show _Only This Memo List"
 msgstr "Vis k_un denne notatlisten"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:713
+#: ../modules/calendar/e-memo-shell-view-actions.c:727
 msgid "Memo _Preview"
 msgstr "_ForhÃndsvisning av notat"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:715
+#: ../modules/calendar/e-memo-shell-view-actions.c:729
 msgid "Show memo preview pane"
 msgstr "Vis forhÃndsvisningsomrÃde for notat"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:736
+#: ../modules/calendar/e-memo-shell-view-actions.c:750
 msgid "Show memo preview below the memo list"
 msgstr "Vis forhÃndsvisning av notat under notatlisten"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:743
+#: ../modules/calendar/e-memo-shell-view-actions.c:757
 msgid "Show memo preview alongside the memo list"
 msgstr "Vis forhÃndsvisning av notat ved siden av notatlisten"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:801
+#: ../modules/calendar/e-memo-shell-view-actions.c:815
 msgid "Print the list of memos"
 msgstr "Skriv ut denne listen med notater"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:808
+#: ../modules/calendar/e-memo-shell-view-actions.c:822
 msgid "Preview the list of memos to be printed"
 msgstr "ForhÃndsvis listen med notater som skal skrives ut"
 
@@ -15152,55 +15150,55 @@ msgstr[0] "%d notat"
 msgstr[1] "%d notater"
 
 #: ../modules/calendar/e-memo-shell-view-private.c:428
-#: ../modules/calendar/e-task-shell-view-private.c:573
+#: ../modules/calendar/e-task-shell-view-private.c:585
 #, c-format
 msgid "%d selected"
 msgstr "%d valgt"
 
-#: ../modules/calendar/e-task-shell-backend.c:284
+#: ../modules/calendar/e-task-shell-backend.c:297
 msgctxt "New"
 msgid "_Task"
 msgstr "_Oppgave"
 
-#: ../modules/calendar/e-task-shell-backend.c:291
+#: ../modules/calendar/e-task-shell-backend.c:304
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Til_delt oppgave"
 
-#: ../modules/calendar/e-task-shell-backend.c:293
+#: ../modules/calendar/e-task-shell-backend.c:306
 msgid "Create a new assigned task"
 msgstr "Opprett en ny tildelt oppgave"
 
-#: ../modules/calendar/e-task-shell-backend.c:301
+#: ../modules/calendar/e-task-shell-backend.c:314
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "_Oppgaveliste"
 
-#: ../modules/calendar/e-task-shell-backend.c:303
-#: ../modules/calendar/e-task-shell-view-actions.c:732
+#: ../modules/calendar/e-task-shell-backend.c:316
+#: ../modules/calendar/e-task-shell-view-actions.c:746
 msgid "Create a new task list"
 msgstr "Opprett en ny oppgaveliste"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:175
+#: ../modules/calendar/e-task-shell-sidebar.c:179
 msgid "Loading tasks"
 msgstr "Laster oppgaver"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:662
+#: ../modules/calendar/e-task-shell-sidebar.c:696
 msgid "Task List Selector"
 msgstr "Valg av oppgaveliste"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:973
+#: ../modules/calendar/e-task-shell-sidebar.c:1010
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Ãpner oppgaver pà %s"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:245
-#: ../modules/calendar/e-task-shell-view-actions.c:260
+#: ../modules/calendar/e-task-shell-view-actions.c:254
+#: ../modules/calendar/e-task-shell-view-actions.c:269
 msgid "Print Tasks"
 msgstr "Skriv ut oppgaver"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:570
+#: ../modules/calendar/e-task-shell-view-actions.c:584
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -15212,99 +15210,99 @@ msgstr ""
 "\n"
 "Vil du virkelig slette disse oppgavene?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:577
+#: ../modules/calendar/e-task-shell-view-actions.c:591
 msgid "Do not ask me again"
 msgstr "Ikke spÃr meg igjen"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:695
+#: ../modules/calendar/e-task-shell-view-actions.c:709
 msgid "_Delete Task"
 msgstr "_Slett oppgave"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:702
+#: ../modules/calendar/e-task-shell-view-actions.c:716
 msgid "_Find in Task..."
 msgstr "_Finn i oppgave â"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:704
+#: ../modules/calendar/e-task-shell-view-actions.c:718
 msgid "Search for text in the displayed task"
 msgstr "SÃk etter tekst i vist oppgave"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:716
+#: ../modules/calendar/e-task-shell-view-actions.c:730
 msgid "Copy..."
 msgstr "Kopier â"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:723
+#: ../modules/calendar/e-task-shell-view-actions.c:737
 msgid "D_elete Task List"
 msgstr "Sl_ett oppgaveliste"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:725
+#: ../modules/calendar/e-task-shell-view-actions.c:739
 msgid "Delete the selected task list"
 msgstr "Slett valgt oppgaveliste"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:730
+#: ../modules/calendar/e-task-shell-view-actions.c:744
 msgid "_New Task List"
 msgstr "_Ny oppgaveliste"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:746
+#: ../modules/calendar/e-task-shell-view-actions.c:760
 msgid "Refresh the selected task list"
 msgstr "Oppdater valgt oppgaveliste"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:753
+#: ../modules/calendar/e-task-shell-view-actions.c:767
 msgid "Rename the selected task list"
 msgstr "Endre navn pà valgt oppgaveliste"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:758
+#: ../modules/calendar/e-task-shell-view-actions.c:772
 msgid "Show _Only This Task List"
 msgstr "Vis k_un denne oppgavelisten"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:772
+#: ../modules/calendar/e-task-shell-view-actions.c:786
 msgid "Mar_k as Incomplete"
 msgstr "Merk som _ikke fullfÃrt"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:802
+#: ../modules/calendar/e-task-shell-view-actions.c:816
 msgid "Delete completed tasks"
 msgstr "Slett fullfÃrte oppgaver"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:877
+#: ../modules/calendar/e-task-shell-view-actions.c:891
 msgid "Task _Preview"
 msgstr "ForhÃndsvisning av _oppgave"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:879
+#: ../modules/calendar/e-task-shell-view-actions.c:893
 msgid "Show task preview pane"
 msgstr "Vis forhÃndsvisningsomrÃde for oppgaver"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:900
+#: ../modules/calendar/e-task-shell-view-actions.c:914
 msgid "Show task preview below the task list"
 msgstr "Vis forhÃndsvisning av oppgave under oppgavelisten"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:907
+#: ../modules/calendar/e-task-shell-view-actions.c:921
 msgid "Show task preview alongside the task list"
 msgstr "Vis forhÃndsvisning av oppgave ved siden av oppgavelisten"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:915
+#: ../modules/calendar/e-task-shell-view-actions.c:929
 msgid "Active Tasks"
 msgstr "Aktive oppgaver"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:929
+#: ../modules/calendar/e-task-shell-view-actions.c:943
 msgid "Completed Tasks"
 msgstr "FullfÃrte oppgaver"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:936
+#: ../modules/calendar/e-task-shell-view-actions.c:950
 msgid "Next 7 Days' Tasks"
 msgstr "Oppgaver for de neste 7 dagene"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:943
+#: ../modules/calendar/e-task-shell-view-actions.c:957
 msgid "Overdue Tasks"
 msgstr "UtgÃtte oppgaver"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:950
+#: ../modules/calendar/e-task-shell-view-actions.c:964
 msgid "Tasks with Attachments"
 msgstr "Oppgaver med vedlegg"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1000
+#: ../modules/calendar/e-task-shell-view-actions.c:1014
 msgid "Print the list of tasks"
 msgstr "Skriv ut denne listen over oppgaver"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1007
+#: ../modules/calendar/e-task-shell-view-actions.c:1021
 msgid "Preview the list of tasks to be printed"
 msgstr "ForhÃndsvis listen over oppgaver som skal skrives ut"
 
@@ -15320,18 +15318,18 @@ msgstr "Slett oppgave"
 msgid "Expunging"
 msgstr "TÃmmer"
 
-#: ../modules/calendar/e-task-shell-view-private.c:569
+#: ../modules/calendar/e-task-shell-view-private.c:581
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d oppgave"
 msgstr[1] "%d oppgaver"
 
-#: ../modules/mail/em-account-prefs.c:218
+#: ../modules/mail/em-account-prefs.c:219
 msgid "Evolution Account Assistant"
 msgstr "Evolution kontoassistent"
 
-#: ../modules/mail/em-account-prefs.c:267
+#: ../modules/mail/em-account-prefs.c:268
 msgid "Account Editor"
 msgstr "Kontoredigering"
 
@@ -15376,7 +15374,7 @@ msgid "Network Preferences"
 msgstr "Brukervalg for nettverk"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1117
-#: ../modules/mail/e-mail-shell-view.c:945
+#: ../modules/mail/e-mail-shell-view.c:949
 msgid "_Disable Account"
 msgstr "_Deaktiver konto"
 
@@ -15668,91 +15666,91 @@ msgstr "Denne kontoen"
 msgid "Current Folder"
 msgstr "Denne mappen"
 
-#: ../modules/mail/e-mail-shell-view.c:559
+#: ../modules/mail/e-mail-shell-view.c:563
 msgid "All Account Search"
 msgstr "SÃk i alle konti"
 
-#: ../modules/mail/e-mail-shell-view.c:732
+#: ../modules/mail/e-mail-shell-view.c:736
 msgid "Account Search"
 msgstr "SÃk i konto"
 
-#: ../modules/mail/e-mail-shell-view.c:943
+#: ../modules/mail/e-mail-shell-view.c:947
 msgid "Proxy _Logout"
 msgstr "_Logg ut proxy"
 
-#: ../modules/mail/e-mail-shell-view-private.c:996
+#: ../modules/mail/e-mail-shell-view-private.c:997
 #, 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:1007
+#: ../modules/mail/e-mail-shell-view-private.c:1008
 #, 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:1013
-#: ../modules/mail/e-mail-shell-view-private.c:1020
+#: ../modules/mail/e-mail-shell-view-private.c:1014
+#: ../modules/mail/e-mail-shell-view-private.c:1021
 #, 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:1026
+#: ../modules/mail/e-mail-shell-view-private.c:1027
 #, 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:1032
+#: ../modules/mail/e-mail-shell-view-private.c:1033
 #, 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:1038
+#: ../modules/mail/e-mail-shell-view-private.c:1039
 #, 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:1050
+#: ../modules/mail/e-mail-shell-view-private.c:1051
 #, 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:1053
+#: ../modules/mail/e-mail-shell-view-private.c:1054
 #, 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:1073
+#: ../modules/mail/e-mail-shell-view-private.c:1074
 msgid "Trash"
 msgstr "Papirkurv"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1541
+#: ../modules/mail/e-mail-shell-view-private.c:1542
 msgid "Send / Receive"
 msgstr "Send / motta"
 
-#: ../modules/mail/em-composer-prefs.c:491
+#: ../modules/mail/em-composer-prefs.c:493
 #: ../modules/plugin-manager/evolution-plugin-manager.c:359
 #: ../plugins/publish-calendar/publish-calendar.c:831
 #: ../widgets/misc/e-account-tree-view.c:224
 msgid "Enabled"
 msgstr "Aktivert"
 
-#: ../modules/mail/em-composer-prefs.c:495
+#: ../modules/mail/em-composer-prefs.c:497
 msgid "Language(s)"
 msgstr "SprÃk"
 
@@ -15941,39 +15939,39 @@ msgstr "Bruk bare lokale tester for uÃnsket e-post."
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Bruk bare lokale tester for uÃnsket e-post (ingen DNS)."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:281
+#: ../modules/startup-wizard/evolution-startup-wizard.c:279
 #: ../widgets/misc/e-import-assistant.c:396
 msgid "Please select the information that you would like to import:"
 msgstr "Vennligst velg informasjon du Ãnsker à importere:"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:313
+#: ../modules/startup-wizard/evolution-startup-wizard.c:311
 #: ../widgets/misc/e-import-assistant.c:552
 #, c-format
 msgid "From %s:"
 msgstr "Fra %s:"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:324
-#: ../modules/startup-wizard/evolution-startup-wizard.c:422
+#: ../modules/startup-wizard/evolution-startup-wizard.c:322
+#: ../modules/startup-wizard/evolution-startup-wizard.c:420
 msgid "Importing Files"
 msgstr "Importerer filer"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:400
+#: ../modules/startup-wizard/evolution-startup-wizard.c:398
 msgid "Import cancelled. Click \"Forward\" to continue."
 msgstr "Import avbrutt. Klikk ÂFremover for à fortsette."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:418
+#: ../modules/startup-wizard/evolution-startup-wizard.c:416
 msgid "Import complete. Click \"Forward\" to continue."
 msgstr "Import fullfÃrt. Klikk ÂFremover for à fortsette."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:492
+#: ../modules/startup-wizard/evolution-startup-wizard.c:496
 msgid "Evolution Setup Assistant"
 msgstr "Konfigurasjonsassistent for Evolution"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:498
+#: ../modules/startup-wizard/evolution-startup-wizard.c:502
 msgid "Welcome"
 msgstr "Velkommen"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:503
+#: ../modules/startup-wizard/evolution-startup-wizard.c:507
 msgid ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect "
 "to your email accounts, and to import files from other applications. \n"
@@ -15986,7 +15984,7 @@ msgstr ""
 "\n"
 "Vennligst klikk ÂFremover for à fortsette. "
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:608
+#: ../modules/startup-wizard/evolution-startup-wizard.c:612
 msgid "Loading accounts..."
 msgstr "Laster kontoer â"
 
@@ -16397,7 +16395,7 @@ msgid "Searching folder content..."
 msgstr "SÃker i mappeinnhold â"
 
 #: ../plugins/caldav/caldav-browse-server.c:1262
-#: ../plugins/caldav/caldav-source.c:258
+#: ../plugins/caldav/caldav-source.c:257
 msgid "Server _handles meeting invitations"
 msgstr "Tjener _hÃndterer mÃteinvitasjoner"
 
@@ -16410,8 +16408,8 @@ msgid "Supports"
 msgstr "StÃtter"
 
 #: ../plugins/caldav/caldav-browse-server.c:1334
-#: ../plugins/caldav/caldav-source.c:256
-msgid "User e-_mail:"
+#: ../plugins/caldav/caldav-source.c:255
+msgid "User e_mail:"
 msgstr "E-_post for bruker:"
 
 #: ../plugins/caldav/caldav-browse-server.c:1406
@@ -16428,33 +16426,34 @@ msgstr "Tjener-URL Â%s er ikke en gyldig URL"
 msgid "Browse for a CalDAV calendar"
 msgstr "Se etter en CalDAV-kalender"
 
-#: ../plugins/caldav/caldav-source.c:237
+#: ../plugins/caldav/caldav-source.c:236
 #: ../plugins/calendar-http/calendar-http.c:104
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../plugins/caldav/caldav-source.c:244
+#: ../plugins/caldav/caldav-source.c:243
+#: ../plugins/calendar-http/calendar-http.c:138
 #: ../plugins/google-account-setup/google-contacts-source.c:351
-msgid "Use _SSL"
-msgstr "Bruk _SSL"
+msgid "Use _secure connection"
+msgstr "Bruk _sikker forbindelse"
 
-#: ../plugins/caldav/caldav-source.c:246
+#: ../plugins/caldav/caldav-source.c:245
 #: ../plugins/google-account-setup/google-contacts-source.c:329
-#: ../plugins/google-account-setup/google-source.c:652
+#: ../plugins/google-account-setup/google-source.c:656
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:267
 msgid "User_name:"
 msgstr "Bruker_navn:"
 
-#: ../plugins/caldav/caldav-source.c:261
+#: ../plugins/caldav/caldav-source.c:260
 msgid "Brows_e server for a calendar"
 msgstr "Bla gj_ennom tjener etter en kalender"
 
-#: ../plugins/caldav/caldav-source.c:279
+#: ../plugins/caldav/caldav-source.c:278
 #: ../plugins/calendar-file/calendar-file.c:195
 #: ../plugins/calendar-http/calendar-http.c:123
 #: ../plugins/calendar-weather/calendar-weather.c:403
 #: ../plugins/google-account-setup/google-contacts-source.c:369
-#: ../plugins/google-account-setup/google-source.c:659
+#: ../plugins/google-account-setup/google-source.c:663
 msgid "Re_fresh:"
 msgstr "O_ppdater"
 
@@ -16502,10 +16501,6 @@ msgstr "Legg til lokale kalendere i Evolution."
 msgid "Local Calendars"
 msgstr "Lokale kalendere"
 
-#: ../plugins/calendar-http/calendar-http.c:138
-msgid "_Secure connection"
-msgstr "_Sikker tilkobling"
-
 #: ../plugins/calendar-http/calendar-http.c:198
 msgid "Userna_me:"
 msgstr "Bruker_navn:"
@@ -16863,12 +16858,12 @@ msgstr "Filen du valgte ser ikke ut som et gyldig .png-bilde. Feil: {0}"
 msgid "Server"
 msgstr "Tjener"
 
-#: ../plugins/google-account-setup/google-source.c:443
+#: ../plugins/google-account-setup/google-source.c:447
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr "Oppgi passord for %s for à aksessere liste med abonnerte kalendere."
 
-#: ../plugins/google-account-setup/google-source.c:560
+#: ../plugins/google-account-setup/google-source.c:564
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -16877,17 +16872,17 @@ msgstr ""
 "Kan ikke lese data fra Google-tjener.\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:560
+#: ../plugins/google-account-setup/google-source.c:564
 #: ../plugins/mail-to-task/mail-to-task.c:796
 #: ../plugins/mail-to-task/mail-to-task.c:1045
 msgid "Unknown error."
 msgstr "Ukjent feil."
 
-#: ../plugins/google-account-setup/google-source.c:663
+#: ../plugins/google-account-setup/google-source.c:667
 msgid "Cal_endar:"
 msgstr "Kal_ender:"
 
-#: ../plugins/google-account-setup/google-source.c:698
+#: ../plugins/google-account-setup/google-source.c:702
 msgid "Retrieve _List"
 msgstr "Hent _liste"
 
@@ -16907,12 +16902,12 @@ msgstr "Bilde i e-postmeldingen"
 msgid "View image attachments directly in mail messages."
 msgstr "Vis bildevedlegg direkte i e-postmeldinger."
 
-#: ../plugins/imap-features/imap-headers.c:333
+#: ../plugins/imap-features/imap-headers.c:329
 #: ../plugins/imap-features/imap-headers.ui.h:2
 msgid "Custom Headers"
 msgstr "Egendefinerte meldingshoder"
 
-#: ../plugins/imap-features/imap-headers.c:346
+#: ../plugins/imap-features/imap-headers.c:341
 #: ../plugins/imap-features/imap-headers.ui.h:5
 msgid "IMAP Headers"
 msgstr "IMAP-meldingshoder"
@@ -16943,7 +16938,7 @@ msgstr ""
 
 #: ../plugins/imap-features/imap-headers.ui.h:8
 msgid ""
-"_Basic Headers - (Fastest) \n"
+"_Basic Headers (Fastest) \n"
 "Use this if you do not have filters based on mailing lists"
 msgstr ""
 "_Grunnleggende meldingshoder - (Raskest)\n"
@@ -16968,140 +16963,140 @@ msgstr "IMAP-funksjoner"
 msgid "Failed to load the calendar '%s' (%s)"
 msgstr "Kunne ikke Ãpne kalender Â%s (%s)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:631
+#: ../plugins/itip-formatter/itip-formatter.c:645
 #, 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:655
+#: ../plugins/itip-formatter/itip-formatter.c:669
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Fant avtalen i kalender Â%sÂ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:761
+#: ../plugins/itip-formatter/itip-formatter.c:775
 msgid "Unable to find any calendars"
 msgstr "Kan ikke finne noen kalendere"
 
-#: ../plugins/itip-formatter/itip-formatter.c:768
+#: ../plugins/itip-formatter/itip-formatter.c:782
 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:772
+#: ../plugins/itip-formatter/itip-formatter.c:786
 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:776
+#: ../plugins/itip-formatter/itip-formatter.c:790
 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:1026
+#: ../plugins/itip-formatter/itip-formatter.c:1067
 msgid "Opening the calendar. Please wait..."
 msgstr "Ãpner kalender. Vennligst vent â"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1029
+#: ../plugins/itip-formatter/itip-formatter.c:1070
 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:1302
+#: ../plugins/itip-formatter/itip-formatter.c:1343
 msgid "Unable to parse item"
 msgstr "Kunne ikke lese oppfÃring"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1391
+#: ../plugins/itip-formatter/itip-formatter.c:1432
 #, 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:1403
+#: ../plugins/itip-formatter/itip-formatter.c:1444
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Sendt til kalender Â%s som godtatt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1407
+#: ../plugins/itip-formatter/itip-formatter.c:1448
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Sendt til kalender Â%s som tentativ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1412
+#: ../plugins/itip-formatter/itip-formatter.c:1453
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Sendt til kalender Â%s som avslÃtt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1458
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Sendt til kalender Â%s som avlyst"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1511
+#: ../plugins/itip-formatter/itip-formatter.c:1552
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organisator har fjernet delegat %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1518
+#: ../plugins/itip-formatter/itip-formatter.c:1559
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Avlysningsvarsel sendt til delegat"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1520
+#: ../plugins/itip-formatter/itip-formatter.c:1561
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Kunne ikke sende avlysningsmelding til delegaten"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1631
+#: ../plugins/itip-formatter/itip-formatter.c:1672
 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:1660
+#: ../plugins/itip-formatter/itip-formatter.c:1701
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Kan ikke oppdatere deltaker. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1664
+#: ../plugins/itip-formatter/itip-formatter.c:1705
 msgid "Attendee status updated"
 msgstr "Deltakerstatus oppdatert"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1668
+#: ../plugins/itip-formatter/itip-formatter.c:1709
 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:1690
+#: ../plugins/itip-formatter/itip-formatter.c:1731
 msgid "Meeting information sent"
 msgstr "Informasjon om mÃte sendt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1693
+#: ../plugins/itip-formatter/itip-formatter.c:1734
 msgid "Task information sent"
 msgstr "Informasjon om oppgave sendt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1696
+#: ../plugins/itip-formatter/itip-formatter.c:1737
 msgid "Memo information sent"
 msgstr "Informasjon om notat sendt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1705
+#: ../plugins/itip-formatter/itip-formatter.c:1746
 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:1708
+#: ../plugins/itip-formatter/itip-formatter.c:1749
 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:1711
+#: ../plugins/itip-formatter/itip-formatter.c:1752
 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:1776
+#: ../plugins/itip-formatter/itip-formatter.c:1817
 msgid "calendar.ics"
 msgstr "kalender.ics"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1781
+#: ../plugins/itip-formatter/itip-formatter.c:1822
 msgid "Save Calendar"
 msgstr "Lagre kalender"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1839
-#: ../plugins/itip-formatter/itip-formatter.c:1850
+#: ../plugins/itip-formatter/itip-formatter.c:1880
+#: ../plugins/itip-formatter/itip-formatter.c:1891
 msgid "The calendar attached is not valid"
 msgstr "Vedlagt kalender er ugyldig"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1840
-#: ../plugins/itip-formatter/itip-formatter.c:1851
+#: ../plugins/itip-formatter/itip-formatter.c:1881
+#: ../plugins/itip-formatter/itip-formatter.c:1892
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -17109,15 +17104,15 @@ msgstr ""
 "Meldingen pÃstÃr at den inneholder en kalender, men kalenderen er ikke en "
 "gyldig iCalendar."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1891
-#: ../plugins/itip-formatter/itip-formatter.c:1919
-#: ../plugins/itip-formatter/itip-formatter.c:2028
+#: ../plugins/itip-formatter/itip-formatter.c:1932
+#: ../plugins/itip-formatter/itip-formatter.c:1960
+#: ../plugins/itip-formatter/itip-formatter.c:2069
 msgid "The item in the calendar is not valid"
 msgstr "OppfÃringen i kalenderen er ikke gyldig"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1892
-#: ../plugins/itip-formatter/itip-formatter.c:1920
-#: ../plugins/itip-formatter/itip-formatter.c:2029
+#: ../plugins/itip-formatter/itip-formatter.c:1933
+#: ../plugins/itip-formatter/itip-formatter.c:1961
+#: ../plugins/itip-formatter/itip-formatter.c:2070
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -17125,11 +17120,11 @@ msgstr ""
 "Meldingen inneholder en kalender, men kalenderen inneholder ingen hendelser, "
 "oppgaver eller ledig/opptatt-informasjon"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1933
+#: ../plugins/itip-formatter/itip-formatter.c:1974
 msgid "The calendar attached contains multiple items"
 msgstr "Vedlagt kalender inneholder flere oppfÃringer"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1934
+#: ../plugins/itip-formatter/itip-formatter.c:1975
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -17137,40 +17132,44 @@ msgstr ""
 "Du mà lagre filen og importere kalenderen for à prosessere alle disse "
 "oppfÃringene"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2592
+#: ../plugins/itip-formatter/itip-formatter.c:2633
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Ingen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2608
+#: ../plugins/itip-formatter/itip-formatter.c:2649
 msgid "Tentatively Accepted"
 msgstr "Akseptert tentativt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2726
+#: ../plugins/itip-formatter/itip-formatter.c:2767
 msgid "This meeting recurs"
 msgstr "Dettee mÃtet gjeninntreffer"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2729
+#: ../plugins/itip-formatter/itip-formatter.c:2770
 msgid "This task recurs"
 msgstr "Denne oppgaven gjeninntreffer"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2732
+#: ../plugins/itip-formatter/itip-formatter.c:2773
 msgid "This memo recurs"
 msgstr "Dette notatet gjeninntreffer"
 
+#: ../plugins/itip-formatter/itip-formatter.c:2992
+msgid "Meeting invitations"
+msgstr "MÃteinvitasjoner"
+
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2976
+#: ../plugins/itip-formatter/itip-formatter.c:3017
 msgid "_Delete message after acting"
 msgstr "_Slett melding etter utfÃrt handling"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2986
-#: ../plugins/itip-formatter/itip-formatter.c:3019
+#: ../plugins/itip-formatter/itip-formatter.c:3027
+#: ../plugins/itip-formatter/itip-formatter.c:3060
 msgid "Conflict Search"
 msgstr "SÃk etter konflikter"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:3001
+#: ../plugins/itip-formatter/itip-formatter.c:3042
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Velg kalendere som skal gjennomsÃkes for à finne mÃtekonflikter"
 
@@ -18196,35 +18195,31 @@ msgstr "Outlook PST-import"
 msgid "Outlook personal folders (.pst)"
 msgstr "Outlook personlige mapper (.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:308
+#: ../plugins/pst-import/pst-importer.c:436
 msgid "_Mail"
 msgstr "_E-post"
 
-#: ../plugins/pst-import/pst-importer.c:326
+#: ../plugins/pst-import/pst-importer.c:455
 msgid "Destination folder:"
 msgstr "MÃlmappe:"
 
-#. Address book
-#: ../plugins/pst-import/pst-importer.c:332
+#: ../plugins/pst-import/pst-importer.c:461
 msgid "_Address Book"
 msgstr "_Adressebok"
 
-#. Appointments
-#: ../plugins/pst-import/pst-importer.c:339
+#: ../plugins/pst-import/pst-importer.c:462
 msgid "A_ppointments"
 msgstr "A_vtaler"
 
-#. Tasks
-#: ../plugins/pst-import/pst-importer.c:345 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:463 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Oppgaver"
 
-#. Journal
-#: ../plugins/pst-import/pst-importer.c:351
+#: ../plugins/pst-import/pst-importer.c:464
 msgid "_Journal entries"
 msgstr "_JournaloppfÃringer"
 
-#: ../plugins/pst-import/pst-importer.c:366
+#: ../plugins/pst-import/pst-importer.c:567
 msgid "Importing Outlook data"
 msgstr "Importerer data fra Outlook"
 
@@ -18398,81 +18393,81 @@ msgstr "Rediger adresse"
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "Description List"
 msgstr "Beskrivelsesliste"
 
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "Categories List"
 msgstr "Liste med kategorier"
 
-#: ../plugins/save-calendar/csv-format.c:373
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "Comment List"
 msgstr "Liste med kommentarer"
 
-#: ../plugins/save-calendar/csv-format.c:376
+#: ../plugins/save-calendar/csv-format.c:378
 msgid "Contact List"
 msgstr "Kontaktliste"
 
-#: ../plugins/save-calendar/csv-format.c:377
+#: ../plugins/save-calendar/csv-format.c:379
 msgid "Start"
 msgstr "Start"
 
-#: ../plugins/save-calendar/csv-format.c:378
+#: ../plugins/save-calendar/csv-format.c:380
 msgid "End"
 msgstr "Slutt"
 
-#: ../plugins/save-calendar/csv-format.c:379
+#: ../plugins/save-calendar/csv-format.c:381
 msgid "Due"
 msgstr "Ferdig"
 
-#: ../plugins/save-calendar/csv-format.c:380
+#: ../plugins/save-calendar/csv-format.c:382
 msgid "percent Done"
 msgstr "Prosent fullfÃrt"
 
-#: ../plugins/save-calendar/csv-format.c:382
+#: ../plugins/save-calendar/csv-format.c:384
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:383
+#: ../plugins/save-calendar/csv-format.c:385
 msgid "Attendees List"
 msgstr "Deltakerliste"
 
-#: ../plugins/save-calendar/csv-format.c:385
+#: ../plugins/save-calendar/csv-format.c:387
 msgid "Modified"
 msgstr "Endret"
 
-#: ../plugins/save-calendar/csv-format.c:560
+#: ../plugins/save-calendar/csv-format.c:562
 msgid "A_dvanced options for the CSV format"
 msgstr "A_vanserte alternativer for CVS-format"
 
-#: ../plugins/save-calendar/csv-format.c:568
+#: ../plugins/save-calendar/csv-format.c:570
 msgid "Prepend a _header"
 msgstr "Legg til et _hode i starten"
 
-#: ../plugins/save-calendar/csv-format.c:577
+#: ../plugins/save-calendar/csv-format.c:579
 msgid "_Value delimiter:"
 msgstr "Skilletegn for _verdier:"
 
-#: ../plugins/save-calendar/csv-format.c:588
+#: ../plugins/save-calendar/csv-format.c:590
 msgid "_Record delimiter:"
 msgstr "Skilletegn for poste_r:"
 
-#: ../plugins/save-calendar/csv-format.c:599
+#: ../plugins/save-calendar/csv-format.c:601
 msgid "_Encapsulate values with:"
 msgstr "Pakk inn v_erdier med:"
 
-#: ../plugins/save-calendar/csv-format.c:625
-msgid "Comma separated value format (.csv)"
+#: ../plugins/save-calendar/csv-format.c:627
+msgid "Comma separated values (.csv)"
 msgstr "Kommaseparert verdiformat (.csv)"
 
-#: ../plugins/save-calendar/ical-format.c:166
-msgid "iCalendar format (.ics)"
-msgstr "iCalendar-format (.ics)"
+#: ../plugins/save-calendar/ical-format.c:166 ../shell/e-shell-utils.c:225
+msgid "iCalendar (.ics)"
+msgstr "iCalendar (.ics)"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
 msgid "Save Selected"
@@ -18492,7 +18487,7 @@ msgid "%FT%T"
 msgstr "%FT%T"
 
 #: ../plugins/save-calendar/rdf-format.c:375
-msgid "RDF format (.rdf)"
+msgid "RDF (.rdf)"
 msgstr "RDF-format (.rdf)"
 
 #: ../plugins/save-calendar/save-calendar.c:122
@@ -18561,27 +18556,27 @@ 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:200
-#: ../plugins/vcard-inline/vcard-inline.c:285
+#: ../plugins/vcard-inline/vcard-inline.c:206
+#: ../plugins/vcard-inline/vcard-inline.c:291
 msgid "Show Full vCard"
 msgstr "Vis alle data i vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:203
+#: ../plugins/vcard-inline/vcard-inline.c:209
 msgid "Show Compact vCard"
 msgstr "Vis kompakt vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:264
+#: ../plugins/vcard-inline/vcard-inline.c:270
 msgid "There is one other contact."
 msgstr "Det finnes en annen kontakt."
 
-#: ../plugins/vcard-inline/vcard-inline.c:273
+#: ../plugins/vcard-inline/vcard-inline.c:279
 #, 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:294
+#: ../plugins/vcard-inline/vcard-inline.c:300
 msgid "Save in Address Book"
 msgstr "Lagre i adressebok"
 
@@ -18869,7 +18864,7 @@ msgid "Use HTTP proxy"
 msgstr "Bruk HTTP-proxy"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:55
-msgid "User name to pass as authentication when doing HTTP proxying."
+msgid "Username to pass as authentication when doing HTTP proxying."
 msgstr "Brukernavn for autentisering med HTTP-proxy."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:56
@@ -18943,10 +18938,6 @@ msgstr " _i"
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
 
-#: ../shell/e-shell-utils.c:225
-msgid "iCalendar (.ics)"
-msgstr "iCalendar (.ics)"
-
 #: ../shell/e-shell-utils.c:246
 msgid "All Files (*)"
 msgstr "Alle filer (*)"
@@ -18958,283 +18949,275 @@ msgstr "Lagrer tilstand for brukergrensesnitt"
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-actions.c:648
+#: ../shell/e-shell-window-actions.c:645
 msgid "translator-credits"
 msgstr "Kjartan Maraas <kmaraas gnome org>"
 
-#: ../shell/e-shell-window-actions.c:659
+#: ../shell/e-shell-window-actions.c:656
 msgid "Evolution Website"
 msgstr "Evolution nettsted"
 
-#: ../shell/e-shell-window-actions.c:921
+#: ../shell/e-shell-window-actions.c:902
 msgid "Categories Editor"
 msgstr "Redigering av kategorier"
 
-#: ../shell/e-shell-window-actions.c:1256
+#: ../shell/e-shell-window-actions.c:1237
 msgid "Bug Buddy is not installed."
 msgstr "Bug Buddy er ikke installert."
 
-#: ../shell/e-shell-window-actions.c:1258
+#: ../shell/e-shell-window-actions.c:1239
 msgid "Bug Buddy could not be run."
 msgstr "Bug Buddy kunne ikke kjÃres."
 
-#: ../shell/e-shell-window-actions.c:1439
+#: ../shell/e-shell-window-actions.c:1420
 msgid "Show information about Evolution"
 msgstr "Vis informasjon om Evolution"
 
-#: ../shell/e-shell-window-actions.c:1444
-#: ../shell/e-shell-window-actions.c:1458
+#: ../shell/e-shell-window-actions.c:1425
+#: ../shell/e-shell-window-actions.c:1439
 msgid "_Close Window"
 msgstr "_Lukk vindu"
 
-#: ../shell/e-shell-window-actions.c:1465
+#: ../shell/e-shell-window-actions.c:1446
 msgid "_Contents"
 msgstr "_Innhold"
 
-#: ../shell/e-shell-window-actions.c:1467
+#: ../shell/e-shell-window-actions.c:1448
 msgid "Open the Evolution User Guide"
 msgstr "Ãpne Evolutions brukermanual"
 
-#: ../shell/e-shell-window-actions.c:1493
-msgid "Evolution _FAQ"
-msgstr "Evolution _OSS"
-
-#: ../shell/e-shell-window-actions.c:1495
-msgid "Open the Frequently Asked Questions webpage"
-msgstr "Ãpne nettside med ofte stilte spÃrsmÃl"
-
-#: ../shell/e-shell-window-actions.c:1500
+#: ../shell/e-shell-window-actions.c:1474
 msgid "_Forget Passwords"
 msgstr "_Glem passord"
 
-#: ../shell/e-shell-window-actions.c:1502
+#: ../shell/e-shell-window-actions.c:1476
 msgid "Forget all remembered passwords"
 msgstr "Glem alle lagrede passord"
 
-#: ../shell/e-shell-window-actions.c:1507
+#: ../shell/e-shell-window-actions.c:1481
 msgid "I_mport..."
 msgstr "I_mporter â"
 
-#: ../shell/e-shell-window-actions.c:1509
+#: ../shell/e-shell-window-actions.c:1483
 msgid "Import data from other programs"
 msgstr "Importer data fra andre programmer"
 
-#: ../shell/e-shell-window-actions.c:1514
+#: ../shell/e-shell-window-actions.c:1488
 msgid "New _Window"
 msgstr "Nytt _vindu"
 
-#: ../shell/e-shell-window-actions.c:1516
+#: ../shell/e-shell-window-actions.c:1490
 msgid "Create a new window displaying this view"
 msgstr "Opprett et nytt vindu med denne visningen"
 
-#: ../shell/e-shell-window-actions.c:1528
+#: ../shell/e-shell-window-actions.c:1502
 msgid "Available Cate_gories"
 msgstr "Tilgjengelige kate_gorier"
 
-#: ../shell/e-shell-window-actions.c:1530
+#: ../shell/e-shell-window-actions.c:1504
 msgid "Manage available categories"
 msgstr "HÃndter tilgjengelige kategorier"
 
-#: ../shell/e-shell-window-actions.c:1542
+#: ../shell/e-shell-window-actions.c:1516
 msgid "_Quick Reference"
 msgstr "_Hurtigreferanse"
 
-#: ../shell/e-shell-window-actions.c:1544
+#: ../shell/e-shell-window-actions.c:1518
 msgid "Show Evolution's shortcut keys"
 msgstr "Vis snarveitaster for Evolution"
 
-#: ../shell/e-shell-window-actions.c:1551
+#: ../shell/e-shell-window-actions.c:1525
 msgid "Exit the program"
 msgstr "Avslutt programmet"
 
-#: ../shell/e-shell-window-actions.c:1556
+#: ../shell/e-shell-window-actions.c:1530
 msgid "_Advanced Search..."
 msgstr "_Avansert sÃk â"
 
-#: ../shell/e-shell-window-actions.c:1558
+#: ../shell/e-shell-window-actions.c:1532
 msgid "Construct a more advanced search"
 msgstr "Sett sammen et mer avansert sÃk"
 
-#: ../shell/e-shell-window-actions.c:1565
+#: ../shell/e-shell-window-actions.c:1539
 msgid "Clear the current search parameters"
 msgstr "TÃm aktive sÃkeparametere"
 
-#: ../shell/e-shell-window-actions.c:1570
+#: ../shell/e-shell-window-actions.c:1544
 msgid "_Edit Saved Searches..."
 msgstr "R_ediger lagrede sÃk â"
 
-#: ../shell/e-shell-window-actions.c:1572
+#: ../shell/e-shell-window-actions.c:1546
 msgid "Manage your saved searches"
 msgstr "HÃndter dine lagrede sÃk"
 
-#: ../shell/e-shell-window-actions.c:1579
+#: ../shell/e-shell-window-actions.c:1553
 msgid "Click here to change the search type"
 msgstr "Klikk her for à endre sÃketype"
 
-#: ../shell/e-shell-window-actions.c:1584
+#: ../shell/e-shell-window-actions.c:1558
 msgid "_Find Now"
 msgstr "_Finn nà "
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1586
+#: ../shell/e-shell-window-actions.c:1560
 msgid "Execute the current search parameters"
 msgstr "KjÃr aktive sÃkeparametere"
 
-#: ../shell/e-shell-window-actions.c:1591
+#: ../shell/e-shell-window-actions.c:1565
 msgid "_Save Search..."
 msgstr "_Lagre sÃk â"
 
-#: ../shell/e-shell-window-actions.c:1593
+#: ../shell/e-shell-window-actions.c:1567
 msgid "Save the current search parameters"
 msgstr "Lagre aktive sÃkeparametere"
 
-#: ../shell/e-shell-window-actions.c:1605
+#: ../shell/e-shell-window-actions.c:1579
 msgid "Submit _Bug Report..."
 msgstr "Sen_d inn feilrapport â"
 
-#: ../shell/e-shell-window-actions.c:1607
+#: ../shell/e-shell-window-actions.c:1581
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Send inn en feilrapport med Bug Buddy"
 
-#: ../shell/e-shell-window-actions.c:1612
+#: ../shell/e-shell-window-actions.c:1586
 msgid "_Work Offline"
 msgstr "Ar_beid frakoblet"
 
-#: ../shell/e-shell-window-actions.c:1614
+#: ../shell/e-shell-window-actions.c:1588
 msgid "Put Evolution into offline mode"
 msgstr "Sett Evolution i frakoblet modus"
 
-#: ../shell/e-shell-window-actions.c:1619
+#: ../shell/e-shell-window-actions.c:1593
 msgid "_Work Online"
 msgstr "Ar_beid tilkoblet"
 
-#: ../shell/e-shell-window-actions.c:1621
+#: ../shell/e-shell-window-actions.c:1595
 msgid "Put Evolution into online mode"
 msgstr "Sett Evolution i tilkoblet modus"
 
-#: ../shell/e-shell-window-actions.c:1649
+#: ../shell/e-shell-window-actions.c:1623
 msgid "Lay_out"
 msgstr "Utf_orming"
 
-#: ../shell/e-shell-window-actions.c:1656
+#: ../shell/e-shell-window-actions.c:1630
 msgid "_New"
 msgstr "_Ny"
 
-#: ../shell/e-shell-window-actions.c:1663
+#: ../shell/e-shell-window-actions.c:1637
 msgid "_Search"
 msgstr "_SÃk"
 
-#: ../shell/e-shell-window-actions.c:1670
+#: ../shell/e-shell-window-actions.c:1644
 msgid "_Switcher Appearance"
 msgstr "Ut_seende for bytter"
 
-#: ../shell/e-shell-window-actions.c:1684
+#: ../shell/e-shell-window-actions.c:1658
 msgid "_Window"
 msgstr "_Vindu"
 
-#: ../shell/e-shell-window-actions.c:1713
+#: ../shell/e-shell-window-actions.c:1687
 msgid "Show Side _Bar"
 msgstr "Vis si_delinje"
 
-#: ../shell/e-shell-window-actions.c:1715
+#: ../shell/e-shell-window-actions.c:1689
 msgid "Show the side bar"
 msgstr "Vis sidelinjen"
 
-#: ../shell/e-shell-window-actions.c:1721
+#: ../shell/e-shell-window-actions.c:1695
 msgid "Show _Buttons"
 msgstr "Vis _knapper"
 
-#: ../shell/e-shell-window-actions.c:1723
+#: ../shell/e-shell-window-actions.c:1697
 msgid "Show the switcher buttons"
 msgstr "Vis knapper for bytter"
 
-#: ../shell/e-shell-window-actions.c:1729
+#: ../shell/e-shell-window-actions.c:1703
 msgid "Show _Status Bar"
 msgstr "Vis _statuslinje"
 
-#: ../shell/e-shell-window-actions.c:1731
+#: ../shell/e-shell-window-actions.c:1705
 msgid "Show the status bar"
 msgstr "Vis statuslinjen"
 
-#: ../shell/e-shell-window-actions.c:1737
+#: ../shell/e-shell-window-actions.c:1711
 msgid "Show _Tool Bar"
 msgstr "Vis verk_tÃylinjen"
 
-#: ../shell/e-shell-window-actions.c:1739
+#: ../shell/e-shell-window-actions.c:1713
 msgid "Show the tool bar"
 msgstr "Vis verktÃylinjen"
 
-#: ../shell/e-shell-window-actions.c:1761
+#: ../shell/e-shell-window-actions.c:1735
 msgid "_Icons Only"
 msgstr "Kun _ikoner"
 
-#: ../shell/e-shell-window-actions.c:1763
+#: ../shell/e-shell-window-actions.c:1737
 msgid "Display window buttons with icons only"
 msgstr "Vis bare ikoner pà vinduknapper"
 
-#: ../shell/e-shell-window-actions.c:1768
+#: ../shell/e-shell-window-actions.c:1742
 msgid "_Text Only"
 msgstr "Kun _tekst"
 
-#: ../shell/e-shell-window-actions.c:1770
+#: ../shell/e-shell-window-actions.c:1744
 msgid "Display window buttons with text only"
 msgstr "Vis bare tekst pà vinduknapper"
 
-#: ../shell/e-shell-window-actions.c:1775
+#: ../shell/e-shell-window-actions.c:1749
 msgid "Icons _and Text"
 msgstr "Ikoner _og tekst"
 
-#: ../shell/e-shell-window-actions.c:1777
+#: ../shell/e-shell-window-actions.c:1751
 msgid "Display window buttons with icons and text"
 msgstr "Vis tekst og ikoner pà vinduknapper"
 
-#: ../shell/e-shell-window-actions.c:1782
+#: ../shell/e-shell-window-actions.c:1756
 msgid "Tool_bar Style"
 msgstr "S_til for verktÃylinje"
 
-#: ../shell/e-shell-window-actions.c:1784
+#: ../shell/e-shell-window-actions.c:1758
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr ""
 "Vis vinduknapper ved à bruke instillinger for verktÃylinjen pà skrivebordet"
 
-#: ../shell/e-shell-window-actions.c:1792
+#: ../shell/e-shell-window-actions.c:1766
 msgid "Define Views..."
 msgstr "Definer visninger â"
 
-#: ../shell/e-shell-window-actions.c:1794
+#: ../shell/e-shell-window-actions.c:1768
 msgid "Create or edit views"
 msgstr "Opprett eller rediger visninger"
 
-#: ../shell/e-shell-window-actions.c:1799
+#: ../shell/e-shell-window-actions.c:1773
 msgid "Save Custom View..."
 msgstr "Lagre egendefinert visning â"
 
-#: ../shell/e-shell-window-actions.c:1801
+#: ../shell/e-shell-window-actions.c:1775
 msgid "Save current custom view"
 msgstr "Lagre aktiv egendefinert visning"
 
-#: ../shell/e-shell-window-actions.c:1808
+#: ../shell/e-shell-window-actions.c:1782
 msgid "C_urrent View"
 msgstr "A_ktiv visning"
 
-#: ../shell/e-shell-window-actions.c:1818
+#: ../shell/e-shell-window-actions.c:1792
 msgid "Custom View"
 msgstr "Egendefinert visning"
 
-#: ../shell/e-shell-window-actions.c:1820
+#: ../shell/e-shell-window-actions.c:1794
 msgid "Current view is a customized view"
 msgstr "Aktiv visning er en egendefinert visning"
 
-#: ../shell/e-shell-window-actions.c:1830
+#: ../shell/e-shell-window-actions.c:1804
 msgid "Change the page settings for your current printer"
 msgstr "Endre sideinnstillingene for din skriver"
 
-#: ../shell/e-shell-window-actions.c:2215
+#: ../shell/e-shell-window-actions.c:2189
 #, c-format
 msgid "Switch to %s"
 msgstr "Bytt til %s"
 
-#: ../shell/e-shell-window-actions.c:2430
+#: ../shell/e-shell-window-actions.c:2404
 msgid "Execute these search parameters"
 msgstr "KjÃr disse sÃkeparameterene"
 
@@ -19612,30 +19595,30 @@ msgstr "MD5-fingeravtrykk"
 
 #: ../smime/gui/certificate-manager.c:93
 #: ../smime/gui/certificate-manager.c:113
-msgid "E-Mail Address"
-msgstr "E-postadresse"
+msgid "Email Address"
+msgstr "E-post_adresse"
 
-#: ../smime/gui/certificate-manager.c:574
+#: ../smime/gui/certificate-manager.c:570
 msgid "Select a certificate to import..."
 msgstr "Velg et sertifikat som skal importeres â"
 
-#: ../smime/gui/certificate-manager.c:587
+#: ../smime/gui/certificate-manager.c:583
 msgid "All files"
 msgstr "Alle filer"
 
-#: ../smime/gui/certificate-manager.c:622
+#: ../smime/gui/certificate-manager.c:618
 msgid "Failed to import certificate"
 msgstr "Klarte ikke à importere sertifikat"
 
-#: ../smime/gui/certificate-manager.c:990
+#: ../smime/gui/certificate-manager.c:985
 msgid "All PKCS12 files"
 msgstr "Alle PKCS12-filer"
 
-#: ../smime/gui/certificate-manager.c:1008
+#: ../smime/gui/certificate-manager.c:1003
 msgid "All email certificate files"
 msgstr "Alle sertifikatfiler for e-post"
 
-#: ../smime/gui/certificate-manager.c:1026
+#: ../smime/gui/certificate-manager.c:1021
 msgid "All CA certificate files"
 msgstr "Alle CA-sertifikatfiler"
 
@@ -20394,7 +20377,7 @@ msgstr "Skriv inn tegnsett som skal brukes"
 msgid "Other..."
 msgstr "Andre â"
 
-#: ../widgets/misc/e-contact-map-window.c:347
+#: ../widgets/misc/e-contact-map-window.c:355
 msgid "Contacts Map"
 msgstr "Kontaktkart"
 
@@ -20811,49 +20794,49 @@ 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:408
+#: ../widgets/misc/e-web-view.c:410
 msgid "_Copy Link Location"
 msgstr "_Kopier adressen til lenke"
 
-#: ../widgets/misc/e-web-view.c:410
+#: ../widgets/misc/e-web-view.c:412
 msgid "Copy the link to the clipboard"
 msgstr "Kopier lenken til utklippstavlen"
 
-#: ../widgets/misc/e-web-view.c:418
+#: ../widgets/misc/e-web-view.c:420
 msgid "_Open Link in Browser"
 msgstr "_Ãpne lenke i nettleser"
 
-#: ../widgets/misc/e-web-view.c:420
+#: ../widgets/misc/e-web-view.c:422
 msgid "Open the link in a web browser"
 msgstr "Ãpne lenken i en nettleser"
 
-#: ../widgets/misc/e-web-view.c:428
+#: ../widgets/misc/e-web-view.c:430
 msgid "_Copy Email Address"
 msgstr "_Kopier e-postadresse"
 
-#: ../widgets/misc/e-web-view.c:445
+#: ../widgets/misc/e-web-view.c:447
 msgid "_Copy Image"
 msgstr "_Kopier bilde"
 
-#: ../widgets/misc/e-web-view.c:447
+#: ../widgets/misc/e-web-view.c:449
 msgid "Copy the image to the clipboard"
 msgstr "Kopier bildet til utklippstavlen"
 
-#: ../widgets/misc/e-web-view.c:467 ../widgets/misc/e-web-view.c:1292
+#: ../widgets/misc/e-web-view.c:469 ../widgets/misc/e-web-view.c:1318
 msgid "Select all text and images"
 msgstr "Velg all tekst og alle bilder"
 
-#: ../widgets/misc/e-web-view.c:956 ../widgets/misc/e-web-view.c:958
-#: ../widgets/misc/e-web-view.c:960
+#: ../widgets/misc/e-web-view.c:982 ../widgets/misc/e-web-view.c:984
+#: ../widgets/misc/e-web-view.c:986
 #, c-format
 msgid "Click to call %s"
 msgstr "Klikk for à ringe %s"
 
-#: ../widgets/misc/e-web-view.c:962
+#: ../widgets/misc/e-web-view.c:988
 msgid "Click to hide/unhide addresses"
 msgstr "Klikk for à skjule/vise adresser"
 
-#: ../widgets/misc/e-web-view.c:964
+#: ../widgets/misc/e-web-view.c:990
 #, c-format
 msgid "Click to open %s"
 msgstr "Klikk for à Ãpne %s"