[evolution] Updated Norwegian bokmål translation



commit 407713ab2eb00c0cb56dbc4e14f9b40aef32f709
Author: Kjartan Maraas <kmaraas gnome org>
Date:   Sat Jul 2 01:46:38 2011 +0200

    Updated Norwegian bokmÃl translation

 po/nb.po | 3317 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 1677 insertions(+), 1640 deletions(-)
---
diff --git a/po/nb.po b/po/nb.po
index c4fbea8..c99e10a 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution 2.91.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-07 11:05+0200\n"
-"PO-Revision-Date: 2011-06-07 11:47+0200\n"
+"POT-Creation-Date: 2011-07-02 01:43+0200\n"
+"PO-Revision-Date: 2011-07-02 01:46+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"
@@ -39,22 +39,35 @@ msgstr ""
 "kontakt med samme adresse likevel?"
 
 #: ../addressbook/addressbook.error.xml.h:4
+#, fuzzy
+msgid ""
+"A contact list named '{0}' is already in this contact list. Would you like "
+"to add it anyway?"
+msgstr ""
+"Navnet eller e-post adressen for denne kontakten eksisterer allerede\n"
+"i denne mappen. Vil du legge den til likevel?"
+
+#: ../addressbook/addressbook.error.xml.h:5
+msgid "Add with duplicates"
+msgstr "Legg til med duplikater"
+
+#: ../addressbook/addressbook.error.xml.h:6
 msgid "Address '{0}' already exists."
 msgstr "Adressen Â{0}Â eksisterer allerede."
 
-#: ../addressbook/addressbook.error.xml.h:5
+#: ../addressbook/addressbook.error.xml.h:7
 msgid "Cannot add new contact"
 msgstr "Kan ikke legge til ny kontakt"
 
-#: ../addressbook/addressbook.error.xml.h:6
+#: ../addressbook/addressbook.error.xml.h:8
 msgid "Cannot move contact."
 msgstr "Kan ikke flytte kontakt."
 
-#: ../addressbook/addressbook.error.xml.h:7
+#: ../addressbook/addressbook.error.xml.h:9
 msgid "Category editor not available."
 msgstr "Kategori editor ikke tilgjengelig."
 
-#: ../addressbook/addressbook.error.xml.h:8
+#: ../addressbook/addressbook.error.xml.h:10
 msgid ""
 "Check to make sure your password is spelled correctly and that you are using "
 "a supported login method. Remember that many passwords are case sensitive; "
@@ -64,15 +77,15 @@ msgstr ""
 "innloggingsmetode. Husk at mange passord skiller mellom smà og store "
 "bokstaver, pass pà at ÂCaps LockÂ-knappen ikke er pÃ."
 
-#: ../addressbook/addressbook.error.xml.h:9
+#: ../addressbook/addressbook.error.xml.h:11
 msgid "Could not get schema information for LDAP server."
 msgstr "Kunne ikke hente schema-informasjon fra LDAP-tjener."
 
-#: ../addressbook/addressbook.error.xml.h:10
+#: ../addressbook/addressbook.error.xml.h:12
 msgid "Could not remove address book."
 msgstr "Kunne ikke fjerne adressebok."
 
-#: ../addressbook/addressbook.error.xml.h:11
+#: ../addressbook/addressbook.error.xml.h:13
 msgid ""
 "Currently you can only access the GroupWise System Address Book from "
 "Evolution. Please use some other GroupWise mail client once to get your "
@@ -82,51 +95,62 @@ msgstr ""
 "Evolution. Vennligst bruk en annen GroupWise-klient en gang for à fà tak i "
 "dine ofte brukte kontakter og mappene for personlige kontakter fra GroupWise."
 
-#: ../addressbook/addressbook.error.xml.h:12
+#: ../addressbook/addressbook.error.xml.h:14
 msgid "Delete address book '{0}'?"
 msgstr "Slett adressebok Â{0}Â?"
 
-#: ../addressbook/addressbook.error.xml.h:13
+#: ../addressbook/addressbook.error.xml.h:15
 #: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:45
 msgid "Do _Not Delete"
 msgstr "Ikke s_lett"
 
-#: ../addressbook/addressbook.error.xml.h:14
+#: ../addressbook/addressbook.error.xml.h:16
 msgid "Error saving {0} to {1}: {2}"
 msgstr "Feil under lagring av {0} til {1}: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "Failed to authenticate with LDAP server."
 msgstr "Kunne ikke autentisere mot LDAP-tjener."
 
-#. Unknown error
-#: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1279
+#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1273
 msgid "Failed to delete contact"
 msgstr "Klarte ikke à slette kontakt"
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:19
 msgid "GroupWise Address book creation:"
 msgstr "Oppretting av GroupWise adressebok:"
 
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP-tjener svarte ikke med gyldig schema-informasjon."
 
-#: ../addressbook/addressbook.error.xml.h:19
+#: ../addressbook/addressbook.error.xml.h:21
+msgid "List '{0}' is already in this contact list."
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:22
+msgid "Skip duplicates"
+msgstr "Hopp over duplikater"
+
+#: ../addressbook/addressbook.error.xml.h:23
+msgid "Some addresses already exist in this contact list."
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:24
 msgid "Some features may not work properly with your current server"
 msgstr "Noen funksjoner vil kanskje ikke fungere med denne tjeneren "
 
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:25
 msgid "The Evolution address book has quit unexpectedly."
 msgstr "Evolution adressebok avsluttet uventet."
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:26
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr "Bildet du valgte er stort. Endre stÃrrelse og lagre?"
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:27
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support "
 "this functionality or it may be misconfigured. Ask your administrator for "
@@ -136,15 +160,15 @@ msgstr ""
 "stÃtter denne funksjonaliteten eller sà er den satt opp feil. SpÃr din "
 "administrator for stÃttede sÃkebaser."
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "This address book could not be opened."
 msgstr "Denne adresseboken kunne ikke Ãpnes."
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "This address book server does not have any suggested search bases."
 msgstr "Denne adresseboktjeneren har ingen foreslÃtt sÃkebase."
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:30
 msgid ""
 "This address book server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
@@ -152,31 +176,31 @@ msgstr ""
 "Adresseboktjeneren din er ikke tilgjengelig eller tjenernavnet er kanskje "
 "stavet feil. Eller sà kan nettverkstilkoblingen din vÃre slÃtt av."
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "This address book will be removed permanently."
 msgstr "Denne adresseboken vil bli slettet for godt."
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:32
 msgid "This server does not support LDAPv3 schema information."
 msgstr "Denne tjeneren stÃtter ikke LDAPv3 schema-informasjon."
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:33
 msgid "Unable to open address book"
 msgstr "Kan ikke Ãpne adressebok"
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:34
 msgid "Unable to perform search."
 msgstr "Kan ikke utfÃre sÃk."
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:35
 msgid "Unable to save {0}."
 msgstr "Kan ikke lagre {0}."
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:36
 msgid "Would you like to save your changes?"
 msgstr "Vil du lagre dine endringer?"
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:37
 msgid ""
 "You are attempting to move a contact from one address book to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
@@ -184,7 +208,7 @@ msgstr ""
 "Du prÃver à flytte en kontakt fra en adressebok til en annen men den kan "
 "ikke bli fjernet fra kilden. Vil du lagre en kopi i stedet?"
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:38
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
@@ -194,11 +218,20 @@ msgstr ""
 "muligens stÃte pà problemer. Tjeneren bÃr oppgraderes til en stÃttet versjon "
 "for best ytelse."
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:39
+#, fuzzy
+msgid ""
+"You are trying to add addresses that are part of this list already. Would "
+"you like to add them anyway?"
+msgstr ""
+"Navnet eller e-post adressen for denne kontakten eksisterer allerede\n"
+"i denne mappen. Vil du legge den til likevel?"
+
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "You do not have permission to delete contacts in this address book."
 msgstr "Du har ikke rettigheter til à slette kontakter i denne adresseboken."
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:41
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
@@ -206,37 +239,37 @@ msgstr ""
 "Du har gjort endringer for denne kontakten. Vil du lagre disse endringene?"
 
 #. Translators: {0} is replaced with an address book name which will not be available
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../addressbook/addressbook.error.xml.h:43
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
 "Dine kontakter for {0} vil ikke vÃre tilgjengelige fÃr Evolution startes pà "
 "nytt."
 
-#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:604
+#: ../addressbook/addressbook.error.xml.h:44 ../mail/em-vfolder-rule.c:604
 #: ../widgets/table/e-table-config.ui.h:18
 msgid "_Add"
 msgstr "_Legg til"
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:45
 msgid "_Discard"
 msgstr "_Forkast"
 
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/addressbook.error.xml.h:46
 msgid "_Do not save"
 msgstr "_Ikke lagre"
 
-#: ../addressbook/addressbook.error.xml.h:41
+#: ../addressbook/addressbook.error.xml.h:47
 msgid "_Resize"
 msgstr "End_re stÃrrelse"
 
-#: ../addressbook/addressbook.error.xml.h:42
+#: ../addressbook/addressbook.error.xml.h:48
 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:617
-#: ../calendar/gui/e-calendar-view.c:2080
+#: ../addressbook/gui/widgets/eab-contact-display.c:706
+#: ../calendar/gui/e-calendar-view.c:2078
 msgid "Anniversary"
 msgstr "Bryllupsdag"
 
@@ -246,8 +279,8 @@ 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:616
-#: ../calendar/gui/e-calendar-view.c:2079 ../capplet/anjal-settings-main.c:79
+#: ../addressbook/gui/widgets/eab-contact-display.c:705
+#: ../calendar/gui/e-calendar-view.c:2077 ../capplet/anjal-settings-main.c:79
 #: ../shell/main.c:140
 msgid "Birthday"
 msgstr "FÃdselsdag"
@@ -268,23 +301,23 @@ msgid "Calendar:"
 msgstr "Kalender:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
-#: ../addressbook/importers/evolution-vcard-importer.c:968
+#: ../addressbook/importers/evolution-vcard-importer.c:979
 msgid "Contact"
 msgstr "Kontakt"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:648
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:668
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2862
+#: ../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
 msgid "Contact Editor"
 msgstr "Kontaktredigering"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/merging/eab-contact-merging.c:297
+#: ../addressbook/gui/merging/eab-contact-merging.c:358
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:537
-#: ../addressbook/gui/widgets/eab-contact-display.c:545
-#: ../addressbook/gui/widgets/eab-contact-display.c:911
+#: ../addressbook/gui/widgets/eab-contact-display.c:626
+#: ../addressbook/gui/widgets/eab-contact-display.c:634
+#: ../addressbook/gui/widgets/eab-contact-display.c:1000
 #: ../smime/lib/e-cert.c:832
 msgid "Email"
 msgstr "E-post"
@@ -299,9 +332,9 @@ 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:75
-#: ../addressbook/gui/widgets/eab-contact-display.c:1195
-#: ../widgets/misc/e-contact-map.c:294
+#: ../addressbook/gui/widgets/eab-contact-display.c:78
+#: ../addressbook/gui/widgets/eab-contact-display.c:1302
+#: ../widgets/misc/e-contact-map.c:295
 msgid "Home"
 msgstr "Hjemme"
 
@@ -341,9 +374,9 @@ msgstr "Notater"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:199
-#: ../addressbook/gui/widgets/eab-contact-display.c:76
-#: ../addressbook/gui/widgets/eab-contact-display.c:400
-#: ../calendar/gui/e-calendar-view.c:1785
+#: ../addressbook/gui/widgets/eab-contact-display.c:79
+#: ../addressbook/gui/widgets/eab-contact-display.c:403
+#: ../calendar/gui/e-calendar-view.c:1783
 msgid "Other"
 msgstr "Andre"
 
@@ -369,10 +402,10 @@ 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:74
-#: ../addressbook/gui/widgets/eab-contact-display.c:597
-#: ../addressbook/gui/widgets/eab-contact-display.c:1192
-#: ../widgets/misc/e-contact-map.c:302
+#: ../addressbook/gui/widgets/eab-contact-display.c:77
+#: ../addressbook/gui/widgets/eab-contact-display.c:686
+#: ../addressbook/gui/widgets/eab-contact-display.c:1299
+#: ../widgets/misc/e-contact-map.c:303
 msgid "Work"
 msgstr "Arbeid"
 
@@ -397,9 +430,9 @@ msgid "_Blog:"
 msgstr "_Blogg:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
-#: ../calendar/gui/dialogs/event-page.c:709
+#: ../calendar/gui/dialogs/event-page.c:708
 #: ../calendar/gui/dialogs/event-page.ui.h:11
-#: ../plugins/itip-formatter/itip-view.c:1922
+#: ../plugins/itip-formatter/itip-view.c:1923
 msgid "_Calendar:"
 msgstr "_Kalender:"
 
@@ -478,73 +511,73 @@ msgid "_Zip/Postal Code:"
 msgstr "_Zip/postnummer:"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:559
+#: ../addressbook/gui/widgets/eab-contact-display.c:648
 msgid "AIM"
 msgstr "AIM"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-display.c:562
+#: ../addressbook/gui/widgets/eab-contact-display.c:651
 msgid "Jabber"
 msgstr "Jabber"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:180
-#: ../addressbook/gui/widgets/eab-contact-display.c:564
+#: ../addressbook/gui/widgets/eab-contact-display.c:653
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:181
-#: ../addressbook/gui/widgets/eab-contact-display.c:565
+#: ../addressbook/gui/widgets/eab-contact-display.c:654
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:182
-#: ../addressbook/gui/widgets/eab-contact-display.c:563
+#: ../addressbook/gui/widgets/eab-contact-display.c:652
 msgid "MSN"
 msgstr "MSN"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:183
-#: ../addressbook/gui/widgets/eab-contact-display.c:561
+#: ../addressbook/gui/widgets/eab-contact-display.c:650
 msgid "ICQ"
 msgstr "ICQ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:184
-#: ../addressbook/gui/widgets/eab-contact-display.c:560
+#: ../addressbook/gui/widgets/eab-contact-display.c:649
 msgid "GroupWise"
 msgstr "GroupWise"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:185
-#: ../addressbook/gui/widgets/eab-contact-display.c:566
+#: ../addressbook/gui/widgets/eab-contact-display.c:655
 msgid "Skype"
 msgstr "Skype"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:219
-#: ../addressbook/gui/widgets/eab-gui-util.c:419
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:220
+#: ../addressbook/gui/widgets/eab-gui-util.c:447
 msgid "Error adding contact"
 msgstr "Feil under innlegging av kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:235
 msgid "Error modifying contact"
 msgstr "Feil under endring av kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:250
 msgid "Error removing contact"
 msgstr "Feil under fjerning av kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:663
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2856
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:661
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2859
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Kontaktredigering - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3286
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3301
 msgid "Please select an image for this contact"
 msgstr "Vennligst velg et bilde for denne kontakten"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3287
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3302
 msgid "_No image"
 msgstr "_Uten bilde"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3581
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3615
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -552,43 +585,43 @@ msgstr ""
 "Kontaktdata er ugyldig:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3585
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3619
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "Â%s har ugyldig format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3592
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3626
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%sÂ%s har ugyldig format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3607
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3618
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3638
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3649
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%sÂ%s er tom"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3633
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3664
 msgid "Invalid contact."
 msgstr "Ugyldig kontakt."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:401
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:411
 msgid "Contact Quick-Add"
 msgstr "Hurtigkontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:404
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:414
 msgid "_Edit Full"
 msgstr "R_ediger alt"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:452
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:462
 msgid "_Full name"
 msgstr "_Fullt navn"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:463
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:473
 msgid "E_mail"
 msgstr "E-_post"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:474
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:484
 msgid "_Select Address Book"
 msgstr "_Velg adressebok"
 
@@ -658,7 +691,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:719
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:729
 msgid "Contact List Editor"
 msgstr "Kontaktlisteredigering"
 
@@ -683,27 +716,26 @@ 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:844
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:852
 msgid "Contact List Members"
 msgstr "Kontaktlistemedlemmer"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1123
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1542
-msgid "_Members"
-msgstr "_Medlemmer"
-
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1376
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1422
 msgid "Error adding list"
 msgstr "Feil under innlegging av liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1390
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1437
 msgid "Error modifying list"
 msgstr "Feil ved endring av liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1404
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1452
 msgid "Error removing list"
 msgstr "Feil under fjerning av liste"
 
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1583
+msgid "_Members"
+msgstr "_Medlemmer"
+
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
 msgid "Changed Contact:"
 msgstr "Endret kontakt:"
@@ -722,7 +754,9 @@ msgstr "Duplisert kontakt funnet"
 msgid ""
 "The name or email of this contact already exists in this folder. Would you "
 "like to save the changes anyway?"
-msgstr "Navnet eller e-postadressen for denne kontakten eksisterer allerede i denne mappen. Vil du lagre endringene likevel?"
+msgstr ""
+"Navnet eller e-postadressen for denne kontakten eksisterer allerede i denne "
+"mappen. Vil du lagre endringene likevel?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
 msgid "New Contact:"
@@ -741,17 +775,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:243
+#: ../addressbook/gui/merging/eab-contact-merging.c:304
 msgid "_Merge"
 msgstr "_Flett"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:168
-#: ../calendar/gui/tasktypes.xml.h:7
-#, c-format
-msgid "Cancelled"
-msgstr "Avbrutt"
-
-#: ../addressbook/gui/merging/eab-contact-merging.c:226
+#: ../addressbook/gui/merging/eab-contact-merging.c:287
 msgid "Merge Contact"
 msgstr "Flett kontakt"
 
@@ -759,9 +787,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:1686
-#: ../modules/calendar/e-memo-shell-view-actions.c:778
-#: ../modules/calendar/e-task-shell-view-actions.c:977
+#: ../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
 msgid "Any field contains"
 msgstr "Et felt inneholder"
 
@@ -775,78 +803,78 @@ msgstr "E-post begynner med"
 msgid "Name contains"
 msgstr "Navn inneholder"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:148
+#: ../addressbook/gui/widgets/e-addressbook-model.c:155
 msgid "No contacts"
 msgstr "Ingen kontakter"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:152
+#: ../addressbook/gui/widgets/e-addressbook-model.c:159
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d kontakt"
 msgstr[1] "%d kontakter"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:344
+#: ../addressbook/gui/widgets/e-addressbook-model.c:340
 msgid "Error getting book view"
 msgstr "Feil under henting av bokvisning"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:758
+#: ../addressbook/gui/widgets/e-addressbook-model.c:751
 msgid "Search Interrupted"
 msgstr "SÃk avbrutt"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:153
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:156
 msgid "Error modifying card"
 msgstr "Feil ved endring av kort"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:626
+#: ../addressbook/gui/widgets/e-addressbook-view.c:624
 msgid "Cut selected contacts to the clipboard"
 msgstr "Klipp ut valgte kontakter til utklippstavlen"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:632
+#: ../addressbook/gui/widgets/e-addressbook-view.c:630
 msgid "Copy selected contacts to the clipboard"
 msgstr "Kopier valgte kontakter til utklippstavlen"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:638
+#: ../addressbook/gui/widgets/e-addressbook-view.c:636
 msgid "Paste contacts from the clipboard"
 msgstr "Lim inn kontakter fra utklippstavlen"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:644
+#: ../addressbook/gui/widgets/e-addressbook-view.c:642
 #: ../modules/addressbook/e-book-shell-view-actions.c:877
 msgid "Delete selected contacts"
 msgstr "Slett valgte kontakter"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:650
+#: ../addressbook/gui/widgets/e-addressbook-view.c:648
 msgid "Select all visible contacts"
 msgstr "Velg alle synlige kontakter"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1297
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1317
 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:1301
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1321
 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:1305
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1325
 #, 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:1311
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1331
 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:1315
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1335
 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:1319
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1339
 #, 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:1478
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1488
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -861,16 +889,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:1486
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1496
 msgid "_Don't Display"
 msgstr "Ikke _vis"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1487
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1497
 msgid "Display _All Contacts"
 msgstr "Vis _alle kontakter"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:588
+#: ../addressbook/gui/widgets/eab-contact-display.c:677
 msgid "Assistant"
 msgstr "Assistent"
 
@@ -907,7 +935,7 @@ msgid "Categories"
 msgstr "Kategorier"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:583
+#: ../addressbook/gui/widgets/eab-contact-display.c:672
 msgid "Company"
 msgstr "Firma"
 
@@ -956,22 +984,22 @@ msgid "Journal"
 msgstr "Journal"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:587
+#: ../addressbook/gui/widgets/eab-contact-display.c:676
 msgid "Manager"
 msgstr "Leder"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:614
+#: ../addressbook/gui/widgets/eab-contact-display.c:703
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:552
+#: ../addressbook/gui/widgets/eab-contact-display.c:641
 msgid "Nickname"
 msgstr "Kallenavn"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:640
+#: ../addressbook/gui/widgets/eab-contact-display.c:729
 msgid "Note"
 msgstr "Kommentar"
 
@@ -1000,13 +1028,13 @@ msgid "Radio"
 msgstr "Radio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:571
+#: ../calendar/gui/e-meeting-list-view.c:585
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Rolle"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:618
+#: ../addressbook/gui/widgets/eab-contact-display.c:707
 msgid "Spouse"
 msgstr "Ektefelle"
 
@@ -1036,7 +1064,7 @@ msgstr "Enhet"
 msgid "Web Site"
 msgstr "Nettside"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:192
 msgid ""
 "\n"
 "\n"
@@ -1046,7 +1074,7 @@ msgstr ""
 "\n"
 "SÃker etter kontakter â"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:187
+#: ../addressbook/gui/widgets/e-minicard-view.c:195
 msgid ""
 "\n"
 "\n"
@@ -1060,7 +1088,7 @@ msgstr ""
 "\n"
 "eller dobbelklikk her for à opprette en ny kontakt."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:190
+#: ../addressbook/gui/widgets/e-minicard-view.c:198
 msgid ""
 "\n"
 "\n"
@@ -1074,7 +1102,7 @@ msgstr ""
 "\n"
 "Dobbelklikk her for à opprette en ny kontakt."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:194
+#: ../addressbook/gui/widgets/e-minicard-view.c:202
 msgid ""
 "\n"
 "\n"
@@ -1084,7 +1112,7 @@ msgstr ""
 "\n"
 "SÃk etter kontakten."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:196
+#: ../addressbook/gui/widgets/e-minicard-view.c:204
 msgid ""
 "\n"
 "\n"
@@ -1094,16 +1122,16 @@ msgstr ""
 "\n"
 "Ingen oppfÃringer i denne visningen."
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Work Email"
 msgstr "E-post pà arbeid"
 
-#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:101
 msgid "Home Email"
 msgstr "E-post hjemme"
 
-#: ../addressbook/gui/widgets/e-minicard.c:103
-#: ../addressbook/gui/widgets/e-minicard.c:808
+#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:807
 msgid "Other Email"
 msgstr "Annen e-post"
 
@@ -1144,61 +1172,61 @@ msgstr "Kontakt: "
 msgid "evolution minicard"
 msgstr "evolution minikort"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:179
+#: ../addressbook/gui/widgets/eab-contact-display.c:182
 msgid "Copy _Email Address"
 msgstr "Kopier _e-postadresse"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:181
+#: ../addressbook/gui/widgets/eab-contact-display.c:184
 #: ../widgets/misc/e-web-view.c:430
 msgid "Copy the email address to the clipboard"
 msgstr "Kopier e-postadresser til utklippstavlen"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:186
+#: ../addressbook/gui/widgets/eab-contact-display.c:189
 #: ../widgets/misc/e-web-view.c:435
 msgid "_Send New Message To..."
 msgstr "_Send ny melding til â"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:188
+#: ../addressbook/gui/widgets/eab-contact-display.c:191
 #: ../widgets/misc/e-web-view.c:437
 msgid "Send a mail message to this address"
 msgstr "Send en e-postmelding til denne adressen"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:210
+#: ../addressbook/gui/widgets/eab-contact-display.c:213
 msgid "Open map"
 msgstr "Ãpne kart"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:465
-#: ../addressbook/gui/widgets/eab-contact-display.c:878
-msgid "List Members"
-msgstr "Listemedlemmer"
+#: ../addressbook/gui/widgets/eab-contact-display.c:521
+#: ../addressbook/gui/widgets/eab-contact-display.c:549
+msgid "List Members:"
+msgstr "Listemedlemmer:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:584
+#: ../addressbook/gui/widgets/eab-contact-display.c:673
 msgid "Department"
 msgstr "Avdeling"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:585
+#: ../addressbook/gui/widgets/eab-contact-display.c:674
 msgid "Profession"
 msgstr "Yrke"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:586
+#: ../addressbook/gui/widgets/eab-contact-display.c:675
 msgid "Position"
 msgstr "Stilling"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:589
+#: ../addressbook/gui/widgets/eab-contact-display.c:678
 msgid "Video Chat"
 msgstr "Videosamtale"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:590
-#: ../calendar/gui/dialogs/calendar-setup.c:376
+#: ../addressbook/gui/widgets/eab-contact-display.c:679
+#: ../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:505
+#: ../modules/calendar/e-cal-shell-view.c:507
 #: ../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:591
+#: ../addressbook/gui/widgets/eab-contact-display.c:680
 #: ../calendar/gui/dialogs/event-editor.c:123
 #: ../calendar/gui/dialogs/event-editor.c:350
 #: ../modules/calendar/e-calendar-preferences.ui.h:17
@@ -1206,25 +1234,25 @@ msgstr "Kalender"
 msgid "Free/Busy"
 msgstr "Ledig/opptatt"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:592
-#: ../addressbook/gui/widgets/eab-contact-display.c:613
+#: ../addressbook/gui/widgets/eab-contact-display.c:681
+#: ../addressbook/gui/widgets/eab-contact-display.c:702
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:593
+#: ../addressbook/gui/widgets/eab-contact-display.c:682
 msgid "Fax"
 msgstr "Faks"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:594
-#: ../addressbook/gui/widgets/eab-contact-display.c:615
+#: ../addressbook/gui/widgets/eab-contact-display.c:683
+#: ../addressbook/gui/widgets/eab-contact-display.c:704
 msgid "Address"
 msgstr "Adresse"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:610
+#: ../addressbook/gui/widgets/eab-contact-display.c:699
 msgid "Home Page"
 msgstr "Hjemmeside"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:611
+#: ../addressbook/gui/widgets/eab-contact-display.c:700
 msgid "Web Log"
 msgstr "Nettdagbok"
 
@@ -1232,38 +1260,42 @@ 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:620
-#: ../capplet/settings/mail-capplet-shell.c:347
-#: ../modules/addressbook/e-book-shell-backend.c:114
+#: ../addressbook/gui/widgets/eab-contact-display.c:709
+#: ../capplet/settings/mail-capplet-shell.c:376
+#: ../modules/addressbook/e-book-shell-backend.c:116
 #: ../modules/addressbook/e-book-shell-migrate.c:144
-#: ../modules/calendar/e-cal-shell-backend.c:132
+#: ../modules/calendar/e-cal-shell-backend.c:134
 #: ../modules/calendar/e-cal-shell-migrate.c:165
-#: ../modules/calendar/e-memo-shell-backend.c:116
+#: ../modules/calendar/e-memo-shell-backend.c:118
 #: ../modules/calendar/e-memo-shell-migrate.c:120
-#: ../modules/calendar/e-task-shell-backend.c:116
+#: ../modules/calendar/e-task-shell-backend.c:118
 #: ../modules/calendar/e-task-shell-migrate.c:132
 msgid "Personal"
 msgstr "Personlig"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:896
+#: ../addressbook/gui/widgets/eab-contact-display.c:967
+msgid "List Members"
+msgstr "Listemedlemmer"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:985
 msgid "Job Title"
 msgstr "Jobbtittel"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:933
+#: ../addressbook/gui/widgets/eab-contact-display.c:1022
 msgid "Home page"
 msgstr "Hjemmeside"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:942
+#: ../addressbook/gui/widgets/eab-contact-display.c:1031
 msgid "Blog"
 msgstr "Weblogg"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1135
+#: ../addressbook/gui/widgets/eab-contact-display.c:1229
 #: ../widgets/misc/e-web-view.c:954
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klikk for à sende melding til %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:115
+#: ../addressbook/gui/widgets/eab-gui-util.c:113
 msgid ""
 "This address book cannot be opened. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -1273,7 +1305,7 @@ msgstr ""
 "for frakoblet bruk eller at den ikke er lastet ned enda. Last adresseboken i "
 "tilkoblet tilstand for à laste ned innholdet"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:142
+#: ../addressbook/gui/widgets/eab-gui-util.c:140
 #, c-format
 msgid ""
 "This address book cannot be opened.  Please check that the path %s exists "
@@ -1282,7 +1314,7 @@ msgstr ""
 "Kunne ikke Ãpne denne adresseboken. Vennligst sjekk at stien %s eksisterer "
 "og at du har rettigheter til à aksessere den."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:155
+#: ../addressbook/gui/widgets/eab-gui-util.c:153
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  To "
 "use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
@@ -1291,7 +1323,7 @@ msgstr ""
 "Ãnsker à bruke LDAP i Evolution mà du installere en pakke som har denne "
 "stÃtten."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:164
+#: ../addressbook/gui/widgets/eab-gui-util.c:162
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
@@ -1299,11 +1331,11 @@ msgstr ""
 "Kunne ikke Ãpne denne adresseboken. Dette betyr enten at du har skrevet inn "
 "en ugyldig URI, eller at tjeneren ikke kan nÃs."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:172
+#: ../addressbook/gui/widgets/eab-gui-util.c:170
 msgid "Detailed error message:"
 msgstr "Detaljert feilmelding:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:202
+#: ../addressbook/gui/widgets/eab-gui-util.c:200
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -1315,7 +1347,7 @@ msgstr ""
 "GjÃr sÃket ditt mer nÃyaktig eller hev grensen pà resultater i\n"
 "brukervalgene til mappetjeneren for denne adresseboken."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:209
+#: ../addressbook/gui/widgets/eab-gui-util.c:207
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "configured for this address book.  Please make your search\n"
@@ -1328,49 +1360,50 @@ msgstr ""
 "for denne adresseboken."
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:217
+#: ../addressbook/gui/widgets/eab-gui-util.c:215
 #, c-format
 msgid "The backend for this address book was unable to parse this query. %s"
 msgstr "Motoren for denne adresseboken forsto ikke denne spÃrringen. %s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:222
+#: ../addressbook/gui/widgets/eab-gui-util.c:220
 #, c-format
 msgid "The backend for this address book refused to perform this query. %s"
 msgstr "Motoren for denne adresseboken nektet à utfÃre denne spÃrringen. %s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:227
+#: ../addressbook/gui/widgets/eab-gui-util.c:226
+#: ../addressbook/gui/widgets/eab-gui-util.c:232
 #, c-format
 msgid "This query did not complete successfully. %s"
 msgstr "Denne spÃrringen ble ikke fullfÃrt. %s"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:252
+#: ../addressbook/gui/widgets/eab-gui-util.c:254
 msgid "card.vcf"
 msgstr "kort.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:292
+#: ../addressbook/gui/widgets/eab-gui-util.c:294
 msgid "Select Address Book"
 msgstr "Velg adressebok"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:355
+#: ../addressbook/gui/widgets/eab-gui-util.c:357
 msgid "list"
 msgstr "liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:493
+#: ../addressbook/gui/widgets/eab-gui-util.c:525
 msgid "Move contact to"
 msgstr "Flytt kontakt til"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:495
+#: ../addressbook/gui/widgets/eab-gui-util.c:527
 msgid "Copy contact to"
 msgstr "Kopier kontakt til"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:498
+#: ../addressbook/gui/widgets/eab-gui-util.c:530
 msgid "Move contacts to"
 msgstr "Flytt kontakter til"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:500
+#: ../addressbook/gui/widgets/eab-gui-util.c:532
 msgid "Copy contacts to"
 msgstr "Kopier kontakter til"
 
@@ -1378,74 +1411,89 @@ msgstr "Kopier kontakter til"
 msgid "Card View"
 msgstr "Kortvisning"
 
-#: ../addressbook/importers/evolution-csv-importer.c:730
-#: ../addressbook/importers/evolution-ldif-importer.c:526
-#: ../addressbook/importers/evolution-vcard-importer.c:278
-#: ../calendar/importers/icalendar-importer.c:325
-#: ../calendar/importers/icalendar-importer.c:764 ../shell/shell.error.xml.h:6
+#: ../addressbook/importers/evolution-csv-importer.c:740
+#: ../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
 msgid "Importing..."
 msgstr "Importerer â"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1025
+#: ../addressbook/importers/evolution-csv-importer.c:1041
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV eller Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1026
+#: ../addressbook/importers/evolution-csv-importer.c:1042
 msgid "Outlook CSV and Tab Importer"
 msgstr "Outlook CSV og Tab-import"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1034
+#: ../addressbook/importers/evolution-csv-importer.c:1050
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV eller Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1035
+#: ../addressbook/importers/evolution-csv-importer.c:1051
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Mozilla CSV og Tab-import"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1043
+#: ../addressbook/importers/evolution-csv-importer.c:1059
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV eller Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1044
+#: ../addressbook/importers/evolution-csv-importer.c:1060
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution CSV og Tab-import"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:760
+#: ../addressbook/importers/evolution-ldif-importer.c:779
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP Data Interchange Format (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:761
+#: ../addressbook/importers/evolution-ldif-importer.c:780
 msgid "Evolution LDIF importer"
 msgstr "LDIF-import for Evolution"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:639
+#: ../addressbook/importers/evolution-vcard-importer.c:648
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:640
+#: ../addressbook/importers/evolution-vcard-importer.c:649
 msgid "Evolution vCard Importer"
 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:744
+#: ../addressbook/printing/e-contact-print.c:714
 #, c-format
 msgid "Page %d"
 msgstr "Side %d"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:644
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:679
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:47
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:645
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:680
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:53
 msgid "Can not open file"
 msgstr "Kan ikke Ãpne fil"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:41
-msgid "Couldn't get list of address books"
-msgstr "Kunne ikke hente liste med adressebÃker"
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
+#, c-format
+msgid "Couldn't get list of address books: %s"
+msgstr "Kunne ikke hente liste med adressebÃker: %s"
+
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
+#: ../calendar/gui/dialogs/event-page.c:2893
+#: ../calendar/gui/dialogs/memo-page.c:926
+#: ../calendar/gui/dialogs/task-page.c:1810 ../em-format/em-format.c:2313
+#: ../mail/em-folder-tree.c:678 ../mail/mail-ops.c:657
+#: ../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
+msgid "Unknown error"
+msgstr "Ukjent feil"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:69
-msgid "failed to open book"
-msgstr "kunne ikke Ãpne adressebok"
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
+#, c-format
+msgid "Failed to open client '%s': %s"
+msgstr "Klarte ikke à Ãpne klient Â%sÂ: %s"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "Specify the output file instead of standard output"
@@ -1916,15 +1964,6 @@ msgstr "_Send"
 msgid "_Send Notice"
 msgstr "_Send melding"
 
-#: ../calendar/common/authentication.c:75
-#: ../calendar/gui/e-meeting-store.c:1827
-#: ../plugins/caldav/caldav-browse-server.c:920
-#: ../plugins/google-account-setup/google-source.c:438
-#: ../plugins/publish-calendar/publish-calendar.c:332
-#: ../smime/gui/component.c:49
-msgid "Enter password"
-msgstr "Oppgi passord"
-
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:105
 msgid "minute"
 msgid_plural "minutes"
@@ -1941,13 +1980,13 @@ 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:1116
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dag"
 msgstr[1] "dager"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:301
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:303
 msgid "Start time"
 msgstr "Starttid"
 
@@ -1961,9 +2000,9 @@ msgstr "Lukk _alle"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1629
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1639
-#: ../plugins/itip-formatter/itip-view.c:1044
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1672
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1682
+#: ../plugins/itip-formatter/itip-view.c:1045
 msgid "Location:"
 msgstr "Sted:"
 
@@ -2011,33 +2050,33 @@ msgstr "sted for avtalen"
 msgid "minutes"
 msgstr "minutter"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1483
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1610
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1526
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1653
 msgid "No summary available."
 msgstr "Sammendrag er ikke tilgjengelig."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1492
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1494
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1535
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1537
 msgid "No description available."
 msgstr "Ingen beskrivelse tilgjengelig."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1502
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1545
 msgid "No location information available."
 msgstr "Stedsinformasjon er ikke tilgjengelig."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1546
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1589
 #, 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"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1738
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1771
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1780
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1813
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1742
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1784
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -2049,7 +2088,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:1777
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1819
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2065,7 +2104,7 @@ msgstr ""
 "\n"
 "Er du sikker pà at du vil kjÃre dette programmet?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1792
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1834
 msgid "Do not ask me about this program again."
 msgstr "Ikke spÃr meg om dette programmet igjen."
 
@@ -2102,10 +2141,6 @@ msgid_plural "%d seconds"
 msgstr[0] "%d sekund"
 msgstr[1] "%d sekunder"
 
-#: ../calendar/gui/cal-editor-utils.c:105
-msgid "Invalid object"
-msgstr "Ugyldig objekt"
-
 #: ../calendar/gui/calendar-view-factory.c:116
 msgid "Day View"
 msgstr "Dagvisning"
@@ -2147,8 +2182,8 @@ msgstr "Kategori"
 msgid "Classification"
 msgstr "Klassifisering"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:241
-#: ../calendar/gui/e-cal-model.c:772 ../calendar/gui/e-task-table.c:494
+#: ../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/memotypes.xml.h:6 ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
 msgstr "Konfidensiell"
@@ -2180,7 +2215,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:377
+#: ../plugins/save-calendar/csv-format.c:384
 msgid "Location"
 msgstr "Lokasjon"
 
@@ -2189,15 +2224,15 @@ msgstr "Lokasjon"
 msgid "Organizer"
 msgstr "Organisator"
 
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:240
-#: ../calendar/gui/e-cal-model.c:770 ../calendar/gui/e-task-table.c:493
+#: ../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/memotypes.xml.h:12
 msgid "Private"
 msgstr "Privat"
 
-#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:239
-#: ../calendar/gui/e-cal-model.c:761 ../calendar/gui/e-cal-model.c:768
-#: ../calendar/gui/e-task-table.c:492 ../calendar/gui/memotypes.xml.h:13
+#: ../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
 msgid "Public"
 msgstr "Offentlig"
 
@@ -2213,7 +2248,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:363
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "Summary"
 msgstr "Sammendrag"
 
@@ -2352,7 +2387,7 @@ msgstr "minutt(er)"
 msgid "start of appointment"
 msgstr "ved avtalens start"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:245
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:240
 msgid "Action/Trigger"
 msgstr "Handling/utlÃser"
 
@@ -2366,80 +2401,80 @@ msgstr "Le_gg til"
 msgid "Alarms"
 msgstr "Varsel"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:159
+#: ../calendar/gui/dialogs/calendar-setup.c:164
 msgid "Type:"
 msgstr "Type:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:175
-#: ../modules/addressbook/addressbook-config.c:511
+#: ../calendar/gui/dialogs/calendar-setup.c:180
+#: ../modules/addressbook/addressbook-config.c:516
 msgid "_Type:"
 msgstr "_Type:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:232 ../mail/mail-config.ui.h:156
+#: ../calendar/gui/dialogs/calendar-setup.c:242 ../mail/mail-config.ui.h:156
 #: ../modules/addressbook/ldap-config.ui.h:26
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
 #: ../widgets/misc/e-signature-script-dialog.c:284
 msgid "_Name:"
 msgstr "_Navn:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:276
+#: ../calendar/gui/dialogs/calendar-setup.c:291
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "Kopier kalenderinnhold lokalt for frakoblet operasjon"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:278
+#: ../calendar/gui/dialogs/calendar-setup.c:293
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "Kopier oppgavelisten lokalt for frakoblet operasjon"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:280
+#: ../calendar/gui/dialogs/calendar-setup.c:295
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "Kopier notatlisten lokalt for frakoblet operasjon"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:352
+#: ../calendar/gui/dialogs/calendar-setup.c:372
 msgid "Colo_r:"
 msgstr "Fa_rge:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:375
-#: ../calendar/gui/dialogs/calendar-setup.c:386
-#: ../calendar/gui/dialogs/calendar-setup.c:397
-#: ../mail/em-folder-properties.c:232 ../mail/mail-config.ui.h:52
-#: ../modules/addressbook/addressbook-config.c:1012
+#: ../calendar/gui/dialogs/calendar-setup.c:395
+#: ../calendar/gui/dialogs/calendar-setup.c:406
+#: ../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/calendar/e-calendar-preferences.ui.h:19
-#: ../plugins/itip-formatter/itip-formatter.c:2815
+#: ../plugins/itip-formatter/itip-formatter.c:2955
 #: ../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:387
+#: ../calendar/gui/dialogs/calendar-setup.c:407
 #: ../modules/calendar/e-calendar-preferences.ui.h:40
 msgid "Task List"
 msgstr "Oppgaveliste"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:398
+#: ../calendar/gui/dialogs/calendar-setup.c:418
 msgid "Memo List"
 msgstr "Notatliste"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:483
+#: ../calendar/gui/dialogs/calendar-setup.c:503
 msgid "Calendar Properties"
 msgstr "Kalenderegenskaper"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:483
+#: ../calendar/gui/dialogs/calendar-setup.c:503
 msgid "New Calendar"
 msgstr "Ny kalender"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:539
+#: ../calendar/gui/dialogs/calendar-setup.c:559
 msgid "Task List Properties"
 msgstr "Egenskaper for oppgaveliste"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:539
+#: ../calendar/gui/dialogs/calendar-setup.c:559
 msgid "New Task List"
 msgstr "Ny oppgaveliste"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:595
+#: ../calendar/gui/dialogs/calendar-setup.c:615
 msgid "Memo List Properties"
 msgstr "Egenskaper for notatliste"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:595
+#: ../calendar/gui/dialogs/calendar-setup.c:615
 msgid "New Memo List"
 msgstr "Ny notatliste"
 
@@ -2494,101 +2529,101 @@ msgstr "%s  Du har ikke gjort endringer. Oppdater redigering?"
 msgid "Validation error: %s"
 msgstr "Valideringsfeil: %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:260
+#: ../calendar/gui/dialogs/comp-editor.c:267
 msgid "Could not save attachments"
 msgstr "Kunne ikke lagre vedlegg"
 
-#: ../calendar/gui/dialogs/comp-editor.c:536
+#: ../calendar/gui/dialogs/comp-editor.c:589
 msgid "Could not update object"
 msgstr "Kunne ikke oppdatere objekt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:655
+#: ../calendar/gui/dialogs/comp-editor.c:715
 msgid "Edit Appointment"
 msgstr "Rediger avtale"
 
-#: ../calendar/gui/dialogs/comp-editor.c:662
+#: ../calendar/gui/dialogs/comp-editor.c:722
 #, c-format
 msgid "Meeting - %s"
 msgstr "MÃte- %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:664
+#: ../calendar/gui/dialogs/comp-editor.c:724
 #, c-format
 msgid "Appointment - %s"
 msgstr "Avtale - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:670
+#: ../calendar/gui/dialogs/comp-editor.c:730
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tildelt oppgave - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:672
+#: ../calendar/gui/dialogs/comp-editor.c:732
 #, c-format
 msgid "Task - %s"
 msgstr "Oppgave - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:677
+#: ../calendar/gui/dialogs/comp-editor.c:737
 #, c-format
 msgid "Memo - %s"
 msgstr "Notat - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:693
+#: ../calendar/gui/dialogs/comp-editor.c:753
 msgid "No Summary"
 msgstr "Ingen sammendrag"
 
-#: ../calendar/gui/dialogs/comp-editor.c:814
+#: ../calendar/gui/dialogs/comp-editor.c:874
 msgid "Keep original item?"
 msgstr "Behold opprinnelig oppfÃring?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1011
+#: ../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:1018 ../mail/e-mail-browser.c:141
+#: ../calendar/gui/dialogs/comp-editor.c:1078 ../mail/e-mail-browser.c:141
 #: ../shell/e-shell-window-actions.c:1474
 #: ../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
 msgid "Copy the selection"
 msgstr "Kopier utvalget"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1025 ../mail/e-mail-browser.c:148
+#: ../calendar/gui/dialogs/comp-editor.c:1085 ../mail/e-mail-browser.c:148
 #: ../shell/e-shell-window-actions.c:1481
 #: ../widgets/misc/e-focus-tracker.c:110 ../widgets/misc/e-focus-tracker.c:550
 #: ../widgets/misc/e-web-view.c:1274
 msgid "Cut the selection"
 msgstr "Klipp ut utvalget"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1032
+#: ../calendar/gui/dialogs/comp-editor.c:1092
 #: ../shell/e-shell-window-actions.c:1488
 #: ../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:1039
+#: ../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:1046 ../mail/e-mail-browser.c:155
+#: ../calendar/gui/dialogs/comp-editor.c:1106 ../mail/e-mail-browser.c:155
 #: ../shell/e-shell-window-actions.c:1523
 #: ../widgets/misc/e-focus-tracker.c:124 ../widgets/misc/e-focus-tracker.c:560
 #: ../widgets/misc/e-web-view.c:1286
 msgid "Paste the clipboard"
 msgstr "Lim inn fra utklippstavlen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1067
+#: ../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:1074 ../mail/e-mail-browser.c:162
+#: ../calendar/gui/dialogs/comp-editor.c:1134 ../mail/e-mail-browser.c:162
 #: ../shell/e-shell-window-actions.c:1600
 #: ../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:1081
+#: ../calendar/gui/dialogs/comp-editor.c:1141
 msgid "_Classification"
 msgstr "K_lassifisering"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../calendar/gui/dialogs/comp-editor.c:1148
 #: ../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
@@ -2597,151 +2632,155 @@ msgstr "K_lassifisering"
 msgid "_Edit"
 msgstr "R_ediger"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1095 ../mail/e-mail-browser.c:169
+#: ../calendar/gui/dialogs/comp-editor.c:1155 ../mail/e-mail-browser.c:169
 #: ../shell/e-shell-window-actions.c:1635
 #: ../widgets/misc/e-signature-editor.c:221
 msgid "_File"
 msgstr "_Fil"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1102
+#: ../calendar/gui/dialogs/comp-editor.c:1162
 #: ../shell/e-shell-window-actions.c:1642
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1109
+#: ../calendar/gui/dialogs/comp-editor.c:1169
 msgid "_Insert"
 msgstr "Sett _inn"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1116
+#: ../calendar/gui/dialogs/comp-editor.c:1176
 #: ../composer/e-composer-actions.c:340
 msgid "_Options"
 msgstr "_Alternativer"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1123 ../mail/e-mail-browser.c:183
+#: ../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
 msgid "_View"
 msgstr "_Vis"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1133
+#: ../calendar/gui/dialogs/comp-editor.c:1193
 #: ../composer/e-composer-actions.c:289
 msgid "_Attachment..."
 msgstr "_Vedlegg â"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1135
+#: ../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:1143
+#: ../calendar/gui/dialogs/comp-editor.c:1203
 msgid "_Categories"
 msgstr "_Kategorier"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1145
+#: ../calendar/gui/dialogs/comp-editor.c:1205
 msgid "Toggles whether to display categories"
 msgstr "SlÃr av/pà visning av kategorier"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1151
+#: ../calendar/gui/dialogs/comp-editor.c:1211
 msgid "Time _Zone"
 msgstr "Tids_sone"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1153
+#: ../calendar/gui/dialogs/comp-editor.c:1213
 msgid "Toggles whether the time zone is displayed"
 msgstr "SlÃr av/pà visning av tidssone"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1162
+#: ../calendar/gui/dialogs/comp-editor.c:1222
 msgid "Pu_blic"
 msgstr "O_ffentlig"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1164
+#: ../calendar/gui/dialogs/comp-editor.c:1224
 msgid "Classify as public"
 msgstr "Klassifiser som offentlig"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1169
+#: ../calendar/gui/dialogs/comp-editor.c:1229
 msgid "_Private"
 msgstr "_Privat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1171
+#: ../calendar/gui/dialogs/comp-editor.c:1231
 msgid "Classify as private"
 msgstr "Klassifiser som privat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1176
+#: ../calendar/gui/dialogs/comp-editor.c:1236
 msgid "_Confidential"
 msgstr "_Konfidensiell"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1178
+#: ../calendar/gui/dialogs/comp-editor.c:1238
 msgid "Classify as confidential"
 msgstr "Klassifiser som konfidensiell"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1186
+#: ../calendar/gui/dialogs/comp-editor.c:1246
 msgid "R_ole Field"
 msgstr "R_olle-felt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1188
+#: ../calendar/gui/dialogs/comp-editor.c:1248
 msgid "Toggles whether the Role field is displayed"
 msgstr "SlÃr av/pà visning av rolle-feltet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1194
+#: ../calendar/gui/dialogs/comp-editor.c:1254
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1196
+#: ../calendar/gui/dialogs/comp-editor.c:1256
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "SlÃr av/pà visning av RSVP-feltet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1202
+#: ../calendar/gui/dialogs/comp-editor.c:1262
 msgid "_Status Field"
 msgstr "_Status-felt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1204
+#: ../calendar/gui/dialogs/comp-editor.c:1264
 msgid "Toggles whether the Status field is displayed"
 msgstr "SlÃr av/pà visning av status-feltet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1210
+#: ../calendar/gui/dialogs/comp-editor.c:1270
 msgid "_Type Field"
 msgstr "_Type felt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1212
+#: ../calendar/gui/dialogs/comp-editor.c:1272
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "SlÃr av/pà visning av deltakertype-feltet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1236
+#: ../calendar/gui/dialogs/comp-editor.c:1296
 #: ../composer/e-composer-private.c:77
 msgid "Recent _Documents"
 msgstr "Siste _dokumenter"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1942
+#: ../calendar/gui/dialogs/comp-editor.c:2018
 #: ../composer/e-composer-actions.c:508
 msgid "Attach"
 msgstr "Legg ved"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2276
-#: ../calendar/gui/dialogs/comp-editor.c:2439
-#: ../calendar/gui/dialogs/comp-editor.c:3414
+#: ../calendar/gui/dialogs/comp-editor.c:2354
+#: ../calendar/gui/dialogs/comp-editor.c:2517
+#: ../calendar/gui/dialogs/comp-editor.c:3495
 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:3378
+#: ../calendar/gui/dialogs/comp-editor.c:3459
 #: ../plugins/prefer-plain/prefer-plain.c:64
 msgid "attachment"
 msgstr "vedlegg"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3446
+#: ../calendar/gui/dialogs/comp-editor.c:3527
 msgid "Unable to use current version!"
 msgstr "Kan ikke bruke denne versjonen!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:92
-msgid "Could not open source"
-msgstr "Kunne ikke Ãpne kilde"
-
-#: ../calendar/gui/dialogs/copy-source-dialog.c:100
+#: ../calendar/gui/dialogs/copy-source-dialog.c:108
 msgid "Could not open destination"
 msgstr "Kunne ikke Ãpne destinasjon"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:109
+#: ../calendar/gui/dialogs/copy-source-dialog.c:123
 msgid "Destination is read only"
 msgstr "Destinasjonen er skrivebeskyttet"
 
+#: ../calendar/gui/dialogs/copy-source-dialog.c:157
+msgid "Cannot create object"
+msgstr "Kan ikke lage objekt"
+
+#: ../calendar/gui/dialogs/copy-source-dialog.c:183
+msgid "Could not open source"
+msgstr "Kunne ikke Ãpne kilde"
+
 #: ../calendar/gui/dialogs/delete-comp.c:210
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "_Slett denne oppfÃringen fra andre mottakere's postbokser?"
@@ -2876,13 +2915,13 @@ 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:3172
+#: ../calendar/gui/dialogs/event-editor.c:314 ../calendar/gui/print.c:3185
 msgid "Appointment"
 msgstr "Avtale"
 
 #: ../calendar/gui/dialogs/event-editor.c:384
 #: ../calendar/gui/dialogs/event-page.ui.h:3
-#: ../calendar/gui/e-meeting-list-view.c:148
+#: ../calendar/gui/e-meeting-list-view.c:160
 msgid "Attendees"
 msgstr "Deltakere"
 
@@ -2894,74 +2933,74 @@ msgstr "Skriv ut denne hendelsen"
 msgid "Event's start time is in the past"
 msgstr "Starttid for hendelsen er passert"
 
-#: ../calendar/gui/dialogs/event-page.c:634
+#: ../calendar/gui/dialogs/event-page.c:633
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr "Hendelsen kan ikke redigeres fordi kalenderen er skrivebeskyttet"
 
-#: ../calendar/gui/dialogs/event-page.c:638
+#: ../calendar/gui/dialogs/event-page.c:637
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "Hendelsen kan ikke redigeres i sin helhet fordi du ikke er organisator"
 
-#: ../calendar/gui/dialogs/event-page.c:650
-#: ../calendar/gui/dialogs/event-page.c:3010
+#: ../calendar/gui/dialogs/event-page.c:649
+#: ../calendar/gui/dialogs/event-page.c:3021
 msgid "This event has alarms"
 msgstr "Denne hendelsen har varsel"
 
-#: ../calendar/gui/dialogs/event-page.c:717
+#: ../calendar/gui/dialogs/event-page.c:716
 #: ../calendar/gui/dialogs/event-page.ui.h:8
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
 msgid "Or_ganizer:"
 msgstr "Or_ganisator:"
 
-#: ../calendar/gui/dialogs/event-page.c:1250
+#: ../calendar/gui/dialogs/event-page.c:1254
 msgid "Event with no start date"
 msgstr "Hendelse uten startdato"
 
-#: ../calendar/gui/dialogs/event-page.c:1253
+#: ../calendar/gui/dialogs/event-page.c:1257
 msgid "Event with no end date"
 msgstr "Hendelse uten sluttdato"
 
-#: ../calendar/gui/dialogs/event-page.c:1426
-#: ../calendar/gui/dialogs/memo-page.c:692
-#: ../calendar/gui/dialogs/task-page.c:845
+#: ../calendar/gui/dialogs/event-page.c:1430
+#: ../calendar/gui/dialogs/memo-page.c:695
+#: ../calendar/gui/dialogs/task-page.c:843
 msgid "Start date is wrong"
 msgstr "Startdato er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:1436
+#: ../calendar/gui/dialogs/event-page.c:1440
 msgid "End date is wrong"
 msgstr "Sluttdato er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:1459
+#: ../calendar/gui/dialogs/event-page.c:1463
 msgid "Start time is wrong"
 msgstr "Tid for start er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:1466
+#: ../calendar/gui/dialogs/event-page.c:1470
 msgid "End time is wrong"
 msgstr "Tid for slutt er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:1631
-#: ../calendar/gui/dialogs/memo-page.c:733
-#: ../calendar/gui/dialogs/task-page.c:907
+#: ../calendar/gui/dialogs/event-page.c:1635
+#: ../calendar/gui/dialogs/memo-page.c:736
+#: ../calendar/gui/dialogs/task-page.c:905
 msgid "An organizer is required."
 msgstr "En organisator kreves."
 
-#: ../calendar/gui/dialogs/event-page.c:1665
-#: ../calendar/gui/dialogs/task-page.c:941
+#: ../calendar/gui/dialogs/event-page.c:1669
+#: ../calendar/gui/dialogs/task-page.c:939
 msgid "At least one attendee is required."
 msgstr "Minst en deltaker kreves."
 
-#: ../calendar/gui/dialogs/event-page.c:1865
+#: ../calendar/gui/dialogs/event-page.c:1869
 msgid "_Delegatees"
 msgstr "_Delegater"
 
-#: ../calendar/gui/dialogs/event-page.c:1867
+#: ../calendar/gui/dialogs/event-page.c:1871
 msgid "Atte_ndees"
 msgstr "De_ltakere"
 
-#: ../calendar/gui/dialogs/event-page.c:2884
+#: ../calendar/gui/dialogs/event-page.c:2891
 #, c-format
-msgid "Unable to open the calendar '%s'."
-msgstr "Kunne ikke Ãpne kalender Â%sÂ."
+msgid "Unable to open the calendar '%s': %s"
+msgstr "Kan ikke Ãpne kalenderen Â%sÂ: %s"
 
 #. Translators: This string is used when we are creating an Event
 #. (meeting or appointment)  on behalf of some other user
@@ -2969,40 +3008,40 @@ msgstr "Kunne ikke Ãpne kalender Â%sÂ."
 #. on behalf of some other user
 #. Translators: This string is used when we are creating a Task
 #. on behalf of some other user
-#: ../calendar/gui/dialogs/event-page.c:2928
-#: ../calendar/gui/dialogs/memo-page.c:956
-#: ../calendar/gui/dialogs/task-page.c:1849
+#: ../calendar/gui/dialogs/event-page.c:2939
+#: ../calendar/gui/dialogs/memo-page.c:967
+#: ../calendar/gui/dialogs/task-page.c:1855
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Du opptrer pà vegne av %s"
 
-#: ../calendar/gui/dialogs/event-page.c:3239
+#: ../calendar/gui/dialogs/event-page.c:3250
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d dag fÃr avtalen"
 msgstr[1] "%d dager fÃr avtalen"
 
-#: ../calendar/gui/dialogs/event-page.c:3245
+#: ../calendar/gui/dialogs/event-page.c:3256
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d time fÃr avtalen"
 msgstr[1] "%d timer fÃr avtalen"
 
-#: ../calendar/gui/dialogs/event-page.c:3251
+#: ../calendar/gui/dialogs/event-page.c:3262
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minutt fÃr avtalen"
 msgstr[1] "%d minutter fÃr avtalen"
 
-#: ../calendar/gui/dialogs/event-page.c:3270
+#: ../calendar/gui/dialogs/event-page.c:3281
 msgid "Customize"
 msgstr "Tilpass"
 
 #. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:3276
+#: ../calendar/gui/dialogs/event-page.c:3287
 msgctxt "cal-alarms"
 msgid "None"
 msgstr "Ingen"
@@ -3129,7 +3168,7 @@ msgid "Select Date"
 msgstr "Velg dato"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:13
-#: ../modules/calendar/e-cal-shell-view-actions.c:1322
+#: ../modules/calendar/e-cal-shell-view-actions.c:1330
 msgid "Select _Today"
 msgstr "Velg i _dag"
 
@@ -3137,7 +3176,7 @@ msgstr "Velg i _dag"
 msgid "September"
 msgstr "September"
 
-#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3176
+#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3189
 msgid "Memo"
 msgstr "Notat"
 
@@ -3145,26 +3184,26 @@ msgstr "Notat"
 msgid "Print this memo"
 msgstr "Skriv ut dette notatet"
 
-#: ../calendar/gui/dialogs/memo-page.c:387
+#: ../calendar/gui/dialogs/memo-page.c:393
 msgid "Memo's start date is in the past"
 msgstr "Startdato for notatet er passert"
 
-#: ../calendar/gui/dialogs/memo-page.c:425
+#: ../calendar/gui/dialogs/memo-page.c:430
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr "Notatet kan ikke redigeres fordi valgt notatliste er skrivebeskyttet"
 
-#: ../calendar/gui/dialogs/memo-page.c:429
+#: ../calendar/gui/dialogs/memo-page.c:434
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "Notatet kan ikke redigeres i sin helhet fordi du ikke er organisator"
 
-#: ../calendar/gui/dialogs/memo-page.c:917
+#: ../calendar/gui/dialogs/memo-page.c:924
 #, c-format
-msgid "Unable to open memos in '%s'."
-msgstr "Kan ikke Ãpne notater i Â%sÂ."
+msgid "Unable to open memos in '%s': %s"
+msgstr "Kan ikke Ãpne notater i Â%sÂ: %s"
 
-#: ../calendar/gui/dialogs/memo-page.c:1088 ../em-format/em-format-quote.c:284
-#: ../em-format/em-format.c:1056 ../mail/em-format-html.c:2478
-#: ../mail/em-format-html.c:2543 ../mail/em-format-html.c:2567
+#: ../calendar/gui/dialogs/memo-page.c:1099 ../em-format/em-format-quote.c:284
+#: ../em-format/em-format.c:1056 ../mail/em-format-html.c:2487
+#: ../mail/em-format-html.c:2552 ../mail/em-format-html.c:2576
 #: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:72
 msgid "To"
 msgstr "Til"
@@ -3184,7 +3223,7 @@ msgid "T_o:"
 msgstr "T_il:"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.c:332
+#: ../calendar/gui/dialogs/task-page.c:331
 #: ../calendar/gui/dialogs/task-page.ui.h:9
 msgid "_Group:"
 msgstr "_Gruppe:"
@@ -3230,17 +3269,17 @@ 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:895
+#: ../calendar/gui/dialogs/recurrence-page.c:894
 msgid "Recurrence date is invalid"
 msgstr "Gjenintreffingsdato er ugyldig"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:935
+#: ../calendar/gui/dialogs/recurrence-page.c:934
 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:965
+#: ../calendar/gui/dialogs/recurrence-page.c:964
 msgid "on"
 msgstr "pÃ"
 
@@ -3248,7 +3287,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:1023
+#: ../calendar/gui/dialogs/recurrence-page.c:1022
 msgid "first"
 msgstr "fÃrste"
 
@@ -3257,7 +3296,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:1029
+#: ../calendar/gui/dialogs/recurrence-page.c:1028
 msgid "second"
 msgstr "sekund"
 
@@ -3265,7 +3304,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:1034
+#: ../calendar/gui/dialogs/recurrence-page.c:1033
 msgid "third"
 msgstr "tredje"
 
@@ -3273,7 +3312,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:1039
+#: ../calendar/gui/dialogs/recurrence-page.c:1038
 msgid "fourth"
 msgstr "fjerde"
 
@@ -3281,7 +3320,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:1044
+#: ../calendar/gui/dialogs/recurrence-page.c:1043
 msgid "fifth"
 msgstr "femte"
 
@@ -3289,13 +3328,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:1049
+#: ../calendar/gui/dialogs/recurrence-page.c:1048
 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:1073
+#: ../calendar/gui/dialogs/recurrence-page.c:1072
 msgid "Other Date"
 msgstr "Annen dato"
 
@@ -3303,7 +3342,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:1079
+#: ../calendar/gui/dialogs/recurrence-page.c:1078
 msgid "1st to 10th"
 msgstr "FÃrste til tiende"
 
@@ -3311,7 +3350,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:1085
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
 msgid "11th to 20th"
 msgstr "ellevte til tjuende"
 
@@ -3319,41 +3358,41 @@ msgstr "ellevte til tjuende"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1091
+#: ../calendar/gui/dialogs/recurrence-page.c:1090
 msgid "21st to 31st"
 msgstr "tjuefÃrste til trettifÃrste"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
 #: ../modules/calendar/e-calendar-preferences.ui.h:22
 msgid "Monday"
 msgstr "Mandag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
 #: ../modules/calendar/e-calendar-preferences.ui.h:46
 msgid "Tuesday"
 msgstr "Tirsdag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1119
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
 #: ../modules/calendar/e-calendar-preferences.ui.h:48
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1120
+#: ../calendar/gui/dialogs/recurrence-page.c:1119
 #: ../modules/calendar/e-calendar-preferences.ui.h:42
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1121
+#: ../calendar/gui/dialogs/recurrence-page.c:1120
 #: ../modules/calendar/e-calendar-preferences.ui.h:18
 msgid "Friday"
 msgstr "Fredag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1122
+#: ../calendar/gui/dialogs/recurrence-page.c:1121
 #: ../modules/calendar/e-calendar-preferences.ui.h:26
 msgid "Saturday"
 msgstr "LÃrdag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1123
+#: ../calendar/gui/dialogs/recurrence-page.c:1122
 #: ../modules/calendar/e-calendar-preferences.ui.h:36
 msgid "Sunday"
 msgstr "SÃndag"
@@ -3361,31 +3400,31 @@ msgstr "SÃndag"
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1245
+#: ../calendar/gui/dialogs/recurrence-page.c:1244
 msgid "on the"
 msgstr "den"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1419
+#: ../calendar/gui/dialogs/recurrence-page.c:1418
 msgid "occurrences"
 msgstr "gjentakelser"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2123
+#: ../calendar/gui/dialogs/recurrence-page.c:2128
 msgid "Add exception"
 msgstr "Legg til unntak"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2164
+#: ../calendar/gui/dialogs/recurrence-page.c:2169
 msgid "Could not get a selection to modify."
 msgstr "Fant ikke et utvalg à endre."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2170
+#: ../calendar/gui/dialogs/recurrence-page.c:2175
 msgid "Modify exception"
 msgstr "Endre unntak"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2214
+#: ../calendar/gui/dialogs/recurrence-page.c:2219
 msgid "Could not get a selection to delete."
 msgstr "Fant ikke et utvalg à slette."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2348
+#: ../calendar/gui/dialogs/recurrence-page.c:2353
 msgid "Date/Time"
 msgstr "Dato/klokkeslett"
 
@@ -3455,12 +3494,12 @@ msgstr "Send mine alarmer med denne hendelsen"
 msgid "Notify new attendees _only"
 msgstr "Varsle _kun nye deltakere"
 
-#: ../calendar/gui/dialogs/task-details-page.c:352
-#: ../calendar/gui/dialogs/task-details-page.c:374
+#: ../calendar/gui/dialogs/task-details-page.c:351
+#: ../calendar/gui/dialogs/task-details-page.c:373
 msgid "Completed date is wrong"
 msgstr "Dato for ferdigstilling er feil"
 
-#: ../calendar/gui/dialogs/task-details-page.c:489
+#: ../calendar/gui/dialogs/task-details-page.c:488
 msgid "Web Page"
 msgstr "Nettside"
 
@@ -3469,8 +3508,8 @@ msgstr "Nettside"
 #: ../calendar/gui/e-cal-component-preview.c:298
 #: ../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:596
-#: ../calendar/gui/print.c:3262 ../mail/em-sync-stream.c:152
+#: ../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
 #: ../mail/em-sync-stream.c:180 ../mail/em-sync-stream.c:202
 #, c-format
 msgid "Canceled"
@@ -3483,15 +3522,15 @@ msgstr "Avbrutt"
 #: ../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:595 ../calendar/gui/print.c:3259
-#: ../calendar/gui/tasktypes.xml.h:9 ../plugins/save-calendar/csv-format.c:367
+#: ../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
 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:516 ../calendar/gui/tasktypes.xml.h:14
+#: ../calendar/gui/e-task-table.c:514 ../calendar/gui/tasktypes.xml.h:14
 #: ../mail/message-list.c:1224 ../widgets/misc/e-send-options.ui.h:13
 msgid "High"
 msgstr "HÃy"
@@ -3502,15 +3541,15 @@ msgstr "HÃy"
 #: ../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:594
-#: ../calendar/gui/print.c:3256
+#: ../calendar/gui/e-task-table.c:221 ../calendar/gui/e-task-table.c:592
+#: ../calendar/gui/print.c:3269
 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:518 ../calendar/gui/tasktypes.xml.h:16
+#: ../calendar/gui/e-task-table.c:516 ../calendar/gui/tasktypes.xml.h:16
 #: ../mail/message-list.c:1222 ../widgets/misc/e-send-options.ui.h:14
 msgid "Low"
 msgstr "Lav"
@@ -3518,7 +3557,7 @@ 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:1521 ../calendar/gui/e-task-table.c:517
+#: ../calendar/gui/e-cal-model.c:1528 ../calendar/gui/e-task-table.c:515
 #: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1223
 #: ../widgets/misc/e-send-options.ui.h:16
 msgid "Normal"
@@ -3529,8 +3568,8 @@ msgstr "Normal"
 #: ../calendar/gui/e-cal-component-preview.c:302
 #: ../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:593
-#: ../calendar/gui/print.c:3253 ../calendar/gui/tasktypes.xml.h:18
+#: ../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
 msgid "Not Started"
 msgstr "Ikke startet"
 
@@ -3546,8 +3585,8 @@ msgstr "Stat_us:"
 #. Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/dialogs/task-details-page.ui.h:18
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:1833
-#: ../calendar/gui/e-meeting-list-view.c:596
+#: ../calendar/gui/e-calendar-view.c:1831
+#: ../calendar/gui/e-meeting-list-view.c:610
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
 #: ../mail/message-list.etspec.h:17
@@ -3556,7 +3595,7 @@ msgstr "Status"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:519 ../calendar/gui/tasktypes.xml.h:24
+#: ../calendar/gui/e-task-table.c:517 ../calendar/gui/tasktypes.xml.h:24
 #: ../widgets/misc/e-send-options.ui.h:27
 msgid "Undefined"
 msgstr "Udefinert"
@@ -3586,7 +3625,7 @@ 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:3174
+#: ../calendar/gui/dialogs/task-editor.c:319 ../calendar/gui/print.c:3187
 #: ../widgets/misc/e-send-options.c:526
 msgid "Task"
 msgstr "Oppgave"
@@ -3607,28 +3646,28 @@ msgstr "Startdato for oppgaven er passert"
 msgid "Task's due date is in the past"
 msgstr "Ferdigdato for oppgaven er passert"
 
-#: ../calendar/gui/dialogs/task-page.c:285
+#: ../calendar/gui/dialogs/task-page.c:284
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr ""
 "Oppgaven kan ikke redigeres fordi valgt oppgaveliste er skrivebeskyttet"
 
-#: ../calendar/gui/dialogs/task-page.c:289
+#: ../calendar/gui/dialogs/task-page.c:288
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr "Oppgaven kan ikke redigeres i sin helhet fordi du ikke er organisator"
 
-#: ../calendar/gui/dialogs/task-page.c:340
+#: ../calendar/gui/dialogs/task-page.c:339
 #: ../calendar/gui/dialogs/task-page.ui.h:4
 msgid "Organi_zer:"
 msgstr "Organi_sator:"
 
-#: ../calendar/gui/dialogs/task-page.c:818
+#: ../calendar/gui/dialogs/task-page.c:816
 msgid "Due date is wrong"
 msgstr "Ferdigdato er feil"
 
-#: ../calendar/gui/dialogs/task-page.c:1806
+#: ../calendar/gui/dialogs/task-page.c:1808
 #, c-format
-msgid "Unable to open tasks in '%s'."
-msgstr "Kan ikke Ãpne oppgaver i Â%sÂ."
+msgid "Unable to open tasks in '%s': %s"
+msgstr "Kan ikke Ãpne oppgaver i Â%sÂ: %s"
 
 #: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Categor_ies..."
@@ -3718,7 +3757,7 @@ 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:667
+#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:669
 msgid "Untitled"
 msgstr "Uten navn"
 
@@ -3741,7 +3780,7 @@ msgstr "Ferdig-dato:"
 
 #. Status
 #: ../calendar/gui/e-cal-component-preview.c:288
-#: ../plugins/itip-formatter/itip-view.c:1075
+#: ../plugins/itip-formatter/itip-view.c:1076
 msgid "Status:"
 msgstr "Status:"
 
@@ -3760,7 +3799,7 @@ 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:368
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "Created"
 msgstr "Opprettet"
 
@@ -3780,12 +3819,12 @@ msgid "Start Date"
 msgstr "Startdato"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-task-table.c:570
+#: ../calendar/gui/e-task-table.c:568
 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:571
+#: ../calendar/gui/e-meeting-time-sel.c:546 ../calendar/gui/e-task-table.c:569
 msgid "Busy"
 msgstr "Opptatt"
 
@@ -3805,39 +3844,39 @@ msgctxt "cal-task-status"
 msgid "None"
 msgstr "Ingen"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1061 ../calendar/gui/e-cal-model.c:1527
-#: ../calendar/gui/e-meeting-list-view.c:187
+#: ../calendar/gui/e-cal-model-tasks.c:1061 ../calendar/gui/e-cal-model.c:1534
+#: ../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:1527
-#: ../calendar/gui/e-meeting-list-view.c:188
+#: ../calendar/gui/e-cal-model-tasks.c:1061 ../calendar/gui/e-cal-model.c:1534
+#: ../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:774 ../calendar/gui/e-meeting-list-view.c:163
-#: ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-cal-model.c:771 ../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:1091
-#: ../calendar/gui/print.c:1108 ../e-util/e-charset.c:52
+#: ../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:457
-#: ../plugins/itip-formatter/itip-formatter.c:2482
+#: ../plugins/itip-formatter/itip-formatter.c:462
+#: ../plugins/itip-formatter/itip-formatter.c:2617
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: ../calendar/gui/e-cal-model.c:1523
+#: ../calendar/gui/e-cal-model.c:1530
 msgid "Recurring"
 msgstr "Gjeninntreffer"
 
-#: ../calendar/gui/e-cal-model.c:1525
+#: ../calendar/gui/e-cal-model.c:1532
 msgid "Assigned"
 msgstr "Tildelt"
 
-#: ../calendar/gui/e-cal-model.c:2643
+#: ../calendar/gui/e-cal-model.c:2714
 #, c-format
 msgid "Opening %s"
 msgstr "Ãpner %s"
@@ -3865,7 +3904,7 @@ msgstr "Ferdigdato"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:20
-#: ../plugins/save-calendar/csv-format.c:374
+#: ../plugins/save-calendar/csv-format.c:381
 msgid "Priority"
 msgstr "Prioritet"
 
@@ -3874,76 +3913,76 @@ msgid "Start date"
 msgstr "Startdato"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-meeting-list-view.c:559
+#: ../calendar/gui/e-meeting-list-view.c:573
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:7
 #: ../widgets/misc/e-attachment-tree-view.c:584
 msgid "Type"
 msgstr "Type"
 
-#: ../calendar/gui/e-calendar-view.c:422
+#: ../calendar/gui/e-calendar-view.c:420
 msgid "Cut selected events to the clipboard"
 msgstr "Klipp ut valgte hendelser til utklippstavlen"
 
-#: ../calendar/gui/e-calendar-view.c:428
+#: ../calendar/gui/e-calendar-view.c:426
 msgid "Copy selected events to the clipboard"
 msgstr "Kopier valgte hendelser til utklippstavlen"
 
-#: ../calendar/gui/e-calendar-view.c:434
+#: ../calendar/gui/e-calendar-view.c:432
 msgid "Paste events from the clipboard"
 msgstr "Lim inn hendelser fra utklippstavlen"
 
-#: ../calendar/gui/e-calendar-view.c:440
+#: ../calendar/gui/e-calendar-view.c:438
 msgid "Delete selected events"
 msgstr "Slett valgte hendelser"
 
-#: ../calendar/gui/e-calendar-view.c:459 ../calendar/gui/e-memo-table.c:183
-#: ../calendar/gui/e-task-table.c:261
+#: ../calendar/gui/e-calendar-view.c:457 ../calendar/gui/e-memo-table.c:182
+#: ../calendar/gui/e-task-table.c:260
 msgid "Deleting selected objects"
 msgstr "Sletter valgte objekter"
 
-#: ../calendar/gui/e-calendar-view.c:653 ../calendar/gui/e-memo-table.c:855
-#: ../calendar/gui/e-task-table.c:1086
+#: ../calendar/gui/e-calendar-view.c:648 ../calendar/gui/e-memo-table.c:852
+#: ../calendar/gui/e-task-table.c:1082
 msgid "Updating objects"
 msgstr "Oppdaterer objekter"
 
-#: ../calendar/gui/e-calendar-view.c:1780
-#: ../calendar/gui/e-meeting-list-view.c:199
+#: ../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:2470
+#: ../plugins/itip-formatter/itip-formatter.c:2605
 msgid "Accepted"
 msgstr "Godtatt"
 
-#: ../calendar/gui/e-calendar-view.c:1781
-#: ../calendar/gui/e-meeting-list-view.c:200
+#: ../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:2476
+#: ../plugins/itip-formatter/itip-formatter.c:2611
 msgid "Declined"
 msgstr "AvslÃtt"
 
-#: ../calendar/gui/e-calendar-view.c:1782
-#: ../calendar/gui/e-meeting-list-view.c:201
+#: ../calendar/gui/e-calendar-view.c:1780
+#: ../calendar/gui/e-meeting-list-view.c:215
 #: ../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
 #: ../calendar/gui/e-meeting-time-sel.c:545
 msgid "Tentative"
 msgstr "Tentativ"
 
-#: ../calendar/gui/e-calendar-view.c:1783
-#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../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:2479
+#: ../plugins/itip-formatter/itip-formatter.c:2614
 msgid "Delegated"
 msgstr "Delegert"
 
-#: ../calendar/gui/e-calendar-view.c:1784
+#: ../calendar/gui/e-calendar-view.c:1782
 msgid "Needs action"
 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:1928 ../calendar/gui/e-memo-table.c:538
-#: ../calendar/gui/e-task-table.c:760
+#: ../calendar/gui/e-calendar-view.c:1926 ../calendar/gui/e-memo-table.c:537
+#: ../calendar/gui/e-task-table.c:758
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organisator: %s <%s>"
@@ -3951,20 +3990,20 @@ 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:1932 ../calendar/gui/e-memo-table.c:543
-#: ../calendar/gui/e-task-table.c:764
+#: ../calendar/gui/e-calendar-view.c:1930 ../calendar/gui/e-memo-table.c:542
+#: ../calendar/gui/e-task-table.c:762
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organisator: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1948 ../calendar/gui/print.c:3208
+#: ../calendar/gui/e-calendar-view.c:1946 ../calendar/gui/print.c:3221
 #, c-format
 msgid "Location: %s"
 msgstr "Sted: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1979
+#: ../calendar/gui/e-calendar-view.c:1977
 #, c-format
 msgid "Time: %s %s"
 msgstr "Tidspunkt: %s %s"
@@ -3992,27 +4031,27 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:804
+#: ../calendar/gui/e-day-view-time-item.c:806
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minutters oppdeling"
 
-#: ../calendar/gui/e-day-view-time-item.c:825
+#: ../calendar/gui/e-day-view-time-item.c:827
 msgid "Show the second time zone"
 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:842
+#: ../calendar/gui/e-day-view-time-item.c:844
 #: ../modules/calendar/e-calendar-preferences.ui.h:76
-#: ../modules/calendar/e-calendar-preferences.c:178
-#: ../modules/calendar/e-calendar-preferences.c:227
+#: ../modules/calendar/e-calendar-preferences.c:179
+#: ../modules/calendar/e-calendar-preferences.c:228
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "Ingen"
 
-#: ../calendar/gui/e-day-view-time-item.c:870
+#: ../calendar/gui/e-day-view-time-item.c:876
 #: ../calendar/gui/e-timezone-entry.c:319
-#: ../modules/calendar/e-calendar-preferences.c:254
+#: ../modules/calendar/e-calendar-preferences.c:255
 msgid "Select..."
 msgstr "Velg â"
 
@@ -4022,8 +4061,8 @@ msgstr "Velg â"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:841 ../calendar/gui/e-day-view.c:1793
-#: ../calendar/gui/e-week-view-main-item.c:209 ../calendar/gui/print.c:1866
+#: ../calendar/gui/e-day-view-top-item.c:848 ../calendar/gui/e-day-view.c:1793
+#: ../calendar/gui/e-week-view-main-item.c:215 ../calendar/gui/print.c:1875
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -4033,10 +4072,10 @@ msgstr "%A %d %B"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:845 ../calendar/gui/e-day-view.c:1810
-#: ../calendar/gui/e-week-view-main-item.c:218
+#: ../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:1017
+#: ../modules/calendar/e-cal-shell-view-private.c:1015
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -4045,24 +4084,24 @@ msgstr "%a %d %b"
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:849 ../calendar/gui/e-day-view.c:1826
-#: ../calendar/gui/e-week-view-main-item.c:232
+#: ../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:1053
+#: ../modules/calendar/e-cal-shell-view-private.c:1051
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1002 ../calendar/gui/e-week-view.c:757
-#: ../calendar/gui/print.c:919 ../calendar/gui/print.c:938
-#: ../calendar/gui/print.c:2363 ../calendar/gui/print.c:2383
+#: ../calendar/gui/e-day-view.c:1002 ../calendar/gui/e-week-view.c:756
+#: ../calendar/gui/print.c:926 ../calendar/gui/print.c:945
+#: ../calendar/gui/print.c:2372 ../calendar/gui/print.c:2392
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1005 ../calendar/gui/e-week-view.c:760
-#: ../calendar/gui/print.c:924 ../calendar/gui/print.c:940
-#: ../calendar/gui/print.c:2368 ../calendar/gui/print.c:2385
+#: ../calendar/gui/e-day-view.c:1005 ../calendar/gui/e-week-view.c:759
+#: ../calendar/gui/print.c:931 ../calendar/gui/print.c:947
+#: ../calendar/gui/print.c:2377 ../calendar/gui/print.c:2394
 msgid "pm"
 msgstr "pm"
 
@@ -4088,67 +4127,67 @@ msgstr "Valgfrie deltakere"
 msgid "Resources"
 msgstr "Ressurser"
 
-#: ../calendar/gui/e-meeting-list-view.c:159
+#: ../calendar/gui/e-meeting-list-view.c:173
 #: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:128
-#: ../calendar/gui/e-meeting-store.c:1022 ../calendar/gui/print.c:1087
+#: ../calendar/gui/e-meeting-store.c:1022 ../calendar/gui/print.c:1094
 msgid "Individual"
 msgstr "Individuell"
 
-#: ../calendar/gui/e-meeting-list-view.c:160
+#: ../calendar/gui/e-meeting-list-view.c:174
 #: ../calendar/gui/e-meeting-store.c:113 ../calendar/gui/e-meeting-store.c:130
-#: ../calendar/gui/print.c:1088 ../widgets/table/e-table-config.ui.h:7
+#: ../calendar/gui/print.c:1095 ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../calendar/gui/e-meeting-list-view.c:161
+#: ../calendar/gui/e-meeting-list-view.c:175
 #: ../calendar/gui/e-meeting-store.c:115 ../calendar/gui/e-meeting-store.c:132
-#: ../calendar/gui/print.c:1089
+#: ../calendar/gui/print.c:1096
 msgid "Resource"
 msgstr "Ressurs"
 
-#: ../calendar/gui/e-meeting-list-view.c:162
+#: ../calendar/gui/e-meeting-list-view.c:176
 #: ../calendar/gui/e-meeting-store.c:117 ../calendar/gui/e-meeting-store.c:134
-#: ../calendar/gui/print.c:1090
+#: ../calendar/gui/print.c:1097
 msgid "Room"
 msgstr "Rom"
 
-#: ../calendar/gui/e-meeting-list-view.c:173
+#: ../calendar/gui/e-meeting-list-view.c:187
 #: ../calendar/gui/e-meeting-store.c:146 ../calendar/gui/e-meeting-store.c:163
-#: ../calendar/gui/print.c:1104
+#: ../calendar/gui/print.c:1111
 msgid "Chair"
 msgstr "Styremedlem"
 
-#: ../calendar/gui/e-meeting-list-view.c:174
+#: ../calendar/gui/e-meeting-list-view.c:188
 #: ../calendar/gui/e-meeting-store.c:148 ../calendar/gui/e-meeting-store.c:165
-#: ../calendar/gui/e-meeting-store.c:1025 ../calendar/gui/print.c:1105
+#: ../calendar/gui/e-meeting-store.c:1025 ../calendar/gui/print.c:1112
 msgid "Required Participant"
 msgstr "Obligatorisk deltaker"
 
-#: ../calendar/gui/e-meeting-list-view.c:175
+#: ../calendar/gui/e-meeting-list-view.c:189
 #: ../calendar/gui/e-meeting-store.c:150 ../calendar/gui/e-meeting-store.c:167
-#: ../calendar/gui/print.c:1106
+#: ../calendar/gui/print.c:1113
 msgid "Optional Participant"
 msgstr "Valgfri deltaker"
 
-#: ../calendar/gui/e-meeting-list-view.c:176
+#: ../calendar/gui/e-meeting-list-view.c:190
 #: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:169
-#: ../calendar/gui/print.c:1107
+#: ../calendar/gui/print.c:1114
 msgid "Non-Participant"
 msgstr "Ikke-deltaker"
 
-#: ../calendar/gui/e-meeting-list-view.c:198
+#: ../calendar/gui/e-meeting-list-view.c:212
 #: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
 #: ../calendar/gui/e-meeting-store.c:1035
 msgid "Needs Action"
 msgstr "Trenger handling"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:539
+#: ../calendar/gui/e-meeting-list-view.c:553
 msgid "Attendee                          "
 msgstr "Deltaker                          "
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:584
+#: ../calendar/gui/e-meeting-list-view.c:598
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4157,18 +4196,26 @@ msgstr "RSVP"
 msgid "In Process"
 msgstr "Under arbeid"
 
-#: ../calendar/gui/e-meeting-store.c:1812
+#: ../calendar/gui/e-meeting-store.c:1834
 #, 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:1822
+#: ../calendar/gui/e-meeting-store.c:1844
 #, c-format
 msgid "Failure reason: %s"
 msgstr "FeilÃrsak: %s"
 
+#: ../calendar/gui/e-meeting-store.c:1849
+#: ../plugins/caldav/caldav-browse-server.c:920
+#: ../plugins/google-account-setup/google-source.c:444
+#: ../plugins/publish-calendar/publish-calendar.c:332
+#: ../smime/gui/component.c:49
+msgid "Enter password"
+msgstr "Oppgi passord"
+
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:431
@@ -4275,8 +4322,8 @@ msgstr "SprÃk"
 msgid "Member"
 msgstr "Medlem"
 
-#: ../calendar/gui/e-memo-table.c:419
-#: ../modules/calendar/e-cal-shell-content.c:473
+#: ../calendar/gui/e-memo-table.c:418
+#: ../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.c:293
@@ -4284,38 +4331,38 @@ msgstr "Medlem"
 msgid "Memos"
 msgstr "Notater"
 
-#: ../calendar/gui/e-memo-table.c:500 ../calendar/gui/e-task-table.c:723
+#: ../calendar/gui/e-memo-table.c:499 ../calendar/gui/e-task-table.c:721
 msgid "* No Summary *"
 msgstr "* Ingen sammendrag *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:585 ../calendar/gui/e-task-table.c:805
+#: ../calendar/gui/e-memo-table.c:584 ../calendar/gui/e-task-table.c:803
 msgid "Start: "
 msgstr "Start: "
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:604 ../calendar/gui/e-task-table.c:823
+#: ../calendar/gui/e-memo-table.c:603 ../calendar/gui/e-task-table.c:821
 msgid "Due: "
 msgstr "Ferdig: "
 
-#: ../calendar/gui/e-memo-table.c:720
+#: ../calendar/gui/e-memo-table.c:717
 msgid "Cut selected memos to the clipboard"
 msgstr "Klipp ut valgte notater til utklippstavlen"
 
-#: ../calendar/gui/e-memo-table.c:726
+#: ../calendar/gui/e-memo-table.c:723
 msgid "Copy selected memos to the clipboard"
 msgstr "Kopier valgte notater til utklippstavlen"
 
-#: ../calendar/gui/e-memo-table.c:732
+#: ../calendar/gui/e-memo-table.c:729
 msgid "Paste memos from the clipboard"
 msgstr "Lim inn notater fra utklippstavlen"
 
-#: ../calendar/gui/e-memo-table.c:738
-#: ../modules/calendar/e-memo-shell-view-actions.c:576
+#: ../calendar/gui/e-memo-table.c:735
+#: ../modules/calendar/e-memo-shell-view-actions.c:573
 msgid "Delete selected memos"
 msgstr "Slett valgt notat"
 
-#: ../calendar/gui/e-memo-table.c:744
+#: ../calendar/gui/e-memo-table.c:741
 msgid "Select all visible memos"
 msgstr "Velg alle synlige notater"
 
@@ -4327,15 +4374,15 @@ 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:545
+#: ../calendar/gui/e-task-table.c:543
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:642 ../calendar/gui/print.c:2159
-#: ../calendar/importers/icalendar-importer.c:81
-#: ../calendar/importers/icalendar-importer.c:828
-#: ../modules/calendar/e-cal-shell-content.c:434
+#: ../calendar/gui/e-task-table.c:640 ../calendar/gui/print.c:2168
+#: ../calendar/importers/icalendar-importer.c:85
+#: ../calendar/importers/icalendar-importer.c:971
+#: ../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.c:448
@@ -4343,24 +4390,24 @@ msgstr "%d%%"
 msgid "Tasks"
 msgstr "Oppgaver"
 
-#: ../calendar/gui/e-task-table.c:951
+#: ../calendar/gui/e-task-table.c:947
 msgid "Cut selected tasks to the clipboard"
 msgstr "Klipp ut valgte oppgaver til utklippstavlen"
 
-#: ../calendar/gui/e-task-table.c:957
+#: ../calendar/gui/e-task-table.c:953
 msgid "Copy selected tasks to the clipboard"
 msgstr "Kopier valgte oppgaver til utklippstavlen"
 
-#: ../calendar/gui/e-task-table.c:963
+#: ../calendar/gui/e-task-table.c:959
 msgid "Paste tasks from the clipboard"
 msgstr "Lim inn oppgaver fra utklippstavlen"
 
-#: ../calendar/gui/e-task-table.c:969
-#: ../modules/calendar/e-task-shell-view-actions.c:700
+#: ../calendar/gui/e-task-table.c:965
+#: ../modules/calendar/e-task-shell-view-actions.c:697
 msgid "Delete selected tasks"
 msgstr "Slett valgte oppgaver"
 
-#: ../calendar/gui/e-task-table.c:975
+#: ../calendar/gui/e-task-table.c:971
 msgid "Select all visible tasks"
 msgstr "Velg alle synlige oppgaver"
 
@@ -4371,7 +4418,7 @@ msgstr "Velg tidssone"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:226 ../calendar/gui/print.c:1847
+#: ../calendar/gui/e-week-view-main-item.c:232 ../calendar/gui/print.c:1856
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -4387,20 +4434,20 @@ msgstr "Har gjeninntreffelse"
 msgid "It is a meeting."
 msgstr "Er et mÃte."
 
-#: ../calendar/gui/ea-cal-view-event.c:302
+#: ../calendar/gui/ea-cal-view-event.c:303
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Kalenderhendelse: Sammendraget er %s."
 
-#: ../calendar/gui/ea-cal-view-event.c:304
+#: ../calendar/gui/ea-cal-view-event.c:306
 msgid "Calendar Event: It has no summary."
 msgstr "Kalenderhendlelse: Har ikke sammendrag."
 
-#: ../calendar/gui/ea-cal-view-event.c:326
+#: ../calendar/gui/ea-cal-view-event.c:328
 msgid "calendar view event"
 msgstr "vis kalenderhendelse"
 
-#: ../calendar/gui/ea-cal-view-event.c:555
+#: ../calendar/gui/ea-cal-view-event.c:557
 msgid "Grab Focus"
 msgstr "Ta fokus"
 
@@ -4468,21 +4515,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:860
+#: ../calendar/importers/icalendar-importer.c:1003
 msgid "Gnome Calendar"
 msgstr "GNOME kalender"
 
 #: ../calendar/gui/ea-gnome-calendar.c:201
-#: ../modules/calendar/e-cal-shell-view-private.c:1013
+#: ../modules/calendar/e-cal-shell-view-private.c:1011
 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:1020
-#: ../modules/calendar/e-cal-shell-view-private.c:1026
-#: ../modules/calendar/e-cal-shell-view-private.c:1029
+#: ../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
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -4490,10 +4537,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:1046
-#: ../modules/calendar/e-cal-shell-view-private.c:1057
-#: ../modules/calendar/e-cal-shell-view-private.c:1064
-#: ../modules/calendar/e-cal-shell-view-private.c:1067
+#: ../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
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -4523,36 +4570,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:2218
+#: ../calendar/gui/gnome-cal.c:2209
 msgid "Purging"
 msgstr "TÃmmer"
 
-#: ../calendar/gui/itip-utils.c:504 ../calendar/gui/itip-utils.c:559
-#: ../calendar/gui/itip-utils.c:656
+#: ../calendar/gui/itip-utils.c:503 ../calendar/gui/itip-utils.c:558
+#: ../calendar/gui/itip-utils.c:661
 msgid "An organizer must be set."
 msgstr "En organisator mà oppgis."
 
-#: ../calendar/gui/itip-utils.c:551
+#: ../calendar/gui/itip-utils.c:550
 msgid "At least one attendee is necessary"
 msgstr "Minst en deltaker kreves"
 
-#: ../calendar/gui/itip-utils.c:741 ../calendar/gui/itip-utils.c:902
+#: ../calendar/gui/itip-utils.c:747 ../calendar/gui/itip-utils.c:908
 msgid "Event information"
 msgstr "Hendelsesinformasjon"
 
-#: ../calendar/gui/itip-utils.c:744 ../calendar/gui/itip-utils.c:905
+#: ../calendar/gui/itip-utils.c:750 ../calendar/gui/itip-utils.c:911
 msgid "Task information"
 msgstr "Oppgaveinformasjon"
 
-#: ../calendar/gui/itip-utils.c:747 ../calendar/gui/itip-utils.c:908
+#: ../calendar/gui/itip-utils.c:753 ../calendar/gui/itip-utils.c:914
 msgid "Memo information"
 msgstr "Informasjon om notat"
 
-#: ../calendar/gui/itip-utils.c:750 ../calendar/gui/itip-utils.c:926
+#: ../calendar/gui/itip-utils.c:756 ../calendar/gui/itip-utils.c:932
 msgid "Free/Busy information"
 msgstr "Ledig/opptatt-informasjon"
 
-#: ../calendar/gui/itip-utils.c:753
+#: ../calendar/gui/itip-utils.c:759
 msgid "Calendar information"
 msgstr "Kalenderinformasjon"
 
@@ -4560,7 +4607,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:790
+#: ../calendar/gui/itip-utils.c:796
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Godtatt"
@@ -4569,7 +4616,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:797
+#: ../calendar/gui/itip-utils.c:803
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Akseptert tentativt"
@@ -4581,7 +4628,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:804 ../calendar/gui/itip-utils.c:852
+#: ../calendar/gui/itip-utils.c:810 ../calendar/gui/itip-utils.c:858
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "AvslÃtt"
@@ -4590,7 +4637,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:811
+#: ../calendar/gui/itip-utils.c:817
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Delegert"
@@ -4598,7 +4645,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:824
+#: ../calendar/gui/itip-utils.c:830
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Oppdatert"
@@ -4606,7 +4653,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:831
+#: ../calendar/gui/itip-utils.c:837
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Avbryt"
@@ -4614,7 +4661,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:838
+#: ../calendar/gui/itip-utils.c:844
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Oppdater"
@@ -4622,30 +4669,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:845
+#: ../calendar/gui/itip-utils.c:851
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Motforslag"
 
-#: ../calendar/gui/itip-utils.c:923
+#: ../calendar/gui/itip-utils.c:929
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Ledig/opptatt-informasjon (%s til %s)"
 
-#: ../calendar/gui/itip-utils.c:931
+#: ../calendar/gui/itip-utils.c:937
 msgid "iCalendar information"
 msgstr "iCalendar-informasjon"
 
-#: ../calendar/gui/itip-utils.c:956
+#: ../calendar/gui/itip-utils.c:962
 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:960
+#: ../calendar/gui/itip-utils.c:966
 msgid "Unable to book a resource, error: "
 msgstr "Kan ikke booke en ressurs. Feil: "
 
-#: ../calendar/gui/itip-utils.c:1121
+#: ../calendar/gui/itip-utils.c:1127
 msgid "You must be an attendee of the event."
 msgstr "Du mà vÃre en deltager i hendelsen."
 
@@ -4804,71 +4851,71 @@ msgstr "LÃ."
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:3001
+#: ../calendar/gui/print.c:3014
 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:3011
+#: ../calendar/gui/print.c:3024
 msgid " (Completed "
 msgstr " (FullfÃrt "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3017
+#: ../calendar/gui/print.c:3030
 msgid "Completed "
 msgstr "FullfÃrt "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3027
+#: ../calendar/gui/print.c:3040
 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:3034
+#: ../calendar/gui/print.c:3047
 msgid "Due "
 msgstr "Ferdig "
 
-#: ../calendar/gui/print.c:3199
+#: ../calendar/gui/print.c:3212
 #, c-format
 msgid "Summary: %s"
 msgstr "Sammendrag: %s"
 
-#: ../calendar/gui/print.c:3226
+#: ../calendar/gui/print.c:3239
 msgid "Attendees: "
 msgstr "Deltakere: "
 
-#: ../calendar/gui/print.c:3269
+#: ../calendar/gui/print.c:3282
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: ../calendar/gui/print.c:3284
+#: ../calendar/gui/print.c:3297
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioritet: %s"
 
-#: ../calendar/gui/print.c:3302
+#: ../calendar/gui/print.c:3315
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Prosent fullfÃrt: %i"
 
-#: ../calendar/gui/print.c:3313
+#: ../calendar/gui/print.c:3326
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:3326
+#: ../calendar/gui/print.c:3339
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorier: %s"
 
-#: ../calendar/gui/print.c:3337
+#: ../calendar/gui/print.c:3350
 msgid "Contacts: "
 msgstr "Kontakter: "
 
@@ -4877,6 +4924,10 @@ msgstr "Kontakter: "
 msgid "% Completed"
 msgstr "% ferdig"
 
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Cancelled"
+msgstr "Avbrutt"
+
 #: ../calendar/gui/tasktypes.xml.h:15
 msgid "In progress"
 msgstr "Under arbeid"
@@ -4889,185 +4940,185 @@ msgstr "er stÃrre enn"
 msgid "is less than"
 msgstr "er mindre enn"
 
-#: ../calendar/importers/icalendar-importer.c:80
+#: ../calendar/importers/icalendar-importer.c:84
 msgid "Appointments and Meetings"
 msgstr "Avtaler og mÃter"
 
-#: ../calendar/importers/icalendar-importer.c:350
-#: ../calendar/importers/icalendar-importer.c:707
-#: ../plugins/itip-formatter/itip-formatter.c:1958
+#: ../calendar/importers/icalendar-importer.c:407
+#: ../calendar/importers/icalendar-importer.c:817
+#: ../plugins/itip-formatter/itip-formatter.c:2094
 msgid "Opening calendar"
 msgstr "Ãpner kalender"
 
-#: ../calendar/importers/icalendar-importer.c:493
+#: ../calendar/importers/icalendar-importer.c:547
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar-filer (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:494
+#: ../calendar/importers/icalendar-importer.c:548
 msgid "Evolution iCalendar importer"
 msgstr "Evolution iCalendar-import"
 
-#: ../calendar/importers/icalendar-importer.c:582
+#: ../calendar/importers/icalendar-importer.c:636
 msgid "Reminder!"
 msgstr "PÃminnelse!"
 
-#: ../calendar/importers/icalendar-importer.c:662
+#: ../calendar/importers/icalendar-importer.c:716
 msgid "vCalendar files (.vcs)"
 msgstr "vCalendar-filer (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:663
+#: ../calendar/importers/icalendar-importer.c:717
 msgid "Evolution vCalendar importer"
 msgstr "Evolution vCalendar-import"
 
-#: ../calendar/importers/icalendar-importer.c:823
+#: ../calendar/importers/icalendar-importer.c:966
 msgid "Calendar Events"
 msgstr "Hendlelser i kalenderen"
 
-#: ../calendar/importers/icalendar-importer.c:861
+#: ../calendar/importers/icalendar-importer.c:1004
 msgid "Evolution Calendar intelligent importer"
 msgstr "Intelligent import for Evolution kalender"
 
-#: ../calendar/importers/icalendar-importer.c:926
-#: ../calendar/importers/icalendar-importer.c:1243
+#: ../calendar/importers/icalendar-importer.c:1069
+#: ../calendar/importers/icalendar-importer.c:1386
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "MÃte"
 
-#: ../calendar/importers/icalendar-importer.c:926
-#: ../calendar/importers/icalendar-importer.c:1243
+#: ../calendar/importers/icalendar-importer.c:1069
+#: ../calendar/importers/icalendar-importer.c:1386
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "Hendelse"
 
-#: ../calendar/importers/icalendar-importer.c:929
-#: ../calendar/importers/icalendar-importer.c:1244
+#: ../calendar/importers/icalendar-importer.c:1072
+#: ../calendar/importers/icalendar-importer.c:1387
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "Oppgave"
 
-#: ../calendar/importers/icalendar-importer.c:932
-#: ../calendar/importers/icalendar-importer.c:1245
+#: ../calendar/importers/icalendar-importer.c:1075
+#: ../calendar/importers/icalendar-importer.c:1388
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "Notat"
 
-#: ../calendar/importers/icalendar-importer.c:941
+#: ../calendar/importers/icalendar-importer.c:1084
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "har gjeninntreffelse"
 
-#: ../calendar/importers/icalendar-importer.c:946
+#: ../calendar/importers/icalendar-importer.c:1089
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "er en instans"
 
-#: ../calendar/importers/icalendar-importer.c:951
+#: ../calendar/importers/icalendar-importer.c:1094
 msgctxt "iCalImp"
 msgid "has alarms"
 msgstr "har alarmer"
 
-#: ../calendar/importers/icalendar-importer.c:956
+#: ../calendar/importers/icalendar-importer.c:1099
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "har vedlegg"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:969
+#: ../calendar/importers/icalendar-importer.c:1112
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "Offentlig"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:972
+#: ../calendar/importers/icalendar-importer.c:1115
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "Privat"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:975
+#: ../calendar/importers/icalendar-importer.c:1118
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "Konfidensiell"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:979
+#: ../calendar/importers/icalendar-importer.c:1122
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "Klassifisering"
 
 #. Translators: Appointment's summary
 #. Translators: Column header for a component summary
-#: ../calendar/importers/icalendar-importer.c:984
-#: ../calendar/importers/icalendar-importer.c:1284
+#: ../calendar/importers/icalendar-importer.c:1127
+#: ../calendar/importers/icalendar-importer.c:1427
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "Sammendrag"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:990
+#: ../calendar/importers/icalendar-importer.c:1133
 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:998
-#: ../calendar/importers/icalendar-importer.c:1280
+#: ../calendar/importers/icalendar-importer.c:1141
+#: ../calendar/importers/icalendar-importer.c:1423
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "Start"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1009
+#: ../calendar/importers/icalendar-importer.c:1152
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "Ferdig"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1021
+#: ../calendar/importers/icalendar-importer.c:1164
 msgctxt "iCalImp"
 msgid "End"
 msgstr "Slutt"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1031
+#: ../calendar/importers/icalendar-importer.c:1174
 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:1055
+#: ../calendar/importers/icalendar-importer.c:1198
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "FullfÃrt"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1063
+#: ../calendar/importers/icalendar-importer.c:1206
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URL"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1074
-#: ../calendar/importers/icalendar-importer.c:1077
+#: ../calendar/importers/icalendar-importer.c:1217
+#: ../calendar/importers/icalendar-importer.c:1220
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "Organisator"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1097
-#: ../calendar/importers/icalendar-importer.c:1100
+#: ../calendar/importers/icalendar-importer.c:1240
+#: ../calendar/importers/icalendar-importer.c:1243
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "Deltakere"
 
-#: ../calendar/importers/icalendar-importer.c:1114
+#: ../calendar/importers/icalendar-importer.c:1257
 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:1276
+#: ../calendar/importers/icalendar-importer.c:1419
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "Type"
@@ -6626,7 +6677,7 @@ msgid "Save as..."
 msgstr "Lagre som â"
 
 #: ../composer/e-composer-actions.c:291
-#: ../widgets/misc/e-attachment-view.c:380
+#: ../widgets/misc/e-attachment-view.c:439
 msgid "Attach a file"
 msgstr "Legg ved en fil"
 
@@ -6683,7 +6734,7 @@ msgstr "Lagre som ut_kast"
 msgid "Save as draft"
 msgstr "Lagre som utkast"
 
-#: ../composer/e-composer-actions.c:371 ../composer/e-composer-private.c:351
+#: ../composer/e-composer-actions.c:371 ../composer/e-composer-private.c:352
 msgid "S_end"
 msgstr "S_end"
 
@@ -6791,35 +6842,35 @@ msgstr ""
 "Skriv inn adressene som skal motta en kopi av meldingen uten à vises i "
 "mottakerlisten for meldingen."
 
-#: ../composer/e-composer-header-table.c:1008
+#: ../composer/e-composer-header-table.c:1020
 msgid "Fr_om:"
 msgstr "Fr_a:"
 
-#: ../composer/e-composer-header-table.c:1017
+#: ../composer/e-composer-header-table.c:1029
 msgid "_Reply-To:"
 msgstr "Sva_r-til:"
 
-#: ../composer/e-composer-header-table.c:1021
+#: ../composer/e-composer-header-table.c:1033
 msgid "_To:"
 msgstr "_Til:"
 
-#: ../composer/e-composer-header-table.c:1026
+#: ../composer/e-composer-header-table.c:1038
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:1031
+#: ../composer/e-composer-header-table.c:1043
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-composer-header-table.c:1036
+#: ../composer/e-composer-header-table.c:1048
 msgid "_Post To:"
 msgstr "_Post til:"
 
-#: ../composer/e-composer-header-table.c:1040
+#: ../composer/e-composer-header-table.c:1052
 msgid "S_ubject:"
 msgstr "Em_ne:"
 
-#: ../composer/e-composer-header-table.c:1049
+#: ../composer/e-composer-header-table.c:1061
 msgid "Si_gnature:"
 msgstr "Si_gnatur:"
 
@@ -6847,11 +6898,11 @@ msgstr "SÃk etter tekst"
 msgid "Search for and replace text"
 msgstr "SÃk etter / erstatt tekst"
 
-#: ../composer/e-composer-private.c:371
+#: ../composer/e-composer-private.c:372
 msgid "Save draft"
 msgstr "Lagre utkast"
 
-#: ../composer/e-msg-composer.c:786
+#: ../composer/e-msg-composer.c:791
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
@@ -6859,7 +6910,7 @@ msgstr ""
 "Kan ikke signere utgÃende melding: Ingen sertifikat for signering satt for "
 "denne kontoen"
 
-#: ../composer/e-msg-composer.c:795
+#: ../composer/e-msg-composer.c:800
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -6868,17 +6919,17 @@ msgstr ""
 "Kan ikke kryptere utgÃende melding: Sertifikat for kryptering ikke satt for "
 "denne kontoen"
 
-#: ../composer/e-msg-composer.c:1690 ../composer/e-msg-composer.c:2074
+#: ../composer/e-msg-composer.c:1695 ../composer/e-msg-composer.c:2079
 msgid "Compose Message"
 msgstr "Skriv melding"
 
-#: ../composer/e-msg-composer.c:4145
+#: ../composer/e-msg-composer.c:4159
 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:4850
+#: ../composer/e-msg-composer.c:4864
 msgid "Untitled Message"
 msgstr "Melding uten navn"
 
@@ -7065,63 +7116,63 @@ msgid "Please enter your password."
 msgstr "Vennligst oppgi ditt passord."
 
 #: ../capplet/settings/mail-account-view.c:259
-#: ../plugins/caldav/caldav-source.c:65
+#: ../plugins/caldav/caldav-source.c:68
 msgid "CalDAV"
 msgstr "CalDAV"
 
 #: ../capplet/settings/mail-account-view.c:361
 #: ../capplet/settings/mail-account-view.c:413
 #: ../plugins/google-account-setup/google-contacts-source.c:55
-#: ../plugins/google-account-setup/google-source.c:80
+#: ../plugins/google-account-setup/google-source.c:83
 msgid "Google"
 msgstr "Google"
 
-#: ../capplet/settings/mail-account-view.c:463
+#: ../capplet/settings/mail-account-view.c:483
 msgid "Personal details:"
 msgstr "Personlige detaljer:"
 
-#: ../capplet/settings/mail-account-view.c:470
+#: ../capplet/settings/mail-account-view.c:490
 msgid "Name:"
 msgstr "Navn:"
 
-#: ../capplet/settings/mail-account-view.c:479
+#: ../capplet/settings/mail-account-view.c:499
 msgid "Email address:"
 msgstr "E-postadresse:"
 
-#: ../capplet/settings/mail-account-view.c:489
+#: ../capplet/settings/mail-account-view.c:509
 msgid "Details:"
 msgstr "Detaljer:"
 
-#: ../capplet/settings/mail-account-view.c:497
+#: ../capplet/settings/mail-account-view.c:517
 msgid "Receiving"
 msgstr "Mottar"
 
-#: ../capplet/settings/mail-account-view.c:504
+#: ../capplet/settings/mail-account-view.c:524
 msgid "Server type:"
 msgstr "Tjenertype:"
 
-#: ../capplet/settings/mail-account-view.c:513
+#: ../capplet/settings/mail-account-view.c:533
 msgid "Server address:"
 msgstr "Tjeneradresse:"
 
-#: ../capplet/settings/mail-account-view.c:522
+#: ../capplet/settings/mail-account-view.c:542
 msgid "Username:"
 msgstr "Brukernavn:"
 
-#: ../capplet/settings/mail-account-view.c:531
+#: ../capplet/settings/mail-account-view.c:551
 msgid "Use encryption:"
 msgstr "Bruk kryptering:"
 
-#: ../capplet/settings/mail-account-view.c:536
-#: ../capplet/settings/mail-account-view.c:571
+#: ../capplet/settings/mail-account-view.c:556
+#: ../capplet/settings/mail-account-view.c:591
 msgid "never"
 msgstr "aldri"
 
-#: ../capplet/settings/mail-account-view.c:548
+#: ../capplet/settings/mail-account-view.c:568
 msgid "Sending"
 msgstr "Sender"
 
-#: ../capplet/settings/mail-account-view.c:590
+#: ../capplet/settings/mail-account-view.c:610
 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. "
@@ -7131,7 +7182,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:592
+#: ../capplet/settings/mail-account-view.c:612
 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 "
@@ -7141,11 +7192,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:594
+#: ../capplet/settings/mail-account-view.c:614
 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:596
+#: ../capplet/settings/mail-account-view.c:616
 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."
@@ -7153,11 +7204,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:597
+#: ../capplet/settings/mail-account-view.c:617
 msgid "You can specify your default settings for your account."
 msgstr "Du kan oppgi forvalgte innstillinger for kontoen."
 
-#: ../capplet/settings/mail-account-view.c:598
+#: ../capplet/settings/mail-account-view.c:618
 msgid ""
 "Time to check things over before we try and connect to the server and fetch "
 "your mail."
@@ -7165,100 +7216,100 @@ msgstr ""
 "Se over innstillingene fÃr forsÃk pà à koble til tjeneren for à hente e-"
 "posten din."
 
-#: ../capplet/settings/mail-account-view.c:613
-#: ../mail/em-account-editor.c:2179 ../mail/em-account-editor.c:2300
+#: ../capplet/settings/mail-account-view.c:633
+#: ../mail/em-account-editor.c:2181 ../mail/em-account-editor.c:2313
 msgid "Identity"
 msgstr "Identitet"
 
-#: ../capplet/settings/mail-account-view.c:613
+#: ../capplet/settings/mail-account-view.c:633
 msgid "Next - Receiving mail"
 msgstr "Neste - mottak av e-post"
 
-#: ../capplet/settings/mail-account-view.c:614
+#: ../capplet/settings/mail-account-view.c:634
 msgid "Receiving mail"
 msgstr "Mottak av e-post"
 
-#: ../capplet/settings/mail-account-view.c:614
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:634
+#: ../capplet/settings/mail-account-view.c:635
 msgid "Next - Sending mail"
 msgstr "Neste - Utsendelse av e-post"
 
-#: ../capplet/settings/mail-account-view.c:614
+#: ../capplet/settings/mail-account-view.c:634
 msgid "Back - Identity"
 msgstr "Tilbake - Identitet"
 
-#: ../capplet/settings/mail-account-view.c:614
+#: ../capplet/settings/mail-account-view.c:634
 msgid "Next - Receiving options"
 msgstr "Neste - Alternativer for mottak"
 
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:635
 msgid "Receiving options"
 msgstr "Alternativer for mottak"
 
-#: ../capplet/settings/mail-account-view.c:615
-#: ../capplet/settings/mail-account-view.c:617
+#: ../capplet/settings/mail-account-view.c:635
+#: ../capplet/settings/mail-account-view.c:637
 msgid "Back - Receiving mail"
 msgstr "Tilbake - Mottak av e-post"
 
-#: ../capplet/settings/mail-account-view.c:617
+#: ../capplet/settings/mail-account-view.c:637
 msgid "Sending mail"
 msgstr "Utsendelse av e-post"
 
-#: ../capplet/settings/mail-account-view.c:617
-#: ../capplet/settings/mail-account-view.c:618
+#: ../capplet/settings/mail-account-view.c:637
+#: ../capplet/settings/mail-account-view.c:638
 msgid "Next - Review account"
 msgstr "Neste - Se over konto"
 
-#: ../capplet/settings/mail-account-view.c:617
+#: ../capplet/settings/mail-account-view.c:637
 msgid "Next - Defaults"
 msgstr "Neste - Forvalg"
 
-#: ../capplet/settings/mail-account-view.c:617
+#: ../capplet/settings/mail-account-view.c:637
 msgid "Back - Receiving options"
 msgstr "Tilbake - Alternativer for mottak"
 
-#: ../capplet/settings/mail-account-view.c:618
-#: ../mail/em-account-editor.c:3129
+#: ../capplet/settings/mail-account-view.c:638
+#: ../mail/em-account-editor.c:3200
 msgid "Defaults"
 msgstr "Forvalg"
 
-#: ../capplet/settings/mail-account-view.c:618
+#: ../capplet/settings/mail-account-view.c:638
 msgid "Back - Sending mail"
 msgstr "Tilbake - Utsendelse av e-post"
 
-#: ../capplet/settings/mail-account-view.c:620
+#: ../capplet/settings/mail-account-view.c:640
 msgid "Review account"
 msgstr "Se over konto"
 
-#: ../capplet/settings/mail-account-view.c:620
+#: ../capplet/settings/mail-account-view.c:640
 msgid "Finish"
 msgstr "FullfÃr"
 
-#: ../capplet/settings/mail-account-view.c:620
+#: ../capplet/settings/mail-account-view.c:640
 msgid "Back - Sending"
 msgstr "Tilbake - Utsendelse"
 
-#: ../capplet/settings/mail-account-view.c:740
+#: ../capplet/settings/mail-account-view.c:760
 msgid "Setup Google contacts with Evolution"
 msgstr "Sett opp Google-kontakter i Evolution"
 
-#: ../capplet/settings/mail-account-view.c:741
+#: ../capplet/settings/mail-account-view.c:761
 msgid "Setup Google calendar with Evolution"
 msgstr "Sett opp Google-kalender i Evolution."
 
-#: ../capplet/settings/mail-account-view.c:746
+#: ../capplet/settings/mail-account-view.c:766
 msgid "You may need to enable IMAP access."
 msgstr "Du mà kanskje slà pà IMAP-tilgang."
 
-#: ../capplet/settings/mail-account-view.c:754
+#: ../capplet/settings/mail-account-view.c:774
 msgid "Google account settings:"
 msgstr "Innstillinger for Google-konto:"
 
-#: ../capplet/settings/mail-account-view.c:780
+#: ../capplet/settings/mail-account-view.c:800
 msgid "Setup Yahoo calendar with Evolution"
 msgstr "Sett opp Yahoo-kalender i Evolution"
 
-#: ../capplet/settings/mail-account-view.c:784
+#: ../capplet/settings/mail-account-view.c:804
 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 "
@@ -7268,45 +7319,45 @@ msgstr ""
 "kalendernavnet. Vennligst bekreft og oppgi kalendernavnet pà nytt hvis det "
 "ikke er korrekt."
 
-#: ../capplet/settings/mail-account-view.c:793
+#: ../capplet/settings/mail-account-view.c:813
 msgid "Yahoo account settings:"
 msgstr "Innstillinger for Yahoo-konto:"
 
-#: ../capplet/settings/mail-account-view.c:807
+#: ../capplet/settings/mail-account-view.c:827
 msgid "Yahoo Calendar name:"
 msgstr "Navn pà Yahoo-kalender"
 
-#: ../capplet/settings/mail-account-view.c:1079
+#: ../capplet/settings/mail-account-view.c:1099
 msgid "Password:"
 msgstr "Passord:"
 
-#: ../capplet/settings/mail-account-view.c:1130
+#: ../capplet/settings/mail-account-view.c:1150
 #: ../capplet/settings/mail-settings-view.c:248
 msgid "Close Tab"
 msgstr "Lukk fane"
 
-#: ../capplet/settings/mail-account-view.c:1140
+#: ../capplet/settings/mail-account-view.c:1160
 msgid "Account Wizard"
 msgstr "Kontoveiviser"
 
-#: ../capplet/settings/mail-capplet-shell.c:209
+#: ../capplet/settings/mail-capplet-shell.c:212
 msgid "Evolution account assistant"
 msgstr "Evolution kontoassistent"
 
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:339 ../mail/e-mail-migrate.c:739
+#: ../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
 #: ../mail/message-list.c:1714
-#: ../modules/addressbook/e-book-shell-backend.c:94
+#: ../modules/addressbook/e-book-shell-backend.c:96
 #: ../modules/addressbook/e-book-shell-migrate.c:136
-#: ../modules/calendar/e-cal-shell-backend.c:107
+#: ../modules/calendar/e-cal-shell-backend.c:109
 #: ../modules/calendar/e-cal-shell-migrate.c:154
-#: ../modules/calendar/e-memo-shell-backend.c:96
+#: ../modules/calendar/e-memo-shell-backend.c:98
 #: ../modules/calendar/e-memo-shell-migrate.c:109
-#: ../modules/calendar/e-task-shell-backend.c:96
+#: ../modules/calendar/e-task-shell-backend.c:98
 #: ../modules/calendar/e-task-shell-migrate.c:121
 msgid "On This Computer"
 msgstr "PÃ denne datamaskinen"
@@ -7476,7 +7527,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:1815
+#: ../modules/calendar/e-cal-shell-view-actions.c:1823
 #: ../plugins/itip-formatter/itip-view.c:191
 #: ../widgets/table/e-cell-date-edit.c:307
 msgid "Today"
@@ -7649,14 +7700,14 @@ msgid "Reply-To"
 msgstr "Svar-til"
 
 #: ../em-format/em-format-quote.c:284 ../em-format/em-format.c:1057
-#: ../mail/em-format-html.c:2479 ../mail/em-format-html.c:2547
-#: ../mail/em-format-html.c:2570 ../modules/mail/em-mailer-prefs.c:73
+#: ../mail/em-format-html.c:2488 ../mail/em-format-html.c:2556
+#: ../mail/em-format-html.c:2579 ../modules/mail/em-mailer-prefs.c:73
 msgid "Cc"
 msgstr "Cc"
 
 #: ../em-format/em-format-quote.c:284 ../em-format/em-format.c:1058
-#: ../mail/em-format-html.c:2480 ../mail/em-format-html.c:2551
-#: ../mail/em-format-html.c:2573 ../modules/mail/em-mailer-prefs.c:74
+#: ../mail/em-format-html.c:2489 ../mail/em-format-html.c:2560
+#: ../mail/em-format-html.c:2582 ../modules/mail/em-mailer-prefs.c:74
 msgid "Bcc"
 msgstr "Bcc"
 
@@ -7668,12 +7719,12 @@ msgid "Subject"
 msgstr "Emne"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:439 ../mail/em-format-html.c:2667
-#: ../modules/mail/em-mailer-prefs.c:1124
+#: ../em-format/em-format-quote.c:439 ../mail/em-format-html.c:2676
+#: ../modules/mail/em-mailer-prefs.c:1129
 msgid "Mailer"
 msgstr "E-postprogram"
 
-#: ../em-format/em-format-quote.c:520 ../mail/em-composer-utils.c:1186
+#: ../em-format/em-format-quote.c:520 ../mail/em-composer-utils.c:1190
 msgid "-------- Forwarded Message --------"
 msgstr "---------Videresendt melding-------"
 
@@ -7692,55 +7743,48 @@ msgstr "Nyhetsgrupper"
 msgid "Face"
 msgstr "Ansikt"
 
-#: ../em-format/em-format.c:1460
+#: ../em-format/em-format.c:1465
 #, c-format
 msgid "%s attachment"
 msgstr "%s-vedlegg"
 
-#: ../em-format/em-format.c:1571
+#: ../em-format/em-format.c:1576
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Kunne ikke lese S/MIME-melding: Ukjent feil"
 
-#: ../em-format/em-format.c:1759 ../em-format/em-format.c:1956
+#: ../em-format/em-format.c:1768 ../em-format/em-format.c:1994
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Kunne ikke lese MIME-melding. Viser ren meldingstekst."
 
-#: ../em-format/em-format.c:1770
+#: ../em-format/em-format.c:1779
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Krypteringstype for multipart/encrypted som ikke er stÃttet"
 
-#: ../em-format/em-format.c:1790
+#: ../em-format/em-format.c:1799
 msgid "Could not parse PGP/MIME message"
 msgstr "Kunne ikke lese PGP/MIME-melding"
 
-#: ../em-format/em-format.c:1791
+#: ../em-format/em-format.c:1800
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "Kunne ikke lese PGP/MIME-melding: Ukjent feil"
 
-#: ../em-format/em-format.c:1981
+#: ../em-format/em-format.c:2019
 msgid "Unsupported signature format"
 msgstr "UstÃttet signaturformat"
 
-#: ../em-format/em-format.c:1994 ../em-format/em-format.c:2176
+#: ../em-format/em-format.c:2032 ../em-format/em-format.c:2214
 msgid "Error verifying signature"
 msgstr "Feil under verifisering av signatur"
 
-#: ../em-format/em-format.c:1995 ../em-format/em-format.c:2161
-#: ../em-format/em-format.c:2177
+#: ../em-format/em-format.c:2033 ../em-format/em-format.c:2199
+#: ../em-format/em-format.c:2215
 msgid "Unknown error verifying signature"
 msgstr "Ukjent feil under verifisering av signatur"
 
-#: ../em-format/em-format.c:2268
+#: ../em-format/em-format.c:2307
 msgid "Could not parse PGP message: "
 msgstr "Kunne ikke lese PGP-melding:"
 
-#: ../em-format/em-format.c:2274 ../mail/em-folder-tree.c:678
-#: ../mail/mail-ops.c:650 ../plugins/caldav/caldav-browse-server.c:209
-#: ../plugins/caldav/caldav-browse-server.c:1406 ../plugins/face/face.c:169
-#: ../smime/gui/certificate-manager.c:100
-msgid "Unknown error"
-msgstr "Ukjent feil"
-
 #. Don't delete this code, since it is needed so that xgettext can extract the translations.
 #. * Please, keep these strings in sync with the strings in the timespans array
 #: ../filter/e-filter-datespec.c:66
@@ -7863,62 +7907,62 @@ msgstr "Velg en tid à sammenligne mot"
 msgid "Choose a File"
 msgstr "Velg en fil"
 
-#: ../filter/e-filter-rule.c:662
+#: ../filter/e-filter-rule.c:664
 msgid "R_ule name:"
 msgstr "Regel_navn:"
 
-#: ../filter/e-filter-rule.c:692
+#: ../filter/e-filter-rule.c:694
 msgid "Find items that meet the following conditions"
 msgstr "Finn oppfÃringer som mÃter fÃlgende kriterier"
 
-#: ../filter/e-filter-rule.c:717
+#: ../filter/e-filter-rule.c:719
 msgid "If all conditions are met"
 msgstr "Hvis alle kriterier er mÃtt"
 
-#: ../filter/e-filter-rule.c:718
+#: ../filter/e-filter-rule.c:720
 msgid "If any conditions are met"
 msgstr "Hvis noe kriterie er mÃtt"
 
-#: ../filter/e-filter-rule.c:721
+#: ../filter/e-filter-rule.c:723
 msgid "_Find items:"
 msgstr "_Finn oppfÃringer:"
 
 #. Translators: "None" for not including threads;
 #. * part of "Include threads: None"
-#: ../filter/e-filter-rule.c:750
+#: ../filter/e-filter-rule.c:752
 msgid "None"
 msgstr "Ingen"
 
-#: ../filter/e-filter-rule.c:751
+#: ../filter/e-filter-rule.c:753
 msgid "All related"
 msgstr "Alle relaterte"
 
-#: ../filter/e-filter-rule.c:752 ../widgets/misc/e-send-options.ui.h:19
+#: ../filter/e-filter-rule.c:754 ../widgets/misc/e-send-options.ui.h:19
 msgid "Replies"
 msgstr "Svar"
 
-#: ../filter/e-filter-rule.c:753
+#: ../filter/e-filter-rule.c:755
 msgid "Replies and parents"
 msgstr "Svar med opphav"
 
-#: ../filter/e-filter-rule.c:754
+#: ../filter/e-filter-rule.c:756
 msgid "No reply or parent"
 msgstr "Ingen svar eller opphav"
 
-#: ../filter/e-filter-rule.c:757
+#: ../filter/e-filter-rule.c:759
 msgid "I_nclude threads"
 msgstr "Ta _med trÃder"
 
-#: ../filter/e-filter-rule.c:782
+#: ../filter/e-filter-rule.c:784
 msgid "A_dd Condition"
 msgstr "Legg til _kriterie"
 
-#: ../filter/e-filter-rule.c:1131 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:318
+#: ../filter/e-filter-rule.c:1133 ../filter/filter.ui.h:2
+#: ../mail/em-utils.c:319
 msgid "Incoming"
 msgstr "Innkommende"
 
-#: ../filter/e-filter-rule.c:1131 ../mail/em-utils.c:319
+#: ../filter/e-filter-rule.c:1133 ../mail/em-utils.c:320
 msgid "Outgoing"
 msgstr "UtgÃende"
 
@@ -8072,19 +8116,27 @@ msgstr "Lukk dette vinduet"
 msgid "(No Subject)"
 msgstr "(Uten emne)"
 
-#: ../mail/e-mail-display.c:65
+#: ../mail/e-mail-display.c:66
 msgid "_Add to Address Book..."
 msgstr "Legg til i _adressebok â"
 
-#: ../mail/e-mail-display.c:72
+#: ../mail/e-mail-display.c:73
 msgid "_To This Address"
 msgstr "_Til denne adressen"
 
-#: ../mail/e-mail-display.c:79
+#: ../mail/e-mail-display.c:80
 msgid "_From This Address"
 msgstr "_Fra denne adressen"
 
-#: ../mail/e-mail-display.c:88
+#: ../mail/e-mail-display.c:87
+msgid "Send _Reply To..."
+msgstr "Send sva_r til â"
+
+#: ../mail/e-mail-display.c:89
+msgid "Send a reply message to this address"
+msgstr "Send svarmelding til denne adressen"
+
+#: ../mail/e-mail-display.c:96
 msgid "Create Search _Folder"
 msgstr "Opprett _sÃkemappe"
 
@@ -8133,7 +8185,7 @@ msgid_plural "Saving %d messages"
 msgstr[0] "Lagrer %d melding"
 msgstr[1] "Lagrer %d meldinger"
 
-#: ../mail/e-mail-folder-utils.c:1515 ../mail/em-folder-utils.c:570
+#: ../mail/e-mail-folder-utils.c:1515 ../mail/em-folder-utils.c:577
 #, c-format
 msgid "Invalid folder URI '%s'"
 msgstr "Ugyldig URI for mappe Â%sÂ"
@@ -8195,29 +8247,29 @@ msgstr "Farge"
 msgid "Name"
 msgstr "Navn"
 
-#: ../mail/e-mail-local.c:41 ../mail/em-folder-properties.c:309
-#: ../mail/em-folder-tree-model.c:720
+#: ../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
 msgid "Inbox"
 msgstr "Innboks"
 
-#: ../mail/e-mail-local.c:42 ../mail/em-folder-tree-model.c:713
+#: ../mail/e-mail-local.c:42 ../mail/em-folder-tree-model.c:715
 #: ../modules/mail/e-mail-shell-view-private.c:1063
 msgid "Drafts"
 msgstr "Skisser"
 
-#: ../mail/e-mail-local.c:43 ../mail/em-folder-tree-model.c:724
+#: ../mail/e-mail-local.c:43 ../mail/em-folder-tree-model.c:726
 #: ../modules/mail/e-mail-shell-view-private.c:1067
 msgid "Outbox"
 msgstr "Utboks"
 
-#: ../mail/e-mail-local.c:44 ../mail/em-folder-tree-model.c:728
+#: ../mail/e-mail-local.c:44 ../mail/em-folder-tree-model.c:730
 #: ../modules/mail/e-mail-shell-view-private.c:1069
 msgid "Sent"
 msgstr "Sendt"
 
-#: ../mail/e-mail-local.c:45 ../mail/em-folder-tree-model.c:716
+#: ../mail/e-mail-local.c:45 ../mail/em-folder-tree-model.c:718
 #: ../modules/mail/e-mail-shell-view-private.c:1071
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 #: ../plugins/templates/templates.c:1006 ../plugins/templates/templates.c:1283
@@ -8225,24 +8277,24 @@ msgstr "Sendt"
 msgid "Templates"
 msgstr "Maler"
 
-#: ../mail/e-mail-migrate.c:132
+#: ../mail/e-mail-migrate.c:133
 msgid "Migrating..."
 msgstr "Flytter â"
 
-#: ../mail/e-mail-migrate.c:167
+#: ../mail/e-mail-migrate.c:168
 msgid "Migration"
 msgstr "Flytting"
 
-#: ../mail/e-mail-migrate.c:208
+#: ../mail/e-mail-migrate.c:209
 #, c-format
 msgid "Migrating '%s':"
 msgstr "Flytter Â%sÂ:"
 
-#: ../mail/e-mail-migrate.c:717
+#: ../mail/e-mail-migrate.c:722
 msgid "Migrating Folders"
 msgstr "Flytter mapper"
 
-#: ../mail/e-mail-migrate.c:718
+#: ../mail/e-mail-migrate.c:723
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -8254,12 +8306,12 @@ msgstr ""
 "\n"
 "Vennligst vent mens Evolution migrere dine mapper â"
 
-#: ../mail/e-mail-migrate.c:1197
+#: ../mail/e-mail-migrate.c:1279
 #, c-format
 msgid "Unable to create local mail folders at '%s': %s"
 msgstr "Kunne ikke opprette lokale e-postmapper i Â%sÂ: %s"
 
-#: ../mail/e-mail-notebook-view.c:580
+#: ../mail/e-mail-notebook-view.c:619
 msgid "Please select a folder"
 msgstr "Vennligst velg en mappe"
 
@@ -8277,10 +8329,14 @@ msgid ""
 msgid_plural ""
 "Folder '%s' contains %u duplicate messages. Are you sure you want to delete "
 "them?"
-msgstr[0] "Mappen Â%s inneholder %u duplikatmelding. Er du sikker pà at du vil slette den?"
-msgstr[1] "Mappen Â%s inneholder %u duplikatmeldinger. Er du sikker pà at du vil slette dem?"
+msgstr[0] ""
+"Mappen Â%s inneholder %u duplikatmelding. Er du sikker pà at du vil slette "
+"den?"
+msgstr[1] ""
+"Mappen Â%s inneholder %u duplikatmeldinger. Er du sikker pà at du vil "
+"slette dem?"
 
-#: ../mail/e-mail-reader-utils.c:930
+#: ../mail/e-mail-reader-utils.c:960
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Lagre melding"
@@ -8291,7 +8347,7 @@ 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:951
+#: ../mail/e-mail-reader-utils.c:981
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Melding"
@@ -8301,7 +8357,7 @@ msgstr[1] "Meldinger"
 msgid "Copy to Folder"
 msgstr "Kopier til mappe"
 
-#: ../mail/e-mail-reader.c:304 ../mail/em-folder-utils.c:473
+#: ../mail/e-mail-reader.c:304 ../mail/em-folder-utils.c:480
 msgid "C_opy"
 msgstr "K_opier"
 
@@ -8309,7 +8365,7 @@ msgstr "K_opier"
 msgid "Move to Folder"
 msgstr "Flytt til mappe"
 
-#: ../mail/e-mail-reader.c:806 ../mail/em-folder-utils.c:473
+#: ../mail/e-mail-reader.c:806 ../mail/em-folder-utils.c:480
 msgid "_Move"
 msgstr "_Flytt"
 
@@ -8322,648 +8378,648 @@ msgstr "_Ikke spÃr meg igjen."
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Alltid ignorer Reply-To: for e-postlister."
 
-#: ../mail/e-mail-reader.c:1759
+#: ../mail/e-mail-reader.c:1767
 msgid "A_dd Sender to Address Book"
 msgstr "L_egg til avsender i adressebok"
 
-#: ../mail/e-mail-reader.c:1761
+#: ../mail/e-mail-reader.c:1769
 msgid "Add sender to address book"
 msgstr "Legg til avsender i adressebok"
 
-#: ../mail/e-mail-reader.c:1766
+#: ../mail/e-mail-reader.c:1774
 msgid "Check for _Junk"
 msgstr "Sjekk etter _uÃnsket e-post"
 
-#: ../mail/e-mail-reader.c:1768
+#: ../mail/e-mail-reader.c:1776
 msgid "Filter the selected messages for junk status"
 msgstr "Filtrer valgte meldinger etter uÃnsket e-poststatus"
 
-#: ../mail/e-mail-reader.c:1773
+#: ../mail/e-mail-reader.c:1781
 msgid "_Copy to Folder..."
 msgstr "K_opier til mappe â"
 
-#: ../mail/e-mail-reader.c:1775
+#: ../mail/e-mail-reader.c:1783
 msgid "Copy selected messages to another folder"
 msgstr "Kopier valgte meldinger til en annen mappe"
 
-#: ../mail/e-mail-reader.c:1780
+#: ../mail/e-mail-reader.c:1788
 msgid "_Delete Message"
 msgstr "_Slett melding"
 
-#: ../mail/e-mail-reader.c:1782
+#: ../mail/e-mail-reader.c:1790
 msgid "Mark the selected messages for deletion"
 msgstr "Merk valgte meldinger for sletting"
 
-#: ../mail/e-mail-reader.c:1787
+#: ../mail/e-mail-reader.c:1795
 msgid "Filter on Mailing _List..."
 msgstr "Filtrer pà e-post_liste â"
 
-#: ../mail/e-mail-reader.c:1789
+#: ../mail/e-mail-reader.c:1797
 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:1794
+#: ../mail/e-mail-reader.c:1802
 msgid "Filter on _Recipients..."
 msgstr "Filtrer pà mottake_re â"
 
-#: ../mail/e-mail-reader.c:1796
+#: ../mail/e-mail-reader.c:1804
 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:1801
+#: ../mail/e-mail-reader.c:1809
 msgid "Filter on Se_nder..."
 msgstr "Filtrer pà se_nder â"
 
-#: ../mail/e-mail-reader.c:1803
+#: ../mail/e-mail-reader.c:1811
 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:1808
+#: ../mail/e-mail-reader.c:1816
 msgid "Filter on _Subject..."
 msgstr "Filtrer pà e_mne â"
 
-#: ../mail/e-mail-reader.c:1810
+#: ../mail/e-mail-reader.c:1818
 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:1815
+#: ../mail/e-mail-reader.c:1823
 msgid "A_pply Filters"
 msgstr "_PÃfÃr filtre"
 
-#: ../mail/e-mail-reader.c:1817
+#: ../mail/e-mail-reader.c:1825
 msgid "Apply filter rules to the selected messages"
 msgstr "Aktiver filterregler pà de valgte meldingene"
 
-#: ../mail/e-mail-reader.c:1822
+#: ../mail/e-mail-reader.c:1830
 msgid "_Find in Message..."
 msgstr "_Finn i melding â"
 
-#: ../mail/e-mail-reader.c:1824
+#: ../mail/e-mail-reader.c:1832
 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:1829
+#: ../mail/e-mail-reader.c:1837
 msgid "_Clear Flag"
 msgstr "F_jern flagg"
 
-#: ../mail/e-mail-reader.c:1831
+#: ../mail/e-mail-reader.c:1839
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Fjern flagg for oppfÃlging fra valgte meldinger"
 
-#: ../mail/e-mail-reader.c:1836
+#: ../mail/e-mail-reader.c:1844
 msgid "_Flag Completed"
 msgstr "Merk som _fullfÃrt"
 
-#: ../mail/e-mail-reader.c:1838
+#: ../mail/e-mail-reader.c:1846
 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:1843
+#: ../mail/e-mail-reader.c:1851
 msgid "Follow _Up..."
 msgstr "FÃlg _opp â"
 
-#: ../mail/e-mail-reader.c:1845
+#: ../mail/e-mail-reader.c:1853
 msgid "Flag the selected messages for follow-up"
 msgstr "Merk valgte meldinger for oppfÃlging"
 
-#: ../mail/e-mail-reader.c:1850
+#: ../mail/e-mail-reader.c:1858
 msgid "_Attached"
 msgstr "L_agt ved"
 
-#: ../mail/e-mail-reader.c:1852 ../mail/e-mail-reader.c:1859
+#: ../mail/e-mail-reader.c:1860 ../mail/e-mail-reader.c:1867
 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:1857
+#: ../mail/e-mail-reader.c:1865
 msgid "Forward As _Attached"
 msgstr "Videresend s_om vedlegg"
 
-#: ../mail/e-mail-reader.c:1864
+#: ../mail/e-mail-reader.c:1872
 msgid "_Inline"
 msgstr "_I meldingen"
 
-#: ../mail/e-mail-reader.c:1866 ../mail/e-mail-reader.c:1873
+#: ../mail/e-mail-reader.c:1874 ../mail/e-mail-reader.c:1881
 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:1871
+#: ../mail/e-mail-reader.c:1879
 msgid "Forward As _Inline"
 msgstr "V_ideresend som vedlegg"
 
-#: ../mail/e-mail-reader.c:1878
+#: ../mail/e-mail-reader.c:1886
 msgid "_Quoted"
 msgstr "_Sitert"
 
-#: ../mail/e-mail-reader.c:1880 ../mail/e-mail-reader.c:1887
+#: ../mail/e-mail-reader.c:1888 ../mail/e-mail-reader.c:1895
 msgid "Forward the selected message quoted like a reply"
 msgstr "Videresend den valgte meldingen sitert som et svar"
 
-#: ../mail/e-mail-reader.c:1885
+#: ../mail/e-mail-reader.c:1893
 msgid "Forward As _Quoted"
 msgstr "Videresend s_om sitat"
 
-#: ../mail/e-mail-reader.c:1892
+#: ../mail/e-mail-reader.c:1900
 msgid "_Load Images"
 msgstr "_Last bilder"
 
-#: ../mail/e-mail-reader.c:1894
+#: ../mail/e-mail-reader.c:1902
 msgid "Force images in HTML mail to be loaded"
 msgstr "Tvungen lasting av bilder i HTML e-post"
 
-#: ../mail/e-mail-reader.c:1899
+#: ../mail/e-mail-reader.c:1907
 msgid "_Important"
 msgstr "V_iktig"
 
-#: ../mail/e-mail-reader.c:1901
+#: ../mail/e-mail-reader.c:1909
 msgid "Mark the selected messages as important"
 msgstr "Merk valgte meldinger som viktige"
 
-#: ../mail/e-mail-reader.c:1906
+#: ../mail/e-mail-reader.c:1914
 msgid "_Junk"
 msgstr "_UÃnsket e-post"
 
-#: ../mail/e-mail-reader.c:1908
+#: ../mail/e-mail-reader.c:1916
 msgid "Mark the selected messages as junk"
 msgstr "Merk valgte meldinger som uÃnsket e-post"
 
-#: ../mail/e-mail-reader.c:1913
+#: ../mail/e-mail-reader.c:1921
 msgid "_Not Junk"
 msgstr "_Ikke uÃnsket e-post"
 
-#: ../mail/e-mail-reader.c:1915
+#: ../mail/e-mail-reader.c:1923
 msgid "Mark the selected messages as not being junk"
 msgstr "Merk valgte meldinger som Ãnsket e-post"
 
-#: ../mail/e-mail-reader.c:1920
+#: ../mail/e-mail-reader.c:1928
 msgid "_Read"
 msgstr "_Les"
 
-#: ../mail/e-mail-reader.c:1922
+#: ../mail/e-mail-reader.c:1930
 msgid "Mark the selected messages as having been read"
 msgstr "Merk valgte meldinger som lest"
 
-#: ../mail/e-mail-reader.c:1927
+#: ../mail/e-mail-reader.c:1935
 msgid "Uni_mportant"
 msgstr "_Ikke viktig"
 
-#: ../mail/e-mail-reader.c:1929
+#: ../mail/e-mail-reader.c:1937
 msgid "Mark the selected messages as unimportant"
 msgstr "Merk valgte meldinger som uviktige"
 
-#: ../mail/e-mail-reader.c:1934
+#: ../mail/e-mail-reader.c:1942
 msgid "_Unread"
 msgstr "_Ulest"
 
-#: ../mail/e-mail-reader.c:1936
+#: ../mail/e-mail-reader.c:1944
 msgid "Mark the selected messages as not having been read"
 msgstr "Merk valgte meldinger som ulest"
 
-#: ../mail/e-mail-reader.c:1941
+#: ../mail/e-mail-reader.c:1949
 msgid "_Edit as New Message..."
 msgstr "R_ediger som ny melding â"
 
-#: ../mail/e-mail-reader.c:1943
+#: ../mail/e-mail-reader.c:1951
 msgid "Open the selected messages in the composer for editing"
 msgstr "Ãpne valgte meldinger i redigeringskomponenten"
 
-#: ../mail/e-mail-reader.c:1948
+#: ../mail/e-mail-reader.c:1956
 msgid "Compose _New Message"
 msgstr "Skriv _ny melding"
 
-#: ../mail/e-mail-reader.c:1950
+#: ../mail/e-mail-reader.c:1958
 msgid "Open a window for composing a mail message"
 msgstr "Ãpne et vindu for à skrive en e-post melding"
 
-#: ../mail/e-mail-reader.c:1955
+#: ../mail/e-mail-reader.c:1963
 msgid "_Open in New Window"
 msgstr "_Ãpne i _nytt vindu"
 
-#: ../mail/e-mail-reader.c:1957
+#: ../mail/e-mail-reader.c:1965
 msgid "Open the selected messages in a new window"
 msgstr "Ãpne valgte meldinger i et nytt vindu"
 
-#: ../mail/e-mail-reader.c:1962
+#: ../mail/e-mail-reader.c:1970
 msgid "_Move to Folder..."
 msgstr "Fl_ytt til mappe â"
 
-#: ../mail/e-mail-reader.c:1964
+#: ../mail/e-mail-reader.c:1972
 msgid "Move selected messages to another folder"
 msgstr "Flytt valgte meldinger til en annen mappe"
 
-#: ../mail/e-mail-reader.c:1969
+#: ../mail/e-mail-reader.c:1977
 msgid "_Switch to Folder"
 msgstr "_Bytt til mappe"
 
-#: ../mail/e-mail-reader.c:1971
+#: ../mail/e-mail-reader.c:1979
 msgid "Display the parent folder"
 msgstr "Vis opphavsmappe"
 
-#: ../mail/e-mail-reader.c:1976
+#: ../mail/e-mail-reader.c:1984
 msgid "Switch to _next tab"
 msgstr "Bytt til _neste fane"
 
-#: ../mail/e-mail-reader.c:1978
+#: ../mail/e-mail-reader.c:1986
 msgid "Switch to the next tab"
 msgstr "Bytt til neste fane"
 
-#: ../mail/e-mail-reader.c:1983
+#: ../mail/e-mail-reader.c:1991
 msgid "Switch to _previous tab"
 msgstr "Bytt til _forrige fane"
 
-#: ../mail/e-mail-reader.c:1985
+#: ../mail/e-mail-reader.c:1993
 msgid "Switch to the previous tab"
 msgstr "Bytt til forrige fane"
 
-#: ../mail/e-mail-reader.c:1990
+#: ../mail/e-mail-reader.c:1998
 msgid "Cl_ose current tab"
 msgstr "L_ukk aktiv fane"
 
-#: ../mail/e-mail-reader.c:1992
+#: ../mail/e-mail-reader.c:2000
 msgid "Close current tab"
 msgstr "Lukk aktiv fane"
 
-#: ../mail/e-mail-reader.c:1997
+#: ../mail/e-mail-reader.c:2005
 msgid "_Next Message"
 msgstr "_Neste melding"
 
-#: ../mail/e-mail-reader.c:1999
+#: ../mail/e-mail-reader.c:2007
 msgid "Display the next message"
 msgstr "Vis neste melding"
 
-#: ../mail/e-mail-reader.c:2004
+#: ../mail/e-mail-reader.c:2012
 msgid "Next _Important Message"
 msgstr "Neste v_iktige melding"
 
-#: ../mail/e-mail-reader.c:2006
+#: ../mail/e-mail-reader.c:2014
 msgid "Display the next important message"
 msgstr "Vis neste viktige melding"
 
-#: ../mail/e-mail-reader.c:2011
+#: ../mail/e-mail-reader.c:2019
 msgid "Next _Thread"
 msgstr "Neste _trÃd"
 
-#: ../mail/e-mail-reader.c:2013
+#: ../mail/e-mail-reader.c:2021
 msgid "Display the next thread"
 msgstr "Vis neste trÃd"
 
-#: ../mail/e-mail-reader.c:2018
+#: ../mail/e-mail-reader.c:2026
 msgid "Next _Unread Message"
 msgstr "Neste _uleste melding"
 
-#: ../mail/e-mail-reader.c:2020
+#: ../mail/e-mail-reader.c:2028
 msgid "Display the next unread message"
 msgstr "Vis neste uleste melding"
 
-#: ../mail/e-mail-reader.c:2025
+#: ../mail/e-mail-reader.c:2033
 msgid "_Previous Message"
 msgstr "_Forrige melding"
 
-#: ../mail/e-mail-reader.c:2027
+#: ../mail/e-mail-reader.c:2035
 msgid "Display the previous message"
 msgstr "Vis forrige melding"
 
-#: ../mail/e-mail-reader.c:2032
+#: ../mail/e-mail-reader.c:2040
 msgid "Pr_evious Important Message"
 msgstr "Forrig_e viktige melding"
 
-#: ../mail/e-mail-reader.c:2034
+#: ../mail/e-mail-reader.c:2042
 msgid "Display the previous important message"
 msgstr "Vis forrige viktige melding"
 
-#: ../mail/e-mail-reader.c:2039
+#: ../mail/e-mail-reader.c:2047
 msgid "Previous T_hread"
 msgstr "Forrige trÃ_d"
 
-#: ../mail/e-mail-reader.c:2041
+#: ../mail/e-mail-reader.c:2049
 msgid "Display the previous thread"
 msgstr "Vis forrige trÃd"
 
-#: ../mail/e-mail-reader.c:2046
+#: ../mail/e-mail-reader.c:2054
 msgid "P_revious Unread Message"
 msgstr "Fo_rrige uleste melding"
 
-#: ../mail/e-mail-reader.c:2048
+#: ../mail/e-mail-reader.c:2056
 msgid "Display the previous unread message"
 msgstr "Vis forrige uleste melding"
 
-#: ../mail/e-mail-reader.c:2055
+#: ../mail/e-mail-reader.c:2063
 msgid "Print this message"
 msgstr "Skriv ut denne meldingen"
 
-#: ../mail/e-mail-reader.c:2062
+#: ../mail/e-mail-reader.c:2070
 msgid "Preview the message to be printed"
 msgstr "ForhÃndsvis meldingen som skal skrives ut"
 
-#: ../mail/e-mail-reader.c:2067
+#: ../mail/e-mail-reader.c:2075
 msgid "Re_direct"
 msgstr "Om_diriger"
 
-#: ../mail/e-mail-reader.c:2069
+#: ../mail/e-mail-reader.c:2077
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Omdiriger (bounce) den valgte meldingen til noen"
 
-#: ../mail/e-mail-reader.c:2074
+#: ../mail/e-mail-reader.c:2082
 msgid "Remo_ve Attachments"
 msgstr "Fjern _vedlegg"
 
-#: ../mail/e-mail-reader.c:2076
+#: ../mail/e-mail-reader.c:2084
 msgid "Remove attachments"
 msgstr "Fjern vedlegg"
 
-#: ../mail/e-mail-reader.c:2081
+#: ../mail/e-mail-reader.c:2089
 msgid "Remove Du_plicate Messages"
 msgstr "Fjern du_plikatmeldinger"
 
-#: ../mail/e-mail-reader.c:2083
+#: ../mail/e-mail-reader.c:2091
 msgid "Checks selected messages for duplicates"
 msgstr "Sjekk valgte meldinger for duplikater"
 
-#: ../mail/e-mail-reader.c:2088 ../mail/mail.error.xml.h:108
-#: ../modules/calendar/e-cal-shell-view-actions.c:1469
+#: ../mail/e-mail-reader.c:2096 ../mail/mail.error.xml.h:108
+#: ../modules/calendar/e-cal-shell-view-actions.c:1477
 #: ../modules/mail/e-mail-attachment-handler.c:177
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: ../mail/e-mail-reader.c:2090
+#: ../mail/e-mail-reader.c:2098
 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:2095 ../mail/mail.error.xml.h:109
+#: ../mail/e-mail-reader.c:2103 ../mail/mail.error.xml.h:109
 msgid "Reply to _List"
 msgstr "Svar til _listen"
 
-#: ../mail/e-mail-reader.c:2097
+#: ../mail/e-mail-reader.c:2105
 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:2102
+#: ../mail/e-mail-reader.c:2110
 #: ../modules/mail/e-mail-attachment-handler.c:184
 msgid "_Reply to Sender"
 msgstr "Sva_r til avsender"
 
-#: ../mail/e-mail-reader.c:2104
+#: ../mail/e-mail-reader.c:2112
 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:2109
+#: ../mail/e-mail-reader.c:2117
 msgid "_Save as mbox..."
 msgstr "Lagre _som mbox â"
 
-#: ../mail/e-mail-reader.c:2111
+#: ../mail/e-mail-reader.c:2119
 msgid "Save selected messages as an mbox file"
 msgstr "Lagre valgte meldinger som en mbox-fil"
 
-#: ../mail/e-mail-reader.c:2116
+#: ../mail/e-mail-reader.c:2124
 msgid "_Message Source"
 msgstr "_Meldingskilde"
 
-#: ../mail/e-mail-reader.c:2118
+#: ../mail/e-mail-reader.c:2126
 msgid "Show the raw email source of the message"
 msgstr "Vis e-post meldingen i sin rÃe form"
 
-#: ../mail/e-mail-reader.c:2130
+#: ../mail/e-mail-reader.c:2138
 msgid "_Undelete Message"
 msgstr "_Angre sletting av melding"
 
-#: ../mail/e-mail-reader.c:2132
+#: ../mail/e-mail-reader.c:2140
 msgid "Undelete the selected messages"
 msgstr "Angre sletting av valgte meldinger"
 
-#: ../mail/e-mail-reader.c:2137
+#: ../mail/e-mail-reader.c:2145
 msgid "_Normal Size"
 msgstr "_Normal stÃrrelse"
 
-#: ../mail/e-mail-reader.c:2139
+#: ../mail/e-mail-reader.c:2147
 msgid "Reset the text to its original size"
 msgstr "Ta teksten tilbake til sin opprinnelige stÃrrelse"
 
-#: ../mail/e-mail-reader.c:2144
+#: ../mail/e-mail-reader.c:2152
 msgid "_Zoom In"
 msgstr "_Zoom inn"
 
-#: ../mail/e-mail-reader.c:2146
+#: ../mail/e-mail-reader.c:2154
 msgid "Increase the text size"
 msgstr "StÃrre tekst"
 
-#: ../mail/e-mail-reader.c:2151
+#: ../mail/e-mail-reader.c:2159
 msgid "Zoom _Out"
 msgstr "Zoom _ut"
 
-#: ../mail/e-mail-reader.c:2153
+#: ../mail/e-mail-reader.c:2161
 msgid "Decrease the text size"
 msgstr "Mindre skrift"
 
-#: ../mail/e-mail-reader.c:2160
+#: ../mail/e-mail-reader.c:2168
 msgid "Create R_ule"
 msgstr "Opprett _regel"
 
-#: ../mail/e-mail-reader.c:2167
+#: ../mail/e-mail-reader.c:2175
 msgid "Ch_aracter Encoding"
 msgstr "Tegn_koding"
 
-#: ../mail/e-mail-reader.c:2174
+#: ../mail/e-mail-reader.c:2182
 msgid "F_orward As"
 msgstr "Videresend s_om"
 
-#: ../mail/e-mail-reader.c:2181
+#: ../mail/e-mail-reader.c:2189
 msgid "_Group Reply"
 msgstr "_Gruppesvar"
 
-#: ../mail/e-mail-reader.c:2188
+#: ../mail/e-mail-reader.c:2196
 msgid "_Go To"
 msgstr "_GÃ til"
 
-#: ../mail/e-mail-reader.c:2195
+#: ../mail/e-mail-reader.c:2203
 msgid "Mar_k As"
 msgstr "Mer_k som"
 
-#: ../mail/e-mail-reader.c:2202
+#: ../mail/e-mail-reader.c:2210
 msgid "_Message"
 msgstr "_Melding"
 
-#: ../mail/e-mail-reader.c:2209
+#: ../mail/e-mail-reader.c:2217
 msgid "_Zoom"
 msgstr "_Zoom"
 
-#: ../mail/e-mail-reader.c:2219
+#: ../mail/e-mail-reader.c:2227
 msgid "Search Folder from Mailing _List..."
 msgstr "SÃkemappe pà e-post_liste â"
 
-#: ../mail/e-mail-reader.c:2221
+#: ../mail/e-mail-reader.c:2229
 msgid "Create a search folder for this mailing list"
 msgstr "Lag en sÃkemappe for denne e-postlisten"
 
-#: ../mail/e-mail-reader.c:2226
+#: ../mail/e-mail-reader.c:2234
 msgid "Search Folder from Recipien_ts..."
 msgstr "SÃkemappe fra mo_ttakere â"
 
-#: ../mail/e-mail-reader.c:2228
+#: ../mail/e-mail-reader.c:2236
 msgid "Create a search folder for these recipients"
 msgstr "Lag en sÃkemappe for disse mottakerene"
 
-#: ../mail/e-mail-reader.c:2233
+#: ../mail/e-mail-reader.c:2241
 msgid "Search Folder from Sen_der..."
 msgstr "SÃkemappe for avsen_der â"
 
-#: ../mail/e-mail-reader.c:2235
+#: ../mail/e-mail-reader.c:2243
 msgid "Create a search folder for this sender"
 msgstr "Lag en sÃkemappe for denne avsenderen"
 
-#: ../mail/e-mail-reader.c:2240
+#: ../mail/e-mail-reader.c:2248
 msgid "Search Folder from S_ubject..."
 msgstr "SÃkemappe for _emne â"
 
-#: ../mail/e-mail-reader.c:2242
+#: ../mail/e-mail-reader.c:2250
 msgid "Create a search folder for this subject"
 msgstr "Lag en sÃkemappe for dette emnet"
 
-#: ../mail/e-mail-reader.c:2265
+#: ../mail/e-mail-reader.c:2273
 msgid "Mark for Follo_w Up..."
 msgstr "Merk for oppfÃl_ging â"
 
-#: ../mail/e-mail-reader.c:2273
+#: ../mail/e-mail-reader.c:2281
 msgid "Mark as _Important"
 msgstr "Merk som v_iktig"
 
-#: ../mail/e-mail-reader.c:2277
+#: ../mail/e-mail-reader.c:2285
 msgid "Mark as _Junk"
 msgstr "Merk som _uÃnsket e-post"
 
-#: ../mail/e-mail-reader.c:2281
+#: ../mail/e-mail-reader.c:2289
 msgid "Mark as _Not Junk"
 msgstr "Merk som _gyldig melding"
 
-#: ../mail/e-mail-reader.c:2285
+#: ../mail/e-mail-reader.c:2293
 msgid "Mar_k as Read"
 msgstr "Mer_k som lest"
 
-#: ../mail/e-mail-reader.c:2289
+#: ../mail/e-mail-reader.c:2297
 msgid "Mark as Uni_mportant"
 msgstr "_Merk som uviktig"
 
-#: ../mail/e-mail-reader.c:2293
+#: ../mail/e-mail-reader.c:2301
 msgid "Mark as _Unread"
 msgstr "Merk som _ulest"
 
-#: ../mail/e-mail-reader.c:2337
+#: ../mail/e-mail-reader.c:2345
 msgid "_Caret Mode"
 msgstr "MarkÃr_modus"
 
-#: ../mail/e-mail-reader.c:2339
+#: ../mail/e-mail-reader.c:2347
 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:2345
+#: ../mail/e-mail-reader.c:2353
 msgid "All Message _Headers"
 msgstr "Alle meldings_hoder"
 
-#: ../mail/e-mail-reader.c:2347
+#: ../mail/e-mail-reader.c:2355
 msgid "Show messages with all email headers"
 msgstr "Vis meldinger med alle meldingshoder"
 
-#: ../mail/e-mail-reader.c:2643
+#: ../mail/e-mail-reader.c:2651
 #, 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:3221 ../mail/mail-config.ui.h:32
-#: ../plugins/google-account-setup/google-source.c:303
-#: ../plugins/google-account-setup/google-source.c:537
-#: ../plugins/google-account-setup/google-source.c:673
+#: ../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
 #: ../widgets/misc/e-account-tree-view.c:253
 msgid "Default"
 msgstr "Forvalgt"
 
-#: ../mail/e-mail-reader.c:3388
+#: ../mail/e-mail-reader.c:3396
 #: ../modules/mail/e-mail-attachment-handler.c:170
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: ../mail/e-mail-reader.c:3389
+#: ../mail/e-mail-reader.c:3397
 msgid "Forward the selected message to someone"
 msgstr "Videresend den valgte meldingen til noen"
 
-#: ../mail/e-mail-reader.c:3408
+#: ../mail/e-mail-reader.c:3416
 msgid "Group Reply"
 msgstr "Gruppesvar"
 
-#: ../mail/e-mail-reader.c:3409
+#: ../mail/e-mail-reader.c:3417
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "Svar til e-postlisten eller til alle mottakere"
 
-#: ../mail/e-mail-reader.c:3462 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:3470 ../mail/em-filter-i18n.h:14
 msgid "Delete"
 msgstr "Slett"
 
-#: ../mail/e-mail-reader.c:3495
-#: ../modules/calendar/e-cal-shell-view-actions.c:1315
-#: ../widgets/misc/e-calendar.c:201
+#: ../mail/e-mail-reader.c:3503
+#: ../modules/calendar/e-cal-shell-view-actions.c:1323
+#: ../widgets/misc/e-calendar.c:202
 msgid "Next"
 msgstr "Neste"
 
-#: ../mail/e-mail-reader.c:3499
-#: ../modules/calendar/e-cal-shell-view-actions.c:1308
-#: ../widgets/misc/e-calendar.c:177
+#: ../mail/e-mail-reader.c:3507
+#: ../modules/calendar/e-cal-shell-view-actions.c:1316
+#: ../widgets/misc/e-calendar.c:178
 msgid "Previous"
 msgstr "Forrige"
 
-#: ../mail/e-mail-reader.c:3508 ../mail/mail-dialogs.ui.h:16
+#: ../mail/e-mail-reader.c:3516 ../mail/mail-dialogs.ui.h:16
 msgid "Reply"
 msgstr "Svar"
 
-#: ../mail/e-mail-reader.c:4172
+#: ../mail/e-mail-reader.c:4186
 #, c-format
 msgid "Folder '%s'"
 msgstr "Mappe Â%sÂ"
 
-#: ../mail/e-mail-session.c:657
+#: ../mail/e-mail-session.c:661
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Skriv inn passord for %s"
 
-#: ../mail/e-mail-session.c:661
+#: ../mail/e-mail-session.c:665
 msgid "Enter Passphrase"
 msgstr "Skriv inn passord"
 
-#: ../mail/e-mail-session.c:665
+#: ../mail/e-mail-session.c:669
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Skriv inn passord for %s"
 
-#: ../mail/e-mail-session.c:669
+#: ../mail/e-mail-session.c:673
 msgid "Enter Password"
 msgstr "Skriv inn passord"
 
-#: ../mail/e-mail-session.c:720
+#: ../mail/e-mail-session.c:724
 #, c-format
 msgid "User canceled operation."
 msgstr "Operasjon avbrutt av bruker."
 
-#: ../mail/e-mail-session.c:835
+#: ../mail/e-mail-session.c:839
 #, 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:844
+#: ../mail/e-mail-session.c:848
 #, 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."
 
-#: ../mail/e-mail-session-utils.c:416
+#: ../mail/e-mail-session-utils.c:419
 #, c-format
 msgid "Cannot get transport for account '%s'"
 msgstr "Kan ikke hente transport for konto Â%sÂ"
 
-#: ../mail/e-mail-session-utils.c:496 ../mail/mail-ops.c:626
+#: ../mail/e-mail-session-utils.c:506 ../mail/mail-ops.c:633
 #, 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:520 ../mail/e-mail-session-utils.c:554
-#: ../mail/mail-ops.c:645 ../mail/mail-ops.c:679
+#: ../mail/e-mail-session-utils.c:530 ../mail/e-mail-session-utils.c:564
+#: ../mail/mail-ops.c:652 ../mail/mail-ops.c:686
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -8972,32 +9028,32 @@ msgstr ""
 "Kunne ikke legge til i %s: %s\n"
 "Legger til i lokal ÂSendtÂ-mappe i stedet."
 
-#: ../mail/e-mail-session-utils.c:574 ../mail/mail-ops.c:699
+#: ../mail/e-mail-session-utils.c:584 ../mail/mail-ops.c:706
 #, 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:785 ../mail/mail-ops.c:802
-#: ../mail/mail-ops.c:898
+#: ../mail/e-mail-session-utils.c:795 ../mail/mail-ops.c:809
+#: ../mail/mail-ops.c:905
 msgid "Sending message"
 msgstr "Sender melding"
 
-#: ../mail/e-mail-session-utils.c:861
+#: ../mail/e-mail-session-utils.c:871
 #, c-format
 msgid "Unsubscribing from folder '%s'"
 msgstr "Fjerner abonnement pà mappe Â%sÂ"
 
-#: ../mail/e-mail-store-utils.c:165
+#: ../mail/e-mail-store-utils.c:167
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "Kobler fra Â%sÂ"
 
-#: ../mail/e-mail-store-utils.c:256
+#: ../mail/e-mail-store-utils.c:258
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "Kobler til Â%s pà nytt"
 
-#: ../mail/e-mail-store-utils.c:331
+#: ../mail/e-mail-store-utils.c:333
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Forbereder konto Â%s for frakoblet bruk"
@@ -9008,7 +9064,7 @@ msgstr "Merk for oppfÃlging"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:567 ../mail/mail-config.ui.h:72
+#: ../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"
@@ -9016,7 +9072,7 @@ 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:571 ../mail/mail-config.ui.h:130
+#: ../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"
@@ -9024,40 +9080,40 @@ 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:575 ../mail/mail-config.ui.h:94
+#: ../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:838 ../widgets/misc/e-signature-combo-box.c:75
+#: ../mail/em-account-editor.c:839 ../widgets/misc/e-signature-combo-box.c:75
 msgctxt "mail-signature"
 msgid "None"
 msgstr "Ingen"
 
-#: ../mail/em-account-editor.c:919
+#: ../mail/em-account-editor.c:920
 msgid "Never"
 msgstr "Aldri"
 
-#: ../mail/em-account-editor.c:920
+#: ../mail/em-account-editor.c:921
 msgid "Always"
 msgstr "Alltid"
 
-#: ../mail/em-account-editor.c:921
+#: ../mail/em-account-editor.c:922
 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:1741 ../widgets/misc/e-account-tree-view.c:131
+#: ../mail/em-account-editor.c:1742 ../widgets/misc/e-account-tree-view.c:131
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "Ingen"
 
-#: ../mail/em-account-editor.c:2176
+#: ../mail/em-account-editor.c:2178
 msgid "Mail Configuration"
 msgstr "E-post-konfigurasjon"
 
-#: ../mail/em-account-editor.c:2177
+#: ../mail/em-account-editor.c:2179
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -9067,7 +9123,7 @@ msgstr ""
 "\n"
 "Klikk ÂFramover for à begynne."
 
-#: ../mail/em-account-editor.c:2180
+#: ../mail/em-account-editor.c:2182
 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 "
@@ -9077,19 +9133,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:2182 ../mail/em-account-editor.c:2345
+#: ../mail/em-account-editor.c:2184 ../mail/em-account-editor.c:2372
 msgid "Receiving Email"
 msgstr "Innkommende e-post"
 
-#: ../mail/em-account-editor.c:2183
+#: ../mail/em-account-editor.c:2185
 msgid "Please configure the following account settings."
 msgstr "Vennligst konfigurer fÃlgende kontoinnstillinger."
 
-#: ../mail/em-account-editor.c:2185 ../mail/em-account-editor.c:2845
+#: ../mail/em-account-editor.c:2187 ../mail/em-account-editor.c:2896
 msgid "Sending Email"
 msgstr "UtgÃende e-post"
 
-#: ../mail/em-account-editor.c:2186
+#: ../mail/em-account-editor.c:2188
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -9097,11 +9153,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:2188 ../mail/mail-config.ui.h:1
+#: ../mail/em-account-editor.c:2190 ../mail/mail-config.ui.h:1
 msgid "Account Information"
 msgstr "Kontoinformasjon"
 
-#: ../mail/em-account-editor.c:2189
+#: ../mail/em-account-editor.c:2191
 msgid ""
 "Please enter a descriptive name for this account below.\n"
 "This name will be used for display purposes only."
@@ -9109,11 +9165,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:2193
+#: ../mail/em-account-editor.c:2195
 msgid "Done"
 msgstr "Ferdig"
 
-#: ../mail/em-account-editor.c:2194
+#: ../mail/em-account-editor.c:2196
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -9127,29 +9183,29 @@ msgstr ""
 "\n"
 "Klikk ÂBruk for à lagre dine innstillinger."
 
-#: ../mail/em-account-editor.c:2659
+#: ../mail/em-account-editor.c:2694
 msgid "Check for _new messages every"
 msgstr "Se etter _nye meldinger hver(t)"
 
-#: ../mail/em-account-editor.c:2667
+#: ../mail/em-account-editor.c:2702
 msgid "minu_tes"
 msgstr "minu_tter"
 
-#: ../mail/em-account-editor.c:2950
+#: ../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:3258 ../mail/mail-config.ui.h:101
+#: ../mail/em-account-editor.c:3339 ../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:3304 ../mail/em-account-editor.c:3372
+#: ../mail/em-account-editor.c:3393 ../mail/em-account-editor.c:3476
 msgid "Receiving Options"
 msgstr "Alternativer for mottak"
 
-#: ../mail/em-account-editor.c:3305 ../mail/em-account-editor.c:3373
+#: ../mail/em-account-editor.c:3394 ../mail/em-account-editor.c:3477
 msgid "Checking for New Messages"
 msgstr "Ser etter nye meldinger"
 
@@ -9157,7 +9213,7 @@ msgstr "Ser etter nye meldinger"
 #. * 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:1180
+#: ../mail/em-composer-utils.c:1184
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -9165,31 +9221,31 @@ msgstr ""
 "${AbbrevWeekdayName}, ${Day}.${Month}.${Year} kl. ${24Hour}.${Minute} "
 "${TimeZone}, skrev ${Sender}:"
 
-#: ../mail/em-composer-utils.c:1191
+#: ../mail/em-composer-utils.c:1195
 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:1961
+#: ../mail/em-composer-utils.c:1976
 #, 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:2015
+#: ../mail/em-composer-utils.c:2030
 #, c-format
 msgid "Delivery Notification for: \"%s\""
 msgstr "Varsling om ny e-post for Â%sÂ"
 
-#: ../mail/em-composer-utils.c:2475
+#: ../mail/em-composer-utils.c:2532
 msgid "an unknown sender"
 msgstr "en ukjent avsender"
 
-#: ../mail/em-composer-utils.c:2844
+#: ../mail/em-composer-utils.c:2933
 msgid "Posting destination"
 msgstr "Destinasjon for post"
 
-#: ../mail/em-composer-utils.c:2845
+#: ../mail/em-composer-utils.c:2934
 msgid "Choose folders to post the message to."
 msgstr "Velg mapper meldingen skal postes til."
 
@@ -9440,37 +9496,37 @@ msgid "Unset Status"
 msgstr "Nullstill status"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:536
+#: ../mail/em-filter-rule.c:538
 msgid "Then"
 msgstr "SÃ etter"
 
-#: ../mail/em-filter-rule.c:567
+#: ../mail/em-filter-rule.c:569
 msgid "Add Ac_tion"
 msgstr "Legg til hand_ling"
 
-#: ../mail/em-folder-properties.c:142
+#: ../mail/em-folder-properties.c:143
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Ulest melding:"
 msgstr[1] "Uleste meldinger:"
 
-#: ../mail/em-folder-properties.c:153
+#: ../mail/em-folder-properties.c:154
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Totalt antall melding:"
 msgstr[1] "Totalt antall meldinger:"
 
-#: ../mail/em-folder-properties.c:174
+#: ../mail/em-folder-properties.c:175
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "Bruk av kvote (%s):"
 
-#: ../mail/em-folder-properties.c:176
+#: ../mail/em-folder-properties.c:177
 #, c-format
 msgid "Quota usage"
 msgstr "Bruk av kvote"
 
-#: ../mail/em-folder-properties.c:314
+#: ../mail/em-folder-properties.c:315
 msgid "Folder Properties"
 msgstr "Egenskaper for mappe"
 
@@ -9490,7 +9546,7 @@ msgstr "Mappe_navn:"
 #: ../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/mail-vfolder.c:1141 ../mail/mail-vfolder.c:1216
+#: ../mail/mail-vfolder.c:1165 ../mail/mail-vfolder.c:1240
 msgid "Search Folders"
 msgstr "SÃkemapper"
 
@@ -9499,7 +9555,7 @@ msgstr "SÃkemapper"
 msgid "UNMATCHED"
 msgstr "UTEN TREFF"
 
-#: ../mail/em-folder-tree-model.c:790 ../mail/em-folder-tree-model.c:1059
+#: ../mail/em-folder-tree-model.c:792 ../mail/em-folder-tree-model.c:1061
 msgid "Loading..."
 msgstr "Laster â"
 
@@ -9507,54 +9563,54 @@ msgstr "Laster â"
 msgid "Folder names cannot contain '/'"
 msgstr "Mappenavn kan ikke inneholde tegnet Â/Â"
 
-#: ../mail/em-folder-tree.c:1327
+#: ../mail/em-folder-tree.c:1331
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1564
+#: ../mail/em-folder-tree.c:1568
 msgid "Mail Folder Tree"
 msgstr "Tre for e-postmapper"
 
-#: ../mail/em-folder-tree.c:2063 ../mail/em-folder-utils.c:114
+#: ../mail/em-folder-tree.c:2068 ../mail/em-folder-utils.c:114
 #, c-format
 msgid "Moving folder %s"
 msgstr "Flytter mappe %s"
 
-#: ../mail/em-folder-tree.c:2066 ../mail/em-folder-utils.c:116
+#: ../mail/em-folder-tree.c:2071 ../mail/em-folder-utils.c:116
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopierer mappe %s"
 
-#: ../mail/em-folder-tree.c:2070 ../mail/message-list.c:2218
+#: ../mail/em-folder-tree.c:2078 ../mail/message-list.c:2218
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Flytter meldinger til mappe %s"
 
-#: ../mail/em-folder-tree.c:2074 ../mail/message-list.c:2220
+#: ../mail/em-folder-tree.c:2082 ../mail/message-list.c:2220
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopierer meldinger til mappe %s"
 
-#: ../mail/em-folder-tree.c:2093
+#: ../mail/em-folder-tree.c:2101
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Kan ikke slippe melding(er) toppnivà for lageret"
 
-#: ../mail/em-folder-utils.c:474
+#: ../mail/em-folder-utils.c:481
 msgid "Move Folder To"
 msgstr "Flytt mappe til"
 
-#: ../mail/em-folder-utils.c:474
+#: ../mail/em-folder-utils.c:481
 msgid "Copy Folder To"
 msgstr "Kopier mappe til"
 
-#: ../mail/em-folder-utils.c:549
+#: ../mail/em-folder-utils.c:556
 msgid "Create Folder"
 msgstr "Opprett mappe"
 
-#: ../mail/em-folder-utils.c:550
+#: ../mail/em-folder-utils.c:557
 msgid "Specify where to create the folder:"
 msgstr "Spesifiser hvor mappen skal opprettes:"
 
@@ -9761,21 +9817,21 @@ msgstr "Peker til eksterne data (%s)"
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Peker til ukjente eksterne data (Â%sÂ-type)"
 
-#: ../mail/em-format-html.c:2799
-msgid "(no subject)"
-msgstr "(uten emne)"
-
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user example com"
-#: ../mail/em-format-html.c:2815
+#: ../mail/em-format-html.c:2824
 #: ../plugins/mail-notification/mail-notification.c:407
 #, c-format
 msgid "From: %s"
 msgstr "Fra: %s"
 
+#: ../mail/em-format-html.c:2837
+msgid "(no subject)"
+msgstr "(uten emne)"
+
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
-#: ../mail/em-format-html.c:2892
+#: ../mail/em-format-html.c:2901
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "Denne meldingen ble sendt av %s pà vegne av %s"
@@ -9848,23 +9904,23 @@ msgstr "Stopp aktiv operasjon"
 #. * messages to be opened.  The %d is replaced with the actual
 #. * count of messages. If you need a '%' in your text, then
 #. * write it doubled, like '%%'.
-#: ../mail/em-utils.c:101
+#: ../mail/em-utils.c:102
 #, c-format
 msgid "Are you sure you want to open %d message at once?"
 msgid_plural "Are you sure you want to open %d messages at once?"
 msgstr[0] "Er du sikker pà at du vil Ãpne %d melding samtidig?"
 msgstr[1] "Er du sikker pà at du vil Ãpne %d meldinger samtidig?"
 
-#: ../mail/em-utils.c:157
+#: ../mail/em-utils.c:158
 #: ../modules/mailto-handler/evolution-mailto-handler.c:154
 msgid "_Do not show this message again"
 msgstr "Ikke vis _denne meldingen igjen"
 
-#: ../mail/em-utils.c:330
+#: ../mail/em-utils.c:331
 msgid "Message Filters"
 msgstr "Meldingsfiltre"
 
-#: ../mail/em-utils.c:915
+#: ../mail/em-utils.c:916
 #, c-format
 msgid "Messages from %s"
 msgstr "Meldinger fra %s"
@@ -11118,53 +11174,53 @@ msgstr "Bredde pà e-postlistefeltet."
 msgid "Importing Elm data"
 msgstr "Importerer data fra Elm"
 
-#: ../mail/importers/elm-importer.c:339 ../mail/importers/pine-importer.c:419
+#: ../mail/importers/elm-importer.c:341 ../mail/importers/pine-importer.c:446
 #: ../modules/mail/e-mail-shell-view.c:1036
 #: ../widgets/misc/e-send-options.c:511
 msgid "Mail"
 msgstr "E-post"
 
-#: ../mail/importers/elm-importer.c:380
+#: ../mail/importers/elm-importer.c:382
 msgid "Evolution Elm importer"
 msgstr "Import fra Elm for Evolution"
 
-#: ../mail/importers/elm-importer.c:381
+#: ../mail/importers/elm-importer.c:383
 msgid "Import mail from Elm."
 msgstr "Importer e-post fra Elm."
 
-#: ../mail/importers/evolution-mbox-importer.c:125
-#: ../plugins/dbx-import/dbx-importer.c:241
+#: ../mail/importers/evolution-mbox-importer.c:135
+#: ../plugins/dbx-import/dbx-importer.c:249
 msgid "_Destination folder:"
 msgstr "_MÃlmappe:"
 
-#: ../mail/importers/evolution-mbox-importer.c:132
-#: ../plugins/dbx-import/dbx-importer.c:251
+#: ../mail/importers/evolution-mbox-importer.c:142
+#: ../plugins/dbx-import/dbx-importer.c:259
 #: ../plugins/pst-import/pst-importer.c:318
 msgid "Select folder"
 msgstr "Velg mappe"
 
-#: ../mail/importers/evolution-mbox-importer.c:133
-#: ../plugins/dbx-import/dbx-importer.c:252
+#: ../mail/importers/evolution-mbox-importer.c:143
+#: ../plugins/dbx-import/dbx-importer.c:260
 #: ../plugins/pst-import/pst-importer.c:319
 msgid "Select folder to import into"
 msgstr "Velg mappe à importere til"
 
-#: ../mail/importers/evolution-mbox-importer.c:404
+#: ../mail/importers/evolution-mbox-importer.c:417
 msgctxt "mboxImp"
 msgid "Subject"
 msgstr "Emne"
 
-#: ../mail/importers/evolution-mbox-importer.c:409
+#: ../mail/importers/evolution-mbox-importer.c:422
 msgctxt "mboxImp"
 msgid "From"
 msgstr "Fra"
 
-#: ../mail/importers/evolution-mbox-importer.c:453
+#: ../mail/importers/evolution-mbox-importer.c:466
 #: ../shell/e-shell-utils.c:221
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley Mailbox (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:454
+#: ../mail/importers/evolution-mbox-importer.c:467
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importer mapper i Berkeley Mailbox format"
 
@@ -11174,32 +11230,32 @@ msgstr "Importerer postboks"
 
 #. Destination folder, was set in our widget
 #: ../mail/importers/mail-importer.c:153
-#: ../plugins/dbx-import/dbx-importer.c:595
-#: ../plugins/pst-import/pst-importer.c:481
-#: ../plugins/pst-import/pst-importer.c:590
+#: ../plugins/dbx-import/dbx-importer.c:603
+#: ../plugins/pst-import/pst-importer.c:500
+#: ../plugins/pst-import/pst-importer.c:609
 #, c-format
 msgid "Importing '%s'"
 msgstr "Importerer Â%sÂ"
 
-#: ../mail/importers/mail-importer.c:313
+#: ../mail/importers/mail-importer.c:315
 #, c-format
 msgid "Scanning %s"
 msgstr "SÃker i %s"
 
-#: ../mail/importers/pine-importer.c:223
+#: ../mail/importers/pine-importer.c:250
 msgid "Importing Pine data"
 msgstr "Importerer data fra Pine"
 
-#: ../mail/importers/pine-importer.c:424
-#: ../modules/addressbook/addressbook-config.c:1013
+#: ../mail/importers/pine-importer.c:451
+#: ../modules/addressbook/addressbook-config.c:1053
 msgid "Address Book"
 msgstr "Adressebok"
 
-#: ../mail/importers/pine-importer.c:466
+#: ../mail/importers/pine-importer.c:493
 msgid "Evolution Pine importer"
 msgstr "Import fra Pine for Evolutions"
 
-#: ../mail/importers/pine-importer.c:467
+#: ../mail/importers/pine-importer.c:494
 msgid "Import mail from Pine."
 msgstr "Importer e-post fra Pine."
 
@@ -11208,7 +11264,7 @@ msgstr "Importer e-post fra Pine."
 msgid "Mail to %s"
 msgstr "Send til %s"
 
-#: ../mail/mail-autofilter.c:238 ../mail/mail-autofilter.c:280
+#: ../mail/mail-autofilter.c:238 ../mail/mail-autofilter.c:281
 #, c-format
 msgid "Mail from %s"
 msgstr "E-post fra %s"
@@ -11218,12 +11274,12 @@ msgstr "E-post fra %s"
 msgid "Subject is %s"
 msgstr "Emne er %s"
 
-#: ../mail/mail-autofilter.c:303
+#: ../mail/mail-autofilter.c:305
 #, c-format
 msgid "%s mailing list"
 msgstr "%s e-postliste"
 
-#: ../mail/mail-autofilter.c:412
+#: ../mail/mail-autofilter.c:414
 msgid "Add Filter Rule"
 msgstr "Legg til filterregel"
 
@@ -11232,7 +11288,7 @@ msgstr "Legg til filterregel"
 #. * folder. For more than one filter rule is each of
 #. * them on a separate line, with four spaces in front
 #. * of its name, without quotes.
-#: ../mail/mail-autofilter.c:515
+#: ../mail/mail-autofilter.c:517
 #, c-format
 msgid ""
 "The filter rule \"%s\" has been modified to account for the deleted folder\n"
@@ -11299,7 +11355,7 @@ msgid "Apply the same _view settings to all folders"
 msgstr "Bruk samme _visningsinnstillinger for alle mapper"
 
 #: ../mail/mail-config.ui.h:15
-#: ../modules/addressbook/addressbook-config.c:1020
+#: ../modules/addressbook/addressbook-config.c:1060
 msgid "Authentication"
 msgstr "Autentisering"
 
@@ -11991,7 +12047,7 @@ msgstr "_Flagg:"
 msgid "_Tick this to accept the license agreement"
 msgstr "_Kryss av her for à godta lisensen"
 
-#: ../mail/mail-folder-cache.c:757
+#: ../mail/mail-folder-cache.c:767
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinger %s"
@@ -12004,69 +12060,69 @@ msgstr "Filtrerer valgte meldinger"
 msgid "Fetching Mail"
 msgstr "Henter e-post"
 
-#: ../mail/mail-ops.c:813
+#: ../mail/mail-ops.c:820
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sender melding %d av %d"
 
-#: ../mail/mail-ops.c:861
+#: ../mail/mail-ops.c:868
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Feil under sending av %d av %d meldinger"
 
-#: ../mail/mail-ops.c:865 ../mail/mail-send-recv.c:824
+#: ../mail/mail-ops.c:872 ../mail/mail-send-recv.c:824
 msgid "Canceled."
 msgstr "Avbrutt."
 
-#: ../mail/mail-ops.c:867 ../mail/mail-send-recv.c:826
+#: ../mail/mail-ops.c:874 ../mail/mail-send-recv.c:826
 msgid "Complete."
 msgstr "FullfÃrt."
 
-#: ../mail/mail-ops.c:977
+#: ../mail/mail-ops.c:984
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Flytter meldinger til Â%sÂ"
 
-#: ../mail/mail-ops.c:978
+#: ../mail/mail-ops.c:985
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Kopierer meldinger til Â%sÂ"
 
-#: ../mail/mail-ops.c:1095
+#: ../mail/mail-ops.c:1102
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Lagrer mappe Â%sÂ"
 
-#: ../mail/mail-ops.c:1169
+#: ../mail/mail-ops.c:1176
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "TÃmmer og lagrer konto Â%sÂ"
 
-#: ../mail/mail-ops.c:1170
+#: ../mail/mail-ops.c:1177
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Lagrer konto Â%sÂ"
 
-#: ../mail/mail-ops.c:1232
+#: ../mail/mail-ops.c:1239
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "Oppdaterer mappe Â%sÂ"
 
-#: ../mail/mail-ops.c:1410
+#: ../mail/mail-ops.c:1417
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "TÃmmer mappe Â%sÂ"
 
-#: ../mail/mail-ops.c:1483
+#: ../mail/mail-ops.c:1490
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "TÃmmer sÃppel i Â%sÂ"
 
-#: ../mail/mail-ops.c:1484
+#: ../mail/mail-ops.c:1491
 msgid "Local Folders"
 msgstr "Lokale mapper"
 
-#: ../mail/mail-ops.c:1582
+#: ../mail/mail-ops.c:1589
 #, c-format
 msgid "Disconnecting %s"
 msgstr "Kobler fra %s"
@@ -12130,7 +12186,7 @@ msgstr "Oppdaterer sÃkemapper for Â%s : %s"
 #. * removed folder. For more than one search folder is
 #. * each of them on a separate line, with four spaces
 #. * in front of its name, without quotes.
-#: ../mail/mail-vfolder.c:668
+#: ../mail/mail-vfolder.c:681
 #, c-format
 msgid ""
 "The Search Folder \"%s\" has been modified to account for the deleted "
@@ -12148,11 +12204,11 @@ msgstr[1] ""
 "%s ble oppdatert fordi de brukte en mappe som ble slettet\n"
 "Â%sÂ."
 
-#: ../mail/mail-vfolder.c:1270
+#: ../mail/mail-vfolder.c:1294
 msgid "Edit Search Folder"
 msgstr "Rediger sÃkemappe"
 
-#: ../mail/mail-vfolder.c:1384
+#: ../mail/mail-vfolder.c:1408
 msgid "New Search Folder"
 msgstr "Ny sÃkemappe"
 
@@ -12972,12 +13028,17 @@ msgstr "Velg alle synlige meldinger"
 msgid "Messages"
 msgstr "Meldinger"
 
+#. default follow-up flag name to use when clicked in the message list column
+#: ../mail/message-list.c:3997
+msgid "Follow-up"
+msgstr "FÃlg opp"
+
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4475 ../mail/message-list.c:4894
+#: ../mail/message-list.c:4501 ../mail/message-list.c:4920
 msgid "Generating message list"
 msgstr "Genererer meldingsliste"
 
-#: ../mail/message-list.c:4712
+#: ../mail/message-list.c:4738
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -12985,7 +13046,7 @@ msgstr ""
 "Ingen meldinger passer dine sÃkekriterier. Du kan enten tÃmme sÃket med "
 "menyoppfÃringen SÃk->TÃm eller endre det."
 
-#: ../mail/message-list.c:4714
+#: ../mail/message-list.c:4740
 msgid "There are no messages in this folder."
 msgstr "Det er ingen meldinger i denne mappen."
 
@@ -13077,15 +13138,15 @@ msgstr ""
 "eller TLS. Dette betyr at din tilkobling vil vÃre usikker, og at du vil vÃre "
 "sÃrbar for sikkerhetshull. "
 
-#: ../modules/addressbook/addressbook-config.c:610
+#: ../modules/addressbook/addressbook-config.c:625
 msgid "U_se in Birthday & Anniversaries calendar"
 msgstr "Bruk i kalender for fÃd_selsdager og jubileum"
 
-#: ../modules/addressbook/addressbook-config.c:646
+#: ../modules/addressbook/addressbook-config.c:666
 msgid "Copy _book content locally for offline operation"
 msgstr "Kopier innholdet i adresse_boken lokalt for frakoblet operasjon"
 
-#: ../modules/addressbook/addressbook-config.c:753
+#: ../modules/addressbook/addressbook-config.c:778
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. A "
 "list of standard ports has been provided. Ask your system administrator what "
@@ -13095,7 +13156,7 @@ msgstr ""
 "liste med standardporter er gitt. SpÃr din systemadministrator hvilken port "
 "du skal bruke."
 
-#: ../modules/addressbook/addressbook-config.c:827
+#: ../modules/addressbook/addressbook-config.c:857
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your LDAP "
@@ -13104,7 +13165,7 @@ msgstr ""
 "Dette er metoden Evolution bruker for à autentisere deg. Merk at hvis du "
 "setter denne til ÂE-post-adresse kreves anonym tilgang til din LDAP-tjener."
 
-#: ../modules/addressbook/addressbook-config.c:902
+#: ../modules/addressbook/addressbook-config.c:937
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the directory tree. A search scope of \"sub\" will include all entries below "
@@ -13116,29 +13177,29 @@ msgstr ""
 "sÃkebase. Et sÃkeomrÃde som Âone vil kun ta med oppfÃringer ett nivà under "
 "basen."
 
-#: ../modules/addressbook/addressbook-config.c:1018
+#: ../modules/addressbook/addressbook-config.c:1058
 msgid "Server Information"
 msgstr "Tjenerinformasjon"
 
-#: ../modules/addressbook/addressbook-config.c:1023
+#: ../modules/addressbook/addressbook-config.c:1063
 #: ../smime/gui/smime-ui.ui.h:13
 msgid "Details"
 msgstr "Detaljer"
 
-#: ../modules/addressbook/addressbook-config.c:1024
+#: ../modules/addressbook/addressbook-config.c:1064
 #: ../modules/mail/e-mail-shell-view.c:58
 msgid "Searching"
 msgstr "SÃker"
 
-#: ../modules/addressbook/addressbook-config.c:1026
+#: ../modules/addressbook/addressbook-config.c:1066
 msgid "Downloading"
 msgstr "Laster ned"
 
-#: ../modules/addressbook/addressbook-config.c:1232
+#: ../modules/addressbook/addressbook-config.c:1272
 msgid "Address Book Properties"
 msgstr "Egenskaper for adressebok"
 
-#: ../modules/addressbook/addressbook-config.c:1234
+#: ../modules/addressbook/addressbook-config.c:1274
 msgid "New Address Book"
 msgstr "Ny adressebok"
 
@@ -13240,7 +13301,7 @@ 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/mail/em-mailer-prefs.c:1145
+#: ../modules/mail/em-mailer-prefs.c:1150
 msgid "_Table column:"
 msgstr "Kolonne i _tabell:"
 
@@ -13253,56 +13314,56 @@ 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:96
+#: ../modules/addressbook/e-book-shell-backend.c:98
 #: ../modules/addressbook/e-book-shell-migrate.c:154
 msgid "On LDAP Servers"
 msgstr "PÃ LDAP-tjenere"
 
-#: ../modules/addressbook/e-book-shell-backend.c:278
+#: ../modules/addressbook/e-book-shell-backend.c:284
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: ../modules/addressbook/e-book-shell-backend.c:280
+#: ../modules/addressbook/e-book-shell-backend.c:286
 #: ../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:285
+#: ../modules/addressbook/e-book-shell-backend.c:291
 msgctxt "New"
 msgid "Contact _List"
 msgstr "Kontakt_liste"
 
-#: ../modules/addressbook/e-book-shell-backend.c:287
+#: ../modules/addressbook/e-book-shell-backend.c:293
 #: ../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:295
+#: ../modules/addressbook/e-book-shell-backend.c:301
 msgctxt "New"
 msgid "Address _Book"
 msgstr "Adresse_bok"
 
-#: ../modules/addressbook/e-book-shell-backend.c:297
+#: ../modules/addressbook/e-book-shell-backend.c:303
 #: ../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:314
+#: ../modules/addressbook/e-book-shell-backend.c:320
 #: ../modules/addressbook/e-book-shell-view.c:405
-#: ../modules/calendar/e-cal-shell-backend.c:109
+#: ../modules/calendar/e-cal-shell-backend.c:111
 #: ../modules/calendar/e-cal-shell-migrate.c:63
 msgid "Contacts"
 msgstr "Kontakter"
 
-#: ../modules/addressbook/e-book-shell-backend.c:324
+#: ../modules/addressbook/e-book-shell-backend.c:330
 msgid "Certificates"
 msgstr "Sertifikater"
 
 #. Translators: This is a save dialog title
-#: ../modules/addressbook/e-book-shell-view-actions.c:383
-#: ../modules/addressbook/e-book-shell-view-actions.c:681
+#: ../modules/addressbook/e-book-shell-view-actions.c:387
+#: ../modules/addressbook/e-book-shell-view-actions.c:683
 msgid "Save as vCard"
 msgstr "Lagre som vCard"
 
@@ -13351,9 +13412,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:1364
-#: ../modules/calendar/e-memo-shell-view-actions.c:630
-#: ../modules/calendar/e-task-shell-view-actions.c:754
+#: ../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/mail/e-mail-shell-view-actions.c:1201
 msgid "_Rename..."
 msgstr "End_re navn â"
@@ -13427,22 +13488,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:1499
-#: ../modules/calendar/e-task-shell-view-actions.c:812
+#: ../modules/calendar/e-cal-shell-view-actions.c:1507
+#: ../modules/calendar/e-task-shell-view-actions.c:809
 msgid "_Actions"
 msgstr "H_andlinger"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:940
-#: ../modules/calendar/e-memo-shell-view-actions.c:667
-#: ../modules/calendar/e-task-shell-view-actions.c:819
+#: ../modules/calendar/e-memo-shell-view-actions.c:664
+#: ../modules/calendar/e-task-shell-view-actions.c:816
 #: ../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:1516
-#: ../modules/calendar/e-memo-shell-view-actions.c:680
-#: ../modules/calendar/e-task-shell-view-actions.c:832
+#: ../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
 msgid "_Delete"
 msgstr "_Slett"
 
@@ -13471,8 +13532,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:737
-#: ../modules/calendar/e-task-shell-view-actions.c:901
+#: ../modules/calendar/e-memo-shell-view-actions.c:734
+#: ../modules/calendar/e-task-shell-view-actions.c:898
 #: ../modules/mail/e-mail-shell-view-actions.c:1474
 msgid "_Classic View"
 msgstr "_Klassisk visning"
@@ -13482,8 +13543,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:744
-#: ../modules/calendar/e-task-shell-view-actions.c:908
+#: ../modules/calendar/e-memo-shell-view-actions.c:741
+#: ../modules/calendar/e-task-shell-view-actions.c:905
 #: ../modules/mail/e-mail-shell-view-actions.c:1481
 msgid "_Vertical View"
 msgstr "_Vertikal visning"
@@ -13493,23 +13554,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:1655
-#: ../modules/calendar/e-memo-shell-view-actions.c:754
-#: ../modules/calendar/e-task-shell-view-actions.c:925
+#: ../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
 msgid "Any Category"
 msgstr "Enhver kategori"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1042
-#: ../modules/calendar/e-cal-shell-view-actions.c:1669
-#: ../modules/calendar/e-memo-shell-view-actions.c:761
-#: ../modules/calendar/e-task-shell-view-actions.c:960
+#: ../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
 msgid "Unmatched"
 msgstr "Ingen treff"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1052
-#: ../modules/calendar/e-cal-shell-view-actions.c:1679
-#: ../modules/calendar/e-memo-shell-view-actions.c:771
-#: ../modules/calendar/e-task-shell-view-actions.c:970
+#: ../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/mail/e-mail-shell-view-actions.c:1557
 #: ../shell/e-shell-content.c:638
 msgid "Advanced Search"
@@ -13806,7 +13867,7 @@ 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:1638
+#: ../modules/calendar/e-cal-shell-view-actions.c:1646
 msgid "Work Week"
 msgstr "Arbeidsuke"
 
@@ -14458,104 +14519,104 @@ msgstr "Hvilken time arbeidsdagen starter"
 msgid "Workday start minute"
 msgstr "Hvilket minutt arbeidsdagen starter"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:271
+#: ../modules/calendar/e-cal-attachment-handler.c:286
 #: ../smime/gui/smime-ui.ui.h:22
 msgid "I_mport"
 msgstr "I_mporter"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:352
+#: ../modules/calendar/e-cal-attachment-handler.c:367
 msgid "Select a Calendar"
 msgstr "Velg en kalender"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:379
+#: ../modules/calendar/e-cal-attachment-handler.c:394
 msgid "Select a Task List"
 msgstr "Velg en oppgaveliste"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:389
+#: ../modules/calendar/e-cal-attachment-handler.c:404
 msgid "I_mport to Calendar"
 msgstr "I_mporter til kalenderen"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:396
+#: ../modules/calendar/e-cal-attachment-handler.c:411
 msgid "I_mport to Tasks"
 msgstr "I_mporter til oppgaver"
 
 #. Create the Webcal source group
-#: ../modules/calendar/e-cal-shell-backend.c:111
+#: ../modules/calendar/e-cal-shell-backend.c:113
 #: ../modules/calendar/e-cal-shell-migrate.c:198
-#: ../modules/calendar/e-memo-shell-backend.c:98
+#: ../modules/calendar/e-memo-shell-backend.c:100
 #: ../modules/calendar/e-memo-shell-migrate.c:152
-#: ../modules/calendar/e-task-shell-backend.c:98
+#: ../modules/calendar/e-task-shell-backend.c:100
 #: ../modules/calendar/e-task-shell-migrate.c:164
 msgid "On The Web"
 msgstr "PÃ nettet"
 
-#: ../modules/calendar/e-cal-shell-backend.c:113
+#: ../modules/calendar/e-cal-shell-backend.c:115
 #: ../plugins/calendar-weather/calendar-weather.c:125
 msgid "Weather"
 msgstr "VÃr"
 
-#: ../modules/calendar/e-cal-shell-backend.c:200
+#: ../modules/calendar/e-cal-shell-backend.c:202
 #: ../modules/calendar/e-cal-shell-migrate.c:66
 msgid "Birthdays & Anniversaries"
 msgstr "FÃdselsdager og jubileum"
 
-#: ../modules/calendar/e-cal-shell-backend.c:425
+#: ../modules/calendar/e-cal-shell-backend.c:423
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Avtale"
 
-#: ../modules/calendar/e-cal-shell-backend.c:427
-#: ../modules/calendar/e-cal-shell-view-actions.c:1443
+#: ../modules/calendar/e-cal-shell-backend.c:425
+#: ../modules/calendar/e-cal-shell-view-actions.c:1451
 msgid "Create a new appointment"
 msgstr "Opprett en ny avtale"
 
-#: ../modules/calendar/e-cal-shell-backend.c:432
+#: ../modules/calendar/e-cal-shell-backend.c:430
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Avtale for hele _dagen"
 
-#: ../modules/calendar/e-cal-shell-backend.c:434
+#: ../modules/calendar/e-cal-shell-backend.c:432
 msgid "Create a new all-day appointment"
 msgstr "Opprett en ny avtale for hele dagen"
 
-#: ../modules/calendar/e-cal-shell-backend.c:439
+#: ../modules/calendar/e-cal-shell-backend.c:437
 msgctxt "New"
 msgid "M_eeting"
 msgstr "MÃt_e"
 
-#: ../modules/calendar/e-cal-shell-backend.c:441
+#: ../modules/calendar/e-cal-shell-backend.c:439
 msgid "Create a new meeting request"
 msgstr "Opprett en ny mÃteforespÃrsel"
 
-#: ../modules/calendar/e-cal-shell-backend.c:449
+#: ../modules/calendar/e-cal-shell-backend.c:447
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Kale_nder"
 
-#: ../modules/calendar/e-cal-shell-backend.c:451
-#: ../modules/calendar/e-cal-shell-view-actions.c:1338
+#: ../modules/calendar/e-cal-shell-backend.c:449
+#: ../modules/calendar/e-cal-shell-view-actions.c:1346
 msgid "Create a new calendar"
 msgstr "Opprett en ny kalender"
 
-#: ../modules/calendar/e-cal-shell-backend.c:754
-#: ../plugins/itip-formatter/itip-formatter.c:2806
+#: ../modules/calendar/e-cal-shell-backend.c:755
+#: ../plugins/itip-formatter/itip-formatter.c:2946
 msgid "Calendar and Tasks"
 msgstr "Kalender og oppgaver"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:225
+#: ../modules/calendar/e-cal-shell-sidebar.c:180
 msgid "Loading calendars"
 msgstr "Laster kalendere"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:640
+#: ../modules/calendar/e-cal-shell-sidebar.c:721
 msgid "_New Calendar..."
 msgstr "_Ny kalender â"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:657
+#: ../modules/calendar/e-cal-shell-sidebar.c:738
 msgid "Calendar Selector"
 msgstr "Kalendervelger"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:1002
+#: ../modules/calendar/e-cal-shell-sidebar.c:1087
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Ãpner kalender pà %s"
@@ -14580,302 +14641,302 @@ msgstr ""
 msgid "Purge events older than"
 msgstr "Slett hendelser eldre enn"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:538
+#: ../modules/calendar/e-cal-shell-view-actions.c:541
 msgid "Copying Items"
 msgstr "Kopierer oppfÃringer"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:808
+#: ../modules/calendar/e-cal-shell-view-actions.c:816
 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:1135
+#: ../modules/calendar/e-cal-shell-view-actions.c:1143
 msgid "event"
 msgstr "hendelse"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1137
+#: ../modules/calendar/e-cal-shell-view-actions.c:1145
 #: ../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:514
-#: ../modules/calendar/e-task-shell-view-actions.c:631
+#: ../modules/calendar/e-memo-shell-view-actions.c:511
+#: ../modules/calendar/e-task-shell-view-actions.c:628
 msgid "Save as iCalendar"
 msgstr "Lagre som iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1294
-#: ../modules/calendar/e-memo-shell-view-actions.c:595
+#: ../modules/calendar/e-cal-shell-view-actions.c:1302
+#: ../modules/calendar/e-memo-shell-view-actions.c:592
 msgid "_Copy..."
 msgstr "_Kopier â"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1301
+#: ../modules/calendar/e-cal-shell-view-actions.c:1309
 msgid "D_elete Calendar"
 msgstr "Sl_ett kalender"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1303
+#: ../modules/calendar/e-cal-shell-view-actions.c:1311
 msgid "Delete the selected calendar"
 msgstr "Slett valgt kalender"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1310
+#: ../modules/calendar/e-cal-shell-view-actions.c:1318
 msgid "Go Back"
 msgstr "GÃ tilbake"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1317
+#: ../modules/calendar/e-cal-shell-view-actions.c:1325
 msgid "Go Forward"
 msgstr "GÃ fremover"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1324
+#: ../modules/calendar/e-cal-shell-view-actions.c:1332
 msgid "Select today"
 msgstr "Velg i dag"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1329
+#: ../modules/calendar/e-cal-shell-view-actions.c:1337
 msgid "Select _Date"
 msgstr "Velg _dato"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1331
+#: ../modules/calendar/e-cal-shell-view-actions.c:1339
 msgid "Select a specific date"
 msgstr "Velg en spesifikk dato"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1336
+#: ../modules/calendar/e-cal-shell-view-actions.c:1344
 msgid "_New Calendar"
 msgstr "_Ny kalender"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1350
-#: ../modules/calendar/e-task-shell-view-actions.c:803
+#: ../modules/calendar/e-cal-shell-view-actions.c:1358
+#: ../modules/calendar/e-task-shell-view-actions.c:800
 msgid "Purg_e"
 msgstr "Fj_ern"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1352
+#: ../modules/calendar/e-cal-shell-view-actions.c:1360
 msgid "Purge old appointments and meetings"
 msgstr "Fjern gamle avtaler og mÃter"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1357
-#: ../modules/calendar/e-memo-shell-view-actions.c:623
-#: ../modules/calendar/e-task-shell-view-actions.c:747
+#: ../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
 msgid "Re_fresh"
 msgstr "O_ppdater"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1359
+#: ../modules/calendar/e-cal-shell-view-actions.c:1367
 msgid "Refresh the selected calendar"
 msgstr "Oppdater valgt kalender"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1366
+#: ../modules/calendar/e-cal-shell-view-actions.c:1374
 msgid "Rename the selected calendar"
 msgstr "Endre navn pà valgt kalender"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1371
+#: ../modules/calendar/e-cal-shell-view-actions.c:1379
 msgid "Show _Only This Calendar"
 msgstr "Vis k_un denne kalenderen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1378
+#: ../modules/calendar/e-cal-shell-view-actions.c:1386
 msgid "Cop_y to Calendar..."
 msgstr "Kop_ier til kalender â"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1385
+#: ../modules/calendar/e-cal-shell-view-actions.c:1393
 msgid "_Delegate Meeting..."
 msgstr "_Deleger mÃte â"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1392
+#: ../modules/calendar/e-cal-shell-view-actions.c:1400
 msgid "_Delete Appointment"
 msgstr "_Slett avtale"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1394
+#: ../modules/calendar/e-cal-shell-view-actions.c:1402
 msgid "Delete selected appointments"
 msgstr "Slett valgte avtaler"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1399
+#: ../modules/calendar/e-cal-shell-view-actions.c:1407
 msgid "Delete This _Occurrence"
 msgstr "Slett denne _hendelsen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1401
+#: ../modules/calendar/e-cal-shell-view-actions.c:1409
 msgid "Delete this occurrence"
 msgstr "Slett denne oppfÃringen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1406
+#: ../modules/calendar/e-cal-shell-view-actions.c:1414
 msgid "Delete All Occ_urrences"
 msgstr "Slett alle oppf_Ãringer"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1408
+#: ../modules/calendar/e-cal-shell-view-actions.c:1416
 msgid "Delete all occurrences"
 msgstr "Slett alle oppfÃringer"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1413
+#: ../modules/calendar/e-cal-shell-view-actions.c:1421
 msgid "New All Day _Event..."
 msgstr "Ny avtale som varer h_ele dagen â"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1415
+#: ../modules/calendar/e-cal-shell-view-actions.c:1423
 msgid "Create a new all day event"
 msgstr "Opprett en ny avtale for hele dagen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1420
+#: ../modules/calendar/e-cal-shell-view-actions.c:1428
 #: ../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:588
-#: ../modules/calendar/e-task-shell-view-actions.c:712
+#: ../modules/calendar/e-memo-shell-view-actions.c:585
+#: ../modules/calendar/e-task-shell-view-actions.c:709
 msgid "_Forward as iCalendar..."
 msgstr "_Videresend som iCalendar â"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1427
+#: ../modules/calendar/e-cal-shell-view-actions.c:1435
 msgid "New _Meeting..."
 msgstr "Nytt _mÃte â"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1429
+#: ../modules/calendar/e-cal-shell-view-actions.c:1437
 msgid "Create a new meeting"
 msgstr "Lag et nytt mÃte"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1434
+#: ../modules/calendar/e-cal-shell-view-actions.c:1442
 msgid "Mo_ve to Calendar..."
 msgstr "Fl_ytt til kalender â"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1441
+#: ../modules/calendar/e-cal-shell-view-actions.c:1449
 msgid "New _Appointment..."
 msgstr "Ny _avtale â"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1448
+#: ../modules/calendar/e-cal-shell-view-actions.c:1456
 msgid "Make this Occurrence _Movable"
 msgstr "GjÃr denne hendelsen _flyttbar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1455
+#: ../modules/calendar/e-cal-shell-view-actions.c:1463
 msgid "_Open Appointment"
 msgstr "_Ãpne avtale"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1457
+#: ../modules/calendar/e-cal-shell-view-actions.c:1465
 msgid "View the current appointment"
 msgstr "Vis denne avtalen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1462
+#: ../modules/calendar/e-cal-shell-view-actions.c:1470
 msgid "_Reply"
 msgstr "Sva_r"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1476
+#: ../modules/calendar/e-cal-shell-view-actions.c:1484
 msgid "_Schedule Meeting..."
 msgstr "_Sett opp mÃte â"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1478
+#: ../modules/calendar/e-cal-shell-view-actions.c:1486
 msgid "Converts an appointment to a meeting"
 msgstr "Konverter en avtale til et mÃte"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1483
+#: ../modules/calendar/e-cal-shell-view-actions.c:1491
 msgid "Conv_ert to Appointment..."
 msgstr "Konv_erter til avtale â"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1485
+#: ../modules/calendar/e-cal-shell-view-actions.c:1493
 msgid "Converts a meeting to an appointment"
 msgstr "Konverterer et mÃte til en avtale"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1490
+#: ../modules/calendar/e-cal-shell-view-actions.c:1498
 msgid "Quit"
 msgstr "Avslutt"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1610
+#: ../modules/calendar/e-cal-shell-view-actions.c:1618
 msgid "Day"
 msgstr "Dag"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1612
+#: ../modules/calendar/e-cal-shell-view-actions.c:1620
 msgid "Show one day"
 msgstr "Vis en dag"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1617
+#: ../modules/calendar/e-cal-shell-view-actions.c:1625
 msgid "List"
 msgstr "Liste"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1619
+#: ../modules/calendar/e-cal-shell-view-actions.c:1627
 msgid "Show as list"
 msgstr "Vis som liste"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1624
+#: ../modules/calendar/e-cal-shell-view-actions.c:1632
 msgid "Month"
 msgstr "MÃned"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1626
+#: ../modules/calendar/e-cal-shell-view-actions.c:1634
 msgid "Show one month"
 msgstr "Vis en mÃned"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1631
+#: ../modules/calendar/e-cal-shell-view-actions.c:1639
 msgid "Week"
 msgstr "Uke"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1633
+#: ../modules/calendar/e-cal-shell-view-actions.c:1641
 msgid "Show one week"
 msgstr "Vis en uke"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1640
+#: ../modules/calendar/e-cal-shell-view-actions.c:1648
 msgid "Show one work week"
 msgstr "Vis en arbeidsuke"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1648
+#: ../modules/calendar/e-cal-shell-view-actions.c:1656
 msgid "Active Appointments"
 msgstr "Aktive avtaler"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1662
+#: ../modules/calendar/e-cal-shell-view-actions.c:1670
 msgid "Next 7 Days' Appointments"
 msgstr "Avtaler for de neste 7 dagene"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1693
-#: ../modules/calendar/e-memo-shell-view-actions.c:785
-#: ../modules/calendar/e-task-shell-view-actions.c:984
+#: ../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
 msgid "Description contains"
 msgstr "Beskrivelse inneholder"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1700
-#: ../modules/calendar/e-memo-shell-view-actions.c:792
-#: ../modules/calendar/e-task-shell-view-actions.c:991
+#: ../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
 msgid "Summary contains"
 msgstr "Sammendrag inneholder"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1712
+#: ../modules/calendar/e-cal-shell-view-actions.c:1720
 msgid "Print this calendar"
 msgstr "Skriv ut denne kalenderen"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1719
+#: ../modules/calendar/e-cal-shell-view-actions.c:1727
 msgid "Preview the calendar to be printed"
 msgstr "ForhÃndsvis kalenderen som skal skrives ut"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1741
+#: ../modules/calendar/e-cal-shell-view-actions.c:1749
 #: ../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:1818
+#: ../modules/calendar/e-cal-shell-view-actions.c:1826
 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:512
+#: ../modules/calendar/e-memo-shell-view-actions.c:509
 msgid "memo"
 msgstr "notat"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:261
-#: ../modules/calendar/e-memo-shell-view-actions.c:644
+#: ../modules/calendar/e-memo-shell-view-actions.c:641
 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:646
+#: ../modules/calendar/e-memo-shell-view-actions.c:643
 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:651
+#: ../modules/calendar/e-memo-shell-view-actions.c:648
 msgid "_Open Memo"
 msgstr "_Ãpne notat"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:270
-#: ../modules/calendar/e-memo-shell-view-actions.c:653
+#: ../modules/calendar/e-memo-shell-view-actions.c:650
 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:658
-#: ../modules/calendar/e-task-shell-view-actions.c:796
+#: ../modules/calendar/e-memo-shell-view-actions.c:655
+#: ../modules/calendar/e-task-shell-view-actions.c:793
 msgid "Open _Web Page"
 msgstr "_Ãpne nettside"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:287
-#: ../modules/calendar/e-memo-shell-view-actions.c:818
+#: ../modules/calendar/e-memo-shell-view-actions.c:815
 msgid "Print the selected memo"
 msgstr "Skriv ut valgt notat"
 
@@ -14884,22 +14945,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:629
+#: ../modules/calendar/e-task-shell-view-actions.c:626
 msgid "task"
 msgstr "oppgave"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:320
-#: ../modules/calendar/e-task-shell-view-actions.c:691
+#: ../modules/calendar/e-task-shell-view-actions.c:688
 msgid "_Assign Task"
 msgstr "Tildel oppg_ave"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:334
-#: ../modules/calendar/e-task-shell-view-actions.c:768
+#: ../modules/calendar/e-task-shell-view-actions.c:765
 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:770
+#: ../modules/calendar/e-task-shell-view-actions.c:767
 msgid "Mark selected tasks as complete"
 msgstr "Merk valgte oppgaver som fullfÃrt"
 
@@ -14908,51 +14969,51 @@ 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:777
+#: ../modules/calendar/e-task-shell-view-actions.c:774
 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:782
+#: ../modules/calendar/e-task-shell-view-actions.c:779
 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:784
+#: ../modules/calendar/e-task-shell-view-actions.c:781
 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:789
+#: ../modules/calendar/e-task-shell-view-actions.c:786
 msgid "_Open Task"
 msgstr "_Ãpne oppgave"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:357
-#: ../modules/calendar/e-task-shell-view-actions.c:791
+#: ../modules/calendar/e-task-shell-view-actions.c:788
 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:1017
+#: ../modules/calendar/e-task-shell-view-actions.c:1014
 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:833
-#: ../modules/calendar/e-task-shell-view-actions.c:1032
+#: ../modules/calendar/e-memo-shell-view-actions.c:830
+#: ../modules/calendar/e-task-shell-view-actions.c:1029
 msgid "_Save as iCalendar..."
 msgstr "_Lagre som iCalendar â"
 
-#: ../modules/calendar/e-calendar-preferences.c:440
+#: ../modules/calendar/e-calendar-preferences.c:441
 msgid "Selected Calendars for Alarms"
 msgstr "Kalendere valgt for varsel"
 
-#: ../modules/calendar/e-calendar-preferences.c:839
+#: ../modules/calendar/e-calendar-preferences.c:840
 msgid "Ti_me and date:"
 msgstr "T_id og dato:"
 
-#: ../modules/calendar/e-calendar-preferences.c:840
+#: ../modules/calendar/e-calendar-preferences.c:841
 msgid "_Date only:"
 msgstr "Kun _dato:"
 
@@ -14976,20 +15037,20 @@ msgid "Memo Li_st"
 msgstr "Notatli_ste"
 
 #: ../modules/calendar/e-memo-shell-backend.c:304
-#: ../modules/calendar/e-memo-shell-view-actions.c:611
+#: ../modules/calendar/e-memo-shell-view-actions.c:608
 msgid "Create a new memo list"
 msgstr "Lag en ny notatliste"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:220
+#: ../modules/calendar/e-memo-shell-sidebar.c:175
 msgid "Loading memos"
 msgstr "Laster notater"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:582
+#: ../modules/calendar/e-memo-shell-sidebar.c:662
 msgid "Memo List Selector"
 msgstr "Valgt av notatliste"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:889
+#: ../modules/calendar/e-memo-shell-sidebar.c:973
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Ãpner notat pà %s"
@@ -14999,63 +15060,63 @@ msgstr "Ãpner notat pà %s"
 msgid "Print Memos"
 msgstr "Skriv ut notater"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:574
+#: ../modules/calendar/e-memo-shell-view-actions.c:571
 msgid "_Delete Memo"
 msgstr "_Slett notat"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:581
+#: ../modules/calendar/e-memo-shell-view-actions.c:578
 msgid "_Find in Memo..."
 msgstr "_Finn i notat â"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:583
+#: ../modules/calendar/e-memo-shell-view-actions.c:580
 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:602
+#: ../modules/calendar/e-memo-shell-view-actions.c:599
 msgid "D_elete Memo List"
 msgstr "Sl_ett notatliste"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:604
+#: ../modules/calendar/e-memo-shell-view-actions.c:601
 msgid "Delete the selected memo list"
 msgstr "Slett valgt notatliste"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:609
+#: ../modules/calendar/e-memo-shell-view-actions.c:606
 msgid "_New Memo List"
 msgstr "_Ny notatliste"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:625
+#: ../modules/calendar/e-memo-shell-view-actions.c:622
 msgid "Refresh the selected memo list"
 msgstr "Oppdater valgt notatliste"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:632
+#: ../modules/calendar/e-memo-shell-view-actions.c:629
 msgid "Rename the selected memo list"
 msgstr "Endre navn pà valgt notatliste"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:637
+#: ../modules/calendar/e-memo-shell-view-actions.c:634
 msgid "Show _Only This Memo List"
 msgstr "Vis k_un denne notatlisten"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:716
+#: ../modules/calendar/e-memo-shell-view-actions.c:713
 msgid "Memo _Preview"
 msgstr "_ForhÃndsvisning av notat"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:718
+#: ../modules/calendar/e-memo-shell-view-actions.c:715
 msgid "Show memo preview pane"
 msgstr "Vis forhÃndsvisningsomrÃde for notat"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:739
+#: ../modules/calendar/e-memo-shell-view-actions.c:736
 msgid "Show memo preview below the memo list"
 msgstr "Vis forhÃndsvisning av notat under notatlisten"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:746
+#: ../modules/calendar/e-memo-shell-view-actions.c:743
 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:804
+#: ../modules/calendar/e-memo-shell-view-actions.c:801
 msgid "Print the list of memos"
 msgstr "Skriv ut denne listen med notater"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:811
+#: ../modules/calendar/e-memo-shell-view-actions.c:808
 msgid "Preview the list of memos to be printed"
 msgstr "ForhÃndsvis listen med notater som skal skrives ut"
 
@@ -15067,7 +15128,7 @@ 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:579
+#: ../modules/calendar/e-task-shell-view-private.c:573
 #, c-format
 msgid "%d selected"
 msgstr "%d valgt"
@@ -15100,20 +15161,20 @@ msgid "Tas_k List"
 msgstr "_Oppgaveliste"
 
 #: ../modules/calendar/e-task-shell-backend.c:303
-#: ../modules/calendar/e-task-shell-view-actions.c:735
+#: ../modules/calendar/e-task-shell-view-actions.c:732
 msgid "Create a new task list"
 msgstr "Opprett en ny oppgaveliste"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:220
+#: ../modules/calendar/e-task-shell-sidebar.c:175
 msgid "Loading tasks"
 msgstr "Laster oppgaver"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:582
+#: ../modules/calendar/e-task-shell-sidebar.c:662
 msgid "Task List Selector"
 msgstr "Valg av oppgaveliste"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:889
+#: ../modules/calendar/e-task-shell-sidebar.c:973
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Ãpner oppgaver pà %s"
@@ -15123,7 +15184,7 @@ msgstr "Ãpner oppgaver pà %s"
 msgid "Print Tasks"
 msgstr "Skriv ut oppgaver"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:573
+#: ../modules/calendar/e-task-shell-view-actions.c:570
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -15135,99 +15196,99 @@ msgstr ""
 "\n"
 "Vil du virkelig slette disse oppgavene?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:580
+#: ../modules/calendar/e-task-shell-view-actions.c:577
 msgid "Do not ask me again"
 msgstr "Ikke spÃr meg igjen"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:698
+#: ../modules/calendar/e-task-shell-view-actions.c:695
 msgid "_Delete Task"
 msgstr "_Slett oppgave"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:705
+#: ../modules/calendar/e-task-shell-view-actions.c:702
 msgid "_Find in Task..."
 msgstr "_Finn i oppgave â"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:707
+#: ../modules/calendar/e-task-shell-view-actions.c:704
 msgid "Search for text in the displayed task"
 msgstr "SÃk etter tekst i vist oppgave"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:719
+#: ../modules/calendar/e-task-shell-view-actions.c:716
 msgid "Copy..."
 msgstr "Kopier â"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:726
+#: ../modules/calendar/e-task-shell-view-actions.c:723
 msgid "D_elete Task List"
 msgstr "Sl_ett oppgaveliste"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:728
+#: ../modules/calendar/e-task-shell-view-actions.c:725
 msgid "Delete the selected task list"
 msgstr "Slett valgt oppgaveliste"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:733
+#: ../modules/calendar/e-task-shell-view-actions.c:730
 msgid "_New Task List"
 msgstr "_Ny oppgaveliste"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:749
+#: ../modules/calendar/e-task-shell-view-actions.c:746
 msgid "Refresh the selected task list"
 msgstr "Oppdater valgt oppgaveliste"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:756
+#: ../modules/calendar/e-task-shell-view-actions.c:753
 msgid "Rename the selected task list"
 msgstr "Endre navn pà valgt oppgaveliste"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:761
+#: ../modules/calendar/e-task-shell-view-actions.c:758
 msgid "Show _Only This Task List"
 msgstr "Vis k_un denne oppgavelisten"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:775
+#: ../modules/calendar/e-task-shell-view-actions.c:772
 msgid "Mar_k as Incomplete"
 msgstr "Merk som _ikke fullfÃrt"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:805
+#: ../modules/calendar/e-task-shell-view-actions.c:802
 msgid "Delete completed tasks"
 msgstr "Slett fullfÃrte oppgaver"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:880
+#: ../modules/calendar/e-task-shell-view-actions.c:877
 msgid "Task _Preview"
 msgstr "ForhÃndsvisning av _oppgave"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:882
+#: ../modules/calendar/e-task-shell-view-actions.c:879
 msgid "Show task preview pane"
 msgstr "Vis forhÃndsvisningsomrÃde for oppgaver"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:903
+#: ../modules/calendar/e-task-shell-view-actions.c:900
 msgid "Show task preview below the task list"
 msgstr "Vis forhÃndsvisning av oppgave under oppgavelisten"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:910
+#: ../modules/calendar/e-task-shell-view-actions.c:907
 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:918
+#: ../modules/calendar/e-task-shell-view-actions.c:915
 msgid "Active Tasks"
 msgstr "Aktive oppgaver"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:932
+#: ../modules/calendar/e-task-shell-view-actions.c:929
 msgid "Completed Tasks"
 msgstr "FullfÃrte oppgaver"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:939
+#: ../modules/calendar/e-task-shell-view-actions.c:936
 msgid "Next 7 Days' Tasks"
 msgstr "Oppgaver for de neste 7 dagene"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:946
+#: ../modules/calendar/e-task-shell-view-actions.c:943
 msgid "Overdue Tasks"
 msgstr "UtgÃtte oppgaver"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:953
+#: ../modules/calendar/e-task-shell-view-actions.c:950
 msgid "Tasks with Attachments"
 msgstr "Oppgaver med vedlegg"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1003
+#: ../modules/calendar/e-task-shell-view-actions.c:1000
 msgid "Print the list of tasks"
 msgstr "Skriv ut denne listen over oppgaver"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1010
+#: ../modules/calendar/e-task-shell-view-actions.c:1007
 msgid "Preview the list of tasks to be printed"
 msgstr "ForhÃndsvis listen over oppgaver som skal skrives ut"
 
@@ -15235,7 +15296,7 @@ msgstr "ForhÃndsvis listen over oppgaver som skal skrives ut"
 msgid "Expunging"
 msgstr "TÃmmer"
 
-#: ../modules/calendar/e-task-shell-view-private.c:575
+#: ../modules/calendar/e-task-shell-view-private.c:569
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -15675,14 +15736,14 @@ msgstr "Evolution kontoassistent"
 msgid "Account Editor"
 msgstr "Kontoredigering"
 
-#: ../modules/mail/em-composer-prefs.c:490
+#: ../modules/mail/em-composer-prefs.c:491
 #: ../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:494
+#: ../modules/mail/em-composer-prefs.c:495
 msgid "Language(s)"
 msgstr "SprÃk"
 
@@ -15711,29 +15772,29 @@ msgid "Contains Value"
 msgstr "Inneholder verdi"
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:698 ../modules/mail/em-mailer-prefs.c:771
+#: ../modules/mail/em-mailer-prefs.c:703 ../modules/mail/em-mailer-prefs.c:776
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "Tillegg %s er tilgjengelig og filen er installert."
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:706 ../modules/mail/em-mailer-prefs.c:780
+#: ../modules/mail/em-mailer-prefs.c:711 ../modules/mail/em-mailer-prefs.c:785
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
 msgstr ""
 "%s-tillegg er ikke tilgjengelig. Vennligst sjekk om pakken er installert."
 
-#: ../modules/mail/em-mailer-prefs.c:744
+#: ../modules/mail/em-mailer-prefs.c:749
 msgid "No junk plugin available"
 msgstr "Ingen tillegg for uÃnsket e-post tilgjengelig"
 
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1147
+#: ../modules/mail/em-mailer-prefs.c:1152
 msgid "_Date header:"
 msgstr "_Datohode:"
 
-#: ../modules/mail/em-mailer-prefs.c:1148
+#: ../modules/mail/em-mailer-prefs.c:1153
 msgid "Show _original header value"
 msgstr "Vis _opprinnelig verdi for hode"
 
@@ -15817,39 +15878,39 @@ msgstr "Testtillegg for Python"
 msgid "Test Plugin for Python EPlugin loader."
 msgstr "Testtillegg for Python EPlugin laster."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:280
+#: ../modules/startup-wizard/evolution-startup-wizard.c:281
 #: ../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:312
+#: ../modules/startup-wizard/evolution-startup-wizard.c:313
 #: ../widgets/misc/e-import-assistant.c:552
 #, c-format
 msgid "From %s:"
 msgstr "Fra %s:"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:323
-#: ../modules/startup-wizard/evolution-startup-wizard.c:420
+#: ../modules/startup-wizard/evolution-startup-wizard.c:324
+#: ../modules/startup-wizard/evolution-startup-wizard.c:422
 msgid "Importing Files"
 msgstr "Importerer filer"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:398
+#: ../modules/startup-wizard/evolution-startup-wizard.c:400
 msgid "Import cancelled. Click \"Forward\" to continue."
 msgstr "Import avbrutt. Klikk ÂFremover for à fortsette."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:416
+#: ../modules/startup-wizard/evolution-startup-wizard.c:418
 msgid "Import complete. Click \"Forward\" to continue."
 msgstr "Import fullfÃrt. Klikk ÂFremover for à fortsette."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:490
+#: ../modules/startup-wizard/evolution-startup-wizard.c:492
 msgid "Evolution Setup Assistant"
 msgstr "Konfigurasjonsassistent for Evolution"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:496
+#: ../modules/startup-wizard/evolution-startup-wizard.c:498
 msgid "Welcome"
 msgstr "Velkommen"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:501
+#: ../modules/startup-wizard/evolution-startup-wizard.c:503
 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"
@@ -15862,6 +15923,10 @@ msgstr ""
 "\n"
 "Vennligst klikk ÂFremover for à fortsette. "
 
+#: ../modules/startup-wizard/evolution-startup-wizard.c:608
+msgid "Loading accounts..."
+msgstr "Laster kontoer â"
+
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
 msgid "Add local address books to Evolution."
 msgstr "Legg til lokale adressebÃker i Evolution."
@@ -16002,85 +16067,85 @@ msgid "With Graphical User Interface"
 msgstr "Med grafisk brukergrensesnitt"
 
 #. FIXME Will the versioned setting always work?
-#: ../plugins/backup-restore/backup.c:289
-#: ../plugins/backup-restore/backup.c:406
+#: ../plugins/backup-restore/backup.c:295
+#: ../plugins/backup-restore/backup.c:412
 msgid "Shutting down Evolution"
 msgstr "Avslutter Evolution"
 
-#: ../plugins/backup-restore/backup.c:298
+#: ../plugins/backup-restore/backup.c:304
 msgid "Backing Evolution accounts and settings"
 msgstr "Sikkerhetskopiering av kontoer og innstillinger for Evolution"
 
-#: ../plugins/backup-restore/backup.c:308
+#: ../plugins/backup-restore/backup.c:314
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Sikkerhetskopiering av data (e-post, kontakter, kalendere, oppgaver, notater)"
 
-#: ../plugins/backup-restore/backup.c:321
+#: ../plugins/backup-restore/backup.c:327
 msgid "Back up complete"
 msgstr "Sikkerhetskopiering fullfÃrt"
 
-#: ../plugins/backup-restore/backup.c:328
-#: ../plugins/backup-restore/backup.c:515
+#: ../plugins/backup-restore/backup.c:334
+#: ../plugins/backup-restore/backup.c:521
 msgid "Restarting Evolution"
 msgstr "Starter Evolution pà nytt"
 
-#: ../plugins/backup-restore/backup.c:412
+#: ../plugins/backup-restore/backup.c:418
 msgid "Back up current Evolution data"
 msgstr "Ta sikkerhetskopi av data for Evolution"
 
-#: ../plugins/backup-restore/backup.c:420
+#: ../plugins/backup-restore/backup.c:426
 msgid "Extracting files from back up"
 msgstr "Henter ut filer fra sikkerhetskopien"
 
-#: ../plugins/backup-restore/backup.c:479
+#: ../plugins/backup-restore/backup.c:485
 msgid "Loading Evolution settings"
 msgstr "Laster innstillinger for Evolution"
 
-#: ../plugins/backup-restore/backup.c:496
+#: ../plugins/backup-restore/backup.c:502
 msgid "Removing temporary back up files"
 msgstr "Fjerner midlertidige sikkerhetskopifiler"
 
-#: ../plugins/backup-restore/backup.c:508
+#: ../plugins/backup-restore/backup.c:514
 msgid "Ensuring local sources"
 msgstr "Sikrer lokale kilder"
 
-#: ../plugins/backup-restore/backup.c:693
+#: ../plugins/backup-restore/backup.c:699
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Sikkerhetskopierer til mappe %s"
 
-#: ../plugins/backup-restore/backup.c:698
+#: ../plugins/backup-restore/backup.c:704
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Gjenoppretter fra mappe %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:722
+#: ../plugins/backup-restore/backup.c:728
 msgid "Evolution Back up"
 msgstr "Evolution sikkerhetskopiering"
 
-#: ../plugins/backup-restore/backup.c:722
+#: ../plugins/backup-restore/backup.c:728
 msgid "Evolution Restore"
 msgstr "Evolution gjenoppretting"
 
-#: ../plugins/backup-restore/backup.c:760
+#: ../plugins/backup-restore/backup.c:766
 msgid "Backing up Evolution Data"
 msgstr "Ta sikkerhetskopi av data for Evolution"
 
-#: ../plugins/backup-restore/backup.c:761
+#: ../plugins/backup-restore/backup.c:767
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Vennligst vent mens Evolution tar sikkerhetskopi av dine data."
 
-#: ../plugins/backup-restore/backup.c:763
+#: ../plugins/backup-restore/backup.c:769
 msgid "Restoring Evolution Data"
 msgstr "Gjenoppretter data for Evolution"
 
-#: ../plugins/backup-restore/backup.c:764
+#: ../plugins/backup-restore/backup.c:770
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Vennligst vent mens Evolution gjenoppretter dine data."
 
-#: ../plugins/backup-restore/backup.c:782
+#: ../plugins/backup-restore/backup.c:788
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "Dette kan ta en stund avhengig av hvor mye data du har i din konto."
 
@@ -16148,35 +16213,35 @@ msgstr ""
 "Dette vil slette alle dine data og innstillinger i Evolution og gjenopprette "
 "dem fra din sikkerhetskopi."
 
-#: ../plugins/bbdb/bbdb.c:685 ../plugins/bbdb/bbdb.c:694
+#: ../plugins/bbdb/bbdb.c:675 ../plugins/bbdb/bbdb.c:684
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Automatiske kontakter"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:709
+#: ../plugins/bbdb/bbdb.c:699
 msgid "Create _address book entries when sending mails"
 msgstr "Opprett oppfÃringer i adresseboken _automatisk nÃr du sender e-post"
 
-#: ../plugins/bbdb/bbdb.c:715
+#: ../plugins/bbdb/bbdb.c:705
 msgid "Select Address book for Automatic Contacts"
 msgstr "Velg adressebok for automatiske kontakter"
 
-#: ../plugins/bbdb/bbdb.c:730
+#: ../plugins/bbdb/bbdb.c:720
 msgid "Instant Messaging Contacts"
 msgstr "Kontakter for lynmeldinger"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:745
+#: ../plugins/bbdb/bbdb.c:735
 msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr "_Synkroniser kontaktinformasjon og bilder fra vennelisten i Pidgin"
 
-#: ../plugins/bbdb/bbdb.c:751
+#: ../plugins/bbdb/bbdb.c:741
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Velg adressebok for venneliste fra Pidgin"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:762
+#: ../plugins/bbdb/bbdb.c:752
 msgid "Synchronize with _buddy list now"
 msgstr "Synkroniser med _vennelisten nÃ"
 
@@ -16323,7 +16388,7 @@ msgid "Searching folder content..."
 msgstr "SÃker i mappeinnhold â"
 
 #: ../plugins/caldav/caldav-browse-server.c:1262
-#: ../plugins/caldav/caldav-source.c:255
+#: ../plugins/caldav/caldav-source.c:258
 msgid "Server _handles meeting invitations"
 msgstr "Tjener _hÃndterer mÃteinvitasjoner"
 
@@ -16336,7 +16401,7 @@ msgid "Supports"
 msgstr "StÃtter"
 
 #: ../plugins/caldav/caldav-browse-server.c:1334
-#: ../plugins/caldav/caldav-source.c:253
+#: ../plugins/caldav/caldav-source.c:256
 msgid "User e-_mail:"
 msgstr "E-_post for bruker:"
 
@@ -16354,33 +16419,33 @@ 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:234
+#: ../plugins/caldav/caldav-source.c:237
 #: ../plugins/calendar-http/calendar-http.c:104
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../plugins/caldav/caldav-source.c:241
+#: ../plugins/caldav/caldav-source.c:244
 #: ../plugins/google-account-setup/google-contacts-source.c:351
 msgid "Use _SSL"
 msgstr "Bruk _SSL"
 
-#: ../plugins/caldav/caldav-source.c:243
+#: ../plugins/caldav/caldav-source.c:246
 #: ../plugins/google-account-setup/google-contacts-source.c:329
-#: ../plugins/google-account-setup/google-source.c:637
+#: ../plugins/google-account-setup/google-source.c:652
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:267
 msgid "User_name:"
 msgstr "Bruker_navn:"
 
-#: ../plugins/caldav/caldav-source.c:258
+#: ../plugins/caldav/caldav-source.c:261
 msgid "Brows_e server for a calendar"
 msgstr "Bla gj_ennom tjener etter en kalender"
 
-#: ../plugins/caldav/caldav-source.c:276
+#: ../plugins/caldav/caldav-source.c:279
 #: ../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:644
+#: ../plugins/google-account-setup/google-source.c:659
 msgid "Re_fresh:"
 msgstr "O_ppdater"
 
@@ -16511,7 +16576,7 @@ msgstr "Legg til vÃrkalendere i Evolution."
 msgid "Weather Calendars"
 msgstr "VÃrkalendere"
 
-#: ../plugins/dbx-import/dbx-importer.c:274
+#: ../plugins/dbx-import/dbx-importer.c:282
 msgid "Importing Outlook Express data"
 msgstr "Importerer data fra Outlook Express"
 
@@ -16789,12 +16854,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:437
+#: ../plugins/google-account-setup/google-source.c:443
 #, 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:548
+#: ../plugins/google-account-setup/google-source.c:560
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -16803,17 +16868,17 @@ msgstr ""
 "Kan ikke lese data fra Google-tjener.\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:548
-#: ../plugins/mail-to-task/mail-to-task.c:737
-#: ../plugins/mail-to-task/mail-to-task.c:956
+#: ../plugins/google-account-setup/google-source.c:560
+#: ../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:648
+#: ../plugins/google-account-setup/google-source.c:663
 msgid "Cal_endar:"
 msgstr "Kal_ender:"
 
-#: ../plugins/google-account-setup/google-source.c:683
+#: ../plugins/google-account-setup/google-source.c:698
 msgid "Retrieve _List"
 msgstr "Hent _liste"
 
@@ -16889,145 +16954,145 @@ msgstr "IMAP-funksjoner"
 
 #. Translators: The first '%s' is replaced with a calendar name,
 #. the second '%s' with an error message
-#: ../plugins/itip-formatter/itip-formatter.c:485
+#: ../plugins/itip-formatter/itip-formatter.c:490
 #, c-format
 msgid "Failed to load the calendar '%s' (%s)"
 msgstr "Kunne ikke Ãpne kalender Â%s (%s)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:654
+#: ../plugins/itip-formatter/itip-formatter.c:631
 #, 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:690
+#: ../plugins/itip-formatter/itip-formatter.c:655
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Fant avtalen i kalender Â%sÂ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:789
+#: ../plugins/itip-formatter/itip-formatter.c:761
 msgid "Unable to find any calendars"
 msgstr "Kan ikke finne noen kalendere"
 
-#: ../plugins/itip-formatter/itip-formatter.c:796
+#: ../plugins/itip-formatter/itip-formatter.c:768
 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:800
+#: ../plugins/itip-formatter/itip-formatter.c:772
 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:804
+#: ../plugins/itip-formatter/itip-formatter.c:776
 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:880
-msgid "Opening the calendar. Please wait.."
+#: ../plugins/itip-formatter/itip-formatter.c:1026
+msgid "Opening the calendar. Please wait..."
 msgstr "Ãpner kalender. Vennligst vent â"
 
-#: ../plugins/itip-formatter/itip-formatter.c:883
+#: ../plugins/itip-formatter/itip-formatter.c:1029
 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:1166
+#: ../plugins/itip-formatter/itip-formatter.c:1302
 msgid "Unable to parse item"
 msgstr "Kunne ikke lese oppfÃring"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1255
+#: ../plugins/itip-formatter/itip-formatter.c:1391
 #, 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:1267
+#: ../plugins/itip-formatter/itip-formatter.c:1403
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Sendt til kalender Â%s som godtatt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1271
+#: ../plugins/itip-formatter/itip-formatter.c:1407
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Sendt til kalender Â%s som tentativ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1276
+#: ../plugins/itip-formatter/itip-formatter.c:1412
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Sendt til kalender Â%s som avslÃtt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1281
+#: ../plugins/itip-formatter/itip-formatter.c:1417
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Sendt til kalender Â%s som avlyst"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1375
+#: ../plugins/itip-formatter/itip-formatter.c:1511
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organisator har fjernet delegat %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1382
+#: ../plugins/itip-formatter/itip-formatter.c:1518
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Avlysningsvarsel sendt til delegat"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1384
+#: ../plugins/itip-formatter/itip-formatter.c:1520
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Kunne ikke sende avlysningsmelding til delegaten"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1495
+#: ../plugins/itip-formatter/itip-formatter.c:1631
 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:1524
+#: ../plugins/itip-formatter/itip-formatter.c:1660
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Kan ikke oppdatere deltaker. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1528
+#: ../plugins/itip-formatter/itip-formatter.c:1664
 msgid "Attendee status updated"
 msgstr "Deltakerstatus oppdatert"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1532
+#: ../plugins/itip-formatter/itip-formatter.c:1668
 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:1554
+#: ../plugins/itip-formatter/itip-formatter.c:1690
 msgid "Meeting information sent"
 msgstr "Informasjon om mÃte sendt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1557
+#: ../plugins/itip-formatter/itip-formatter.c:1693
 msgid "Task information sent"
 msgstr "Informasjon om oppgave sendt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1560
+#: ../plugins/itip-formatter/itip-formatter.c:1696
 msgid "Memo information sent"
 msgstr "Informasjon om notat sendt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1569
+#: ../plugins/itip-formatter/itip-formatter.c:1705
 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:1572
+#: ../plugins/itip-formatter/itip-formatter.c:1708
 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:1575
+#: ../plugins/itip-formatter/itip-formatter.c:1711
 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:1640
+#: ../plugins/itip-formatter/itip-formatter.c:1776
 msgid "calendar.ics"
 msgstr "kalender.ics"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1645
+#: ../plugins/itip-formatter/itip-formatter.c:1781
 msgid "Save Calendar"
 msgstr "Lagre kalender"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1703
-#: ../plugins/itip-formatter/itip-formatter.c:1714
+#: ../plugins/itip-formatter/itip-formatter.c:1839
+#: ../plugins/itip-formatter/itip-formatter.c:1850
 msgid "The calendar attached is not valid"
 msgstr "Vedlagt kalender er ugyldig"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1704
-#: ../plugins/itip-formatter/itip-formatter.c:1715
+#: ../plugins/itip-formatter/itip-formatter.c:1840
+#: ../plugins/itip-formatter/itip-formatter.c:1851
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -17035,15 +17100,15 @@ msgstr ""
 "Meldingen pÃstÃr at den inneholder en kalender, men kalenderen er ikke en "
 "gyldig iCalendar."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1755
-#: ../plugins/itip-formatter/itip-formatter.c:1783
-#: ../plugins/itip-formatter/itip-formatter.c:1892
+#: ../plugins/itip-formatter/itip-formatter.c:1891
+#: ../plugins/itip-formatter/itip-formatter.c:1919
+#: ../plugins/itip-formatter/itip-formatter.c:2028
 msgid "The item in the calendar is not valid"
 msgstr "OppfÃringen i kalenderen er ikke gyldig"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1756
-#: ../plugins/itip-formatter/itip-formatter.c:1784
-#: ../plugins/itip-formatter/itip-formatter.c:1893
+#: ../plugins/itip-formatter/itip-formatter.c:1892
+#: ../plugins/itip-formatter/itip-formatter.c:1920
+#: ../plugins/itip-formatter/itip-formatter.c:2029
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -17051,11 +17116,11 @@ msgstr ""
 "Meldingen inneholder en kalender, men kalenderen inneholder ingen hendelser, "
 "oppgaver eller ledig/opptatt-informasjon"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1797
+#: ../plugins/itip-formatter/itip-formatter.c:1933
 msgid "The calendar attached contains multiple items"
 msgstr "Vedlagt kalender inneholder flere oppfÃringer"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1798
+#: ../plugins/itip-formatter/itip-formatter.c:1934
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -17063,40 +17128,40 @@ msgstr ""
 "Du mà lagre filen og importere kalenderen for à prosessere alle disse "
 "oppfÃringene"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2457
+#: ../plugins/itip-formatter/itip-formatter.c:2592
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Ingen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2473
+#: ../plugins/itip-formatter/itip-formatter.c:2608
 msgid "Tentatively Accepted"
 msgstr "Akseptert tentativt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2591
+#: ../plugins/itip-formatter/itip-formatter.c:2726
 msgid "This meeting recurs"
 msgstr "Dettee mÃtet gjeninntreffer"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2594
+#: ../plugins/itip-formatter/itip-formatter.c:2729
 msgid "This task recurs"
 msgstr "Denne oppgaven gjeninntreffer"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2597
+#: ../plugins/itip-formatter/itip-formatter.c:2732
 msgid "This memo recurs"
 msgstr "Dette notatet gjeninntreffer"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2831
+#: ../plugins/itip-formatter/itip-formatter.c:2971
 msgid "_Delete message after acting"
 msgstr "_Slett melding etter utfÃrt handling"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2841
-#: ../plugins/itip-formatter/itip-formatter.c:2874
+#: ../plugins/itip-formatter/itip-formatter.c:2981
+#: ../plugins/itip-formatter/itip-formatter.c:3014
 msgid "Conflict Search"
 msgstr "SÃk etter konflikter"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2856
+#: ../plugins/itip-formatter/itip-formatter.c:2996
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Velg kalendere som skal gjennomsÃkes for à finne mÃtekonflikter"
 
@@ -17473,7 +17538,7 @@ msgstr "Startdag:"
 
 #. Start time
 #: ../plugins/itip-formatter/itip-view.c:698
-#: ../plugins/itip-formatter/itip-view.c:1054
+#: ../plugins/itip-formatter/itip-view.c:1055
 msgid "Start time:"
 msgstr "Start-tid:"
 
@@ -17483,100 +17548,100 @@ msgstr "Sluttdag:"
 
 #. End time
 #: ../plugins/itip-formatter/itip-view.c:710
-#: ../plugins/itip-formatter/itip-view.c:1065
+#: ../plugins/itip-formatter/itip-view.c:1066
 msgid "End time:"
 msgstr "Slutt-tid:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:843
+#: ../plugins/itip-formatter/itip-view.c:844
 msgid "_Open Calendar"
 msgstr "_Ãpne kalender"
 
-#: ../plugins/itip-formatter/itip-view.c:849
-#: ../plugins/itip-formatter/itip-view.c:853
-#: ../plugins/itip-formatter/itip-view.c:859
-#: ../plugins/itip-formatter/itip-view.c:876
-#: ../plugins/itip-formatter/itip-view.c:881
+#: ../plugins/itip-formatter/itip-view.c:850
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:877
+#: ../plugins/itip-formatter/itip-view.c:882
 msgid "_Decline"
 msgstr "Av_slÃ"
 
-#: ../plugins/itip-formatter/itip-view.c:850
-#: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:862
-#: ../plugins/itip-formatter/itip-view.c:878
-#: ../plugins/itip-formatter/itip-view.c:883
+#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:856
+#: ../plugins/itip-formatter/itip-view.c:863
+#: ../plugins/itip-formatter/itip-view.c:879
+#: ../plugins/itip-formatter/itip-view.c:884
 msgid "A_ccept"
 msgstr "_Godta"
 
-#: ../plugins/itip-formatter/itip-view.c:853
+#: ../plugins/itip-formatter/itip-view.c:854
 msgid "_Decline all"
 msgstr "A_vslà alle"
 
-#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:855
 msgid "_Tentative all"
 msgstr "GjÃr alle _tentative"
 
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:860
-#: ../plugins/itip-formatter/itip-view.c:877
-#: ../plugins/itip-formatter/itip-view.c:882
+#: ../plugins/itip-formatter/itip-view.c:855
+#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:878
+#: ../plugins/itip-formatter/itip-view.c:883
 msgid "_Tentative"
 msgstr "_Tentativ"
 
-#: ../plugins/itip-formatter/itip-view.c:855
+#: ../plugins/itip-formatter/itip-view.c:856
 msgid "A_ccept all"
 msgstr "_Godta alle"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:866
+#: ../plugins/itip-formatter/itip-view.c:867
 msgid "_Send Information"
 msgstr "_Send informasjon"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:870
+#: ../plugins/itip-formatter/itip-view.c:871
 msgid "_Update Attendee Status"
 msgstr "_Oppdater status for deltaker"
 
-#: ../plugins/itip-formatter/itip-view.c:873
+#: ../plugins/itip-formatter/itip-view.c:874
 msgid "_Update"
 msgstr "_Oppdater"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1085
-#: ../plugins/itip-formatter/itip-view.c:1139
+#: ../plugins/itip-formatter/itip-view.c:1086
+#: ../plugins/itip-formatter/itip-view.c:1140
 msgid "Comment:"
 msgstr "Kommentar:"
 
-#: ../plugins/itip-formatter/itip-view.c:1124
+#: ../plugins/itip-formatter/itip-view.c:1125
 msgid "Send _reply to sender"
 msgstr "Send sva_r til avsender"
 
-#: ../plugins/itip-formatter/itip-view.c:1154
+#: ../plugins/itip-formatter/itip-view.c:1155
 msgid "Send _updates to attendees"
 msgstr "Send _oppdateringer til deltakere"
 
-#: ../plugins/itip-formatter/itip-view.c:1163
+#: ../plugins/itip-formatter/itip-view.c:1164
 msgid "_Apply to all instances"
 msgstr "B_ruk pà alle instanser"
 
-#: ../plugins/itip-formatter/itip-view.c:1172
+#: ../plugins/itip-formatter/itip-view.c:1173
 msgid "Show time as _free"
 msgstr "Vis tid som _ledig"
 
-#: ../plugins/itip-formatter/itip-view.c:1175
+#: ../plugins/itip-formatter/itip-view.c:1176
 msgid "_Preserve my reminder"
 msgstr "_Bevar min pÃminnelse"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1181
+#: ../plugins/itip-formatter/itip-view.c:1182
 msgid "_Inherit reminder"
 msgstr "Arv pÃm_innelse"
 
-#: ../plugins/itip-formatter/itip-view.c:1924
+#: ../plugins/itip-formatter/itip-view.c:1925
 msgid "_Tasks:"
 msgstr "_Oppgaver:"
 
-#: ../plugins/itip-formatter/itip-view.c:1926
+#: ../plugins/itip-formatter/itip-view.c:1927
 msgid "_Memos:"
 msgstr "_Notater:"
 
@@ -17752,12 +17817,12 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "Varsler nÃr nye meldinger ankommer."
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john doe myco example>"
-#: ../plugins/mail-to-task/mail-to-task.c:157
+#: ../plugins/mail-to-task/mail-to-task.c:235
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "Opprettet av en e-post fra %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:490
+#: ../plugins/mail-to-task/mail-to-task.c:586
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
@@ -17766,7 +17831,7 @@ msgstr ""
 "Valgt kalender inneholder hendelsen Â%s allerede. Vil du redigere den gamle "
 "hendelsen?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:493
+#: ../plugins/mail-to-task/mail-to-task.c:589
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
@@ -17775,7 +17840,7 @@ msgstr ""
 "Valgt oppgaveliste inneholder oppgave Â%s allerede. Vil du redigere den "
 "gamle oppgaven?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:496
+#: ../plugins/mail-to-task/mail-to-task.c:592
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -17784,109 +17849,51 @@ msgstr ""
 "Valgt notatliste inneholder notatet Â%s allerede. Vil du redigere det gamle "
 "notatet?"
 
-#. Translators: Codewise it is impossible to provide separate strings for all
-#. combinations of singular and plural. Please translate it in the way that you
-#. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:516
+#: ../plugins/mail-to-task/mail-to-task.c:609
+#, c-format
 msgid ""
-"Selected calendar contains some events for the given mails already. Would "
-"you like to create new events anyway?"
+"You have selected %d mails to be converted to events. Do you really want to "
+"add them all?"
 msgstr ""
-"Valgt kalender inneholder noen hendelser for disse e-postene allerede. Vil "
-"du lage nye hendelser likevel?"
 
-#. Translators: Codewise it is impossible to provide separate strings for all
-#. combinations of singular and plural. Please translate it in the way that you
-#. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:522
+#: ../plugins/mail-to-task/mail-to-task.c:612
+#, c-format
 msgid ""
-"Selected task list contains some tasks for the given mails already. Would "
-"you like to create new tasks anyway?"
+"You have selected %d mails to be converted to tasks. Do you really want to "
+"add them all?"
 msgstr ""
-"Valgt oppgaveliste inneholder noen oppgaver for disse meldingene allerede. "
-"Vil du lage nye oppgaver likevel?"
 
-#. Translators: Codewise it is impossible to provide separate strings for all
-#. combinations of singular and plural. Please translate it in the way that you
-#. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:528
+#: ../plugins/mail-to-task/mail-to-task.c:615
+#, c-format
 msgid ""
-"Selected memo list contains some memos for the given mails already. Would "
-"you like to create new memos anyway?"
+"You have selected %d mails to be converted to memos. Do you really want to "
+"add them all?"
 msgstr ""
-"Valgt notatliste inneholder noen notater for disse meldingene allerede. Vil "
-"du lage nye notater likevel?"
-
-#. Translators: Codewise it is impossible to provide separate strings for all
-#. combinations of singular and plural. Please translate it in the way that you
-#. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:549
-msgid ""
-"Selected calendar contains an event for the given mail already. Would you "
-"like to create new event anyway?"
-msgid_plural ""
-"Selected calendar contains events for the given mails already. Would you "
-"like to create new events anyway?"
-msgstr[0] ""
-"Valgt kalender inneholder en hendelse for gitt melding allerede. Vil du lage "
-"en ny hendelse likevel?"
-msgstr[1] ""
-"Valgt kalender inneholder hendelser for gitte meldinger allerede. Vil du "
-"lage nye hendelser likevel?"
-
-#. Translators: Codewise it is impossible to provide separate strings for all
-#. combinations of singular and plural. Please translate it in the way that you
-#. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:558
-msgid ""
-"Selected task list contains a task for the given mail already. Would you "
-"like to create new task anyway?"
-msgid_plural ""
-"Selected task list contains tasks for the given mails already. Would you "
-"like to create new tasks anyway?"
-msgstr[0] ""
-"Valgt oppgaveliste inneholder en oppgave for gitt melding allerede. Vil du "
-"lage en ny oppgave likevel?"
-msgstr[1] ""
-"Valgt oppgaveliste inneholder oppgaver for gitte meldinger allerede. Vil du "
-"lage nye oppgaver likevel?"
 
-#. Translators: Codewise it is impossible to provide separate strings for all
-#. combinations of singular and plural. Please translate it in the way that you
-#. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:567
-msgid ""
-"Selected memo list contains a memo for the given mail already. Would you "
-"like to create new memo anyway?"
-msgid_plural ""
-"Selected memo list contains memos for the given mails already. Would you "
-"like to create new memos anyway?"
-msgstr[0] ""
-"Valgt notatliste inneholder et notat for gitt melding allerede. Vil du lage "
-"et nytt notat likevel?"
-msgstr[1] ""
-"Valgt notatliste inneholder notater for gitte meldinger allerede. Vil du "
-"lage nye notater likevel?"
+#: ../plugins/mail-to-task/mail-to-task.c:634
+#, fuzzy
+msgid "Do you wish to continue converting remaining mails?"
+msgstr "Vil du overskrive den?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:626
+#: ../plugins/mail-to-task/mail-to-task.c:709
 msgid "[No Summary]"
 msgstr "[Ingen sammendrag]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:637
+#: ../plugins/mail-to-task/mail-to-task.c:721
 msgid "Invalid object returned from a server"
 msgstr "Ugyldig objekt returnert fra en tjener"
 
-#: ../plugins/mail-to-task/mail-to-task.c:708
+#: ../plugins/mail-to-task/mail-to-task.c:771
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "En feil oppsto under prosessering: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:737
+#: ../plugins/mail-to-task/mail-to-task.c:796
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Kan ikke Ãpne kalender. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:744
+#: ../plugins/mail-to-task/mail-to-task.c:803
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
@@ -17894,7 +17901,7 @@ msgstr ""
 "Valgt kilde er skrivebeskyttet og hendelser kan ikke opprettes der. Velg en "
 "annen kilde."
 
-#: ../plugins/mail-to-task/mail-to-task.c:747
+#: ../plugins/mail-to-task/mail-to-task.c:806
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -17902,7 +17909,7 @@ msgstr ""
 "Valgt kilde er skrivebeskyttet og oppgaver kan ikke opprettes der. Velg en "
 "annen kilde."
 
-#: ../plugins/mail-to-task/mail-to-task.c:750
+#: ../plugins/mail-to-task/mail-to-task.c:809
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
@@ -17910,40 +17917,45 @@ msgstr ""
 "Valgt kilde er skrivebeskyttet og notater kan ikke opprettes der. Velg en "
 "annen kilde."
 
-#: ../plugins/mail-to-task/mail-to-task.c:956
+#: ../plugins/mail-to-task/mail-to-task.c:1045
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "Fant ikke kildeliste %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1075
+#: ../plugins/mail-to-task/mail-to-task.c:1104
+#, fuzzy
+msgid "No writable calendar is available."
+msgstr "Ingen beskrivelse tilgjengelig."
+
+#: ../plugins/mail-to-task/mail-to-task.c:1196
 msgid "Create an _Event"
 msgstr "Lag en h_endelse"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1077
+#: ../plugins/mail-to-task/mail-to-task.c:1198
 msgid "Create a new event from the selected message"
 msgstr " Lag en ny hendelse fra den valgte meldingen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1082
+#: ../plugins/mail-to-task/mail-to-task.c:1203
 msgid "Create a Mem_o"
 msgstr "Lag et n_otat"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1084
+#: ../plugins/mail-to-task/mail-to-task.c:1205
 msgid "Create a new memo from the selected message"
 msgstr "Lag et nytt notat fra den valgte meldingen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1089
+#: ../plugins/mail-to-task/mail-to-task.c:1210
 msgid "Create a _Task"
 msgstr "Lag en o_ppgave"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1091
+#: ../plugins/mail-to-task/mail-to-task.c:1212
 msgid "Create a new task from the selected message"
 msgstr "Lag en ny oppgave fra den valgte meldingen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1099
+#: ../plugins/mail-to-task/mail-to-task.c:1220
 msgid "Create a _Meeting"
 msgstr "Lag et _mÃte"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1101
+#: ../plugins/mail-to-task/mail-to-task.c:1222
 msgid "Create a new meeting from the selected message"
 msgstr "Lag et nytt mÃte fra den valgte meldingen"
 
@@ -18369,7 +18381,7 @@ msgstr "Br_ukernavn:"
 msgid "iCal"
 msgstr "iCal"
 
-#: ../plugins/publish-calendar/publish-format-fb.c:73
+#: ../plugins/publish-calendar/publish-format-fb.c:88
 #: ../plugins/publish-calendar/publish-format-ical.c:86
 #, c-format
 msgid "Could not publish calendar: Calendar backend no longer exists"
@@ -18440,87 +18452,86 @@ msgstr "SpamAssassin filter for uÃnsket e-post"
 msgid "SpamAssassin Options"
 msgstr "Alternativer for SpamAssassin"
 
-#.
-#. * Translator: the %F %T is the thirth argument for a strftime function.
-#. * It lets you define the formatting of the date in the csv-file.
-#. *
-#: ../plugins/save-calendar/csv-format.c:161
+#. Translators: the %F %T is the third argument for a
+#. * strftime function.  It lets you define the formatting
+#. * of the date in the csv-file.
+#: ../plugins/save-calendar/csv-format.c:160
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:362
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "Description List"
 msgstr "Beskrivelsesliste"
 
-#: ../plugins/save-calendar/csv-format.c:365
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "Categories List"
 msgstr "Liste med kategorier"
 
-#: ../plugins/save-calendar/csv-format.c:366
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "Comment List"
 msgstr "Liste med kommentarer"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Contact List"
 msgstr "Kontaktliste"
 
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:377
 msgid "Start"
 msgstr "Start"
 
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../plugins/save-calendar/csv-format.c:378
 msgid "End"
 msgstr "Slutt"
 
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../plugins/save-calendar/csv-format.c:379
 msgid "Due"
 msgstr "Ferdig"
 
-#: ../plugins/save-calendar/csv-format.c:373
+#: ../plugins/save-calendar/csv-format.c:380
 msgid "percent Done"
 msgstr "Prosent fullfÃrt"
 
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/save-calendar/csv-format.c:382
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:376
+#: ../plugins/save-calendar/csv-format.c:383
 msgid "Attendees List"
 msgstr "Deltakerliste"
 
-#: ../plugins/save-calendar/csv-format.c:378
+#: ../plugins/save-calendar/csv-format.c:385
 msgid "Modified"
 msgstr "Endret"
 
-#: ../plugins/save-calendar/csv-format.c:531
+#: ../plugins/save-calendar/csv-format.c:560
 msgid "A_dvanced options for the CSV format"
 msgstr "A_vanserte alternativer for CVS-format"
 
-#: ../plugins/save-calendar/csv-format.c:538
+#: ../plugins/save-calendar/csv-format.c:568
 msgid "Prepend a _header"
 msgstr "Legg til et _hode i starten"
 
-#: ../plugins/save-calendar/csv-format.c:547
+#: ../plugins/save-calendar/csv-format.c:577
 msgid "_Value delimiter:"
 msgstr "Skilletegn for _verdier:"
 
-#: ../plugins/save-calendar/csv-format.c:554
+#: ../plugins/save-calendar/csv-format.c:588
 msgid "_Record delimiter:"
 msgstr "Skilletegn for poste_r:"
 
-#: ../plugins/save-calendar/csv-format.c:561
+#: ../plugins/save-calendar/csv-format.c:599
 msgid "_Encapsulate values with:"
 msgstr "Pakk inn v_erdier med:"
 
-#: ../plugins/save-calendar/csv-format.c:583
+#: ../plugins/save-calendar/csv-format.c:625
 msgid "Comma separated value format (.csv)"
 msgstr "Kommaseparert verdiformat (.csv)"
 
-#: ../plugins/save-calendar/ical-format.c:162
+#: ../plugins/save-calendar/ical-format.c:166
 msgid "iCalendar format (.ics)"
 msgstr "iCalendar-format (.ics)"
 
@@ -18541,7 +18552,7 @@ msgstr "Lagre en kalender eller oppgaveliste til disk."
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:369
+#: ../plugins/save-calendar/rdf-format.c:375
 msgid "RDF format (.rdf)"
 msgstr "RDF-format (.rdf)"
 
@@ -18611,27 +18622,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:198
-#: ../plugins/vcard-inline/vcard-inline.c:283
+#: ../plugins/vcard-inline/vcard-inline.c:200
+#: ../plugins/vcard-inline/vcard-inline.c:285
 msgid "Show Full vCard"
 msgstr "Vis alle data i vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:201
+#: ../plugins/vcard-inline/vcard-inline.c:203
 msgid "Show Compact vCard"
 msgstr "Vis kompakt vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:262
+#: ../plugins/vcard-inline/vcard-inline.c:264
 msgid "There is one other contact."
 msgstr "Det finnes en annen kontakt."
 
-#: ../plugins/vcard-inline/vcard-inline.c:271
+#: ../plugins/vcard-inline/vcard-inline.c:273
 #, 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:292
+#: ../plugins/vcard-inline/vcard-inline.c:294
 msgid "Save in Address Book"
 msgstr "Lagre i adressebok"
 
@@ -19596,66 +19607,100 @@ msgstr ""
 "sertifikatet stoler du heller ikke pà at dette sertifikatet er autentisk med "
 "mindre annet indikeres her"
 
-#: ../smime/gui/certificate-manager.c:148
-#: ../smime/gui/certificate-manager.c:460
-#: ../smime/gui/certificate-manager.c:697
-msgid "Select a certificate to import..."
-msgstr "Velg et sertifikat som skal importeres â"
-
-#: ../smime/gui/certificate-manager.c:157
-msgid "All PKCS12 files"
-msgstr "Alle PKCS12-filer"
-
-#: ../smime/gui/certificate-manager.c:163
-#: ../smime/gui/certificate-manager.c:475
-#: ../smime/gui/certificate-manager.c:711
-msgid "All files"
-msgstr "Alle filer"
-
-#: ../smime/gui/certificate-manager.c:182
-msgid "Failed to import user's certificate"
-msgstr "Klarte ikke à importere brukers sertifikat"
-
-#: ../smime/gui/certificate-manager.c:352
-#: ../smime/gui/certificate-manager.c:574
-#: ../smime/gui/certificate-manager.c:808
+#: ../smime/gui/certificate-manager.c:73 ../smime/gui/certificate-manager.c:92
+#: ../smime/gui/certificate-manager.c:112
 msgid "Certificate Name"
 msgstr "Navn pà sertifikat"
 
-#: ../smime/gui/certificate-manager.c:361
-#: ../smime/gui/certificate-manager.c:592
-msgid "Purposes"
-msgstr "Hensikter"
+#: ../smime/gui/certificate-manager.c:74 ../smime/gui/certificate-manager.c:94
+msgid "Issued To Organization"
+msgstr "Utstedt til organisasjon"
+
+#: ../smime/gui/certificate-manager.c:75 ../smime/gui/certificate-manager.c:95
+msgid "Issued To Organizational Unit"
+msgstr "Utstedt til organisasjonsenhet"
 
-#: ../smime/gui/certificate-manager.c:370 ../smime/gui/smime-ui.ui.h:32
+#: ../smime/gui/certificate-manager.c:76 ../smime/gui/certificate-manager.c:96
+#: ../smime/gui/certificate-manager.c:114 ../smime/gui/smime-ui.ui.h:32
 #: ../smime/lib/e-cert.c:566
 msgid "Serial Number"
 msgstr "Serienummer"
 
-#: ../smime/gui/certificate-manager.c:378
+#: ../smime/gui/certificate-manager.c:77 ../smime/gui/certificate-manager.c:97
+#: ../smime/gui/certificate-manager.c:115
+msgid "Purposes"
+msgstr "Hensikter"
+
+#: ../smime/gui/certificate-manager.c:78 ../smime/gui/certificate-manager.c:98
+#: ../smime/gui/certificate-manager.c:116 ../smime/gui/smime-ui.ui.h:23
+msgid "Issued By"
+msgstr "Utstedt av"
+
+#: ../smime/gui/certificate-manager.c:79 ../smime/gui/certificate-manager.c:99
+#: ../smime/gui/certificate-manager.c:117
+msgid "Issued By Organization"
+msgstr "Utstedt av organisasjon:"
+
+#: ../smime/gui/certificate-manager.c:80
+#: ../smime/gui/certificate-manager.c:100
+#: ../smime/gui/certificate-manager.c:118
+#, fuzzy
+msgid "Issued By Organizational Unit"
+msgstr "Organisasjonsenhet (OU)"
+
+#: ../smime/gui/certificate-manager.c:81
+#: ../smime/gui/certificate-manager.c:101
+#: ../smime/gui/certificate-manager.c:119
+msgid "Issued"
+msgstr "Utstedt"
+
+#: ../smime/gui/certificate-manager.c:82
+#: ../smime/gui/certificate-manager.c:102
+#: ../smime/gui/certificate-manager.c:120
 msgid "Expires"
 msgstr "UtgÃr"
 
-#: ../smime/gui/certificate-manager.c:469
-msgid "All email certificate files"
-msgstr "Alle sertifikatfiler for e-post"
+#: ../smime/gui/certificate-manager.c:83
+#: ../smime/gui/certificate-manager.c:103
+#: ../smime/gui/certificate-manager.c:121 ../smime/gui/smime-ui.ui.h:29
+msgid "SHA1 Fingerprint"
+msgstr "SHA1-fingeravtrykk"
 
-#: ../smime/gui/certificate-manager.c:502
-msgid "Failed to import contact's certificate"
-msgstr "Klarte ikke à importere kontaktens sertifikat"
+#: ../smime/gui/certificate-manager.c:84
+#: ../smime/gui/certificate-manager.c:104
+#: ../smime/gui/certificate-manager.c:122 ../smime/gui/smime-ui.ui.h:26
+msgid "MD5 Fingerprint"
+msgstr "MD5-fingeravtrykk"
 
-#: ../smime/gui/certificate-manager.c:583
+#: ../smime/gui/certificate-manager.c:93
+#: ../smime/gui/certificate-manager.c:113
 msgid "E-Mail Address"
 msgstr "E-postadresse"
 
-#: ../smime/gui/certificate-manager.c:706
+#: ../smime/gui/certificate-manager.c:574
+msgid "Select a certificate to import..."
+msgstr "Velg et sertifikat som skal importeres â"
+
+#: ../smime/gui/certificate-manager.c:587
+msgid "All files"
+msgstr "Alle filer"
+
+#: ../smime/gui/certificate-manager.c:622
+msgid "Failed to import certificate"
+msgstr "Klarte ikke à importere sertifikat"
+
+#: ../smime/gui/certificate-manager.c:990
+msgid "All PKCS12 files"
+msgstr "Alle PKCS12-filer"
+
+#: ../smime/gui/certificate-manager.c:1008
+msgid "All email certificate files"
+msgstr "Alle sertifikatfiler for e-post"
+
+#: ../smime/gui/certificate-manager.c:1026
 msgid "All CA certificate files"
 msgstr "Alle CA-sertifikatfiler"
 
-#: ../smime/gui/certificate-manager.c:737
-msgid "Failed to import certificate authority's certificate"
-msgstr "Klarte ikke à importere sertifikatmyndighetens sertifikat"
-
 #: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
@@ -19778,10 +19823,6 @@ msgstr "Feltverdi"
 msgid "Fingerprints"
 msgstr "Fingeravtrykk"
 
-#: ../smime/gui/smime-ui.ui.h:23
-msgid "Issued By"
-msgstr "Utstedt av"
-
 #: ../smime/gui/smime-ui.ui.h:24
 msgid "Issued On"
 msgstr "Utstedt"
@@ -19790,10 +19831,6 @@ msgstr "Utstedt"
 msgid "Issued To"
 msgstr "Utstedt til"
 
-#: ../smime/gui/smime-ui.ui.h:26
-msgid "MD5 Fingerprint"
-msgstr "MD5-fingeravtrykk"
-
 #: ../smime/gui/smime-ui.ui.h:27
 msgid "Organization (O)"
 msgstr "Organisasjon (O)"
@@ -19802,10 +19839,6 @@ msgstr "Organisasjon (O)"
 msgid "Organizational Unit (OU)"
 msgstr "Organisasjonsenhet (OU)"
 
-#: ../smime/gui/smime-ui.ui.h:29
-msgid "SHA1 Fingerprint"
-msgstr "SHA1-fingeravtrykk"
-
 #: ../smime/gui/smime-ui.ui.h:30 ../smime/lib/e-cert.c:824
 msgid "SSL Client Certificate"
 msgstr "SSL-klientsertifikat"
@@ -20309,36 +20342,40 @@ msgstr[1] "Lagre vedlegg"
 msgid "attachment.dat"
 msgstr "vedlegg.dat"
 
-#: ../widgets/misc/e-attachment-view.c:352
+#: ../widgets/misc/e-attachment-view.c:404
+msgid "Open With Other Application..."
+msgstr ""
+
+#: ../widgets/misc/e-attachment-view.c:411
 msgid "S_ave All"
 msgstr "L_agre alle"
 
-#: ../widgets/misc/e-attachment-view.c:378
+#: ../widgets/misc/e-attachment-view.c:437
 msgid "A_dd Attachment..."
 msgstr "Legg til ve_dlegg â"
 
-#: ../widgets/misc/e-attachment-view.c:402
+#: ../widgets/misc/e-attachment-view.c:461
 msgid "_Hide"
 msgstr "_Skjul"
 
-#: ../widgets/misc/e-attachment-view.c:409
+#: ../widgets/misc/e-attachment-view.c:468
 msgid "Hid_e All"
 msgstr "Skj_ul alle"
 
-#: ../widgets/misc/e-attachment-view.c:416
+#: ../widgets/misc/e-attachment-view.c:475
 msgid "_View Inline"
 msgstr "_Vis i meldingsteksten"
 
-#: ../widgets/misc/e-attachment-view.c:423
+#: ../widgets/misc/e-attachment-view.c:482
 msgid "Vie_w All Inline"
 msgstr "_Vis alle i meldingsteksten"
 
-#: ../widgets/misc/e-attachment-view.c:741
+#: ../widgets/misc/e-attachment-view.c:803
 #, c-format
-msgid "Open with \"%s\""
+msgid "Open With \"%s\""
 msgstr "Ãpne med Â%sÂ"
 
-#: ../widgets/misc/e-attachment-view.c:744
+#: ../widgets/misc/e-attachment-view.c:806
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "Ãpne dette vedlegget i %s"
@@ -20403,7 +20440,7 @@ msgstr "Ctrl-klikk for à Ãpne en lenke"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../widgets/misc/e-calendar.c:225
+#: ../widgets/misc/e-calendar.c:226
 msgid "Month Calendar"
 msgstr "MÃnedskalender"
 
@@ -20419,7 +20456,7 @@ msgstr "Skriv inn tegnsett som skal brukes"
 msgid "Other..."
 msgstr "Andre â"
 
-#: ../widgets/misc/e-contact-map-window.c:344
+#: ../widgets/misc/e-contact-map-window.c:347
 msgid "Contacts Map"
 msgstr "Kontaktkart"
 
@@ -20490,7 +20527,7 @@ msgid "File _type:"
 msgstr "Fil_type:"
 
 #: ../widgets/misc/e-import-assistant.c:333
-#: ../widgets/misc/e-import-assistant.c:909
+#: ../widgets/misc/e-import-assistant.c:910
 msgid "Choose the destination for this import"
 msgstr "Velg mÃl det skal importeres til"
 
@@ -20517,37 +20554,37 @@ msgstr ""
 "Hvis du vil prÃve igjen kan du klikke pà ÂTilbakeÂ-knappen."
 
 #. Install a custom "Cancel Import" button.
-#: ../widgets/misc/e-import-assistant.c:766
+#: ../widgets/misc/e-import-assistant.c:767
 msgid "_Cancel Import"
 msgstr "A_vbryt import"
 
-#: ../widgets/misc/e-import-assistant.c:908
+#: ../widgets/misc/e-import-assistant.c:909
 msgid "Preview data to be imported"
 msgstr "ForhÃndsvis data som skal importeres"
 
-#: ../widgets/misc/e-import-assistant.c:914
-#: ../widgets/misc/e-import-assistant.c:927
-#: ../widgets/misc/e-import-assistant.c:1272
-#: ../widgets/misc/e-import-assistant.c:1348
-#: ../widgets/misc/e-import-assistant.c:1357
+#: ../widgets/misc/e-import-assistant.c:915
+#: ../widgets/misc/e-import-assistant.c:928
+#: ../widgets/misc/e-import-assistant.c:1273
+#: ../widgets/misc/e-import-assistant.c:1349
+#: ../widgets/misc/e-import-assistant.c:1358
 msgid "Import Data"
 msgstr "Importer data"
 
-#: ../widgets/misc/e-import-assistant.c:922
+#: ../widgets/misc/e-import-assistant.c:923
 msgid "Select what type of file you want to import from the list."
 msgstr "Velg hvilken type fil du vil importere fra listen."
 
-#: ../widgets/misc/e-import-assistant.c:1262
-#: ../widgets/misc/e-import-assistant.c:1297
+#: ../widgets/misc/e-import-assistant.c:1263
+#: ../widgets/misc/e-import-assistant.c:1298
 msgid "Evolution Import Assistant"
 msgstr "Importeringsassistent for Evolution"
 
-#: ../widgets/misc/e-import-assistant.c:1279
-#: ../widgets/misc/e-import-assistant.c:1335
+#: ../widgets/misc/e-import-assistant.c:1280
+#: ../widgets/misc/e-import-assistant.c:1336
 msgid "Import Location"
 msgstr "Importer adresse"
 
-#: ../widgets/misc/e-import-assistant.c:1290
+#: ../widgets/misc/e-import-assistant.c:1291
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
@@ -20557,19 +20594,19 @@ msgstr ""
 "Gjennom denne veiviseren vil du ledes gjennom import av eksterne filer til "
 "Evolution."
 
-#: ../widgets/misc/e-import-assistant.c:1307
+#: ../widgets/misc/e-import-assistant.c:1308
 msgid "Importer Type"
 msgstr "Type import"
 
-#: ../widgets/misc/e-import-assistant.c:1317
+#: ../widgets/misc/e-import-assistant.c:1318
 msgid "Select Information to Import"
 msgstr "Velg informasjon som skal importeres"
 
-#: ../widgets/misc/e-import-assistant.c:1326
+#: ../widgets/misc/e-import-assistant.c:1327
 msgid "Select a File"
 msgstr "Velg en fil"
 
-#: ../widgets/misc/e-import-assistant.c:1343
+#: ../widgets/misc/e-import-assistant.c:1344
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "Klikk pà ÂBruk for à starte import av filen til Evolution."
 
@@ -21165,10 +21202,10 @@ msgstr "klikk"
 msgid "sort"
 msgstr "sortere"
 
-#: ../widgets/text/e-text.c:2283
+#: ../widgets/text/e-text.c:2306
 msgid "Select All"
 msgstr "Velg alle"
 
-#: ../widgets/text/e-text.c:2295
+#: ../widgets/text/e-text.c:2318
 msgid "Input Methods"
 msgstr "Inndatametoder"



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