[evolution] Updated Norwegian bokmål translation



commit 03d82a917daa142afb2715d09f07cbc6e88679d0
Author: Kjartan Maraas <kmaraas gnome org>
Date:   Sun Oct 3 16:26:38 2010 +0200

    Updated Norwegian bokmål translation

 po/nb.po | 3781 ++++++++++++++++++++++++++++++--------------------------------
 1 files changed, 1829 insertions(+), 1952 deletions(-)
---
diff --git a/po/nb.po b/po/nb.po
index 1a9bcd1..43dd331 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -4,13 +4,13 @@
 # Terance Edward Sola <terance lyse net>, 2005.
 #
 #
-#: ../shell/main.c:532
+#: ../shell/main.c:559
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 2.31.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-02 15:47+0200\n"
-"PO-Revision-Date: 2010-09-02 15:42+0200\n"
+"POT-Creation-Date: 2010-10-03 15:59+0200\n"
+"PO-Revision-Date: 2010-10-03 16:26+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas gnome org>\n"
 "Language-Team: Norwegian bokmal <i18n-nb lister ping uio no>\n"
 "Language: \n"
@@ -99,7 +99,7 @@ msgstr "Kunne ikke autentisere mot LDAP-tjener."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1277
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1278
 msgid "Failed to delete contact"
 msgstr "Klarte ikke å slette kontakt"
 
@@ -212,7 +212,7 @@ msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:37 ../mail/em-vfolder-rule.c:525
 #: ../plugins/groupwise-features/junk-settings.ui.h:4
-#: ../plugins/groupwise-features/properties.ui.h:10
+#: ../plugins/groupwise-features/properties.ui.h:9
 #: ../widgets/table/e-table-config.ui.h:18
 msgid "_Add"
 msgstr "_Legg til"
@@ -235,7 +235,7 @@ msgstr "Br_uk som den er"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../calendar/gui/e-calendar-view.c:2022
+#: ../calendar/gui/e-calendar-view.c:2027
 msgid "Anniversary"
 msgstr "Bryllupsdag"
 
@@ -246,8 +246,8 @@ msgstr "Bryllupsdag"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
 #: ../addressbook/gui/widgets/eab-contact-display.c:582
-#: ../calendar/gui/e-calendar-view.c:2021 ../capplet/anjal-settings-main.c:117
-#: ../shell/main.c:122
+#: ../calendar/gui/e-calendar-view.c:2026 ../capplet/anjal-settings-main.c:123
+#: ../shell/main.c:128
 msgid "Birthday"
 msgstr "Fødselsdag"
 
@@ -343,7 +343,7 @@ msgstr "Notater"
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:188
 #: ../addressbook/gui/widgets/eab-contact-display.c:71
 #: ../addressbook/gui/widgets/eab-contact-display.c:460
-#: ../calendar/gui/e-calendar-view.c:1725
+#: ../calendar/gui/e-calendar-view.c:1732
 msgid "Other"
 msgstr "Andre"
 
@@ -395,7 +395,7 @@ msgid "_Blog:"
 msgstr "_Blogg:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
-#: ../calendar/gui/dialogs/event-page.c:882
+#: ../calendar/gui/dialogs/event-page.c:885
 #: ../calendar/gui/dialogs/event-page.ui.h:11
 #: ../plugins/itip-formatter/itip-view.c:1921
 msgid "_Calendar:"
@@ -516,7 +516,7 @@ msgid "Skype"
 msgstr "Skype"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:208
-#: ../addressbook/gui/widgets/eab-gui-util.c:352
+#: ../addressbook/gui/widgets/eab-gui-util.c:371
 msgid "Error adding contact"
 msgstr "Feil under innlegging av kontakt"
 
@@ -656,7 +656,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:657
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:659
 msgid "Contact List Editor"
 msgstr "Kontaktlisteredigering"
 
@@ -673,7 +673,7 @@ msgid "_List name:"
 msgstr "_Listenavn:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:173
+#: ../mail/mail-config.ui.h:154
 msgid "_Select..."
 msgstr "_Velg..."
 
@@ -681,24 +681,24 @@ 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:751
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:753
 msgid "Contact List Members"
 msgstr "Kontaktlistemedlemmer"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:905
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1320
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:907
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1322
 msgid "_Members"
 msgstr "_Medlemmer"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1160
 msgid "Error adding list"
 msgstr "Feil under innlegging av liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1172
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1174
 msgid "Error modifying list"
 msgstr "Feil ved endring av liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1186
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1188
 msgid "Error removing list"
 msgstr "Feil under fjerning av liste"
 
@@ -818,33 +818,33 @@ msgstr "Slett valgte kontakter"
 msgid "Select all visible contacts"
 msgstr "Velg alle synlige kontakter"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1295
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1296
 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:1299
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1300
 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:1303
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1304
 #, 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:1309
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1310
 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:1313
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1314
 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:1317
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1318
 #, 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)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1472
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1473
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -853,11 +853,11 @@ msgstr ""
 "�pning av %d kontakter vil medføre at %d nye vinduer vil\n"
 "vises på skjermen. Vil du virkelig vise alle disse kontaktene?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1477
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1478
 msgid "_Don't Display"
 msgstr "Ikke _vis"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1478
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1479
 msgid "Display _All Contacts"
 msgstr "Vis _alle kontakter"
 
@@ -1028,7 +1028,7 @@ msgstr "Enhet"
 msgid "Web Site"
 msgstr "Nettside"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:183
+#: ../addressbook/gui/widgets/e-minicard-view.c:186
 msgid ""
 "\n"
 "\n"
@@ -1038,7 +1038,7 @@ msgstr ""
 "\n"
 "Søker etter kontakter..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:186
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -1052,7 +1052,7 @@ msgstr ""
 "\n"
 "eller dobbelklikk her for å opprette en ny kontakt."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:189
+#: ../addressbook/gui/widgets/e-minicard-view.c:192
 msgid ""
 "\n"
 "\n"
@@ -1066,7 +1066,7 @@ msgstr ""
 "\n"
 "Dobbelklikk her for å opprette en ny kontakt."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:193
+#: ../addressbook/gui/widgets/e-minicard-view.c:196
 msgid ""
 "\n"
 "\n"
@@ -1076,7 +1076,7 @@ msgstr ""
 "\n"
 "Søk etter kontakten."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:195
+#: ../addressbook/gui/widgets/e-minicard-view.c:198
 msgid ""
 "\n"
 "\n"
@@ -1086,16 +1086,16 @@ msgstr ""
 "\n"
 "Ingen oppføringer i denne visningen."
 
-#: ../addressbook/gui/widgets/e-minicard.c:99
+#: ../addressbook/gui/widgets/e-minicard.c:102
 msgid "Work Email"
 msgstr "E-post på arbeid"
 
-#: ../addressbook/gui/widgets/e-minicard.c:100
+#: ../addressbook/gui/widgets/e-minicard.c:103
 msgid "Home Email"
 msgstr "E-post hjemme"
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:807
+#: ../addressbook/gui/widgets/e-minicard.c:104
+#: ../addressbook/gui/widgets/e-minicard.c:810
 msgid "Other Email"
 msgstr "Annen e-post"
 
@@ -1190,7 +1190,7 @@ msgstr "Videosamtale"
 #: ../calendar/gui/dialogs/calendar-setup.c:370
 #: ../modules/calendar/e-cal-shell-view-actions.c:218
 #: ../modules/calendar/e-cal-shell-view-actions.c:247
-#: ../modules/calendar/e-cal-shell-view.c:488
+#: ../modules/calendar/e-cal-shell-view.c:491
 #: ../plugins/groupwise-features/camel-gw-listener.c:421
 #: ../plugins/groupwise-features/camel-gw-listener.c:446
 #: ../plugins/groupwise-features/camel-gw-listener.c:561
@@ -1234,7 +1234,7 @@ msgstr "Nettdagbok"
 #. Create the default Person memo list
 #. Create the default Person task list
 #: ../addressbook/gui/widgets/eab-contact-display.c:586
-#: ../capplet/settings/mail-capplet-shell.c:350
+#: ../capplet/settings/mail-capplet-shell.c:353
 #: ../modules/addressbook/e-book-shell-backend.c:116
 #: ../modules/addressbook/e-book-shell-migrate.c:138
 #: ../modules/calendar/e-cal-shell-backend.c:127
@@ -1275,7 +1275,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:80
+#: ../addressbook/gui/widgets/eab-gui-util.c:98
 #, c-format
 msgid ""
 "This address book cannot be opened.  Please check that the path %s exists "
@@ -1284,7 +1284,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:92
+#: ../addressbook/gui/widgets/eab-gui-util.c:111
 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."
@@ -1293,7 +1293,7 @@ msgstr ""
 "ønsker å bruke LDAP i Evolution må du installere en pakke som har denne "
 "støtten."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:101
+#: ../addressbook/gui/widgets/eab-gui-util.c:120
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
@@ -1301,11 +1301,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:109
+#: ../addressbook/gui/widgets/eab-gui-util.c:128
 msgid "Detailed error message:"
 msgstr "Detaljert feilmelding:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:133
+#: ../addressbook/gui/widgets/eab-gui-util.c:152
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -1317,7 +1317,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:140
+#: ../addressbook/gui/widgets/eab-gui-util.c:159
 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"
@@ -1330,49 +1330,49 @@ 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:148
+#: ../addressbook/gui/widgets/eab-gui-util.c:167
 #, 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:153
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
 #, 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:158
+#: ../addressbook/gui/widgets/eab-gui-util.c:177
 #, 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:183
+#: ../addressbook/gui/widgets/eab-gui-util.c:202
 msgid "card.vcf"
 msgstr "kort.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:223
+#: ../addressbook/gui/widgets/eab-gui-util.c:242
 msgid "Select Address Book"
 msgstr "Velg adressebok"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:286
+#: ../addressbook/gui/widgets/eab-gui-util.c:305
 msgid "list"
 msgstr "liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:425
+#: ../addressbook/gui/widgets/eab-gui-util.c:444
 msgid "Move contact to"
 msgstr "Flytt kontakt til"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:427
+#: ../addressbook/gui/widgets/eab-gui-util.c:446
 msgid "Copy contact to"
 msgstr "Kopier kontakt til"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:430
+#: ../addressbook/gui/widgets/eab-gui-util.c:449
 msgid "Move contacts to"
 msgstr "Flytt kontakter til"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:432
+#: ../addressbook/gui/widgets/eab-gui-util.c:451
 msgid "Copy contacts to"
 msgstr "Kopier kontakter til"
 
@@ -1449,60 +1449,60 @@ msgstr "Kunne ikke hente liste med adressebøker"
 msgid "failed to open book"
 msgstr "kunne ikke åpne adressebok"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:45
+#: ../addressbook/tools/evolution-addressbook-export.c:59
 msgid "Specify the output file instead of standard output"
 msgstr "Oppgi utdatafil i stedet for standard utdata"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:46
+#: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "OUTPUTFILE"
 msgstr "UTDATAFIL"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:49
+#: ../addressbook/tools/evolution-addressbook-export.c:63
 msgid "List local address book folders"
 msgstr "Vis lokale adressebokmapper"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:52
+#: ../addressbook/tools/evolution-addressbook-export.c:66
 msgid "Show cards as vcard or csv file"
 msgstr "Vis kontakter som vcard eller csv-fil"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:53
+#: ../addressbook/tools/evolution-addressbook-export.c:67
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:70
 msgid "Export in asynchronous mode"
 msgstr "Eksporter i asynkron modus"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:59
+#: ../addressbook/tools/evolution-addressbook-export.c:73
 msgid ""
 "The number of cards in one output file in asynchronous mode, default size "
 "100."
 msgstr ""
 "Antall kontakter i en utdatafil i asynkron modus. Forvalgt størrelse er 100."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:61
+#: ../addressbook/tools/evolution-addressbook-export.c:75
 msgid "NUMBER"
 msgstr "ANTALL"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:101
+#: ../addressbook/tools/evolution-addressbook-export.c:137
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Feil med kommandolinjeflagg. Vennligst bruk --help for å se bruksinformasjon."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:115
+#: ../addressbook/tools/evolution-addressbook-export.c:151
 msgid "Only support csv or vcard format."
 msgstr "Støtt kun csv- eller vcard-format."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:124
+#: ../addressbook/tools/evolution-addressbook-export.c:160
 msgid "In async mode, output must be file."
 msgstr "I asynkron modus må utdata være en fil."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:132
+#: ../addressbook/tools/evolution-addressbook-export.c:168
 msgid "In normal mode, there is no need for the size option."
 msgstr "I normalt modus er ikke størrelsesflagget nødvendig."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:163
+#: ../addressbook/tools/evolution-addressbook-export.c:199
 msgid "Unhandled error"
 msgstr "Uhåndtert feil"
 
@@ -1963,8 +1963,8 @@ msgstr "Avvis _alle"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1596
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1602
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1598
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1604
 #: ../calendar/gui/e-itip-control.c:1175
 #: ../plugins/itip-formatter/itip-view.c:1043
 msgid "Location:"
@@ -2004,7 +2004,7 @@ msgid "minutes"
 msgstr "minutter"
 
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1457
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1579
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1581
 msgid "No summary available."
 msgstr "Sammendrag er ikke tilgjengelig."
 
@@ -2022,13 +2022,13 @@ msgstr "Stedsinformasjon er ikke tilgjengelig."
 msgid "You have %d alarms"
 msgstr "Du har %d alarmer"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1692
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1725
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1694
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1727
 #: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1698
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -2040,7 +2040,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:1731
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1733
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2056,7 +2056,7 @@ msgstr ""
 "\n"
 "Er du sikker på at du vil kjøre dette programmet?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1746
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1748
 msgid "Do not ask me about this program again."
 msgstr "Ikke spør meg om dette programmet igjen."
 
@@ -2098,7 +2098,7 @@ msgid "Alarm programs"
 msgstr "Varslingsprogrammer"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
-#: ../mail/evolution-mail.schemas.in.h:11
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "Antall sekunder feilen skal vises i statuslinjen."
 
@@ -2225,7 +2225,7 @@ msgid "Last alarm time"
 msgstr "Siste varslingstid"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Level beyond which the message should be logged."
 msgstr "Over dette nivået skal meldingen logges."
 
@@ -2703,7 +2703,7 @@ msgid "Classification"
 msgstr "Klassifisering"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:235
-#: ../calendar/gui/e-cal-model.c:525 ../calendar/gui/e-task-table.c:490
+#: ../calendar/gui/e-cal-model.c:534 ../calendar/gui/e-task-table.c:490
 #: ../calendar/gui/memotypes.xml.h:6
 #: ../plugins/email-custom-header/email-custom-header.c:323
 #: ../widgets/misc/e-send-options.ui.h:2
@@ -2712,7 +2712,7 @@ msgstr "Konfidensiell"
 
 #: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/e-cal-list-view.etspec.h:3
 #: ../calendar/gui/memotypes.xml.h:7 ../calendar/gui/tasktypes.xml.h:10
-#: ../plugins/plugin-manager/plugin-manager.c:60
+#: ../modules/plugin-manager/evolution-plugin-manager.c:68
 #: ../widgets/misc/e-attachment-tree-view.c:524
 #: ../widgets/table/e-table-config.ui.h:6
 msgid "Description"
@@ -2747,13 +2747,13 @@ msgid "Organizer"
 msgstr "Organisator"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:234
-#: ../calendar/gui/e-cal-model.c:523 ../calendar/gui/e-task-table.c:489
+#: ../calendar/gui/e-cal-model.c:532 ../calendar/gui/e-task-table.c:489
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Privat"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:233
-#: ../calendar/gui/e-cal-model.c:514 ../calendar/gui/e-cal-model.c:521
+#: ../calendar/gui/e-cal-model.c:523 ../calendar/gui/e-cal-model.c:530
 #: ../calendar/gui/e-task-table.c:488 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Offentlig"
@@ -2844,7 +2844,7 @@ msgstr "Egendefinert lyd for varsel"
 msgid "Mes_sage:"
 msgstr "Be_skjed:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:81
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:70
 msgid "Options"
 msgstr "Alternativer"
 
@@ -2988,12 +2988,12 @@ msgstr "30 minutter"
 msgid "60 minutes"
 msgstr "60 minutter"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:7
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10
 msgid "Alerts"
 msgstr "Varsel"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:11
-#: ../mail/mail-config.ui.h:30
+#: ../mail/mail-config.ui.h:28
 #: ../modules/addressbook/autocompletion-config.c:156
 msgid "Date/Time Format"
 msgstr "Fromat for dato ogklokkeslett"
@@ -3028,9 +3028,9 @@ msgstr "Fredag"
 #: ../calendar/gui/dialogs/calendar-setup.c:369
 #: ../calendar/gui/dialogs/calendar-setup.c:380
 #: ../calendar/gui/dialogs/calendar-setup.c:391
-#: ../mail/em-folder-properties.c:200 ../mail/mail-config.ui.h:56
+#: ../mail/em-folder-properties.c:200 ../mail/mail-config.ui.h:49
 #: ../modules/addressbook/addressbook-config.c:1005
-#: ../plugins/itip-formatter/itip-formatter.c:2678
+#: ../plugins/itip-formatter/itip-formatter.c:2787
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
 #: ../smime/gui/smime-ui.ui.h:21
 msgid "General"
@@ -3051,7 +3051,7 @@ msgid "Monday"
 msgstr "Mandag"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:23
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:74
 msgid "Pick a color"
 msgstr "Velg en farge"
 
@@ -3124,7 +3124,7 @@ msgstr "Torsdag"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
 #: ../e-util/e-non-intrusive-error-dialog.c:287
-#: ../widgets/misc/e-dateedit.c:595
+#: ../widgets/misc/e-dateedit.c:598
 msgid "Time"
 msgstr "Tid"
 
@@ -3247,11 +3247,11 @@ msgstr "Type:"
 msgid "_Type:"
 msgstr "_Type:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:165
+#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:147
 #: ../modules/addressbook/ldap-config.ui.h:26
-#: ../plugins/groupwise-features/properties.ui.h:11
+#: ../plugins/groupwise-features/properties.ui.h:10
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
-#: ../widgets/misc/e-signature-script-dialog.c:284
+#: ../widgets/misc/e-signature-script-dialog.c:286
 msgid "_Name:"
 msgstr "_Navn:"
 
@@ -3350,239 +3350,239 @@ msgstr "%s  Du har ikke gjort endringer. Oppdater redigering?"
 msgid "Validation error: %s"
 msgstr "Valideringsfeil: %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:246
+#: ../calendar/gui/dialogs/comp-editor.c:252
 msgid "Could not save attachments"
 msgstr "Kunne ikke lagre vedlegg"
 
-#: ../calendar/gui/dialogs/comp-editor.c:522
+#: ../calendar/gui/dialogs/comp-editor.c:528
 msgid "Could not update object"
 msgstr "Kunne ikke oppdatere objekt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:637
+#: ../calendar/gui/dialogs/comp-editor.c:643
 msgid "Edit Appointment"
 msgstr "Rediger avtale"
 
-#: ../calendar/gui/dialogs/comp-editor.c:644
+#: ../calendar/gui/dialogs/comp-editor.c:650
 #, c-format
 msgid "Meeting - %s"
 msgstr "Møte- %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:646
+#: ../calendar/gui/dialogs/comp-editor.c:652
 #, c-format
 msgid "Appointment - %s"
 msgstr "Avtale - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:652
+#: ../calendar/gui/dialogs/comp-editor.c:658
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tildelt oppgave - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:654
+#: ../calendar/gui/dialogs/comp-editor.c:660
 #, c-format
 msgid "Task - %s"
 msgstr "Oppgave - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:659
+#: ../calendar/gui/dialogs/comp-editor.c:665
 #, c-format
 msgid "Memo - %s"
 msgstr "Notat - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:675
+#: ../calendar/gui/dialogs/comp-editor.c:681
 msgid "No Summary"
 msgstr "Ingen sammendrag"
 
-#: ../calendar/gui/dialogs/comp-editor.c:786
+#: ../calendar/gui/dialogs/comp-editor.c:792
 msgid "Keep original item?"
 msgstr "Behold opprinnelig oppføring?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:983
+#: ../calendar/gui/dialogs/comp-editor.c:988
 msgid "Click here to close the current window"
 msgstr "Klikk her for å lukke dette vinduet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:990 ../mail/e-mail-browser.c:117
+#: ../calendar/gui/dialogs/comp-editor.c:995 ../mail/e-mail-browser.c:120
 #: ../shell/e-shell-window-actions.c:1454
 #: ../widgets/misc/e-focus-tracker.c:118 ../widgets/misc/e-focus-tracker.c:552
 #: ../widgets/misc/e-web-view.c:413 ../widgets/misc/e-web-view.c:1066
 msgid "Copy the selection"
 msgstr "Kopier utvalget"
 
-#: ../calendar/gui/dialogs/comp-editor.c:997 ../mail/e-mail-browser.c:124
+#: ../calendar/gui/dialogs/comp-editor.c:1002 ../mail/e-mail-browser.c:127
 #: ../shell/e-shell-window-actions.c:1461
 #: ../widgets/misc/e-focus-tracker.c:111 ../widgets/misc/e-focus-tracker.c:547
 #: ../widgets/misc/e-web-view.c:1060
 msgid "Cut the selection"
 msgstr "Klipp ut utvalget"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1004
+#: ../calendar/gui/dialogs/comp-editor.c:1009
 #: ../shell/e-shell-window-actions.c:1468
 #: ../widgets/misc/e-focus-tracker.c:132 ../widgets/misc/e-focus-tracker.c:562
 msgid "Delete the selection"
 msgstr "Slett utvalget"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1011
+#: ../calendar/gui/dialogs/comp-editor.c:1016
 msgid "Click here to view help available"
 msgstr "klikk her for å vise tilgjengelig hjelp"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1018 ../mail/e-mail-browser.c:131
+#: ../calendar/gui/dialogs/comp-editor.c:1023 ../mail/e-mail-browser.c:134
 #: ../shell/e-shell-window-actions.c:1503
 #: ../widgets/misc/e-focus-tracker.c:125 ../widgets/misc/e-focus-tracker.c:557
 #: ../widgets/misc/e-web-view.c:1072
 msgid "Paste the clipboard"
 msgstr "Lim inn fra utklippstavlen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1039
+#: ../calendar/gui/dialogs/comp-editor.c:1044
 msgid "Click here to save the current window"
 msgstr "Klikk her for å lagre dette vinduet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1046 ../mail/e-mail-browser.c:138
+#: ../calendar/gui/dialogs/comp-editor.c:1051 ../mail/e-mail-browser.c:141
 #: ../shell/e-shell-window-actions.c:1573
 #: ../widgets/misc/e-focus-tracker.c:139 ../widgets/misc/e-focus-tracker.c:567
 msgid "Select all text"
 msgstr "Velg all tekst"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1053
+#: ../calendar/gui/dialogs/comp-editor.c:1058
 msgid "_Classification"
 msgstr "K_lassifisering"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1060
+#: ../calendar/gui/dialogs/comp-editor.c:1065
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:152
+#: ../mail/e-mail-browser.c:155
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
 #: ../shell/e-shell-window-actions.c:1608
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "R_ediger"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1067 ../mail/e-mail-browser.c:145
+#: ../calendar/gui/dialogs/comp-editor.c:1072 ../mail/e-mail-browser.c:148
 #: ../shell/e-shell-window-actions.c:1615
-#: ../widgets/misc/e-signature-editor.c:220
+#: ../widgets/misc/e-signature-editor.c:222
 msgid "_File"
 msgstr "_Fil"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1074
+#: ../calendar/gui/dialogs/comp-editor.c:1079
 #: ../shell/e-shell-window-actions.c:1622
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1081
+#: ../calendar/gui/dialogs/comp-editor.c:1086
 msgid "_Insert"
 msgstr "Sett _inn"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../calendar/gui/dialogs/comp-editor.c:1093
 #: ../composer/e-composer-actions.c:315
 msgid "_Options"
 msgstr "_Alternativer"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1095 ../mail/e-mail-browser.c:159
-#: ../shell/e-shell-window-actions.c:1657 ../smime/gui/smime-ui.ui.h:45
+#: ../calendar/gui/dialogs/comp-editor.c:1100 ../mail/e-mail-browser.c:162
+#: ../shell/e-shell-window-actions.c:1657 ../smime/gui/smime-ui.ui.h:46
 msgid "_View"
 msgstr "_Vis"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1105
+#: ../calendar/gui/dialogs/comp-editor.c:1110
 #: ../composer/e-composer-actions.c:243
 msgid "_Attachment..."
 msgstr "_Vedlegg..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1107
+#: ../calendar/gui/dialogs/comp-editor.c:1112
 msgid "Click here to attach a file"
 msgstr "klikk her for å legge ved en fil"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1115
+#: ../calendar/gui/dialogs/comp-editor.c:1120
 msgid "_Categories"
 msgstr "_Kategorier"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1117
+#: ../calendar/gui/dialogs/comp-editor.c:1122
 msgid "Toggles whether to display categories"
 msgstr "Slår av/på visning av kategorier"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1123
+#: ../calendar/gui/dialogs/comp-editor.c:1128
 msgid "Time _Zone"
 msgstr "Tids_sone"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1125
+#: ../calendar/gui/dialogs/comp-editor.c:1130
 msgid "Toggles whether the time zone is displayed"
 msgstr "Slår av/på visning av tidssone"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1134
+#: ../calendar/gui/dialogs/comp-editor.c:1139
 msgid "Pu_blic"
 msgstr "O_ffentlig"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1136
+#: ../calendar/gui/dialogs/comp-editor.c:1141
 msgid "Classify as public"
 msgstr "Klassifiser som offentlig"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1141
+#: ../calendar/gui/dialogs/comp-editor.c:1146
 msgid "_Private"
 msgstr "_Privat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1143
+#: ../calendar/gui/dialogs/comp-editor.c:1148
 msgid "Classify as private"
 msgstr "Klassifiser som privat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1148
+#: ../calendar/gui/dialogs/comp-editor.c:1153
 msgid "_Confidential"
 msgstr "_Konfidensiell"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1150
+#: ../calendar/gui/dialogs/comp-editor.c:1155
 msgid "Classify as confidential"
 msgstr "Klassifiser som konfidensiell"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1158
+#: ../calendar/gui/dialogs/comp-editor.c:1163
 msgid "R_ole Field"
 msgstr "R_olle-felt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1160
+#: ../calendar/gui/dialogs/comp-editor.c:1165
 msgid "Toggles whether the Role field is displayed"
 msgstr "Slår av/på visning av rolle-feltet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1166
+#: ../calendar/gui/dialogs/comp-editor.c:1171
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1168
+#: ../calendar/gui/dialogs/comp-editor.c:1173
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Slår av/på visning av RSVP-feltet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1174
+#: ../calendar/gui/dialogs/comp-editor.c:1179
 msgid "_Status Field"
 msgstr "_Status-felt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1176
+#: ../calendar/gui/dialogs/comp-editor.c:1181
 msgid "Toggles whether the Status field is displayed"
 msgstr "Slår av/på visning av status-feltet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1182
+#: ../calendar/gui/dialogs/comp-editor.c:1187
 msgid "_Type Field"
 msgstr "_Type felt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1184
+#: ../calendar/gui/dialogs/comp-editor.c:1189
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Slår av/på visning av deltakertype-feltet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1208
+#: ../calendar/gui/dialogs/comp-editor.c:1213
 #: ../composer/e-composer-private.c:70
 msgid "Recent _Documents"
 msgstr "Siste _dokumenter"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1743
+#: ../calendar/gui/dialogs/comp-editor.c:1748
 #: ../composer/e-composer-actions.c:431
 msgid "Attach"
 msgstr "Legg ved"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2072
-#: ../calendar/gui/dialogs/comp-editor.c:2121
-#: ../calendar/gui/dialogs/comp-editor.c:3086
+#: ../calendar/gui/dialogs/comp-editor.c:2076
+#: ../calendar/gui/dialogs/comp-editor.c:2125
+#: ../calendar/gui/dialogs/comp-editor.c:3092
 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:3050
+#: ../calendar/gui/dialogs/comp-editor.c:3056
 #: ../plugins/prefer-plain/prefer-plain.c:64
 msgid "attachment"
 msgstr "vedlegg"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3118
+#: ../calendar/gui/dialogs/comp-editor.c:3124
 msgid "Unable to use current version!"
 msgstr "Kan ikke bruke denne versjonen!"
 
@@ -3708,7 +3708,7 @@ msgstr "Gjør denne hendelsen til repeterende"
 
 #: ../calendar/gui/dialogs/event-editor.c:245
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../plugins/groupwise-features/send-options.c:210
+#: ../plugins/groupwise-features/send-options.c:212
 #: ../widgets/misc/e-send-options.ui.h:22
 msgid "Send Options"
 msgstr "Alternativer for sending"
@@ -3748,81 +3748,81 @@ msgstr "Deltakere"
 msgid "Print this event"
 msgstr "Skriv ut denne hendelsen"
 
-#: ../calendar/gui/dialogs/event-page.c:766
+#: ../calendar/gui/dialogs/event-page.c:769
 msgid "Event's start time is in the past"
 msgstr "Starttid for hendelsen er passert"
 
-#: ../calendar/gui/dialogs/event-page.c:807
+#: ../calendar/gui/dialogs/event-page.c:810
 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:811
+#: ../calendar/gui/dialogs/event-page.c:814
 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:823
-#: ../calendar/gui/dialogs/event-page.c:2775
+#: ../calendar/gui/dialogs/event-page.c:826
+#: ../calendar/gui/dialogs/event-page.c:2778
 msgid "This event has alarms"
 msgstr "Denne hendelsen har varsel"
 
-#: ../calendar/gui/dialogs/event-page.c:890
+#: ../calendar/gui/dialogs/event-page.c:893
 #: ../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:937
+#: ../calendar/gui/dialogs/event-page.c:940
 msgid "_Delegatees"
 msgstr "_Delegater"
 
-#: ../calendar/gui/dialogs/event-page.c:939
+#: ../calendar/gui/dialogs/event-page.c:942
 msgid "Atte_ndees"
 msgstr "De_ltakere"
 
-#: ../calendar/gui/dialogs/event-page.c:1154
+#: ../calendar/gui/dialogs/event-page.c:1157
 msgid "Event with no start date"
 msgstr "Hendelse uten startdato"
 
-#: ../calendar/gui/dialogs/event-page.c:1157
+#: ../calendar/gui/dialogs/event-page.c:1160
 msgid "Event with no end date"
 msgstr "Hendelse uten sluttdato"
 
-#: ../calendar/gui/dialogs/event-page.c:1328
+#: ../calendar/gui/dialogs/event-page.c:1331
 #: ../calendar/gui/dialogs/memo-page.c:686
-#: ../calendar/gui/dialogs/task-page.c:907
+#: ../calendar/gui/dialogs/task-page.c:910
 msgid "Start date is wrong"
 msgstr "Startdato er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:1338
+#: ../calendar/gui/dialogs/event-page.c:1341
 msgid "End date is wrong"
 msgstr "Sluttdato er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:1361
+#: ../calendar/gui/dialogs/event-page.c:1364
 msgid "Start time is wrong"
 msgstr "Tid for start er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:1368
+#: ../calendar/gui/dialogs/event-page.c:1371
 msgid "End time is wrong"
 msgstr "Tid for slutt er feil"
 
-#: ../calendar/gui/dialogs/event-page.c:1530
+#: ../calendar/gui/dialogs/event-page.c:1533
 #: ../calendar/gui/dialogs/memo-page.c:727
-#: ../calendar/gui/dialogs/task-page.c:967
+#: ../calendar/gui/dialogs/task-page.c:970
 msgid "The organizer selected no longer has an account."
 msgstr "Valgt organisator har ingen konto lenger."
 
-#: ../calendar/gui/dialogs/event-page.c:1536
+#: ../calendar/gui/dialogs/event-page.c:1539
 #: ../calendar/gui/dialogs/memo-page.c:733
-#: ../calendar/gui/dialogs/task-page.c:973
+#: ../calendar/gui/dialogs/task-page.c:976
 msgid "An organizer is required."
 msgstr "En organisator kreves."
 
-#: ../calendar/gui/dialogs/event-page.c:1561
-#: ../calendar/gui/dialogs/task-page.c:997
+#: ../calendar/gui/dialogs/event-page.c:1564
+#: ../calendar/gui/dialogs/task-page.c:1000
 msgid "At least one attendee is required."
 msgstr "Minst en deltaker kreves."
 
-#: ../calendar/gui/dialogs/event-page.c:2649
+#: ../calendar/gui/dialogs/event-page.c:2652
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Kunne ikke åpne kalender «%s»."
@@ -3833,40 +3833,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:2693
+#: ../calendar/gui/dialogs/event-page.c:2696
 #: ../calendar/gui/dialogs/memo-page.c:946
-#: ../calendar/gui/dialogs/task-page.c:1787
+#: ../calendar/gui/dialogs/task-page.c:1790
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Du opptrer på vegne av %s"
 
-#: ../calendar/gui/dialogs/event-page.c:2994
+#: ../calendar/gui/dialogs/event-page.c:2997
 #, 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:3000
+#: ../calendar/gui/dialogs/event-page.c:3003
 #, 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:3006
+#: ../calendar/gui/dialogs/event-page.c:3009
 #, 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:3019
+#: ../calendar/gui/dialogs/event-page.c:3022
 msgid "Customize"
 msgstr "Tilpass"
 
 #. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:3021
+#: ../calendar/gui/dialogs/event-page.c:3024
 msgctxt "cal-alarms"
 msgid "None"
 msgstr "Ingen"
@@ -3892,7 +3892,7 @@ msgstr "_Varsel"
 #: ../calendar/gui/dialogs/event-page.ui.h:12
 #: ../calendar/gui/dialogs/memo-page.ui.h:6
 #: ../calendar/gui/dialogs/task-page.ui.h:8
-#: ../widgets/misc/e-attachment-dialog.c:347
+#: ../widgets/misc/e-attachment-dialog.c:349
 msgid "_Description:"
 msgstr "_Beskrivelse:"
 
@@ -3964,9 +3964,9 @@ msgstr "Notatet kan ikke redigeres i sin helhet fordi du ikke er organisator"
 msgid "Unable to open memos in '%s'."
 msgstr "Kan ikke åpne notater i «%s»."
 
-#: ../calendar/gui/dialogs/memo-page.c:1078 ../em-format/em-format-quote.c:270
-#: ../em-format/em-format.c:1043 ../mail/em-format-html.c:2289
-#: ../mail/em-format-html.c:2348 ../mail/em-format-html.c:2372
+#: ../calendar/gui/dialogs/memo-page.c:1078 ../em-format/em-format-quote.c:282
+#: ../em-format/em-format.c:1052 ../mail/em-format-html.c:2390
+#: ../mail/em-format-html.c:2449 ../mail/em-format-html.c:2473
 #: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:74
 msgid "To"
 msgstr "Til"
@@ -3986,7 +3986,7 @@ msgid "T_o:"
 msgstr "T_il:"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.c:426
+#: ../calendar/gui/dialogs/task-page.c:429
 #: ../calendar/gui/dialogs/task-page.ui.h:9
 msgid "_Group:"
 msgstr "_Gruppe:"
@@ -4126,7 +4126,7 @@ msgid "21st to 31st"
 msgstr "tjueførste til trettiførste"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
-#. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
+#. (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:1111
 msgid "day"
@@ -4171,7 +4171,7 @@ msgstr "Hver"
 msgid "Exceptions"
 msgstr "Unntak"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:89
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:77
 msgid "Preview"
 msgstr "Forhåndsvis"
 
@@ -4244,8 +4244,8 @@ msgstr "Nettside"
 #: ../calendar/gui/e-cal-model-tasks.c:443
 #: ../calendar/gui/e-cal-model-tasks.c:717 ../calendar/gui/e-task-table.c:215
 #: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:588
-#: ../calendar/gui/print.c:2697 ../mail/em-sync-stream.c:151
-#: ../mail/em-sync-stream.c:178 ../mail/em-sync-stream.c:199
+#: ../calendar/gui/print.c:2697 ../mail/em-sync-stream.c:152
+#: ../mail/em-sync-stream.c:180 ../mail/em-sync-stream.c:202
 #, c-format
 msgid "Canceled"
 msgstr "Avbrutt"
@@ -4267,7 +4267,7 @@ msgstr "Fullført"
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
 #: ../calendar/gui/e-cal-component-preview.c:314
 #: ../calendar/gui/e-task-table.c:511 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1183 ../widgets/misc/e-send-options.ui.h:13
+#: ../mail/message-list.c:1188 ../widgets/misc/e-send-options.ui.h:13
 msgid "High"
 msgstr "Høy"
 
@@ -4286,15 +4286,15 @@ msgstr "Under arbeid"
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
 #: ../calendar/gui/e-cal-component-preview.c:318
 #: ../calendar/gui/e-task-table.c:513 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1181 ../widgets/misc/e-send-options.ui.h:14
+#: ../mail/message-list.c:1186 ../widgets/misc/e-send-options.ui.h:14
 msgid "Low"
 msgstr "Lav"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
 #: ../calendar/gui/e-cal-component-preview.c:316
-#: ../calendar/gui/e-cal-model.c:1269 ../calendar/gui/e-task-table.c:512
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1182
+#: ../calendar/gui/e-cal-model.c:1278 ../calendar/gui/e-task-table.c:512
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1187
 #: ../widgets/misc/e-send-options.ui.h:16
 msgid "Normal"
 msgstr "Normal"
@@ -4321,7 +4321,7 @@ 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:1773
+#: ../calendar/gui/e-calendar-view.c:1780
 #: ../calendar/gui/e-meeting-list-view.c:594
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
@@ -4375,33 +4375,33 @@ msgstr "Oppgavedetaljer"
 msgid "Print this task"
 msgstr "Skriv ut denne oppgaven"
 
-#: ../calendar/gui/dialogs/task-page.c:343
+#: ../calendar/gui/dialogs/task-page.c:346
 msgid "Task's start date is in the past"
 msgstr "Startdato for oppgaven er passert"
 
-#: ../calendar/gui/dialogs/task-page.c:344
+#: ../calendar/gui/dialogs/task-page.c:347
 msgid "Task's due date is in the past"
 msgstr "Ferdigdato for oppgaven er passert"
 
-#: ../calendar/gui/dialogs/task-page.c:379
+#: ../calendar/gui/dialogs/task-page.c:382
 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:383
+#: ../calendar/gui/dialogs/task-page.c:386
 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:434
+#: ../calendar/gui/dialogs/task-page.c:437
 #: ../calendar/gui/dialogs/task-page.ui.h:4
 msgid "Organi_zer:"
 msgstr "Organi_sator:"
 
-#: ../calendar/gui/dialogs/task-page.c:880
+#: ../calendar/gui/dialogs/task-page.c:883
 msgid "Due date is wrong"
 msgstr "Ferdigdato er feil"
 
-#: ../calendar/gui/dialogs/task-page.c:1744
+#: ../calendar/gui/dialogs/task-page.c:1747
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Kan ikke åpne oppgaver i «%s»."
@@ -4529,7 +4529,7 @@ msgstr "Prioritet:"
 
 #: ../calendar/gui/e-cal-component-preview.c:337
 #: ../calendar/gui/e-itip-control.c:1227 ../calendar/gui/e-itip-control.ui.h:4
-#: ../mail/mail-config.ui.h:37
+#: ../mail/mail-config.ui.h:34
 msgid "Description:"
 msgstr "Beskrivelse:"
 
@@ -4585,42 +4585,41 @@ msgctxt "cal-task-status"
 msgid "None"
 msgstr "Ingen"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1275
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1284
 #: ../calendar/gui/e-meeting-list-view.c:187
 #: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:179
 #: ../calendar/gui/e-meeting-store.c:856
 msgid "Yes"
 msgstr "Ja"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1275
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1284
 #: ../calendar/gui/e-meeting-list-view.c:188
 #: ../calendar/gui/e-meeting-store.c:181
 msgid "No"
 msgstr "Nei"
 
-#. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:527 ../calendar/gui/e-itip-control.c:1210
+#: ../calendar/gui/e-cal-model.c:536 ../calendar/gui/e-itip-control.c:1210
 #: ../calendar/gui/e-itip-control.c:1349
 #: ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-list-view.c:177
 #: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:162
 #: ../calendar/gui/e-meeting-store.c:225 ../calendar/gui/print.c:972
-#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:967
-#: ../plugins/itip-formatter/itip-formatter.c:457
-#: ../plugins/itip-formatter/itip-formatter.c:2345
-#: ../plugins/plugin-manager/plugin-manager.c:89
+#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52
+#: ../modules/plugin-manager/evolution-plugin-manager.c:98
+#: ../plugins/itip-formatter/itip-formatter.c:458
+#: ../plugins/itip-formatter/itip-formatter.c:2454
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: ../calendar/gui/e-cal-model.c:1271
+#: ../calendar/gui/e-cal-model.c:1280
 msgid "Recurring"
 msgstr "Gjeninntreffer"
 
-#: ../calendar/gui/e-cal-model.c:1273
+#: ../calendar/gui/e-cal-model.c:1282
 msgid "Assigned"
 msgstr "Tildelt"
 
-#: ../calendar/gui/e-cal-model.c:2175
+#: ../calendar/gui/e-cal-model.c:2184
 #, c-format
 msgid "Opening %s"
 msgstr "Ã?pner %s"
@@ -4664,90 +4663,90 @@ msgstr "Startdato"
 msgid "Type"
 msgstr "Type"
 
-#: ../calendar/gui/e-calendar-view.c:407
+#: ../calendar/gui/e-calendar-view.c:414
 msgid "Cut selected events to the clipboard"
 msgstr "Klipp ut valgte hendelser til utklippstavlen"
 
-#: ../calendar/gui/e-calendar-view.c:413
+#: ../calendar/gui/e-calendar-view.c:420
 msgid "Copy selected events to the clipboard"
 msgstr "Kopier valgte hendelser til utklippstavlen"
 
-#: ../calendar/gui/e-calendar-view.c:419
+#: ../calendar/gui/e-calendar-view.c:426
 msgid "Paste events from the clipboard"
 msgstr "Lim inn hendelser fra utklippstavlen"
 
-#: ../calendar/gui/e-calendar-view.c:425
+#: ../calendar/gui/e-calendar-view.c:432
 msgid "Delete selected events"
 msgstr "Slett valgte hendelser"
 
-#: ../calendar/gui/e-calendar-view.c:444 ../calendar/gui/e-memo-table.c:188
+#: ../calendar/gui/e-calendar-view.c:451 ../calendar/gui/e-memo-table.c:188
 #: ../calendar/gui/e-task-table.c:266
 msgid "Deleting selected objects"
 msgstr "Sletter valgte objekter"
 
-#: ../calendar/gui/e-calendar-view.c:638 ../calendar/gui/e-memo-table.c:845
-#: ../calendar/gui/e-task-table.c:1068
+#: ../calendar/gui/e-calendar-view.c:645 ../calendar/gui/e-memo-table.c:847
+#: ../calendar/gui/e-task-table.c:1070
 msgid "Updating objects"
 msgstr "Oppdaterer objekter"
 
-#: ../calendar/gui/e-calendar-view.c:1720
+#: ../calendar/gui/e-calendar-view.c:1727
 #: ../calendar/gui/e-itip-control.c:1195
 #: ../calendar/gui/e-meeting-list-view.c:199
 #: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
-#: ../plugins/itip-formatter/itip-formatter.c:2333
+#: ../plugins/itip-formatter/itip-formatter.c:2442
 msgid "Accepted"
 msgstr "Godtatt"
 
-#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-calendar-view.c:1728
 #: ../calendar/gui/e-itip-control.c:1205
 #: ../calendar/gui/e-meeting-list-view.c:200
 #: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
-#: ../plugins/itip-formatter/itip-formatter.c:2339
+#: ../plugins/itip-formatter/itip-formatter.c:2448
 msgid "Declined"
 msgstr "Avslått"
 
-#: ../calendar/gui/e-calendar-view.c:1722
+#: ../calendar/gui/e-calendar-view.c:1729
 #: ../calendar/gui/e-meeting-list-view.c:201
 #: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
 #: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "Tentative"
 msgstr "Tentativ"
 
-#: ../calendar/gui/e-calendar-view.c:1723
+#: ../calendar/gui/e-calendar-view.c:1730
 #: ../calendar/gui/e-meeting-list-view.c:202
 #: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
-#: ../plugins/itip-formatter/itip-formatter.c:2342
+#: ../plugins/itip-formatter/itip-formatter.c:2451
 msgid "Delegated"
 msgstr "Delegert"
 
-#: ../calendar/gui/e-calendar-view.c:1724
+#: ../calendar/gui/e-calendar-view.c:1731
 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:1869 ../calendar/gui/e-memo-table.c:528
-#: ../calendar/gui/e-task-table.c:743
+#: ../calendar/gui/e-calendar-view.c:1875 ../calendar/gui/e-memo-table.c:530
+#: ../calendar/gui/e-task-table.c:745
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organisator: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:1873 ../calendar/gui/e-memo-table.c:533
-#: ../calendar/gui/e-task-table.c:746
+#: ../calendar/gui/e-calendar-view.c:1879 ../calendar/gui/e-memo-table.c:535
+#: ../calendar/gui/e-task-table.c:748
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organisator: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1889 ../calendar/gui/print.c:2646
+#: ../calendar/gui/e-calendar-view.c:1895 ../calendar/gui/print.c:2646
 #, c-format
 msgid "Location: %s"
 msgstr "Sted: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1920
+#: ../calendar/gui/e-calendar-view.c:1926
 #, c-format
 msgid "Time: %s %s"
 msgstr "Tidspunkt: %s %s"
@@ -4790,7 +4789,7 @@ msgstr "Vis den andre tidssonen"
 #. 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:897 ../calendar/gui/e-day-view.c:1878
+#: ../calendar/gui/e-day-view-top-item.c:897 ../calendar/gui/e-day-view.c:1895
 #: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1744
 msgid "%A %d %B"
 msgstr "%A %d %B"
@@ -4801,10 +4800,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:901 ../calendar/gui/e-day-view.c:1895
+#: ../calendar/gui/e-day-view-top-item.c:901 ../calendar/gui/e-day-view.c:1912
 #: ../calendar/gui/e-week-view-main-item.c:227
-#: ../calendar/gui/ea-gnome-calendar.c:202
-#: ../modules/calendar/e-cal-shell-view-private.c:1014
+#: ../calendar/gui/ea-gnome-calendar.c:203
+#: ../modules/calendar/e-cal-shell-view-private.c:1015
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -4813,27 +4812,27 @@ 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:905 ../calendar/gui/e-day-view.c:1911
+#: ../calendar/gui/e-day-view-top-item.c:905 ../calendar/gui/e-day-view.c:1928
 #: ../calendar/gui/e-week-view-main-item.c:241
-#: ../calendar/gui/ea-gnome-calendar.c:232
-#: ../modules/calendar/e-cal-shell-view-private.c:1050
+#: ../calendar/gui/ea-gnome-calendar.c:233
+#: ../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:1077 ../calendar/gui/e-week-view.c:749
+#: ../calendar/gui/e-day-view.c:1092 ../calendar/gui/e-week-view.c:770
 #: ../calendar/gui/print.c:819
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1080 ../calendar/gui/e-week-view.c:752
+#: ../calendar/gui/e-day-view.c:1095 ../calendar/gui/e-week-view.c:773
 #: ../calendar/gui/print.c:821
 msgid "pm"
 msgstr "pm"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2645
+#: ../calendar/gui/e-day-view.c:2679
 #, c-format
 msgid "Week %d"
 msgstr "Uke %d"
@@ -4951,13 +4950,13 @@ msgstr ""
 
 #. Translators: "None" used as a default value for events without Summary received by mail
 #: ../calendar/gui/e-itip-control.c:1160
-#: ../plugins/itip-formatter/itip-formatter.c:2320
+#: ../plugins/itip-formatter/itip-formatter.c:2429
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Ingen"
 
 #: ../calendar/gui/e-itip-control.c:1200
-#: ../plugins/itip-formatter/itip-formatter.c:2336
+#: ../plugins/itip-formatter/itip-formatter.c:2445
 msgid "Tentatively Accepted"
 msgstr "Akseptert tentativt"
 
@@ -5174,7 +5173,7 @@ msgid "Attendee status updated\n"
 msgstr "Deltakerstatus oppdatert\n"
 
 #: ../calendar/gui/e-itip-control.c:2084
-#: ../plugins/itip-formatter/itip-formatter.c:1421
+#: ../plugins/itip-formatter/itip-formatter.c:1528
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Deltakerstatus kan ikke oppdateres fordi oppføringen ikke eksisterer lenger"
@@ -5229,8 +5228,8 @@ msgid "Send Latest Information"
 msgstr "Send siste informasjon"
 
 #: ../calendar/gui/e-itip-control.c:2465
-#: ../modules/mail/e-mail-shell-view-actions.c:1036
-#: ../widgets/misc/e-activity-proxy.c:300
+#: ../modules/mail/e-mail-shell-view-actions.c:1062
+#: ../widgets/misc/e-activity-proxy.c:315
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -5447,7 +5446,7 @@ msgstr "Språk"
 msgid "Member"
 msgstr "Medlem"
 
-#: ../calendar/gui/e-memo-table.c:412
+#: ../calendar/gui/e-memo-table.c:414
 #: ../modules/calendar/e-cal-shell-content.c:473
 #: ../modules/calendar/e-memo-shell-view-actions.c:218
 #: ../modules/calendar/e-memo-shell-view-actions.c:233
@@ -5456,38 +5455,38 @@ msgstr "Medlem"
 msgid "Memos"
 msgstr "Notater"
 
-#: ../calendar/gui/e-memo-table.c:490 ../calendar/gui/e-task-table.c:707
+#: ../calendar/gui/e-memo-table.c:492 ../calendar/gui/e-task-table.c:709
 msgid "* No Summary *"
 msgstr "* Ingen sammendrag *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:575 ../calendar/gui/e-task-table.c:787
+#: ../calendar/gui/e-memo-table.c:577 ../calendar/gui/e-task-table.c:789
 msgid "Start: "
 msgstr "Start: "
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:594 ../calendar/gui/e-task-table.c:805
+#: ../calendar/gui/e-memo-table.c:596 ../calendar/gui/e-task-table.c:807
 msgid "Due: "
 msgstr "Ferdig: "
 
-#: ../calendar/gui/e-memo-table.c:710
+#: ../calendar/gui/e-memo-table.c:712
 msgid "Cut selected memos to the clipboard"
 msgstr "Klipp ut valgte notater til utklippstavlen"
 
-#: ../calendar/gui/e-memo-table.c:716
+#: ../calendar/gui/e-memo-table.c:718
 msgid "Copy selected memos to the clipboard"
 msgstr "Kopier valgte notater til utklippstavlen"
 
-#: ../calendar/gui/e-memo-table.c:722
+#: ../calendar/gui/e-memo-table.c:724
 msgid "Paste memos from the clipboard"
 msgstr "Lim inn notater fra utklippstavlen"
 
-#: ../calendar/gui/e-memo-table.c:728
+#: ../calendar/gui/e-memo-table.c:730
 #: ../modules/calendar/e-memo-shell-view-actions.c:566
 msgid "Delete selected memos"
 msgstr "Slett valgt notat"
 
-#: ../calendar/gui/e-memo-table.c:734
+#: ../calendar/gui/e-memo-table.c:736
 msgid "Select all visible memos"
 msgstr "Velg alle synlige notater"
 
@@ -5504,13 +5503,13 @@ msgstr "Klikk for å legge til et notat"
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:629 ../calendar/gui/print.c:2072
+#: ../calendar/gui/e-task-table.c:631 ../calendar/gui/print.c:2072
 #: ../calendar/importers/icalendar-importer.c:81
 #: ../calendar/importers/icalendar-importer.c:828
 #: ../modules/calendar/e-cal-shell-content.c:434
 #: ../modules/calendar/e-task-shell-view-actions.c:241
 #: ../modules/calendar/e-task-shell-view-actions.c:256
-#: ../modules/calendar/e-task-shell-view.c:437
+#: ../modules/calendar/e-task-shell-view.c:440
 #: ../plugins/caldav/caldav-browse-server.c:429
 #: ../plugins/groupwise-features/camel-gw-listener.c:422
 #: ../plugins/groupwise-features/camel-gw-listener.c:562
@@ -5518,24 +5517,24 @@ msgstr "%d%%"
 msgid "Tasks"
 msgstr "Oppgaver"
 
-#: ../calendar/gui/e-task-table.c:933
+#: ../calendar/gui/e-task-table.c:935
 msgid "Cut selected tasks to the clipboard"
 msgstr "Klipp ut valgte oppgaver til utklippstavlen"
 
-#: ../calendar/gui/e-task-table.c:939
+#: ../calendar/gui/e-task-table.c:941
 msgid "Copy selected tasks to the clipboard"
 msgstr "Kopier valgte oppgaver til utklippstavlen"
 
-#: ../calendar/gui/e-task-table.c:945
+#: ../calendar/gui/e-task-table.c:947
 msgid "Paste tasks from the clipboard"
 msgstr "Lim inn oppgaver fra utklippstavlen"
 
-#: ../calendar/gui/e-task-table.c:951
+#: ../calendar/gui/e-task-table.c:953
 #: ../modules/calendar/e-task-shell-view-actions.c:690
 msgid "Delete selected tasks"
 msgstr "Slett valgte oppgaver"
 
-#: ../calendar/gui/e-task-table.c:957
+#: ../calendar/gui/e-task-table.c:959
 msgid "Select all visible tasks"
 msgstr "Velg alle synlige oppgaver"
 
@@ -5579,23 +5578,23 @@ msgstr "vis kalenderhendelse"
 msgid "Grab Focus"
 msgstr "Ta fokus"
 
-#: ../calendar/gui/ea-cal-view.c:304
+#: ../calendar/gui/ea-cal-view.c:305
 msgid "New Appointment"
 msgstr "Ny avtale"
 
-#: ../calendar/gui/ea-cal-view.c:305
+#: ../calendar/gui/ea-cal-view.c:306
 msgid "New All Day Event"
 msgstr "Ny avtale som varer hele dagen"
 
-#: ../calendar/gui/ea-cal-view.c:306
+#: ../calendar/gui/ea-cal-view.c:307
 msgid "New Meeting"
 msgstr "Nytt møte"
 
-#: ../calendar/gui/ea-cal-view.c:307
+#: ../calendar/gui/ea-cal-view.c:308
 msgid "Go to Today"
 msgstr "GÃ¥ til i dag"
 
-#: ../calendar/gui/ea-cal-view.c:308
+#: ../calendar/gui/ea-cal-view.c:309
 msgid "Go to Date"
 msgstr "GÃ¥ til dato"
 
@@ -5604,7 +5603,7 @@ msgstr "GÃ¥ til dato"
 msgid "a table to view and select the current time range"
 msgstr "en tabell som viser og velger aktivt tidsområde"
 
-#: ../calendar/gui/ea-day-view.c:150 ../calendar/gui/ea-week-view.c:149
+#: ../calendar/gui/ea-day-view.c:151 ../calendar/gui/ea-week-view.c:150
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -5613,14 +5612,14 @@ msgstr[1] "Har %d hendelser."
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:155 ../calendar/gui/ea-week-view.c:152
+#: ../calendar/gui/ea-day-view.c:156 ../calendar/gui/ea-week-view.c:153
 msgid "It has no events."
 msgstr "Har ingen hendelser."
 
 #. To translators: First %s is the week, for example "July 10th -
 #. July 14th, 2006". Second %s is the number of events in this work
 #. week, for example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:162
+#: ../calendar/gui/ea-day-view.c:163
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Arbeidsukevisning: %s. %s"
@@ -5628,47 +5627,47 @@ msgstr "Arbeidsukevisning: %s. %s"
 #. To translators: First %s is the day, for example "Thursday July
 #. 13th, 2006". Second %s is the number of events on this day, for
 #. example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:168
+#: ../calendar/gui/ea-day-view.c:169
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Dagvisning: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:202
+#: ../calendar/gui/ea-day-view.c:203
 msgid "calendar view for a work week"
 msgstr "kalendervisning for en arbeidsuke"
 
-#: ../calendar/gui/ea-day-view.c:204
+#: ../calendar/gui/ea-day-view.c:205
 msgid "calendar view for one or more days"
 msgstr "kalendervisning for en eller flere dager"
 
-#: ../calendar/gui/ea-gnome-calendar.c:48
-#: ../calendar/gui/ea-gnome-calendar.c:56
+#: ../calendar/gui/ea-gnome-calendar.c:49
+#: ../calendar/gui/ea-gnome-calendar.c:57
 #: ../calendar/importers/icalendar-importer.c:860
 msgid "Gnome Calendar"
 msgstr "GNOME kalender"
 
-#: ../calendar/gui/ea-gnome-calendar.c:199
-#: ../modules/calendar/e-cal-shell-view-private.c:1010
+#: ../calendar/gui/ea-gnome-calendar.c:200
+#: ../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:204
-#: ../calendar/gui/ea-gnome-calendar.c:209
-#: ../calendar/gui/ea-gnome-calendar.c:211
-#: ../modules/calendar/e-cal-shell-view-private.c:1017
-#: ../modules/calendar/e-cal-shell-view-private.c:1023
-#: ../modules/calendar/e-cal-shell-view-private.c:1026
+#: ../calendar/gui/ea-gnome-calendar.c:205
+#: ../calendar/gui/ea-gnome-calendar.c:210
+#: ../calendar/gui/ea-gnome-calendar.c:212
+#: ../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"
 
-#: ../calendar/gui/ea-gnome-calendar.c:228
-#: ../calendar/gui/ea-gnome-calendar.c:234
-#: ../calendar/gui/ea-gnome-calendar.c:240
-#: ../calendar/gui/ea-gnome-calendar.c:242
-#: ../modules/calendar/e-cal-shell-view-private.c:1043
-#: ../modules/calendar/e-cal-shell-view-private.c:1054
-#: ../modules/calendar/e-cal-shell-view-private.c:1061
-#: ../modules/calendar/e-cal-shell-view-private.c:1064
+#: ../calendar/gui/ea-gnome-calendar.c:229
+#: ../calendar/gui/ea-gnome-calendar.c:235
+#: ../calendar/gui/ea-gnome-calendar.c:241
+#: ../calendar/gui/ea-gnome-calendar.c:243
+#: ../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"
 
@@ -5680,25 +5679,25 @@ msgstr "Hoppeknapp"
 msgid "Click here, you can find more events."
 msgstr "Klikk her for å finne flere hendelser."
 
-#: ../calendar/gui/ea-week-view.c:157
+#: ../calendar/gui/ea-week-view.c:158
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "MÃ¥nedsvisning: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:161
+#: ../calendar/gui/ea-week-view.c:162
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Ukevisning: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:195
+#: ../calendar/gui/ea-week-view.c:196
 msgid "calendar view for a month"
 msgstr "kalendervisning for en måned"
 
-#: ../calendar/gui/ea-week-view.c:197
+#: ../calendar/gui/ea-week-view.c:198
 msgid "calendar view for one or more weeks"
 msgstr "kalendervisning for en eller flere uker"
 
-#: ../calendar/gui/gnome-cal.c:2291
+#: ../calendar/gui/gnome-cal.c:2313
 msgid "Purging"
 msgstr "Tømmer"
 
@@ -6126,7 +6125,7 @@ msgstr "Avtaler og møter"
 
 #: ../calendar/importers/icalendar-importer.c:350
 #: ../calendar/importers/icalendar-importer.c:707
-#: ../plugins/itip-formatter/itip-formatter.c:1835
+#: ../plugins/itip-formatter/itip-formatter.c:1942
 msgid "Opening calendar"
 msgstr "Ã?pner kalender"
 
@@ -7857,12 +7856,12 @@ msgid "Save as..."
 msgstr "Lagre som..."
 
 #: ../composer/e-composer-actions.c:245
-#: ../widgets/misc/e-attachment-view.c:379
+#: ../widgets/misc/e-attachment-view.c:381
 msgid "Attach a file"
 msgstr "Legg ved en fil"
 
 #: ../composer/e-composer-actions.c:250
-#: ../widgets/misc/e-signature-editor.c:206
+#: ../widgets/misc/e-signature-editor.c:208
 msgid "_Close"
 msgstr "L_ukk"
 
@@ -7898,7 +7897,7 @@ msgstr "Lagre som ut_kast"
 msgid "Save as draft"
 msgstr "Lagre som utkast"
 
-#: ../composer/e-composer-actions.c:292 ../composer/e-composer-private.c:297
+#: ../composer/e-composer-actions.c:292 ../composer/e-composer-private.c:298
 msgid "S_end"
 msgstr "S_end"
 
@@ -8046,37 +8045,37 @@ msgstr "Si_gnatur:"
 msgid "Click here for the address book"
 msgstr "Klikk her for å få opp adresseboken"
 
-#: ../composer/e-composer-post-header.c:130
+#: ../composer/e-composer-post-header.c:131
 msgid "Click here to select folders to post to"
 msgstr "Klikk her for å velge mapper å poste til"
 
-#: ../composer/e-composer-private.c:215
+#: ../composer/e-composer-private.c:216
 msgid "Undo the last action"
 msgstr "Angre siste handling"
 
-#: ../composer/e-composer-private.c:219
+#: ../composer/e-composer-private.c:220
 msgid "Redo the last undone action"
 msgstr "Gjenopprett siste angrede handling"
 
-#: ../composer/e-composer-private.c:223
+#: ../composer/e-composer-private.c:224
 msgid "Search for text"
 msgstr "Søk etter tekst"
 
-#: ../composer/e-composer-private.c:227
+#: ../composer/e-composer-private.c:228
 msgid "Search for and replace text"
 msgstr "Søk etter / erstatt tekst"
 
-#: ../composer/e-composer-private.c:317
+#: ../composer/e-composer-private.c:318
 msgid "Save draft"
 msgstr "Lagre utkast"
 
 #. Check buttons
-#: ../composer/e-msg-composer.c:196
+#: ../composer/e-msg-composer.c:210
 #: ../plugins/attachment-reminder/attachment-reminder.c:117
 msgid "_Do not show this message again."
 msgstr "Ikke vis _denne meldingen igjen."
 
-#: ../composer/e-msg-composer.c:1029
+#: ../composer/e-msg-composer.c:1051
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
@@ -8084,7 +8083,7 @@ msgstr ""
 "Kan ikke signere utgående melding: Ingen sertifikat for signering satt for "
 "denne kontoen"
 
-#: ../composer/e-msg-composer.c:1041
+#: ../composer/e-msg-composer.c:1063
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -8093,21 +8092,17 @@ msgstr ""
 "Kan ikke kryptere utgående melding: Sertifikat for kryptering ikke satt for "
 "denne kontoen"
 
-#: ../composer/e-msg-composer.c:1460
-msgid "Unable to reconstruct message from autosave file"
-msgstr "Kunne ikke gjenopprette melding fra automatisk lagret fil"
-
-#: ../composer/e-msg-composer.c:1530 ../composer/e-msg-composer.c:1876
+#: ../composer/e-msg-composer.c:1491 ../composer/e-msg-composer.c:1836
 msgid "Compose Message"
 msgstr "Skriv melding"
 
-#: ../composer/e-msg-composer.c:3535
+#: ../composer/e-msg-composer.c:3527
 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:4150
+#: ../composer/e-msg-composer.c:4142
 msgid "Untitled Message"
 msgstr "Melding uten navn"
 
@@ -8209,8 +8204,8 @@ msgid "Unable to activate the address selector control."
 msgstr "Klarte ikke å aktivere kontroll for adressevelger."
 
 #: ../composer/mail-composer.error.xml.h:21
-msgid "You cannot attach the file n{0}' to this message."
-msgstr "Du kan ikke legge ved filen «n{0}» i denne meldingen."
+msgid "You cannot attach the file &quot;{0}&quot; to this message."
+msgstr "Du kan ikke legge ved filen &quot;{0}&quot; i denne meldingen."
 
 #: ../composer/mail-composer.error.xml.h:22
 msgid "You need to configure an account before you can compose mail."
@@ -8232,24 +8227,24 @@ msgstr "Gjenopp_rett"
 msgid "_Save Draft"
 msgstr "L_agre skisse"
 
-#: ../capplet/anjal-settings-main.c:198
+#: ../capplet/anjal-settings-main.c:223
 msgid "Run Anjal in a window"
 msgstr "Kjør Anjal i et vindu"
 
-#: ../capplet/anjal-settings-main.c:199
+#: ../capplet/anjal-settings-main.c:224
 msgid "Make Anjal the default email client"
 msgstr "Bruk Anjal som _forvalgt e-postklient"
 
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:206
+#: ../capplet/anjal-settings-main.c:231
 msgid "ID of the socket to embed in"
 msgstr "ID for pluggen vi skal koble til"
 
-#: ../capplet/anjal-settings-main.c:207
+#: ../capplet/anjal-settings-main.c:232
 msgid "socket"
 msgstr "plugg"
 
-#: ../capplet/anjal-settings-main.c:220
+#: ../capplet/anjal-settings-main.c:245
 msgid "Anjal email client"
 msgstr "Anjal e-postprogram"
 
@@ -8293,39 +8288,39 @@ msgid "Email address:"
 msgstr "E-postadresse:"
 
 #: ../capplet/settings/mail-account-view.c:490
-msgid "<span size=\"large\" weight=\"bold\">Details:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">Detaljer:</span>"
+msgid "Details:"
+msgstr "Detaljer:"
 
-#: ../capplet/settings/mail-account-view.c:496
-msgid "<span size=\"large\" weight=\"bold\">Receiving</span>"
-msgstr "<span size=\"large\" weight=\"bold\">Mottar</span>"
+#: ../capplet/settings/mail-account-view.c:498
+msgid "Receiving"
+msgstr "Mottar"
 
-#: ../capplet/settings/mail-account-view.c:501
+#: ../capplet/settings/mail-account-view.c:505
 msgid "Server type:"
 msgstr "Tjenertype:"
 
-#: ../capplet/settings/mail-account-view.c:510
+#: ../capplet/settings/mail-account-view.c:514
 msgid "Server address:"
 msgstr "Tjeneradresse:"
 
-#: ../capplet/settings/mail-account-view.c:519
+#: ../capplet/settings/mail-account-view.c:523
 msgid "Username:"
 msgstr "Brukernavn:"
 
-#: ../capplet/settings/mail-account-view.c:528
+#: ../capplet/settings/mail-account-view.c:532
 msgid "Use encryption:"
 msgstr "Bruk kryptering:"
 
-#: ../capplet/settings/mail-account-view.c:533
-#: ../capplet/settings/mail-account-view.c:566
+#: ../capplet/settings/mail-account-view.c:537
+#: ../capplet/settings/mail-account-view.c:572
 msgid "never"
 msgstr "aldri"
 
-#: ../capplet/settings/mail-account-view.c:545
-msgid "<span size=\"large\" weight=\"bold\">Sending</span>"
-msgstr "<span size=\"large\" weight=\"bold\">Sender</span>"
+#: ../capplet/settings/mail-account-view.c:549
+msgid "Sending"
+msgstr "Sender"
 
-#: ../capplet/settings/mail-account-view.c:585
+#: ../capplet/settings/mail-account-view.c:591
 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. "
@@ -8335,7 +8330,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:587
+#: ../capplet/settings/mail-account-view.c:593
 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 "
@@ -8345,11 +8340,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:589
+#: ../capplet/settings/mail-account-view.c:595
 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:591
+#: ../capplet/settings/mail-account-view.c:597
 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."
@@ -8357,11 +8352,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:592
+#: ../capplet/settings/mail-account-view.c:598
 msgid "You can specify your default settings for your account."
 msgstr "Du kan oppgi forvalgte innstillinger for kontoen."
 
-#: ../capplet/settings/mail-account-view.c:593
+#: ../capplet/settings/mail-account-view.c:599
 msgid ""
 "Time to check things over before we try and connect to the server and fetch "
 "your mail."
@@ -8369,102 +8364,100 @@ msgstr ""
 "Se over innstillingene før forsøk på å koble til tjeneren for å hente e-"
 "posten din."
 
-#: ../capplet/settings/mail-account-view.c:608
-#: ../mail/em-account-editor.c:2101 ../mail/em-account-editor.c:2222
-#: ../mail/mail-config.ui.h:62
+#: ../capplet/settings/mail-account-view.c:614
+#: ../mail/em-account-editor.c:2146 ../mail/em-account-editor.c:2267
 msgid "Identity"
 msgstr "Identitet"
 
-#: ../capplet/settings/mail-account-view.c:608
+#: ../capplet/settings/mail-account-view.c:614
 msgid "Next - Receiving mail"
 msgstr "Neste - mottak av e-post"
 
-#: ../capplet/settings/mail-account-view.c:609
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Receiving mail"
 msgstr "Mottak av e-post"
 
-#: ../capplet/settings/mail-account-view.c:609
-#: ../capplet/settings/mail-account-view.c:610
+#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:616
 msgid "Next - Sending mail"
 msgstr "Neste - Utsendelse av e-post"
 
-#: ../capplet/settings/mail-account-view.c:609
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Back - Identity"
 msgstr "Tilbake - Identitet"
 
-#: ../capplet/settings/mail-account-view.c:609
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Next - Receiving options"
 msgstr "Neste - Alternativer for mottak"
 
-#: ../capplet/settings/mail-account-view.c:610
+#: ../capplet/settings/mail-account-view.c:616
 msgid "Receiving options"
 msgstr "Alternativer for mottak"
 
-#: ../capplet/settings/mail-account-view.c:610
-#: ../capplet/settings/mail-account-view.c:612
+#: ../capplet/settings/mail-account-view.c:616
+#: ../capplet/settings/mail-account-view.c:618
 msgid "Back - Receiving mail"
 msgstr "Tilbake - Mottak av e-post"
 
-#: ../capplet/settings/mail-account-view.c:612
+#: ../capplet/settings/mail-account-view.c:618
 msgid "Sending mail"
 msgstr "Utsendelse av e-post"
 
-#: ../capplet/settings/mail-account-view.c:612
-#: ../capplet/settings/mail-account-view.c:613
+#: ../capplet/settings/mail-account-view.c:618
+#: ../capplet/settings/mail-account-view.c:619
 msgid "Next - Review account"
 msgstr "Neste - Se over konto"
 
-#: ../capplet/settings/mail-account-view.c:612
+#: ../capplet/settings/mail-account-view.c:618
 msgid "Next - Defaults"
 msgstr "Neste - Forvalg"
 
-#: ../capplet/settings/mail-account-view.c:612
+#: ../capplet/settings/mail-account-view.c:618
 msgid "Back - Receiving options"
 msgstr "Tilbake - Alternativer for mottak"
 
-#: ../capplet/settings/mail-account-view.c:613
-#: ../mail/em-account-editor.c:2988 ../mail/mail-config.ui.h:34
+#: ../capplet/settings/mail-account-view.c:619
+#: ../mail/em-account-editor.c:3055
 msgid "Defaults"
 msgstr "Forvalg"
 
-#: ../capplet/settings/mail-account-view.c:613
+#: ../capplet/settings/mail-account-view.c:619
 msgid "Back - Sending mail"
 msgstr "Tilbake - Utsendelse av e-post"
 
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:621
 msgid "Review account"
 msgstr "Se over konto"
 
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:621
 msgid "Finish"
 msgstr "Fullfør"
 
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:621
 msgid "Back - Sending"
 msgstr "Tilbake - Utsendelse"
 
-#: ../capplet/settings/mail-account-view.c:719
+#: ../capplet/settings/mail-account-view.c:726
 msgid "Setup Google contacts with Evolution"
 msgstr "Sett opp Google-kontakter i Evolution"
 
-#: ../capplet/settings/mail-account-view.c:720
+#: ../capplet/settings/mail-account-view.c:727
 msgid "Setup Google calendar with Evolution"
 msgstr "Sett opp Google-kalender i Evolution."
 
-#: ../capplet/settings/mail-account-view.c:725
+#: ../capplet/settings/mail-account-view.c:732
 msgid "You may need to enable IMAP access."
 msgstr "Du må kanskje slå på IMAP-tilgang."
 
-#: ../capplet/settings/mail-account-view.c:733
-msgid "<span size=\"large\" weight=\"bold\">Google account settings:</span>"
-msgstr ""
-"<span size=\"large\" weight=\"bold\">Innstillinger for Google-konto:</span>"
+#: ../capplet/settings/mail-account-view.c:740
+msgid "Google account settings:"
+msgstr "Innstillinger for Google-konto:"
 
-#: ../capplet/settings/mail-account-view.c:757
+#: ../capplet/settings/mail-account-view.c:767
 msgid "Setup Yahoo calendar with Evolution"
 msgstr "Sett opp Yahoo-kalender i Evolution"
 
-#: ../capplet/settings/mail-account-view.c:761
+#: ../capplet/settings/mail-account-view.c:771
 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 "
@@ -8474,39 +8467,38 @@ msgstr ""
 "kalendernavnet. Vennligst bekreft og oppgi kalendernavnet på nytt hvis det "
 "ikke er korrekt."
 
-#: ../capplet/settings/mail-account-view.c:768
-msgid "<span size=\"large\" weight=\"bold\">Yahoo account settings:</span>"
-msgstr ""
-"<span size=\"large\" weight=\"bold\">Innstillinger for Yahoo-konto:</span>"
+#: ../capplet/settings/mail-account-view.c:778
+msgid "Yahoo account settings:"
+msgstr "Innstillinger for Yahoo-konto:"
 
-#: ../capplet/settings/mail-account-view.c:780
+#: ../capplet/settings/mail-account-view.c:792
 msgid "Yahoo Calendar name:"
 msgstr "Navn på Yahoo-kalender"
 
-#: ../capplet/settings/mail-account-view.c:1049
+#: ../capplet/settings/mail-account-view.c:1061
 msgid "Password:"
 msgstr "Passord:"
 
-#: ../capplet/settings/mail-account-view.c:1117
+#: ../capplet/settings/mail-account-view.c:1129
 #: ../capplet/settings/mail-settings-view.c:267
 msgid "Close Tab"
 msgstr "Lukk fane"
 
-#: ../capplet/settings/mail-account-view.c:1127
+#: ../capplet/settings/mail-account-view.c:1139
 msgid "Account Wizard"
 msgstr "Kontoveiviser"
 
-#: ../capplet/settings/mail-capplet-shell.c:208
+#: ../capplet/settings/mail-capplet-shell.c:211
 msgid "Evolution account assistant"
 msgstr "Evolution kontoassistent"
 
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:342 ../mail/e-mail-migrate.c:664
-#: ../mail/e-mail-store.c:227 ../mail/em-folder-tree-model.c:148
+#: ../capplet/settings/mail-capplet-shell.c:345 ../mail/e-mail-migrate.c:672
+#: ../mail/e-mail-store.c:218 ../mail/em-folder-tree-model.c:148
 #: ../mail/em-folder-tree-model.c:151 ../mail/em-folder-tree-model.c:154
 #: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:163
-#: ../mail/em-folder-tree-model.c:165 ../mail/mail-vfolder.c:207
-#: ../mail/message-list.c:1666
+#: ../mail/em-folder-tree-model.c:165 ../mail/mail-vfolder.c:208
+#: ../mail/message-list.c:1671
 #: ../modules/addressbook/e-book-shell-backend.c:96
 #: ../modules/addressbook/e-book-shell-migrate.c:130
 #: ../modules/calendar/e-cal-shell-backend.c:102
@@ -8519,9 +8511,9 @@ msgid "On This Computer"
 msgstr "PÃ¥ denne datamaskinen"
 
 #: ../capplet/settings/mail-settings-view.c:146
-#: ../plugins/groupwise-features/share-folder.c:737
-msgid "Modify"
-msgstr "Endre"
+#, c-format
+msgid "Modify %s..."
+msgstr "Endre %s..."
 
 #: ../capplet/settings/mail-settings-view.c:148
 msgid "Add a new account"
@@ -8543,7 +8535,7 @@ msgstr "Varsling om kalenderhendelser"
 msgid "Evolution Alarm Notify"
 msgstr "Evolution varslingstjeneste"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:845
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:848
 #: ../shell/e-shell-window-private.c:253
 msgid "Evolution"
 msgstr "Evolution"
@@ -8569,42 +8561,27 @@ msgid "Email Settings"
 msgstr "Innstillinger for e-post"
 
 #. Translators: This is a cancelled activity.
-#: ../e-util/e-activity.c:228
+#: ../e-util/e-activity.c:265
 #, c-format
 msgid "%s (cancelled)"
 msgstr "%s (avbrutt)"
 
 #. Translators: This is a completed activity.
-#: ../e-util/e-activity.c:231
+#: ../e-util/e-activity.c:268
 #, c-format
 msgid "%s (completed)"
 msgstr "%s (fullført)"
 
-#. Translators: This is an activity whose percent
-#. * complete is unknown.
-#: ../e-util/e-activity.c:235
+#: ../e-util/e-activity.c:270
 #, c-format
-msgid "%s..."
-msgstr "%s..."
+msgid "%s"
+msgstr "%s"
 
-#: ../e-util/e-activity.c:240
+#: ../e-util/e-activity.c:275
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% fullført)"
 
-#: ../e-util/e-alert.c:73 ../e-util/e-alert.c:76
-msgid "Evolution Error"
-msgstr "Evolution feil"
-
-#: ../e-util/e-alert.c:79 ../e-util/e-alert.c:82
-msgid "Evolution Warning"
-msgstr "Evolution advarsel"
-
-#: ../e-util/e-alert.c:652
-#, c-format
-msgid "Internal error, unknown error '%s' requested"
-msgstr "Intern feil, ukjent feil «%s» forespurt"
-
 #: ../e-util/e-charset.c:53
 msgid "Arabic"
 msgstr "Arabisk"
@@ -8763,12 +8740,12 @@ msgstr "Loggmeldinger:"
 msgid "Log Level"
 msgstr "Loggnivå"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2757
+#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2758
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Meldinger"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:110
+#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:113
 #: ../shell/e-shell-window-actions.c:1426
 #: ../shell/e-shell-window-actions.c:1433
 #: ../shell/e-shell-window-actions.c:1440
@@ -8859,104 +8836,106 @@ msgstr "GConf-feil: %s"
 msgid "All further errors shown only on terminal."
 msgstr "Alle videre feil blir kun vist på konsollet."
 
-#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1041
+#: ../em-format/em-format-quote.c:282 ../em-format/em-format.c:1050
 #: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
 #: ../modules/mail/em-mailer-prefs.c:72
 msgid "From"
 msgstr "Fra"
 
-#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1042
+#: ../em-format/em-format-quote.c:282 ../em-format/em-format.c:1051
 #: ../modules/mail/em-mailer-prefs.c:73
 msgid "Reply-To"
 msgstr "Svar-til"
 
-#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1044
-#: ../mail/em-format-html.c:2290 ../mail/em-format-html.c:2352
-#: ../mail/em-format-html.c:2375 ../modules/mail/em-mailer-prefs.c:75
+#: ../em-format/em-format-quote.c:282 ../em-format/em-format.c:1053
+#: ../mail/em-format-html.c:2391 ../mail/em-format-html.c:2453
+#: ../mail/em-format-html.c:2476 ../modules/mail/em-mailer-prefs.c:75
 msgid "Cc"
 msgstr "Cc"
 
-#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1045
-#: ../mail/em-format-html.c:2291 ../mail/em-format-html.c:2356
-#: ../mail/em-format-html.c:2378 ../modules/mail/em-mailer-prefs.c:76
+#: ../em-format/em-format-quote.c:282 ../em-format/em-format.c:1054
+#: ../mail/em-format-html.c:2392 ../mail/em-format-html.c:2457
+#: ../mail/em-format-html.c:2479 ../modules/mail/em-mailer-prefs.c:76
 msgid "Bcc"
 msgstr "Bcc"
 
-#: ../em-format/em-format-quote.c:410 ../em-format/em-format.c:1046
+#: ../em-format/em-format-quote.c:422 ../em-format/em-format.c:1055
 #: ../mail/e-mail-tag-editor.c:328 ../mail/em-filter-i18n.h:74
 #: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:77
-#: ../plugins/groupwise-features/properties.ui.h:6 ../smime/lib/e-cert.c:1140
+#: ../plugins/groupwise-features/notification.ui.h:2
+#: ../plugins/groupwise-features/properties.ui.h:5 ../smime/lib/e-cert.c:1140
 msgid "Subject"
 msgstr "Emne"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:421 ../mail/em-format-html.c:2472
-#: ../modules/mail/em-mailer-prefs.c:1120
+#: ../em-format/em-format-quote.c:433 ../mail/em-format-html.c:2573
+#: ../modules/mail/em-mailer-prefs.c:1040
 msgid "Mailer"
 msgstr "E-postprogram"
 
-#: ../em-format/em-format-quote.c:500 ../mail/em-composer-utils.c:1301
+#: ../em-format/em-format-quote.c:514 ../mail/em-composer-utils.c:1311
 msgid "-------- Forwarded Message --------"
 msgstr "---------Videresendt melding-------"
 
-#: ../em-format/em-format.c:1047 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:78 ../widgets/misc/e-dateedit.c:527
-#: ../widgets/misc/e-dateedit.c:549
+#: ../em-format/em-format.c:1056 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:78 ../widgets/misc/e-dateedit.c:530
+#: ../widgets/misc/e-dateedit.c:552
 msgid "Date"
 msgstr "Dato"
 
-#: ../em-format/em-format.c:1048 ../modules/mail/em-mailer-prefs.c:79
+#: ../em-format/em-format.c:1057 ../modules/mail/em-mailer-prefs.c:79
 msgid "Newsgroups"
 msgstr "Nyhetsgrupper"
 
-#: ../em-format/em-format.c:1049 ../modules/mail/em-mailer-prefs.c:80
+#: ../em-format/em-format.c:1058 ../modules/mail/em-mailer-prefs.c:80
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "Ansikt"
 
-#: ../em-format/em-format.c:1432
+#: ../em-format/em-format.c:1453
 #, c-format
 msgid "%s attachment"
 msgstr "%s-vedlegg"
 
-#: ../em-format/em-format.c:1504
+#: ../em-format/em-format.c:1528
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Kunne ikke lese S/MIME-melding: Ukjent feil"
 
-#: ../em-format/em-format.c:1662 ../em-format/em-format.c:1846
+#: ../em-format/em-format.c:1710 ../em-format/em-format.c:1906
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Kunne ikke lese MIME-melding. Viser ren meldingstekst."
 
-#: ../em-format/em-format.c:1672
+#: ../em-format/em-format.c:1720
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Krypteringstype for multipart/encrypted som ikke er støttet"
 
-#: ../em-format/em-format.c:1688
+#: ../em-format/em-format.c:1739
 msgid "Could not parse PGP/MIME message"
 msgstr "Kunne ikke lese PGP/MIME-melding"
 
-#: ../em-format/em-format.c:1689
+#: ../em-format/em-format.c:1740
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "Kunne ikke lese PGP/MIME-melding: Ukjent feil"
 
-#: ../em-format/em-format.c:1871
+#: ../em-format/em-format.c:1931
 msgid "Unsupported signature format"
 msgstr "Ustøttet signaturformat"
 
-#: ../em-format/em-format.c:1881 ../em-format/em-format.c:2041
+#: ../em-format/em-format.c:1944 ../em-format/em-format.c:2117
 msgid "Error verifying signature"
 msgstr "Feil under verifisering av signatur"
 
-#: ../em-format/em-format.c:1882 ../em-format/em-format.c:2029
-#: ../em-format/em-format.c:2042
+#: ../em-format/em-format.c:1945 ../em-format/em-format.c:2104
+#: ../em-format/em-format.c:2118
 msgid "Unknown error verifying signature"
 msgstr "Ukjent feil under verifisering av signatur"
 
-#: ../em-format/em-format.c:2129
+#: ../em-format/em-format.c:2209
 msgid "Could not parse PGP message: "
 msgstr "Kunne ikke lese PGP-melding:"
 
-#: ../em-format/em-format.c:2135 ../plugins/caldav/caldav-browse-server.c:203
+#: ../em-format/em-format.c:2215 ../mail/mail-ops.c:604
+#: ../plugins/caldav/caldav-browse-server.c:203
 #: ../plugins/caldav/caldav-browse-server.c:1254 ../plugins/face/face.c:169
 #: ../smime/gui/certificate-manager.c:100
 msgid "Unknown error"
@@ -9132,20 +9111,20 @@ msgstr "Ta _med tråder"
 msgid "A_dd Condition"
 msgstr "Legg til _kriterie"
 
-#: ../filter/e-filter-rule.c:1128 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:304
+#: ../filter/e-filter-rule.c:1126 ../filter/filter.ui.h:2
+#: ../mail/em-utils.c:302
 msgid "Incoming"
 msgstr "Innkommende"
 
-#: ../filter/e-filter-rule.c:1128 ../mail/em-utils.c:305
+#: ../filter/e-filter-rule.c:1126 ../mail/em-utils.c:303
 msgid "Outgoing"
 msgstr "Utgående"
 
-#: ../filter/e-rule-editor.c:268
+#: ../filter/e-rule-editor.c:270
 msgid "Add Rule"
 msgstr "Legg til regel"
 
-#: ../filter/e-rule-editor.c:355
+#: ../filter/e-rule-editor.c:359
 msgid "Edit Rule"
 msgstr "Rediger regel"
 
@@ -9246,7 +9225,7 @@ msgstr "i fremtiden"
 msgid "months"
 msgstr "måneder"
 
-#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:190
+#: ../filter/filter.ui.h:19
 msgid "seconds"
 msgstr "sekunder"
 
@@ -9263,7 +9242,7 @@ msgid "years"
 msgstr "Ã¥r"
 
 #: ../mail/e-mail-attachment-bar.c:91 ../mail/e-mail-attachment-bar.c:96
-#: ../mail/em-format-html-display.c:1024 ../mail/mail-config.ui.h:15
+#: ../mail/em-format-html-display.c:1055 ../mail/mail-config.ui.h:13
 #: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:129
 #: ../widgets/misc/e-attachment-paned.c:134
 msgid "Attachment"
@@ -9272,16 +9251,16 @@ msgstr[0] "Vedlegg"
 msgstr[1] "Vedlegg"
 
 #: ../mail/e-mail-attachment-bar.c:611
-#: ../widgets/misc/e-attachment-paned.c:599
+#: ../widgets/misc/e-attachment-paned.c:600
 msgid "Icon View"
 msgstr "Ikonvisning"
 
 #: ../mail/e-mail-attachment-bar.c:612
-#: ../widgets/misc/e-attachment-paned.c:600
+#: ../widgets/misc/e-attachment-paned.c:601
 msgid "List View"
 msgstr "Listevisning"
 
-#: ../mail/e-mail-browser.c:265
+#: ../mail/e-mail-browser.c:268
 msgid "(No Subject)"
 msgstr "(Uten emne)"
 
@@ -9301,7 +9280,7 @@ msgstr "_Fra denne adressen"
 msgid "Create Search _Folder"
 msgstr "Opprett _søkemappe"
 
-#: ../mail/e-mail-label-dialog.c:220
+#: ../mail/e-mail-label-dialog.c:222
 msgid "_Label name:"
 msgstr "Etikett_navn:"
 
@@ -9351,16 +9330,16 @@ msgid "Color"
 msgstr "Farge"
 
 #: ../mail/e-mail-label-tree-view.c:96
+#: ../modules/plugin-manager/evolution-plugin-manager.c:66
 #: ../plugins/caldav/caldav-browse-server.c:1163
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
-#: ../plugins/plugin-manager/plugin-manager.c:58
 #: ../widgets/menus/gal-define-views-dialog.c:334
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
 msgid "Name"
 msgstr "Navn"
 
 #: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:283
-#: ../mail/em-folder-tree-model.c:696 ../mail/em-folder-tree.c:2759
+#: ../mail/em-folder-tree-model.c:696 ../mail/em-folder-tree.c:2856
 #: ../modules/mail/e-mail-shell-view-private.c:1062
 msgid "Inbox"
 msgstr "Innboks"
@@ -9379,7 +9358,7 @@ msgstr "Sendt"
 
 #: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:691
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:578
+#: ../plugins/templates/templates.c:580
 msgid "Templates"
 msgstr "Maler"
 
@@ -9396,11 +9375,11 @@ msgstr "Flytting"
 msgid "Migrating '%s':"
 msgstr "Flytter «%s»:"
 
-#: ../mail/e-mail-migrate.c:649
+#: ../mail/e-mail-migrate.c:652
 msgid "Migrating Folders"
 msgstr "Flytter mapper"
 
-#: ../mail/e-mail-migrate.c:650
+#: ../mail/e-mail-migrate.c:653
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -9412,7 +9391,7 @@ msgstr ""
 "\n"
 "Vennligst vent mens Evolution migrere dine mapper..."
 
-#: ../mail/e-mail-migrate.c:739
+#: ../mail/e-mail-migrate.c:809
 #, c-format
 msgid "Unable to create local mail folders at '%s': %s"
 msgstr "Kunne ikke opprette lokale e-postmapper i «%s»: %s"
@@ -9429,33 +9408,33 @@ msgstr "Vennligst velg en mappe"
 msgid "Do not ask me again"
 msgstr "Ikke spør meg igjen"
 
-#: ../mail/e-mail-reader.c:276 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:279 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Kopier til mappe"
 
-#: ../mail/e-mail-reader.c:276 ../mail/em-folder-utils.c:402
+#: ../mail/e-mail-reader.c:279 ../mail/em-folder-utils.c:412
 msgid "C_opy"
 msgstr "K_opier"
 
-#: ../mail/e-mail-reader.c:689 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:692 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "Flytt til mappe"
 
-#: ../mail/e-mail-reader.c:689 ../mail/em-folder-utils.c:402
+#: ../mail/e-mail-reader.c:692 ../mail/em-folder-utils.c:412
 msgid "_Move"
 msgstr "_Flytt"
 
 #. Check buttons
-#: ../mail/e-mail-reader.c:954 ../mail/e-mail-reader.c:1070
-#: ../mail/e-mail-reader.c:1111
+#: ../mail/e-mail-reader.c:957 ../mail/e-mail-reader.c:1073
+#: ../mail/e-mail-reader.c:1114
 msgid "_Do not ask me again."
 msgstr "_Ikke spør meg igjen."
 
-#: ../mail/e-mail-reader.c:1116
+#: ../mail/e-mail-reader.c:1119
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Alltid ignorer Reply-To: for e-postlister."
 
-#: ../mail/e-mail-reader.c:1206
+#: ../mail/e-mail-reader.c:1209
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Lagre melding"
@@ -9467,540 +9446,541 @@ msgstr[1] "Lagre meldinger"
 #. * Subject. The extension ".mbox" is appended to this
 #. * string, thus it will be something like "Message.mbox"
 #. * at the end.
-#: ../mail/e-mail-reader.c:1227
-#: ../plugins/groupwise-features/properties.ui.h:4
+#: ../mail/e-mail-reader.c:1230
+#: ../plugins/groupwise-features/notification.ui.h:1
+#: ../plugins/groupwise-features/properties.ui.h:3
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Melding"
 msgstr[1] "Meldinger"
 
-#: ../mail/e-mail-reader.c:1492
+#: ../mail/e-mail-reader.c:1496
 msgid "A_dd Sender to Address Book"
 msgstr "L_egg til avsender i adressebok"
 
-#: ../mail/e-mail-reader.c:1494
+#: ../mail/e-mail-reader.c:1498
 msgid "Add sender to address book"
 msgstr "Legg til avsender i adressebok"
 
-#: ../mail/e-mail-reader.c:1499
+#: ../mail/e-mail-reader.c:1503
 msgid "Check for _Junk"
 msgstr "Sjekk etter _uønsket e-post"
 
-#: ../mail/e-mail-reader.c:1501
+#: ../mail/e-mail-reader.c:1505
 msgid "Filter the selected messages for junk status"
 msgstr "Filtrer valgte meldinger etter uønsket e-poststatus"
 
-#: ../mail/e-mail-reader.c:1506
+#: ../mail/e-mail-reader.c:1510
 msgid "_Copy to Folder..."
 msgstr "K_opier til mappe..."
 
-#: ../mail/e-mail-reader.c:1508
+#: ../mail/e-mail-reader.c:1512
 msgid "Copy selected messages to another folder"
 msgstr "Kopier valgte meldinger til en annen mappe"
 
-#: ../mail/e-mail-reader.c:1513
+#: ../mail/e-mail-reader.c:1517
 msgid "_Delete Message"
 msgstr "_Slett melding"
 
-#: ../mail/e-mail-reader.c:1515
+#: ../mail/e-mail-reader.c:1519
 msgid "Mark the selected messages for deletion"
 msgstr "Merk valgte meldinger for sletting"
 
-#: ../mail/e-mail-reader.c:1520
+#: ../mail/e-mail-reader.c:1524
 msgid "Filter on Mailing _List..."
 msgstr "Filtrer på e-post_liste..."
 
-#: ../mail/e-mail-reader.c:1522
+#: ../mail/e-mail-reader.c:1526
 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:1527
+#: ../mail/e-mail-reader.c:1531
 msgid "Filter on _Recipients..."
 msgstr "Filtrer på mottake_re..."
 
-#: ../mail/e-mail-reader.c:1529
+#: ../mail/e-mail-reader.c:1533
 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:1534
+#: ../mail/e-mail-reader.c:1538
 msgid "Filter on Se_nder..."
 msgstr "Filtrer på se_nder..."
 
-#: ../mail/e-mail-reader.c:1536
+#: ../mail/e-mail-reader.c:1540
 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:1541
+#: ../mail/e-mail-reader.c:1545
 msgid "Filter on _Subject..."
 msgstr "Filtrer på e_mne..."
 
-#: ../mail/e-mail-reader.c:1543
+#: ../mail/e-mail-reader.c:1547
 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:1548
+#: ../mail/e-mail-reader.c:1552
 msgid "A_pply Filters"
 msgstr "_Påfør filtre"
 
-#: ../mail/e-mail-reader.c:1550
+#: ../mail/e-mail-reader.c:1554
 msgid "Apply filter rules to the selected messages"
 msgstr "Aktiver filterregler på de valgte meldingene"
 
-#: ../mail/e-mail-reader.c:1555
+#: ../mail/e-mail-reader.c:1559
 msgid "_Find in Message..."
 msgstr "_Finn i melding..."
 
-#: ../mail/e-mail-reader.c:1557
+#: ../mail/e-mail-reader.c:1561
 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:1562
+#: ../mail/e-mail-reader.c:1566
 msgid "_Clear Flag"
 msgstr "F_jern flagg"
 
-#: ../mail/e-mail-reader.c:1564
+#: ../mail/e-mail-reader.c:1568
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Fjern flagg for oppfølging fra valgte meldinger"
 
-#: ../mail/e-mail-reader.c:1569
+#: ../mail/e-mail-reader.c:1573
 msgid "_Flag Completed"
 msgstr "Merk som _fullført"
 
-#: ../mail/e-mail-reader.c:1571
+#: ../mail/e-mail-reader.c:1575
 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:1576
+#: ../mail/e-mail-reader.c:1580
 msgid "Follow _Up..."
 msgstr "Følg _opp..."
 
-#: ../mail/e-mail-reader.c:1578
+#: ../mail/e-mail-reader.c:1582
 msgid "Flag the selected messages for follow-up"
 msgstr "Merk valgte meldinger for oppfølging"
 
-#: ../mail/e-mail-reader.c:1583
+#: ../mail/e-mail-reader.c:1587
 msgid "_Attached"
 msgstr "L_agt ved"
 
-#: ../mail/e-mail-reader.c:1585 ../mail/e-mail-reader.c:1592
+#: ../mail/e-mail-reader.c:1589 ../mail/e-mail-reader.c:1596
 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:1590
+#: ../mail/e-mail-reader.c:1594
 msgid "Forward As _Attached"
 msgstr "Videresend s_om vedlegg"
 
-#: ../mail/e-mail-reader.c:1597
+#: ../mail/e-mail-reader.c:1601
 msgid "_Inline"
 msgstr "_I meldingen"
 
-#: ../mail/e-mail-reader.c:1599 ../mail/e-mail-reader.c:1606
+#: ../mail/e-mail-reader.c:1603 ../mail/e-mail-reader.c:1610
 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:1604
+#: ../mail/e-mail-reader.c:1608
 msgid "Forward As _Inline"
 msgstr "V_ideresend som vedlegg"
 
-#: ../mail/e-mail-reader.c:1611
+#: ../mail/e-mail-reader.c:1615
 msgid "_Quoted"
 msgstr "_Sitert"
 
-#: ../mail/e-mail-reader.c:1613 ../mail/e-mail-reader.c:1620
+#: ../mail/e-mail-reader.c:1617 ../mail/e-mail-reader.c:1624
 msgid "Forward the selected message quoted like a reply"
 msgstr "Videresend den valgte meldingen sitert som et svar"
 
-#: ../mail/e-mail-reader.c:1618
+#: ../mail/e-mail-reader.c:1622
 msgid "Forward As _Quoted"
 msgstr "Videresend s_om sitat"
 
-#: ../mail/e-mail-reader.c:1625
+#: ../mail/e-mail-reader.c:1629
 msgid "_Load Images"
 msgstr "_Last bilder"
 
-#: ../mail/e-mail-reader.c:1627
+#: ../mail/e-mail-reader.c:1631
 msgid "Force images in HTML mail to be loaded"
 msgstr "Tvungen lasting av bilder i HTML e-post"
 
-#: ../mail/e-mail-reader.c:1632
+#: ../mail/e-mail-reader.c:1636
 msgid "_Important"
 msgstr "V_iktig"
 
-#: ../mail/e-mail-reader.c:1634
+#: ../mail/e-mail-reader.c:1638
 msgid "Mark the selected messages as important"
 msgstr "Merk valgte meldinger som viktige"
 
-#: ../mail/e-mail-reader.c:1639
+#: ../mail/e-mail-reader.c:1643
 msgid "_Junk"
 msgstr "_Uønsket e-post"
 
-#: ../mail/e-mail-reader.c:1641
+#: ../mail/e-mail-reader.c:1645
 msgid "Mark the selected messages as junk"
 msgstr "Merk valgte meldinger som uønsket e-post"
 
-#: ../mail/e-mail-reader.c:1646
+#: ../mail/e-mail-reader.c:1650
 msgid "_Not Junk"
 msgstr "_Ikke uønsket e-post"
 
-#: ../mail/e-mail-reader.c:1648
+#: ../mail/e-mail-reader.c:1652
 msgid "Mark the selected messages as not being junk"
 msgstr "Merk valgte meldinger som ønsket e-post"
 
-#: ../mail/e-mail-reader.c:1653
+#: ../mail/e-mail-reader.c:1657
 msgid "_Read"
 msgstr "_Les"
 
-#: ../mail/e-mail-reader.c:1655
+#: ../mail/e-mail-reader.c:1659
 msgid "Mark the selected messages as having been read"
 msgstr "Merk valgte meldinger som lest"
 
-#: ../mail/e-mail-reader.c:1660
+#: ../mail/e-mail-reader.c:1664
 msgid "Uni_mportant"
 msgstr "_Ikke viktig"
 
-#: ../mail/e-mail-reader.c:1662
+#: ../mail/e-mail-reader.c:1666
 msgid "Mark the selected messages as unimportant"
 msgstr "Merk valgte meldinger som uviktige"
 
-#: ../mail/e-mail-reader.c:1667
+#: ../mail/e-mail-reader.c:1671
 msgid "_Unread"
 msgstr "_Ulest"
 
-#: ../mail/e-mail-reader.c:1669
+#: ../mail/e-mail-reader.c:1673
 msgid "Mark the selected messages as not having been read"
 msgstr "Merk valgte meldinger som ulest"
 
-#: ../mail/e-mail-reader.c:1674
+#: ../mail/e-mail-reader.c:1678
 msgid "_Edit as New Message..."
 msgstr "R_ediger som ny melding..."
 
-#: ../mail/e-mail-reader.c:1676
+#: ../mail/e-mail-reader.c:1680
 msgid "Open the selected messages in the composer for editing"
 msgstr "Ã?pne valgte meldinger i redigeringskomponenten"
 
-#: ../mail/e-mail-reader.c:1681
+#: ../mail/e-mail-reader.c:1685
 msgid "Compose _New Message"
 msgstr "Skriv _ny melding"
 
-#: ../mail/e-mail-reader.c:1683
+#: ../mail/e-mail-reader.c:1687
 msgid "Open a window for composing a mail message"
 msgstr "�pne et vindu for å skrive en e-post melding"
 
-#: ../mail/e-mail-reader.c:1688
+#: ../mail/e-mail-reader.c:1692
 msgid "_Open in New Window"
 msgstr "_Ã?pne i _nytt vindu"
 
-#: ../mail/e-mail-reader.c:1690
+#: ../mail/e-mail-reader.c:1694
 msgid "Open the selected messages in a new window"
 msgstr "Ã?pne valgte meldinger i et nytt vindu"
 
-#: ../mail/e-mail-reader.c:1695
+#: ../mail/e-mail-reader.c:1699
 msgid "_Move to Folder..."
 msgstr "Fl_ytt til mappe..."
 
-#: ../mail/e-mail-reader.c:1697
+#: ../mail/e-mail-reader.c:1701
 msgid "Move selected messages to another folder"
 msgstr "Flytt valgte meldinger til en annen mappe"
 
-#: ../mail/e-mail-reader.c:1702
+#: ../mail/e-mail-reader.c:1706
 msgid "_Switch to Folder"
 msgstr "_Bytt til mappe"
 
-#: ../mail/e-mail-reader.c:1704
+#: ../mail/e-mail-reader.c:1708
 msgid "Display the parent folder"
 msgstr "Vis opphavsmappe"
 
-#: ../mail/e-mail-reader.c:1709
+#: ../mail/e-mail-reader.c:1713
 msgid "Switch to _next tab"
 msgstr "Bytt til _neste fane"
 
-#: ../mail/e-mail-reader.c:1711
+#: ../mail/e-mail-reader.c:1715
 msgid "Switch to the next tab"
 msgstr "Bytt til neste fane"
 
-#: ../mail/e-mail-reader.c:1716
+#: ../mail/e-mail-reader.c:1720
 msgid "Switch to _previous tab"
 msgstr "Bytt til _forrige fane"
 
-#: ../mail/e-mail-reader.c:1718
+#: ../mail/e-mail-reader.c:1722
 msgid "Switch to the previous tab"
 msgstr "Bytt til forrige fane"
 
-#: ../mail/e-mail-reader.c:1723
+#: ../mail/e-mail-reader.c:1727
 msgid "Cl_ose current tab"
 msgstr "L_ukk aktiv fane"
 
-#: ../mail/e-mail-reader.c:1725
+#: ../mail/e-mail-reader.c:1729
 msgid "Close current tab"
 msgstr "Lukk aktiv fane"
 
-#: ../mail/e-mail-reader.c:1730
+#: ../mail/e-mail-reader.c:1734
 msgid "_Next Message"
 msgstr "_Neste melding"
 
-#: ../mail/e-mail-reader.c:1732
+#: ../mail/e-mail-reader.c:1736
 msgid "Display the next message"
 msgstr "Vis neste melding"
 
-#: ../mail/e-mail-reader.c:1737
+#: ../mail/e-mail-reader.c:1741
 msgid "Next _Important Message"
 msgstr "Neste v_iktige melding"
 
-#: ../mail/e-mail-reader.c:1739
+#: ../mail/e-mail-reader.c:1743
 msgid "Display the next important message"
 msgstr "Vis neste viktige melding"
 
-#: ../mail/e-mail-reader.c:1744
+#: ../mail/e-mail-reader.c:1748
 msgid "Next _Thread"
 msgstr "Neste _tråd"
 
-#: ../mail/e-mail-reader.c:1746
+#: ../mail/e-mail-reader.c:1750
 msgid "Display the next thread"
 msgstr "Vis neste tråd"
 
-#: ../mail/e-mail-reader.c:1751
+#: ../mail/e-mail-reader.c:1755
 msgid "Next _Unread Message"
 msgstr "Neste _uleste melding"
 
-#: ../mail/e-mail-reader.c:1753
+#: ../mail/e-mail-reader.c:1757
 msgid "Display the next unread message"
 msgstr "Vis neste uleste melding"
 
-#: ../mail/e-mail-reader.c:1758
+#: ../mail/e-mail-reader.c:1762
 msgid "_Previous Message"
 msgstr "_Forrige melding"
 
-#: ../mail/e-mail-reader.c:1760
+#: ../mail/e-mail-reader.c:1764
 msgid "Display the previous message"
 msgstr "Vis forrige melding"
 
-#: ../mail/e-mail-reader.c:1765
+#: ../mail/e-mail-reader.c:1769
 msgid "Pr_evious Important Message"
 msgstr "Forrig_e viktige melding"
 
-#: ../mail/e-mail-reader.c:1767
+#: ../mail/e-mail-reader.c:1771
 msgid "Display the previous important message"
 msgstr "Vis forrige viktige melding"
 
-#: ../mail/e-mail-reader.c:1772
+#: ../mail/e-mail-reader.c:1776
 msgid "P_revious Unread Message"
 msgstr "Fo_rrige uleste melding"
 
-#: ../mail/e-mail-reader.c:1774
+#: ../mail/e-mail-reader.c:1778
 msgid "Display the previous unread message"
 msgstr "Vis forrige uleste melding"
 
-#: ../mail/e-mail-reader.c:1781
+#: ../mail/e-mail-reader.c:1785
 msgid "Print this message"
 msgstr "Skriv ut denne meldingen"
 
-#: ../mail/e-mail-reader.c:1788
+#: ../mail/e-mail-reader.c:1792
 msgid "Preview the message to be printed"
 msgstr "Forhåndsvis meldingen som skal skrives ut"
 
-#: ../mail/e-mail-reader.c:1793
+#: ../mail/e-mail-reader.c:1797
 msgid "Re_direct"
 msgstr "Om_diriger"
 
-#: ../mail/e-mail-reader.c:1795
+#: ../mail/e-mail-reader.c:1799
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Omdiriger (bounce) den valgte meldingen til noen"
 
-#: ../mail/e-mail-reader.c:1800 ../mail/mail.error.xml.h:91
+#: ../mail/e-mail-reader.c:1804 ../mail/mail.error.xml.h:91
 #: ../modules/calendar/e-cal-shell-view-actions.c:1459
 #: ../modules/mail/e-mail-attachment-handler.c:151
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: ../mail/e-mail-reader.c:1802
+#: ../mail/e-mail-reader.c:1806
 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:1807 ../mail/mail.error.xml.h:92
+#: ../mail/e-mail-reader.c:1811 ../mail/mail.error.xml.h:92
 msgid "Reply to _List"
 msgstr "Svar til _listen"
 
-#: ../mail/e-mail-reader.c:1809
+#: ../mail/e-mail-reader.c:1813
 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:1814
+#: ../mail/e-mail-reader.c:1818
 #: ../modules/mail/e-mail-attachment-handler.c:158
 msgid "_Reply to Sender"
 msgstr "Sva_r til avsender"
 
-#: ../mail/e-mail-reader.c:1816
+#: ../mail/e-mail-reader.c:1820
 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:1821
+#: ../mail/e-mail-reader.c:1825
 msgid "_Save as mbox..."
 msgstr "Lagre _som mbox..."
 
-#: ../mail/e-mail-reader.c:1823
+#: ../mail/e-mail-reader.c:1827
 msgid "Save selected messages as an mbox file"
 msgstr "Lagre valgte meldinger som en mbox-fil"
 
-#: ../mail/e-mail-reader.c:1828
+#: ../mail/e-mail-reader.c:1832
 msgid "Search Folder from Mailing _List..."
 msgstr "Søkemappe på e-post_liste..."
 
-#: ../mail/e-mail-reader.c:1830
+#: ../mail/e-mail-reader.c:1834
 msgid "Create a search folder for this mailing list"
 msgstr "Lag en søkemappe for denne e-postlisten"
 
-#: ../mail/e-mail-reader.c:1835
+#: ../mail/e-mail-reader.c:1839
 msgid "Search Folder from Recipien_ts..."
 msgstr "Søkemappe fra mo_ttakere..."
 
-#: ../mail/e-mail-reader.c:1837
+#: ../mail/e-mail-reader.c:1841
 msgid "Create a search folder for these recipients"
 msgstr "Lag en søkemappe for disse mottakerene"
 
-#: ../mail/e-mail-reader.c:1842
+#: ../mail/e-mail-reader.c:1846
 msgid "Search Folder from Sen_der..."
 msgstr "Søkemappe for avsen_der..."
 
-#: ../mail/e-mail-reader.c:1844
+#: ../mail/e-mail-reader.c:1848
 msgid "Create a search folder for this sender"
 msgstr "Lag en søkemappe for denne avsenderen"
 
-#: ../mail/e-mail-reader.c:1849
+#: ../mail/e-mail-reader.c:1853
 msgid "Search Folder from S_ubject..."
 msgstr "Søkemappe for _emne..."
 
-#: ../mail/e-mail-reader.c:1851
+#: ../mail/e-mail-reader.c:1855
 msgid "Create a search folder for this subject"
 msgstr "Lag en søkemappe for dette emnet"
 
-#: ../mail/e-mail-reader.c:1856
+#: ../mail/e-mail-reader.c:1860
 msgid "_Message Source"
 msgstr "_Meldingskilde"
 
-#: ../mail/e-mail-reader.c:1858
+#: ../mail/e-mail-reader.c:1862
 msgid "Show the raw email source of the message"
 msgstr "Vis e-post meldingen i sin råe form"
 
-#: ../mail/e-mail-reader.c:1870
+#: ../mail/e-mail-reader.c:1874
 msgid "_Undelete Message"
 msgstr "_Angre sletting av melding"
 
-#: ../mail/e-mail-reader.c:1872
+#: ../mail/e-mail-reader.c:1876
 msgid "Undelete the selected messages"
 msgstr "Angre sletting av valgte meldinger"
 
-#: ../mail/e-mail-reader.c:1877
+#: ../mail/e-mail-reader.c:1881
 msgid "_Normal Size"
 msgstr "_Normal størrelse"
 
-#: ../mail/e-mail-reader.c:1879
+#: ../mail/e-mail-reader.c:1883
 msgid "Reset the text to its original size"
 msgstr "Ta teksten tilbake til sin opprinnelige størrelse"
 
-#: ../mail/e-mail-reader.c:1884
+#: ../mail/e-mail-reader.c:1888
 msgid "_Zoom In"
 msgstr "_Zoom inn"
 
-#: ../mail/e-mail-reader.c:1886
+#: ../mail/e-mail-reader.c:1890
 msgid "Increase the text size"
 msgstr "Større tekst"
 
-#: ../mail/e-mail-reader.c:1891
+#: ../mail/e-mail-reader.c:1895
 msgid "Zoom _Out"
 msgstr "Zoom _ut"
 
-#: ../mail/e-mail-reader.c:1893
+#: ../mail/e-mail-reader.c:1897
 msgid "Decrease the text size"
 msgstr "Mindre skrift"
 
-#: ../mail/e-mail-reader.c:1900
+#: ../mail/e-mail-reader.c:1904
 msgid "Create R_ule"
 msgstr "Opprett _regel"
 
-#: ../mail/e-mail-reader.c:1907
+#: ../mail/e-mail-reader.c:1911
 msgid "Ch_aracter Encoding"
 msgstr "Tegn_koding"
 
-#: ../mail/e-mail-reader.c:1914
+#: ../mail/e-mail-reader.c:1918
 msgid "F_orward As"
 msgstr "Videresend s_om"
 
-#: ../mail/e-mail-reader.c:1921
+#: ../mail/e-mail-reader.c:1925
 msgid "_Group Reply"
 msgstr "_Gruppesvar"
 
-#: ../mail/e-mail-reader.c:1928
+#: ../mail/e-mail-reader.c:1932
 msgid "_Go To"
 msgstr "_GÃ¥ til"
 
-#: ../mail/e-mail-reader.c:1935
+#: ../mail/e-mail-reader.c:1939
 msgid "Mar_k As"
 msgstr "Mer_k som"
 
-#: ../mail/e-mail-reader.c:1942
+#: ../mail/e-mail-reader.c:1946
 msgid "_Message"
 msgstr "_Melding"
 
-#: ../mail/e-mail-reader.c:1949
+#: ../mail/e-mail-reader.c:1953
 msgid "_Zoom"
 msgstr "_Zoom"
 
-#: ../mail/e-mail-reader.c:1974
+#: ../mail/e-mail-reader.c:1978
 msgid "Mark for Follo_w Up..."
 msgstr "Merk for oppføl_ging..."
 
-#: ../mail/e-mail-reader.c:1982
+#: ../mail/e-mail-reader.c:1986
 msgid "Mark as _Important"
 msgstr "Merk som v_iktig"
 
-#: ../mail/e-mail-reader.c:1986
+#: ../mail/e-mail-reader.c:1990
 msgid "Mark as _Junk"
 msgstr "Merk som _uønsket e-post"
 
-#: ../mail/e-mail-reader.c:1990
+#: ../mail/e-mail-reader.c:1994
 msgid "Mark as _Not Junk"
 msgstr "Merk som _gyldig melding"
 
-#: ../mail/e-mail-reader.c:1994
+#: ../mail/e-mail-reader.c:1998
 msgid "Mar_k as Read"
 msgstr "Mer_k som lest"
 
-#: ../mail/e-mail-reader.c:1998
+#: ../mail/e-mail-reader.c:2002
 msgid "Mark as Uni_mportant"
 msgstr "_Merk som uviktig"
 
-#: ../mail/e-mail-reader.c:2002
+#: ../mail/e-mail-reader.c:2006
 msgid "Mark as _Unread"
 msgstr "Merk som _ulest"
 
-#: ../mail/e-mail-reader.c:2038
+#: ../mail/e-mail-reader.c:2042
 msgid "_Caret Mode"
 msgstr "Markør_modus"
 
-#: ../mail/e-mail-reader.c:2040
+#: ../mail/e-mail-reader.c:2044
 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:2046
+#: ../mail/e-mail-reader.c:2050
 msgid "All Message _Headers"
 msgstr "Alle meldings_hoder"
 
-#: ../mail/e-mail-reader.c:2048
+#: ../mail/e-mail-reader.c:2052
 msgid "Show messages with all email headers"
 msgstr "Vis meldinger med alle meldingshoder"
 
-#: ../mail/e-mail-reader.c:2269
+#: ../mail/e-mail-reader.c:2275
 msgid "Unable to retrieve message"
 msgstr "Kunne ikke hente ut melding"
 
-#: ../mail/e-mail-reader.c:2329 ../mail/mail-ops.c:1891
+#: ../mail/e-mail-reader.c:2335 ../mail/mail-ops.c:1927
 #, 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:2893 ../mail/mail-config.ui.h:31
+#: ../mail/e-mail-reader.c:2902 ../mail/mail-config.ui.h:29
 #: ../plugins/google-account-setup/google-source.c:303
 #: ../plugins/google-account-setup/google-source.c:537
 #: ../plugins/google-account-setup/google-source.c:659
@@ -10008,45 +9988,45 @@ msgstr "Henter melding «%s»"
 msgid "Default"
 msgstr "Forvalgt"
 
-#: ../mail/e-mail-reader.c:3041
+#: ../mail/e-mail-reader.c:3050
 #: ../modules/mail/e-mail-attachment-handler.c:144
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: ../mail/e-mail-reader.c:3042
+#: ../mail/e-mail-reader.c:3051
 msgid "Forward the selected message to someone"
 msgstr "Videresend den valgte meldingen til noen"
 
-#: ../mail/e-mail-reader.c:3061
+#: ../mail/e-mail-reader.c:3070
 msgid "Group Reply"
 msgstr "Gruppesvar"
 
-#: ../mail/e-mail-reader.c:3062
+#: ../mail/e-mail-reader.c:3071
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "Svar til e-postlisten eller til alle mottakere"
 
-#: ../mail/e-mail-reader.c:3107 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:3116 ../mail/em-filter-i18n.h:14
 #: ../plugins/groupwise-features/share-folder.c:743
 msgid "Delete"
 msgstr "Slett"
 
-#: ../mail/e-mail-reader.c:3140
+#: ../mail/e-mail-reader.c:3149
 #: ../modules/calendar/e-cal-shell-view-actions.c:1305
 #: ../widgets/misc/e-calendar.c:196
 msgid "Next"
 msgstr "Neste"
 
-#: ../mail/e-mail-reader.c:3144
+#: ../mail/e-mail-reader.c:3153
 #: ../modules/calendar/e-cal-shell-view-actions.c:1298
 #: ../widgets/misc/e-calendar.c:172
 msgid "Previous"
 msgstr "Forrige"
 
-#: ../mail/e-mail-reader.c:3154 ../mail/mail-dialogs.ui.h:19
+#: ../mail/e-mail-reader.c:3163 ../mail/mail-dialogs.ui.h:16
 msgid "Reply"
 msgstr "Svar"
 
-#: ../mail/e-mail-reader.c:3722
+#: ../mail/e-mail-reader.c:3731
 #, c-format
 msgid "Folder '%s'"
 msgstr "Mappe «%s»"
@@ -10057,7 +10037,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:512 ../mail/mail-config.ui.h:77
+#: ../mail/em-account-editor.c:510 ../mail/mail-config.ui.h:67
 #: ../modules/addressbook/ldap-config.ui.h:9
 msgid "No encryption"
 msgstr "Ingen kryptering"
@@ -10065,7 +10045,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:516 ../mail/mail-config.ui.h:136
+#: ../mail/em-account-editor.c:514 ../mail/mail-config.ui.h:121
 #: ../modules/addressbook/ldap-config.ui.h:20
 msgid "TLS encryption"
 msgstr "TLS-kryptering"
@@ -10073,17 +10053,17 @@ 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:520 ../mail/mail-config.ui.h:105
+#: ../mail/em-account-editor.c:518 ../mail/mail-config.ui.h:89
 #: ../modules/addressbook/ldap-config.ui.h:12
 msgid "SSL encryption"
 msgstr "SSL-kryptering"
 
-#: ../mail/em-account-editor.c:607
+#: ../mail/em-account-editor.c:605
 #, c-format
 msgid "%s License Agreement"
 msgstr "Lisensavtale for %s"
 
-#: ../mail/em-account-editor.c:614
+#: ../mail/em-account-editor.c:612
 #, c-format
 msgid ""
 "\n"
@@ -10097,34 +10077,34 @@ msgstr ""
 "og kryss av i ruten for å akseptere den\n"
 
 #. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:901 ../widgets/misc/e-signature-combo-box.c:79
+#: ../mail/em-account-editor.c:899 ../widgets/misc/e-signature-combo-box.c:79
 msgctxt "mail-signature"
 msgid "None"
 msgstr "Ingen"
 
-#: ../mail/em-account-editor.c:985
+#: ../mail/em-account-editor.c:983
 msgid "Never"
 msgstr "Aldri"
 
-#: ../mail/em-account-editor.c:986
+#: ../mail/em-account-editor.c:984
 msgid "Always"
 msgstr "Alltid"
 
-#: ../mail/em-account-editor.c:987
+#: ../mail/em-account-editor.c:985
 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:1723 ../widgets/misc/e-account-tree-view.c:128
+#: ../mail/em-account-editor.c:1768 ../widgets/misc/e-account-tree-view.c:128
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "Ingen"
 
-#: ../mail/em-account-editor.c:2098
+#: ../mail/em-account-editor.c:2143
 msgid "Mail Configuration"
 msgstr "E-post-konfigurasjon"
 
-#: ../mail/em-account-editor.c:2099
+#: ../mail/em-account-editor.c:2144
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -10134,7 +10114,7 @@ msgstr ""
 "\n"
 "Klikk «Framover» for å begynne."
 
-#: ../mail/em-account-editor.c:2102
+#: ../mail/em-account-editor.c:2147
 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 "
@@ -10144,20 +10124,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:2104 ../mail/em-account-editor.c:2261
-#: ../mail/mail-config.ui.h:98
+#: ../mail/em-account-editor.c:2149 ../mail/em-account-editor.c:2311
 msgid "Receiving Email"
 msgstr "Innkommende e-post"
 
-#: ../mail/em-account-editor.c:2105
+#: ../mail/em-account-editor.c:2150
 msgid "Please configure the following account settings."
 msgstr "Vennligst konfigurer følgende kontoinnstillinger."
 
-#: ../mail/em-account-editor.c:2107 ../mail/em-account-editor.c:2743
+#: ../mail/em-account-editor.c:2152 ../mail/em-account-editor.c:2799
 msgid "Sending Email"
 msgstr "Utgående e-post"
 
-#: ../mail/em-account-editor.c:2108
+#: ../mail/em-account-editor.c:2153
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -10165,11 +10144,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:2110
+#: ../mail/em-account-editor.c:2155
 msgid "Account Management"
 msgstr "HÃ¥ndtering av konti"
 
-#: ../mail/em-account-editor.c:2111
+#: ../mail/em-account-editor.c:2156
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -10177,11 +10156,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:2115
+#: ../mail/em-account-editor.c:2160
 msgid "Done"
 msgstr "Ferdig"
 
-#: ../mail/em-account-editor.c:2116
+#: ../mail/em-account-editor.c:2161
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10195,52 +10174,52 @@ msgstr ""
 "\n"
 "Klikk «Bruk» for å lagre dine innstillinger."
 
-#: ../mail/em-account-editor.c:2557
+#: ../mail/em-account-editor.c:2613
 msgid "Check for _new messages every"
 msgstr "Se etter _nye meldinger hver(t)"
 
-#: ../mail/em-account-editor.c:2565
+#: ../mail/em-account-editor.c:2621
 msgid "minu_tes"
 msgstr "minu_tter"
 
-#: ../mail/em-account-editor.c:2841
+#: ../mail/em-account-editor.c:2903
 msgid "Please select a folder from the current account."
 msgstr "Vennligst velg en mappe fra valgt konto."
 
-#: ../mail/em-account-editor.c:3111 ../mail/mail-config.ui.h:112
+#: ../mail/em-account-editor.c:3183 ../mail/mail-config.ui.h:96
 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:3156 ../mail/em-account-editor.c:3224
+#: ../mail/em-account-editor.c:3228 ../mail/em-account-editor.c:3296
 msgid "Receiving Options"
 msgstr "Alternativer for mottak"
 
-#: ../mail/em-account-editor.c:3157 ../mail/em-account-editor.c:3225
+#: ../mail/em-account-editor.c:3229 ../mail/em-account-editor.c:3297
 msgid "Checking for New Messages"
 msgstr "Ser etter nye meldinger"
 
 #. 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:1734
+#: ../mail/em-composer-utils.c:1744
 #, 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."
 
 #. Translators: %s is the subject of the email message
-#: ../mail/em-composer-utils.c:1782
+#: ../mail/em-composer-utils.c:1794
 #, c-format
 msgid "Delivery Notification for: \"%s\""
 msgstr "Varsling om ny e-post for «%s»"
 
-#: ../mail/em-composer-utils.c:2191
+#: ../mail/em-composer-utils.c:2204
 msgid "an unknown sender"
 msgstr "en ukjent avsender"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:2238
+#: ../mail/em-composer-utils.c:2251
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10248,15 +10227,15 @@ msgstr ""
 "${AbbrevWeekdayName}, ${Day}.${Month}.${Year} kl. ${24Hour}.${Minute} "
 "${TimeZone}, skrev ${Sender}:"
 
-#: ../mail/em-composer-utils.c:2382
+#: ../mail/em-composer-utils.c:2395
 msgid "-----Original Message-----"
 msgstr "-----Opprinnelig melding-----"
 
-#: ../mail/em-composer-utils.c:2594
+#: ../mail/em-composer-utils.c:2607
 msgid "Posting destination"
 msgstr "Destinasjon for post"
 
-#: ../mail/em-composer-utils.c:2595
+#: ../mail/em-composer-utils.c:2608
 msgid "Choose folders to post the message to."
 msgstr "Velg mapper meldingen skal postes til."
 
@@ -10377,7 +10356,7 @@ msgstr "er ikke satt"
 msgid "is set"
 msgstr "er satt"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:66
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:58
 msgid "Junk"
 msgstr "Uønsket e-post"
 
@@ -10426,7 +10405,7 @@ msgid "Play Sound"
 msgstr "Spill lyd"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:18
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:15
 msgid "Read"
 msgstr "Les"
 
@@ -10541,7 +10520,6 @@ msgid "Quota usage"
 msgstr "Bruk av kvote"
 
 #: ../mail/em-folder-properties.c:288
-#: ../plugins/groupwise-features/properties.ui.h:3
 msgid "Folder Properties"
 msgstr "Egenskaper for mappe"
 
@@ -10561,7 +10539,7 @@ msgstr "Mappe_navn:"
 #: ../mail/em-folder-tree-model.c:149 ../mail/em-folder-tree-model.c:152
 #: ../mail/em-folder-tree-model.c:158 ../mail/em-folder-tree-model.c:160
 #: ../mail/em-folder-tree-model.c:167 ../mail/em-folder-tree-model.c:169
-#: ../mail/mail-vfolder.c:1064 ../mail/mail-vfolder.c:1129
+#: ../mail/mail-vfolder.c:1080 ../mail/mail-vfolder.c:1145
 msgid "Search Folders"
 msgstr "Søkemapper"
 
@@ -10570,102 +10548,84 @@ msgstr "Søkemapper"
 msgid "UNMATCHED"
 msgstr "UTEN TREFF"
 
-#: ../mail/em-folder-tree-model.c:766 ../mail/em-folder-tree-model.c:1113
+#: ../mail/em-folder-tree-model.c:766 ../mail/em-folder-tree-model.c:1036
 msgid "Loading..."
 msgstr "Laster..."
 
-#: ../mail/em-folder-tree.c:184
+#: ../mail/em-folder-tree.c:193
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanner mapper i «%s»"
 
-#: ../mail/em-folder-tree.c:601
+#: ../mail/em-folder-tree.c:614
 msgid "Folder names cannot contain '/'"
 msgstr "Mappenavn kan ikke inneholde tegnet «/»"
 
-#. Translators: This is the string used for displaying the
-#. * folder names in folder trees. The first "%s" will be
-#. * replaced by the folder's name and "%u" will be replaced
-#. * with the number of unread messages in the folder. The
-#. * second %s will be replaced with a "+" letter for collapsed
-#. * folders with unread messages in some subfolder too,
-#. * or with an empty string for other cases.
-#. *
-#. * Most languages should translate this as "%s (%u%s)". The
-#. * languages that use localized digits (like Persian) may
-#. * need to replace "%u" with "%Iu". Right-to-left languages
-#. * (like Arabic and Hebrew) may need to add bidirectional
-#. * formatting codes to take care of the cases the folder
-#. * name appears in either direction.
-#. *
-#. * Do not translate the "folder-display|" part. Remove it
-#. * from your translation.
-#.
-#: ../mail/em-folder-tree.c:1084
+#: ../mail/em-folder-tree.c:1105
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1318
+#: ../mail/em-folder-tree.c:1344
 msgid "Mail Folder Tree"
 msgstr "Tre for e-postmapper"
 
-#: ../mail/em-folder-tree.c:1623 ../mail/em-folder-utils.c:92
+#: ../mail/em-folder-tree.c:1666 ../mail/em-folder-utils.c:92
 #, c-format
 msgid "Moving folder %s"
 msgstr "Flytter mappe %s"
 
-#: ../mail/em-folder-tree.c:1625 ../mail/em-folder-utils.c:94
+#: ../mail/em-folder-tree.c:1670 ../mail/em-folder-utils.c:94
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopierer mappe %s"
 
-#: ../mail/em-folder-tree.c:1632 ../mail/message-list.c:2164
+#: ../mail/em-folder-tree.c:1679 ../mail/message-list.c:2170
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Flytter meldinger til mappe %s"
 
-#: ../mail/em-folder-tree.c:1634 ../mail/message-list.c:2166
+#: ../mail/em-folder-tree.c:1683 ../mail/message-list.c:2172
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopierer meldinger til mappe %s"
 
-#: ../mail/em-folder-tree.c:1650
+#: ../mail/em-folder-tree.c:1700
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Kan ikke slippe melding(er) toppnivå for lageret"
 
-#: ../mail/em-folder-utils.c:403
+#: ../mail/em-folder-utils.c:413
 msgid "Move Folder To"
 msgstr "Flytt mappe til"
 
-#: ../mail/em-folder-utils.c:403
+#: ../mail/em-folder-utils.c:413
 msgid "Copy Folder To"
 msgstr "Kopier mappe til"
 
-#: ../mail/em-folder-utils.c:533
-#: ../plugins/groupwise-features/share-folder-common.c:136
+#: ../mail/em-folder-utils.c:543
+#: ../plugins/groupwise-features/share-folder-common.c:137
 #, c-format
 msgid "Creating folder '%s'"
 msgstr "Oppretter mappe «%s»"
 
-#: ../mail/em-folder-utils.c:693
+#: ../mail/em-folder-utils.c:708
 msgid "Create Folder"
 msgstr "Opprett mappe"
 
-#: ../mail/em-folder-utils.c:694
-#: ../plugins/groupwise-features/install-shared.c:165
-#: ../plugins/groupwise-features/share-folder-common.c:343
+#: ../mail/em-folder-utils.c:709
+#: ../plugins/groupwise-features/install-shared.c:170
+#: ../plugins/groupwise-features/share-folder-common.c:347
 msgid "Specify where to create the folder:"
 msgstr "Spesifiser hvor mappen skal opprettes:"
 
-#: ../mail/em-folder-utils.c:714
+#: ../mail/em-folder-utils.c:729
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Fjerner abonnement på mappe «%s»"
 
-#: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1576
+#: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1603
 msgid "Unsigned"
 msgstr "Usignert"
 
@@ -10677,7 +10637,7 @@ msgstr ""
 "Denne meldingen er ikke signert. Du har ingen garanti for at meldingen er "
 "autentisk."
 
-#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1577
+#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1604
 msgid "Valid signature"
 msgstr "Gyldig signatur"
 
@@ -10689,7 +10649,7 @@ msgstr ""
 "Denne meldingen er signert og gyldig hvilket betyr denne meldingen høyst "
 "sannsynlig er autentisk."
 
-#: ../mail/em-format-html-display.c:92 ../mail/em-format-html.c:1578
+#: ../mail/em-format-html-display.c:92 ../mail/em-format-html.c:1605
 msgid "Invalid signature"
 msgstr "Ugyldig signatur"
 
@@ -10701,7 +10661,7 @@ msgstr ""
 "Signaturen for denne meldingen kan ikke verifiseres. Den kan være endret "
 "under overføring."
 
-#: ../mail/em-format-html-display.c:93 ../mail/em-format-html.c:1579
+#: ../mail/em-format-html-display.c:93 ../mail/em-format-html.c:1606
 msgid "Valid signature, but cannot verify sender"
 msgstr "Gyldig signatur, men kan ikke verifisere avsender"
 
@@ -10713,7 +10673,7 @@ msgstr ""
 "Denne meldingen er signert med en gyldig signatur, men avsender av meldingen "
 "kan ikke verifiseres."
 
-#: ../mail/em-format-html-display.c:94 ../mail/em-format-html.c:1580
+#: ../mail/em-format-html-display.c:94 ../mail/em-format-html.c:1607
 msgid "Signature exists, but need public key"
 msgstr "Signatur eksisterer, men trenger offentlig nøkkel"
 
@@ -10725,7 +10685,7 @@ msgstr ""
 "Denne meldingen er signert med en gyldig signatur, men det finnes ingen "
 "tilhørende offentlig nøkkel."
 
-#: ../mail/em-format-html-display.c:101 ../mail/em-format-html.c:1586
+#: ../mail/em-format-html-display.c:101 ../mail/em-format-html.c:1613
 msgid "Unencrypted"
 msgstr "Ukryptert"
 
@@ -10737,7 +10697,7 @@ msgstr ""
 "Denne meldingen er ikke kryptert. Innholdet kan vises under overføring over "
 "Internett."
 
-#: ../mail/em-format-html-display.c:102 ../mail/em-format-html.c:1587
+#: ../mail/em-format-html-display.c:102 ../mail/em-format-html.c:1614
 msgid "Encrypted, weak"
 msgstr "Kryptert, svak"
 
@@ -10751,7 +10711,7 @@ msgstr ""
 "vanskelig, men ikke umulig for en utenforstående å se innholdet i denne "
 "meldingen på noenlunde kort tid."
 
-#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1588
+#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1615
 msgid "Encrypted"
 msgstr "Kryptert"
 
@@ -10763,7 +10723,7 @@ msgstr ""
 "Denne meldingen er kryptert. Det vil være vanskelig for en utenforstående å "
 "se innholdet i denne meldingen."
 
-#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1589
+#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1616
 msgid "Encrypted, strong"
 msgstr "Kryptert, sterk"
 
@@ -10776,15 +10736,15 @@ msgstr ""
 "Denne meldingen er kryptert med en sterk algoritme. Det vil være meget "
 "vanskelig for en utenforstående å se innholdet i denne meldingen på kort tid."
 
-#: ../mail/em-format-html-display.c:235 ../smime/gui/smime-ui.ui.h:46
+#: ../mail/em-format-html-display.c:240 ../smime/gui/smime-ui.ui.h:47
 msgid "_View Certificate"
 msgstr "_Vis sertifikat"
 
-#: ../mail/em-format-html-display.c:248
+#: ../mail/em-format-html-display.c:253
 msgid "This certificate is not viewable"
 msgstr "Dette sertifikatet kan ikke vises"
 
-#: ../mail/em-format-html-display.c:497
+#: ../mail/em-format-html-display.c:508
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -10792,28 +10752,28 @@ msgstr ""
 "Evolution kan ikke rendre denne e-posten da den er for stor. Du kan vise den "
 "uformattert eller åpne den i et eksternt redigeringsprogram."
 
-#: ../mail/em-format-html-display.c:725
+#: ../mail/em-format-html-display.c:751
 msgid "Completed on"
 msgstr "Fullført"
 
-#: ../mail/em-format-html-display.c:733
+#: ../mail/em-format-html-display.c:759
 msgid "Overdue:"
 msgstr "Utgått:"
 
 #. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
-#: ../mail/em-format-html-display.c:737
+#: ../mail/em-format-html-display.c:763
 msgid "by"
 msgstr "innen"
 
-#: ../mail/em-format-html-display.c:949 ../mail/em-format-html-display.c:996
+#: ../mail/em-format-html-display.c:980 ../mail/em-format-html-display.c:1027
 msgid "View _Unformatted"
 msgstr "Vis uformattert"
 
-#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html-display.c:982
 msgid "Hide _Unformatted"
 msgstr "Skjul _uformatterte"
 
-#: ../mail/em-format-html-display.c:1016
+#: ../mail/em-format-html-display.c:1047
 msgid "O_pen With"
 msgstr "Ã?_pne med"
 
@@ -10822,55 +10782,55 @@ msgstr "Ã?_pne med"
 msgid "Page %d of %d"
 msgstr "Side %d av %d"
 
-#: ../mail/em-format-html.c:153
+#: ../mail/em-format-html.c:165
 msgid "Formatting message"
 msgstr "Formatterer melding"
 
-#: ../mail/em-format-html.c:352
+#: ../mail/em-format-html.c:362
 msgid "Formatting Message..."
 msgstr "Formatterer melding..."
 
-#: ../mail/em-format-html.c:1421 ../mail/em-format-html.c:1430
+#: ../mail/em-format-html.c:1447 ../mail/em-format-html.c:1457
 #, c-format
 msgid "Retrieving '%s'"
 msgstr "Henter «%s»"
 
-#: ../mail/em-format-html.c:1901
+#: ../mail/em-format-html.c:1968
 msgid "Unknown external-body part."
 msgstr "Ukjent del av ekstern kropp."
 
-#: ../mail/em-format-html.c:1909
+#: ../mail/em-format-html.c:1976
 msgid "Malformed external-body part."
 msgstr "Feilutformet del for ekstern kropp."
 
-#: ../mail/em-format-html.c:1939
+#: ../mail/em-format-html.c:2006
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Peker til FTP-tjener (%s)"
 
-#: ../mail/em-format-html.c:1950
+#: ../mail/em-format-html.c:2017
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Peker til lokal fil (%s) gyldig på nettsted «%s»"
 
-#: ../mail/em-format-html.c:1952
+#: ../mail/em-format-html.c:2019
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Peker til lokal fil (%s)"
 
-#: ../mail/em-format-html.c:1973
+#: ../mail/em-format-html.c:2040
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Peker til eksterne data (%s)"
 
-#: ../mail/em-format-html.c:1984
+#: ../mail/em-format-html.c:2051
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Peker til ukjente eksterne data («%s»-type)"
 
 #. 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:2647
+#: ../mail/em-format-html.c:2751
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "Denne meldingen ble sendt av %s på vegne av %s"
@@ -10881,48 +10841,85 @@ msgstr "Denne meldingen ble sendt av %s på vegne av %s"
 msgid "No HTML stream available"
 msgstr "Ingen HTML-strøm tilgjengelig."
 
-#: ../mail/em-subscribe-editor.c:677
-msgid "This store does not support subscriptions, or they are not enabled."
-msgstr ""
-"Dette lageret støtter ikke abonnering, eller så er dette ikke aktivert."
+#: ../mail/em-subscription-editor.c:1129
+msgid "Folder Subscriptions"
+msgstr "Abonnement på mapper"
+
+#: ../mail/em-subscription-editor.c:1168
+msgid "_Account:"
+msgstr "K_onto:"
+
+#: ../mail/em-subscription-editor.c:1183
+msgid "Clear Search"
+msgstr "Tøm søk"
 
-#: ../mail/em-subscribe-editor.c:728
-msgid "Subscribed"
-msgstr "Abonnert"
+#: ../mail/em-subscription-editor.c:1201
+msgid "Sho_w items that contain:"
+msgstr "_Vis oppføringer som inneholder:"
 
-#: ../mail/em-subscribe-editor.c:732
-msgid "Folder"
-msgstr "Mappe"
+#: ../mail/em-subscription-editor.c:1238
+msgid "Subscribe to the selected folder"
+msgstr "Abonner på valgt mappe"
 
-#. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:1120
-msgid "Please select a server."
-msgstr "Vennligst velg en tjener."
+#: ../mail/em-subscription-editor.c:1239
+msgid "Su_bscribe"
+msgstr "A_bonner"
+
+#: ../mail/em-subscription-editor.c:1250
+#: ../modules/mail/e-mail-shell-view-actions.c:1006
+msgid "Unsubscribe from the selected folder"
+msgstr "Fjern abonnement på valgt mappe"
 
-#: ../mail/em-subscribe-editor.c:1166
-msgid "No server has been selected"
-msgstr "Ingen tjener er valgt"
+#: ../mail/em-subscription-editor.c:1251
+#: ../modules/mail/e-mail-shell-view-actions.c:1004
+msgid "_Unsubscribe"
+msgstr "_Fjern abonnement"
+
+#: ../mail/em-subscription-editor.c:1262
+msgid "Collapse all folders"
+msgstr "Slå sammen alle mapper"
+
+#: ../mail/em-subscription-editor.c:1263
+msgid "C_ollapse All"
+msgstr "Slå sammen _alle"
+
+#: ../mail/em-subscription-editor.c:1273
+msgid "Expand all folders"
+msgstr "Utvid alle mapper"
+
+#: ../mail/em-subscription-editor.c:1274
+msgid "E_xpand All"
+msgstr "Ut_vid alle"
 
-#. Translators: This message is shown only for ten or more 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:106
+#: ../mail/em-subscription-editor.c:1284
+msgid "Refresh the folder list"
+msgstr "Oppdater mappelisten"
+
+#: ../mail/em-subscription-editor.c:1296
+msgid "Stop the current operation"
+msgstr "Stopp aktiv operasjon"
+
+#. Translators: This message is shown only for ten or more
+#. * 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:104
 #, c-format
-msgid "Are you sure you want to open %d messages at once?"
+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:152
-#: ../modules/mailto-handler/evolution-mailto-handler.c:146
+#: ../mail/em-utils.c:150
+#: ../modules/mailto-handler/evolution-mailto-handler.c:148
 msgid "_Do not show this message again"
 msgstr "Ikke vis _denne meldingen igjen"
 
-#: ../mail/em-utils.c:314
+#: ../mail/em-utils.c:312
 msgid "Message Filters"
 msgstr "Meldingsfiltre"
 
-#: ../mail/em-utils.c:848
+#: ../mail/em-utils.c:860
 #, c-format
 msgid "Messages from %s"
 msgstr "Meldinger fra %s"
@@ -10948,70 +10945,82 @@ msgid "\"Filter Editor\" window width"
 msgstr "Vindubredde for «Filterredigering»"
 
 #: ../mail/evolution-mail.schemas.in.h:4
+msgid "\"Folder Subscriptions\" window height"
+msgstr "Vinduhøyde for vinduet «Abonnement på mapper»"
+
+#: ../mail/evolution-mail.schemas.in.h:5
+msgid "\"Folder Subscriptions\" window maximize state"
+msgstr "Maksimeringstilstand for vinduet «Abonnement på mapper»"
+
+#: ../mail/evolution-mail.schemas.in.h:6
+msgid "\"Folder Subscriptions\" window width"
+msgstr "Vindubredde for vinduet «Abonnement på mapper»"
+
+#: ../mail/evolution-mail.schemas.in.h:7
 msgid "\"Search Folder Editor\" window height"
 msgstr "Forvalgt vinduhøyde for «Redigering av søkemapper»"
 
-#: ../mail/evolution-mail.schemas.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:8
 msgid "\"Search Folder Editor\" window maximize state"
 msgstr "Maksimeringstilstand for vindu for «Redigering av søkemapper»"
 
-#: ../mail/evolution-mail.schemas.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:9
 msgid "\"Search Folder Editor\" window width"
 msgstr "Bredde på vindu for «Redigering av søkemapper»"
 
-#: ../mail/evolution-mail.schemas.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:10
 msgid "\"Send and Receive Mail\" window height"
 msgstr "Høyde på vindu for «Send & motta e-post»"
 
-#: ../mail/evolution-mail.schemas.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "\"Send and Receive Mail\" window maximize state"
 msgstr "Maksimeringstilstand for «Send & motta e-post»-vindu"
 
-#: ../mail/evolution-mail.schemas.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "\"Send and Receive Mail\" window width"
 msgstr "Bredde på «Send & motta e-post»-vindu"
 
-#: ../mail/evolution-mail.schemas.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Always request read receipt"
 msgstr "Alltid be om lesekvittering"
 
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Automatic emoticon recognition"
 msgstr "Automatisk gjenkjenning av smilefjes"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid "Automatic link recognition"
 msgstr "Automatisk gjenkjenning av lenker"
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Check incoming mail being junk"
 msgstr "Sjekk om innkommende meldinger er uønsket e-post"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Citation highlight color"
 msgstr "Farge for utheving av sitattekst"
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:19
 msgid "Citation highlight color."
 msgstr "Farge for utheving av sitattekst."
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Composer Window default height"
 msgstr "Forvalgt høyde for skrivevindu"
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Composer Window default width"
 msgstr "Forvalgt bredde for skrivevindu"
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Composer load/attach directory"
 msgstr "Katalog for å laste/legge ved vedlegg i redigeringsprogrammet"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Komprimer visning av adresser i Til/Cc/Bcc"
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -11019,7 +11028,7 @@ msgstr ""
 "Komprimer visning av adresser i Til/Cc/Bcc til antall oppgitt i "
 "address_count."
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -11027,11 +11036,11 @@ msgstr ""
 "Kontrollerer hvor ofte lokale endringer synkroniseres med ekstern e-"
 "posttjener. Intervallet må være minst 30 sekunder."
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Custom headers to use while checking for junk."
 msgstr "Egendefinert meldingshode som skal sjekkes for uønsket e-post."
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -11039,63 +11048,55 @@ msgstr ""
 "Egendefinerte meldingshoder som brukes ved sjekk etter uønsket e-post. "
 "Formatet for listeelementene er «headername=value»."
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default charset in which to compose messages"
 msgstr "Forvalgt tegnsett for nye meldinger"
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default charset in which to compose messages."
 msgstr "Forvalgt tegnsett for nye meldinger."
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default charset in which to display messages"
 msgstr "Forvalgt tegnsett for visning av meldinger"
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default charset in which to display messages."
 msgstr "Forvalgt tegnsett for visning av meldinger."
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default forward style"
 msgstr "Forvalgt videresendingsstil"
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Default height of the Composer Window."
 msgstr "Forvalgt høyde for redigeringsvinduet."
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Default height of the mail browser window."
 msgstr "Forvalgt høyde for e-postleservinduet."
 
-#: ../mail/evolution-mail.schemas.in.h:32
-msgid "Default height of the subscribe dialog."
-msgstr "Forvalgt høyde for dialog for abonnering."
-
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Default maximized state of the mail browser window."
 msgstr "Forvalgt maksimert tilstand for e-postleservinduet."
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Default reply style"
 msgstr "Forvalgt svarstil"
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid "Default value for thread expand state"
 msgstr "Forvalgt verdi for trådutvidelsestilstand"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid "Default width of the Composer Window."
 msgstr "Forvalgt bredde for redigeringsvinduet."
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Default width of the mail browser window."
 msgstr "Forvalgt bredde for e-postleservinduet."
 
-#: ../mail/evolution-mail.schemas.in.h:38
-msgid "Default width of the subscribe dialog."
-msgstr "Forvalgt bredde for abonneringsdialogen."
-
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
@@ -11103,11 +11104,11 @@ msgstr ""
 "Bestemmer om oppslag for filtrering av uønsket e-post kun skal slås opp i "
 "lokale adressebøker"
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "Bestemmer om avsenders e-post skal slås opp i adresseboken"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -11119,13 +11120,13 @@ msgstr ""
 "som er merket for automatisk fullføring. Operasjonen kan være treg hvils "
 "eksterne adressebøker som LDAP er merket for automatisk fullføring."
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
 "Bestemmer om egendefinerte meldingshoder skal brukes for å se etter uønsket "
 "e-post"
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -11135,7 +11136,7 @@ msgstr ""
 "post. Hvis dette alternativet er aktivert og meldingshodene finnes vil  "
 "dette forbedre hastigheten for denne sjekken."
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -11143,47 +11144,47 @@ msgstr ""
 "Bestemmer om samme skrift skal brukes for både «Fra» og «Emne»-linjene i "
 "«Meldinger»-kolonnen i vertikal visning."
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Directory for loading/attaching files to composer."
 msgstr "Katalog for å laste/legge ved filer i redigering av ny e-post."
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Directory for saving mail component files."
 msgstr "Katalog for å lagre komponentfiler for e-post."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr "Slå av eller på bruk av ellipse for mappenavn i sidelinjen"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Display only message texts not exceeding certain size"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Do not add signature delimiter"
 msgstr "Ikke legg til skillelinje for signatur"
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Vis indikatorer for stavefeil mens du skriver."
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid "Empty Junk folders on exit"
 msgstr "Tøm mappe for uønsket e-post når programmet avsluttes"
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "Empty Trash folders on exit"
 msgstr "Tøm papirkurven når programmet avsluttes"
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Tøm alle mapper for uønsket e-post når programmet avsluttes."
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Tøm alle papirkurver når programmet avsluttes."
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
@@ -11191,32 +11192,32 @@ msgstr ""
 "Slå på animerte bilder i HTML-meldinger. Mange brukere synes at animerte "
 "bilder er plagsomme og foretrekker å se et statisk bilde i stedet."
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 "Slå på skrivemerkemodus slik at insettingspunktet vises når du leser e-post."
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Enable or disable magic space bar"
 msgstr "Aktiver eller deaktiver magisk mellomrom"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "Slå av/på spørring ved merking av flere meldinger."
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Enable or disable type ahead search feature"
 msgstr "Aktiver eller deaktiver funksjon for å søke mens du skriver"
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid "Enable search folders"
 msgstr "Aktiver søkemapper"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid "Enable search folders on startup."
 msgstr "Aktiver søkemapper ved oppstart."
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
@@ -11224,7 +11225,7 @@ msgstr ""
 "Slår på søkefunksjonen for sidelinjen for å muliggjøre interaktive søk etter "
 "mappenavn."
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -11232,29 +11233,29 @@ msgstr ""
 "Aktiver dette for å bruke mellomrom-tasten til å gå forover i "
 "meldingsvisning, meldingsliste og mapper."
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid ""
 "Enable to display only message texts not exceeding size defined in "
 "'message_text_part_limit' key."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr "Slå på for å bruke en lignende meldingslistevisning for alle mapper."
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Enable/disable caret mode"
 msgstr "Aktiver/deaktiver markørmodus"
 
-#: ../mail/evolution-mail.schemas.in.h:68 ../mail/mail-config.ui.h:48
+#: ../mail/evolution-mail.schemas.in.h:69 ../mail/mail-config.ui.h:42
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "Bruk samme koding for filnavn som Outlook/GMail"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid ""
 "Encode file names in the mail headers same as Outlook or GMail do, to let "
 "them display correctly file names with UTF-8 letters sent by Evolution, "
@@ -11262,27 +11263,27 @@ msgid ""
 "standard."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "Flush Outbox after filtering"
 msgstr "Tøm utboks etter filtrering"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "Group Reply replies to list"
 msgstr "Gruppesvar svarer til listen"
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "Height of the message-list pane"
 msgstr "Høyde på e-postlistefeltet"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid "Height of the message-list pane."
 msgstr "Høyde på e-postlistefeltet."
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Skjuler per-mappe forhåndsvisning og fjerner utvalget"
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -11290,7 +11291,7 @@ msgstr ""
 "Spør brukeren om han virkelig vil gjøre det hvis han prøver å åpne 10 eller "
 "flere e-poster på en gang."
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid ""
 "If there isn't a builtin viewer for a particular MIME type inside Evolution, "
 "any MIME types appearing in this list which map to a Bonobo component viewer "
@@ -11301,11 +11302,11 @@ msgstr ""
 "enhver MIME-type i denne listen som har en tilsvarende Bonobo-komponent for "
 "visnin."
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "Ignore list Reply-To:"
 msgstr "Ignorer Reply-To: for lister"
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid ""
 "Initial height of the \"Filter Editor\" window. The value updates as the "
 "user resizes the window vertically."
@@ -11313,7 +11314,16 @@ msgstr ""
 "Initiell høyde for «Filterredigering»-vinduet. Verdien oppdateres ettersom "
 "bruker endrer størrelse på vinduet vertikalt."
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:80
+#, fuzzy
+msgid ""
+"Initial height of the \"Folder Subscriptions\" window. The value updates as "
+"the user resizes the window vertically."
+msgstr ""
+"Initiell høyde for «Filterredigering»-vinduet. Verdien oppdateres ettersom "
+"bruker endrer størrelse på vinduet vertikalt."
+
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid ""
 "Initial height of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window vertically."
@@ -11321,7 +11331,7 @@ msgstr ""
 "Initiell høyde for «Rediger søkemapper»-vinduet. Verdien oppdateres ettersom "
 "bruker endrer størrelse på vinduet vertikalt."
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
@@ -11329,7 +11339,7 @@ msgstr ""
 "Initiell høyde for «Send og motta e-post»-vinduet. Verdien oppdateres "
 "ettersom bruker endrer størrelse på vinduet vertikalt."
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid ""
 "Initial maximize state of the \"Filter Editor\" window. The value updates "
 "when the user maximizes or unmaximizes the window. Note, this particular "
@@ -11337,7 +11347,15 @@ msgid ""
 "maximized. This key exists only as an implementation detail."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:84
+msgid ""
+"Initial maximize state of the \"Folder Subscriptions\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Folder Subscriptions\" "
+"window cannot be maximized. This key exists only as an implementation detail."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid ""
 "Initial maximize state of the \"Search Folder Editor\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -11345,7 +11363,7 @@ msgid ""
 "window cannot be maximized. This key exists only as an implementation detail."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -11354,7 +11372,7 @@ msgid ""
 "detail."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:87
 #, fuzzy
 msgid ""
 "Initial width of the \"Filter Editor\" window. The value updates as the user "
@@ -11363,7 +11381,16 @@ msgstr ""
 "Initiell bredde på «Send og motta e-post»-vinduet. Verdien oppdateres "
 "ettersom bruker endrer størrelse på vinduet horisontalt."
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:88
+#, fuzzy
+msgid ""
+"Initial width of the \"Folder Subscriptions\" window. The value updates as "
+"the user resizes the window horizontally."
+msgstr ""
+"Initiell bredde på «Send og motta e-post»-vinduet. Verdien oppdateres "
+"ettersom bruker endrer størrelse på vinduet horisontalt."
+
+#: ../mail/evolution-mail.schemas.in.h:89
 #, fuzzy
 msgid ""
 "Initial width of the \"Search Folder Editor\" window. The value updates as "
@@ -11372,7 +11399,7 @@ msgstr ""
 "Initiell bredde på «Send og motta e-post»-vinduet. Verdien oppdateres "
 "ettersom bruker endrer størrelse på vinduet horisontalt."
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -11380,7 +11407,7 @@ msgstr ""
 "Initiell bredde på «Send og motta e-post»-vinduet. Verdien oppdateres "
 "ettersom bruker endrer størrelse på vinduet horisontalt."
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid ""
 "Instead of the normal \"Reply to All\" behaviour, this option will make the "
 "'Group Reply' toolbar button try to reply only to the mailing list through "
@@ -11388,7 +11415,7 @@ msgid ""
 "replying."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -11398,7 +11425,7 @@ msgstr ""
 "en søkemappe sletter meldingene permanent, og ikke bare fjerner dem fra "
 "søkeresultatene."
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:93
 #, fuzzy
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
@@ -11408,48 +11435,48 @@ msgstr ""
 "en søkemappe sletter meldingene permanent, og ikke bare fjerner dem fra "
 "søkeresultatene."
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "reply to many people."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying sending "
 "a private reply to a message which arrived via a mailing list, but the list "
 "sets a Reply-To: header which redirects your reply back to the list"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Last time Empty Junk was run"
 msgstr "Siste gang mapper for uønsket e-post ble tømt"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Last time Empty Trash was run"
 msgstr "Siste gang papirkurven ble tømt"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Layout style"
 msgstr "Stil for utforming"
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid "List of Labels and their associated colors"
 msgstr "Liste over etiketter og deres assosierte farger"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "List of MIME types to check for Bonobo component viewers"
 msgstr "Liste over MIME-typer som skal se etter bonobo-komponentvisere"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "List of accepted licenses"
 msgstr "Liste med godtatte lisenser"
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "List of accounts"
 msgstr "Liste med kontoer"
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -11458,15 +11485,15 @@ msgstr ""
 "innholder strenger som er undermapper relativt til /apps/evolution/mail/"
 "accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "List of custom headers and whether they are enabled."
 msgstr "Liste over tillpassede topptekster og om de er slått på."
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "List of dictionary language codes used for spell checking."
 msgstr "Liste med språkkoder for ordliste som skal brukes for stavekontroll."
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -11475,15 +11502,15 @@ msgstr ""
 "inneholder strenger som inneholder «name:color» hvor «color» bruker HTML hex "
 "koding."
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "List of protocol names whose license has been accepted."
 msgstr "Liste over protokollnavn som har en godkjent lisens."
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Load images for HTML messages over HTTP"
 msgstr "Last bilder for HTML-meldinger og HTTP"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid ""
 "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
 "Never load images off the net. \"1\" - Load images in messages from "
@@ -11493,125 +11520,125 @@ msgstr ""
 "last bilder fra nettet «1» - Last bilder i e-poster fra kontakter «2» - "
 "Alltid last bilder fra nettet."
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Log filter actions"
 msgstr "Loggfør filterhandlinger"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Log filter actions to the specified log file."
 msgstr "Logg filterhandlinger til oppgitt loggfil."
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Logfile to log filter actions"
 msgstr "Loggfil med filterhandlinger"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Logfile to log filter actions."
 msgstr "Loggfil med filterhandlinger."
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Mail browser height"
 msgstr "Høyde på e-postleser"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Mail browser maximized"
 msgstr "E-postleser maksimert"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Mail browser width"
 msgstr "Bredde på e-postleser"
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Mark as Seen after specified timeout"
 msgstr "Merk som «lest» etter spesifisert tidsgrense"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Mark as Seen after specified timeout."
 msgstr "Merk som «sett» etter spesifisert tidsgrense."
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Mark citations in the message \"Preview\""
 msgstr "Merk sitat in e-posten «Forhåndsvisning»"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Merk sitat in e-posten «Forhåndsvisning»."
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Message text limit for display"
 msgstr "Grense for tekst i meldingsvisning"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "Stil på e-postvisning («normal», «full headers», «source»)"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Minimum days between emptying the junk on exit"
 msgstr ""
 "Minimum antall dager mellom tømming av mapper for uønsket e-post ved "
 "avslutting"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Minimum antall dager mellom tømming av papirkurven ved avslutting"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr ""
 "Minste tidsperiode mellom tømming av mapper for uønsket e-post ved "
 "avslutting, i dager."
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 "Minste tidsperiode mellom tømming av papirkurven ved avslutting, i dager."
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Antall adresser som skal vises i Til/Cc/Bcc"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Prompt on empty subject"
 msgstr "Stopp og spør ved tomt emne"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Stopp og spør før en mappe blir tømt."
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Stopp og spør når en en e-post uten emne skal bli sendt."
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Prompt when deleting messages in search folder"
 msgstr "Spør ved sletting av meldinger fra søkemappe"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "Spør når e-postlister stikker av med private svar"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Prompt when replying privately to list messages"
 msgstr "Spør ved privat svar til meldinger fra e-postlister"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Prompt when replying to many recipients"
 msgstr "Spør ved svar til mange mottakere"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Prompt when user expunges"
 msgstr "Stopp og spør før tømming"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "Prompt when user only fills Bcc"
 msgstr "Stopp og spør når bare «Bcc» er utfylt"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Spør når bruker prøver å åpne 10 eller flere meldinger samtidig"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -11619,126 +11646,126 @@ msgstr ""
 "Spør når bruker prøver å sende HTML-meldinger til mottakere som ikke ønsker "
 "Ã¥ motta HTML-meldinger."
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Spør når bruker prøver å sende en melding uten Til- eller Cc-mottakere."
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Spør når bruker prøver å sende uønsket HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid "Prompt while marking multiple messages"
 msgstr "Spør ved merking av flere meldinger"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Put personalized signatures at the top of replies"
 msgstr "Plasser personlige signaturer på toppen av svar"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Put the cursor at the bottom of replies"
 msgstr "Plasser markør ved bunnen av svar"
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "Gjenkjenn smilefjes i tekst og erstatt dem med bilder."
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Recognize links in text and replace them."
 msgstr "Gjenkjenn lenker i tekst og erstatt dem."
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Run junk test on incoming mail."
 msgstr "Sjekk om innkommende e-post er uønsket."
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Save directory"
 msgstr "Lagre katalog"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Search for the sender photo in local address books"
 msgstr "Søk etter bilde av avsender i lokale adressebøker"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Send HTML mail by default"
 msgstr "Send HTML e-post som forvalg"
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Send HTML mail by default."
 msgstr "Send HTML e-post som forvalg."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Sender email-address column in the message list"
 msgstr "Kolonne for avsenders e-postadresse i meldingslisten"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Server synchronization interval"
 msgstr "Intervall for serversynkronisering"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "Vis «Bcc» feltet når meldinger sendes"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "Vis «Cc» feltet når meldinger sendes"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "Vis «Fra» feltet når du poster til en nyhetsgruppe"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr "Vis «Svar-til» feltet når du poster til en nyhetsgruppe"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "Vis «Svar-til» feltet når meldinger sendes"
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Show Animations"
 msgstr "Vis animasjoner"
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Show all message headers"
 msgstr "Vis alle meldingshoder"
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Show all the headers when viewing a messages."
 msgstr "Vis alle meldingshoder når en melding vises."
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Show animated images as animations."
 msgstr "Vis animerte bilder som animasjoner."
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Vis slettede meldinger i meldingslisten (gjennomstreket)."
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Show deleted messages in the message-list"
 msgstr "Vis slettede meldinger i meldingslisten"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Show image animations"
 msgstr "Vis bildeanimasjoner"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Show original \"Date\" header value."
 msgstr "Vis opprinnelig verdi for «Date»-meldingshode."
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Show photo of the sender"
 msgstr "Vis bilde av avsender"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -11746,7 +11773,7 @@ msgstr ""
 "Vis «Bcc»-feltet når en melding sendes. Dette kontrolleres fra «Vis»-menyen "
 "når en e-postkonto velges."
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -11754,7 +11781,7 @@ msgstr ""
 "Vis «Cc»-feltet når en melding sendes. Dette kontrolleres fra «Vis»-menyen "
 "når en e-postkonto velges."
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -11762,7 +11789,7 @@ msgstr ""
 "Vis «Fra»-feltet når en melding sendes til en nyhetsgruppe. Dette "
 "kontrolleres fra «Vis»-menyen når en e-postkonto velges."
 
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -11770,7 +11797,7 @@ msgstr ""
 "Vis «Svar-til»-feltet når en melding sendes til en nyhetsgruppe. Dette "
 "kontrolleres fra «Vis»-menyen når en e-postkonto velges."
 
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -11778,24 +11805,24 @@ msgstr ""
 "Vis «Svar-til»-feltet når en melding sendes. Dette kontrolleres fra «Vis»-"
 "menyen når en e-postkonto velges."
 
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr "Vis avsenders e-postadresse i en egen kolonne i meldingslisten."
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid ""
 "Show the original \"Date\" header (with a local time only if the time zone "
 "differs). Otherwise always show \"Date\" header value in a user preferred "
 "format and local time zone."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Vis bilde av avsender i meldingsområdet."
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid ""
 "Some mailing lists set a Reply-To: header to trick users into sending "
 "replies to the list, even when they ask Evolution to make a private reply. "
@@ -11806,47 +11833,39 @@ msgid ""
 "Post: header, if there is one."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Spell check inline"
 msgstr "Stavekontroll i meldingen"
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Spell checking color"
 msgstr "Farge for stavekontroll"
 
-#: ../mail/evolution-mail.schemas.in.h:176
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid "Spell checking languages"
 msgstr "Språk for stavekontroll"
 
-#: ../mail/evolution-mail.schemas.in.h:177
-msgid "Subscribe dialog default height"
-msgstr "Forvalgt høyde på abonneringsvinduet"
-
-#: ../mail/evolution-mail.schemas.in.h:178
-msgid "Subscribe dialog default width"
-msgstr "Forvalgt bredde på abonneringsvinduet"
-
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid "Terminal font"
 msgstr "Terminalskrift"
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:182
 msgid "The default plugin for Junk hook"
 msgstr "Forvalgt tillegg for uønsket e-post"
 
-#: ../mail/evolution-mail.schemas.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:183
 #, fuzzy
 msgid ""
 "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr "Sist gang mapper for uønsket e-post ble tømt i dager siden epoch."
 
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:184
 #, fuzzy
 msgid ""
 "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr "Sist gang papirkurven ble tømt i dager."
 
-#: ../mail/evolution-mail.schemas.in.h:183
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the message list. \"0\" (Classic View) places the preview pane below the "
@@ -11854,15 +11873,15 @@ msgid ""
 "message list."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:184
+#: ../mail/evolution-mail.schemas.in.h:186
 msgid "The terminal font for mail display."
 msgstr "Terminalskrift for meldingsvisning."
 
-#: ../mail/evolution-mail.schemas.in.h:185
+#: ../mail/evolution-mail.schemas.in.h:187
 msgid "The variable width font for mail display."
 msgstr "Skrift med variabel bredde for meldingsvisning."
 
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../mail/evolution-mail.schemas.in.h:188
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -11870,7 +11889,7 @@ msgstr ""
 "Denne har tre mulige verdier. «0» for feil. «1» for advarsler. «2» for "
 "feilsøkingsmeldinger."
 
-#: ../mail/evolution-mail.schemas.in.h:187
+#: ../mail/evolution-mail.schemas.in.h:189
 #, fuzzy
 msgid ""
 "This decides the max size of the message text that will be displayed under "
@@ -11880,7 +11899,7 @@ msgstr ""
 "Bestemmer maksimal størrelse for tekstdelen som kan formatteres i evolution. "
 "Forvalg er 4MB / 4096 KB og oppgis i KB."
 
-#: ../mail/evolution-mail.schemas.in.h:188
+#: ../mail/evolution-mail.schemas.in.h:190
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -11890,7 +11909,7 @@ msgstr ""
 "tillegg er aktivert. Hvis forvalgt tillegg deaktiveres vil ikke de andre "
 "brukes."
 
-#: ../mail/evolution-mail.schemas.in.h:189
+#: ../mail/evolution-mail.schemas.in.h:191
 msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
@@ -11899,7 +11918,7 @@ msgstr ""
 "Dette fjerner markering fra e-posten i listen og fjerner forhåndsvisning for "
 "den mappen."
 
-#: ../mail/evolution-mail.schemas.in.h:190
+#: ../mail/evolution-mail.schemas.in.h:192
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -11911,18 +11930,18 @@ msgstr ""
 "&lt;header enabled&gt; - sett «enabled» hvis toppteksten skal vises i e-"
 "postvisningen. "
 
-#: ../mail/evolution-mail.schemas.in.h:191
+#: ../mail/evolution-mail.schemas.in.h:193
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local address book only to exclude "
 "mail sent by known contacts from junk filtering."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:192
+#: ../mail/evolution-mail.schemas.in.h:194
 msgid "This option would help in improving the speed of fetching."
 msgstr "Dette valget vil øke hastigheten ved henting."
 
-#: ../mail/evolution-mail.schemas.in.h:193
+#: ../mail/evolution-mail.schemas.in.h:195
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -11930,7 +11949,7 @@ msgstr ""
 "Setter antall adresser som skal vises i forvalgt listevisning for meldinger. "
 "Etter dette vises «...»."
 
-#: ../mail/evolution-mail.schemas.in.h:194
+#: ../mail/evolution-mail.schemas.in.h:196
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -11938,7 +11957,7 @@ msgstr ""
 "Denne innstillingen spesifiserer om tråder skal være i utvidet eller "
 "sammenslått tilstand som forvalg. Evolution må startes på nytt."
 
-#: ../mail/evolution-mail.schemas.in.h:195
+#: ../mail/evolution-mail.schemas.in.h:197
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -11948,79 +11967,79 @@ msgstr ""
 "melding i hver tråd i stedet for meldingens dato. Evolution må startes på "
 "nytt."
 
-#: ../mail/evolution-mail.schemas.in.h:196
+#: ../mail/evolution-mail.schemas.in.h:198
 msgid "Thread the message-list based on Subject"
 msgstr "Lag tråder av e-postlisten basert på emne"
 
-#: ../mail/evolution-mail.schemas.in.h:197
+#: ../mail/evolution-mail.schemas.in.h:199
 msgid "Timeout for marking message as seen"
 msgstr "Tidsgrense for å merke e-post som sett"
 
-#: ../mail/evolution-mail.schemas.in.h:198
+#: ../mail/evolution-mail.schemas.in.h:200
 msgid "Timeout for marking message as seen."
 msgstr "Tidsavbrydd å merke e-poster som sett."
 
-#: ../mail/evolution-mail.schemas.in.h:199
+#: ../mail/evolution-mail.schemas.in.h:201
 msgid "UID string of the default account."
 msgstr "UID-streng for forvalgt konto."
 
-#: ../mail/evolution-mail.schemas.in.h:200
+#: ../mail/evolution-mail.schemas.in.h:202
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr "Farge for understreking av feilstavede ord ved bruk av stavekontroll."
 
-#: ../mail/evolution-mail.schemas.in.h:201
+#: ../mail/evolution-mail.schemas.in.h:203
 msgid "Use SpamAssassin daemon and client"
 msgstr "Bruk SpamAssassin tjener og klient"
 
-#: ../mail/evolution-mail.schemas.in.h:202
+#: ../mail/evolution-mail.schemas.in.h:204
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "Bruk SpamAssassin tjener og klient (spamd/spamc)."
 
-#: ../mail/evolution-mail.schemas.in.h:203
+#: ../mail/evolution-mail.schemas.in.h:205
 msgid "Use custom fonts"
 msgstr "Bruk egendefinerte skrifter"
 
-#: ../mail/evolution-mail.schemas.in.h:204
+#: ../mail/evolution-mail.schemas.in.h:206
 msgid "Use custom fonts for displaying mail."
 msgstr "Bruk tilpassede skrifttyper for e-postvisning."
 
-#: ../mail/evolution-mail.schemas.in.h:205
+#: ../mail/evolution-mail.schemas.in.h:207
 msgid "Use only local spam tests."
 msgstr "Bruk bare lokale tester for uønsket e-post."
 
-#: ../mail/evolution-mail.schemas.in.h:206
+#: ../mail/evolution-mail.schemas.in.h:208
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Bruk bare lokale tester for uønsket e-post (ingen DNS)."
 
-#: ../mail/evolution-mail.schemas.in.h:207
+#: ../mail/evolution-mail.schemas.in.h:209
 msgid ""
 "Users get all up in arms over where the cursor should go when replying to a "
 "message. This determines whether the cursor is placed at the top of the "
 "message or the bottom."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:208
+#: ../mail/evolution-mail.schemas.in.h:210
 msgid ""
 "Users get all up in arms over where their signature should go when replying "
 "to a message. This determines whether the signature is placed at the top of "
 "the message or the bottom."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:209
+#: ../mail/evolution-mail.schemas.in.h:211
 msgid "Variable width font"
 msgstr "Skrift for variabel bredde"
 
-#: ../mail/evolution-mail.schemas.in.h:210
+#: ../mail/evolution-mail.schemas.in.h:212
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr ""
 "Om en forespørsel om lesekvittering skal legges til alle meldinger som "
 "forvalg."
 
-#: ../mail/evolution-mail.schemas.in.h:211
+#: ../mail/evolution-mail.schemas.in.h:213
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr "Slå av eller på bruk av ellipse for mappenavn i sidelinjen."
 
-#: ../mail/evolution-mail.schemas.in.h:212
+#: ../mail/evolution-mail.schemas.in.h:214
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -12028,22 +12047,22 @@ msgstr ""
 "Om e-poster skal sorteres etter emner når de ikke inneholder «In-Reply-To» "
 "eller referansetopptekster."
 
-#: ../mail/evolution-mail.schemas.in.h:213
+#: ../mail/evolution-mail.schemas.in.h:215
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "Om tråder sorteres basert på siste melding i den tråden"
 
-#: ../mail/evolution-mail.schemas.in.h:214
+#: ../mail/evolution-mail.schemas.in.h:216
 msgid ""
 "Whether to flush Outbox after filtering is done. Outbox flush will happen "
 "only when there was used any 'Forward to' filter action and approximately "
 "one minute after the last action invocation."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:215
+#: ../mail/evolution-mail.schemas.in.h:217
 msgid "Width of the message-list pane"
 msgstr "Bredde på e-postlistefeltet"
 
-#: ../mail/evolution-mail.schemas.in.h:216
+#: ../mail/evolution-mail.schemas.in.h:218
 msgid "Width of the message-list pane."
 msgstr "Bredde på e-postlistefeltet."
 
@@ -12052,7 +12071,7 @@ msgid "Importing Elm data"
 msgstr "Importerer data fra Elm"
 
 #: ../mail/importers/elm-importer.c:325 ../mail/importers/pine-importer.c:400
-#: ../modules/mail/e-mail-shell-view.c:964
+#: ../modules/mail/e-mail-shell-view.c:1018
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
 #: ../widgets/misc/e-send-options.c:500
 msgid "Mail"
@@ -12073,31 +12092,31 @@ msgstr "_MÃ¥lmappe:"
 
 #: ../mail/importers/evolution-mbox-importer.c:122
 #: ../plugins/dbx-import/dbx-importer.c:232
-#: ../plugins/pst-import/pst-importer.c:300
+#: ../plugins/pst-import/pst-importer.c:302
 msgid "Select folder"
 msgstr "Velg mappe"
 
 #: ../mail/importers/evolution-mbox-importer.c:122
-#: ../plugins/pst-import/pst-importer.c:300
+#: ../plugins/pst-import/pst-importer.c:302
 msgid "Select folder to import into"
 msgstr "Velg mappe å importere til"
 
-#: ../mail/importers/evolution-mbox-importer.c:382
+#: ../mail/importers/evolution-mbox-importer.c:381
 msgctxt "mboxImp"
 msgid "Subject"
 msgstr "Emne"
 
-#: ../mail/importers/evolution-mbox-importer.c:387
+#: ../mail/importers/evolution-mbox-importer.c:386
 msgctxt "mboxImp"
 msgid "From"
 msgstr "Fra"
 
-#: ../mail/importers/evolution-mbox-importer.c:431
+#: ../mail/importers/evolution-mbox-importer.c:430
 #: ../shell/e-shell-utils.c:251
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley Mailbox (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:432
+#: ../mail/importers/evolution-mbox-importer.c:431
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importer mapper i Berkeley Mailbox format"
 
@@ -12106,15 +12125,15 @@ msgid "Importing mailbox"
 msgstr "Importerer postboks"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:150
+#: ../mail/importers/mail-importer.c:146
 #: ../plugins/dbx-import/dbx-importer.c:554
-#: ../plugins/pst-import/pst-importer.c:452
+#: ../plugins/pst-import/pst-importer.c:449
 #: ../plugins/pst-import/pst-importer.c:558
 #, c-format
 msgid "Importing '%s'"
 msgstr "Importerer «%s»"
 
-#: ../mail/importers/mail-importer.c:295
+#: ../mail/importers/mail-importer.c:289
 #, c-format
 msgid "Scanning %s"
 msgstr "Søker i %s"
@@ -12160,509 +12179,451 @@ msgstr "%s e-postliste"
 msgid "Add Filter Rule"
 msgstr "Legg til filterregel"
 
-#. Translators: The first %s is name of the affected filter rule(s),
-#. the second %s is uri of the removed 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:450
+#. Translators: The first %s is name of the affected
+#. * filter rule(s), the second %s is URI of the removed
+#. * 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:451
 #, c-format
 msgid ""
-"The filter rule \"%s\" has been updated, because it used just removed "
-"folder\n"
+"The filter rule \"%s\" has been modified to account for the deleted folder\n"
 "\"%s\"."
 msgid_plural ""
 "The following filter rules\n"
-"%s have been updated, because they used just removed folder\n"
+"%s have been modified to account for the deleted folder\n"
 "\"%s\"."
 msgstr[0] ""
-"Filterregel «%s» ble oppdatert fordi den brukte en mappe som ble fjernet\n"
+"Filterregel «%s» ble oppdatert for å ta høyde for slettet mappe\n"
 "«%s»."
 msgstr[1] ""
 "Følgende filterregler\n"
-"%s ble oppdatert fordi de brukte en mappe som ble fjernet\n"
+"%s ble oppdatert fordi de brukte en mappe som ble slettet\n"
 "«%s»."
 
-#. Translators: This is part of the line with 'Top Posting Option' text. See Edit|Preferences|Composer Preferences for the usage
-#: ../mail/mail-config.ui.h:2
-msgid "(Not Recommended)"
-msgstr "(Ikke anbefalt)"
-
-#: ../mail/mail-config.ui.h:3
-msgid "(Note: Requires restart of the application)"
-msgstr "(NB! Krever omstart av programmet)"
-
-#: ../mail/mail-config.ui.h:4
+#: ../mail/mail-config.ui.h:1
 msgid "Account Information"
 msgstr "Kontoinformasjon"
 
-#: ../mail/mail-config.ui.h:5
+#: ../mail/mail-config.ui.h:2
 msgid "Add Ne_w Signature..."
 msgstr "Legg til n_y signatur..."
 
-#: ../mail/mail-config.ui.h:6
+#: ../mail/mail-config.ui.h:3
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "All_tid signer utgående meldinger når denne kontoen brukes"
 
-#: ../mail/mail-config.ui.h:8
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:5
+msgid "Allowing a _mailing list to redirect a private reply to the list"
+msgstr "En e-postliste tillates å o_mdirigere private svar til listen"
+
+#: ../mail/mail-config.ui.h:6
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "Send krypterte me_ldinger til meg selv når kryptert e-post sendes"
 
-#: ../mail/mail-config.ui.h:9
+#: ../mail/mail-config.ui.h:7
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "All_tid _kopi (cc) til:"
 
-#: ../mail/mail-config.ui.h:10
+#: ../mail/mail-config.ui.h:8
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Alltid _blindkopi (bcc) til:"
 
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:9
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Alltid s_tol på nøkler i min nøkkelring ved kryptering"
 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:10
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Alltid krypter til _meg selv ved sending av krypterte meldinger"
 
-#: ../mail/mail-config.ui.h:13
+#: ../mail/mail-config.ui.h:11
 msgid "Always request rea_d receipt"
 msgstr "Allti_d be om lesekvittering"
 
-#: ../mail/mail-config.ui.h:14
+#: ../mail/mail-config.ui.h:12
 msgid "Apply the same _view settings to all folders"
 msgstr "Bruk samme _visningsinnstillinger for alle mapper"
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:14
 #: ../modules/addressbook/addressbook-config.c:1013
 msgid "Authentication"
 msgstr "Autentisering"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:15
 msgid "Automatically insert _emoticon images"
 msgstr "S_ett inn smilefjes automatisk"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:16
 msgid "C_haracter set:"
 msgstr "Te_gnsett:"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:17
 msgid "Ch_eck for Supported Types"
 msgstr "Sj_ekk støttede typer"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:18
 msgid "Check cu_stom headers for junk"
 msgstr "_Sjekk egendefinerte meldingshoder for uønsket e-post"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:19
 msgid "Check incoming _messages for junk"
 msgstr "Sjekk om innkommende _meldinger er uønsket"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:20
 msgid "Check spelling while I _type"
 msgstr "Sjekk s_taving mens jeg skriver"
 
-#: ../mail/mail-config.ui.h:23
-msgid "Checks incoming mail messages to be Junk"
-msgstr "Sjekker om innkommende e-post er uønsket"
-
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:21
 msgid "Cle_ar"
 msgstr "_Tøm"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:22
 msgid "Clea_r"
 msgstr "Tø_m"
 
-#: ../mail/mail-config.ui.h:26
+#: ../mail/mail-config.ui.h:23
 msgid "Color for _misspelled words:"
 msgstr "_Farge for feilstavede ord:"
 
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:24
 msgid "Composing Messages"
 msgstr "Skriver meldinger"
 
-#: ../mail/mail-config.ui.h:28 ../plugins/plugin-manager/plugin-manager.c:146
+#: ../mail/mail-config.ui.h:25
+#: ../modules/plugin-manager/evolution-plugin-manager.c:157
 msgid "Configuration"
 msgstr "Konfigurasjon"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:26
 msgid "Confirm _when expunging a folder"
 msgstr "_Bekreft ved tømming av en mappe"
 
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:27
+msgid "Confirmations"
+msgstr "Bekreftelser"
+
+#: ../mail/mail-config.ui.h:30
 msgid "Default Behavior"
 msgstr "Forvalgt oppførsel"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:31
 msgid "Default character e_ncoding:"
 msgstr "Forvalgt teg_nkoding:"
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:32
 msgid "Delete Mail"
 msgstr "Slett e-post"
 
-#: ../mail/mail-config.ui.h:36
+#: ../mail/mail-config.ui.h:33
 msgid "Delete junk messages on e_xit"
 msgstr "Slett uønsket e-post når programmet a_vsluttes"
 
-#: ../mail/mail-config.ui.h:38
+#: ../mail/mail-config.ui.h:35
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "Signer _utgående meldinger digitalt (som forvalg)"
 
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:36
 msgid "Displayed Message Headers"
 msgstr "Viste meldingshoder"
 
-#: ../mail/mail-config.ui.h:40
-msgid "Do not display messages when text si_ze exceeds"
-msgstr "Ikke vis meldinger når tekstst_ørrelsen overstiger"
-
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:37
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "Ikke mer_k meldinger som uønsket hvis avsender finnes i adresseboken"
 
-#: ../mail/mail-config.ui.h:42
+#: ../mail/mail-config.ui.h:38
 msgid "Do not quote"
 msgstr "Ikke siter"
 
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:39
 msgid "Drafts _Folder:"
 msgstr "Mappe _for skisser:"
 
-#: ../mail/mail-config.ui.h:44
+#: ../mail/mail-config.ui.h:40
 msgid "Email _Address:"
 msgstr "E-post_adresse:"
 
-#: ../mail/mail-config.ui.h:45
+#: ../mail/mail-config.ui.h:41
 msgid "Empty trash folders on e_xit"
 msgstr "_Tøm papirkurven når programmet avsluttes"
 
-#: ../mail/mail-config.ui.h:46
-msgid "Enable Magic S_pacebar"
-msgstr "Aktiver magi_sk mellomromtast"
-
-#: ../mail/mail-config.ui.h:47
-msgid "Enable Sea_rch Folders"
-msgstr "Aktiver søkemappe_r"
-
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:43
 msgid "Encry_ption certificate:"
 msgstr "Sertifikat for kry_ptering:"
 
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:44
 msgid "Encrypt out_going messages (by default)"
 msgstr "Krypter ut_gående meldinger (som forvalg)"
 
-#: ../mail/mail-config.ui.h:51
-msgid "Fi_xed-width:"
-msgstr "Fast _bredde:"
+#: ../mail/mail-config.ui.h:45
+msgid "F_all back to threading messages by subject"
+msgstr "F_all tilbake til tråding av meldinger etter emne"
 
-#: ../mail/mail-config.ui.h:52
-msgid "Fix_ed width Font:"
+#: ../mail/mail-config.ui.h:46
+msgid "Fix_ed Width Font:"
 msgstr "Skrift med fast br_edde:"
 
-#: ../mail/mail-config.ui.h:53
-msgid "Font Properties"
-msgstr "Egenskaper for skrift"
-
-#: ../mail/mail-config.ui.h:54
+#: ../mail/mail-config.ui.h:47
 msgid "Format messages in _HTML"
 msgstr "Formater meldinger med _HTML"
 
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:48
 msgid "Full Nam_e:"
 msgstr "_Fullt navn:"
 
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:50
 msgid "Group Reply goes only to mailing list, if possible"
 msgstr "Gruppesvar går kun til e-postliste hvis mulig"
 
-#: ../mail/mail-config.ui.h:58
+#: ../mail/mail-config.ui.h:51
 msgid "HTML Messages"
 msgstr "HTML-meldinger"
 
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:52
 msgid "H_TTP Proxy:"
 msgstr "H_TTP-proxy:"
 
-#: ../mail/mail-config.ui.h:60
+#: ../mail/mail-config.ui.h:53
 msgid "Headers"
 msgstr "Meldingshoder"
 
-#: ../mail/mail-config.ui.h:61
+#: ../mail/mail-config.ui.h:54
 msgid "Highlight _quotations with"
 msgstr "_Merk sitering med"
 
-#: ../mail/mail-config.ui.h:63
+#: ../mail/mail-config.ui.h:55
 msgid "Ignore Reply-To: for mailing lists"
 msgstr "Ignorer Reply-To: for e-postlister"
 
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.ui.h:56
 msgid "Inline"
 msgstr "I meldingen"
 
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:57
 msgid "Inline (Outlook style)"
 msgstr "I meldingen (som i Outlook)"
 
-#: ../mail/mail-config.ui.h:67
-msgid "KB"
-msgstr "KB"
-
-#: ../mail/mail-config.ui.h:68 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:59 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "Etiketter"
 
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:60
 msgid "Languages Table"
 msgstr "Språktabell"
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:61
 msgid "Loading Images"
 msgstr "Laster bilder"
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:62
 msgid "Mail Headers Table"
 msgstr "Tabell med meldingshoder"
 
-#: ../mail/mail-config.ui.h:72
+#: ../mail/mail-config.ui.h:63
 msgid "Mailbox location"
 msgstr "Plassering av postboks"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:64
 msgid "Message Display"
 msgstr "Meldingsvisning"
 
-#: ../mail/mail-config.ui.h:74
-msgid "Message Fonts"
-msgstr "Skrift for melding"
-
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:65
 msgid "Message Receipts"
 msgstr "Meldingsmottakere"
 
-#: ../mail/mail-config.ui.h:76
+#: ../mail/mail-config.ui.h:66
 msgid "No _Proxy for:"
 msgstr "Ingen _proxy for:"
 
-#: ../mail/mail-config.ui.h:78
-msgid ""
-"Note: you will not be prompted for a password until you connect for the "
-"first time"
-msgstr ""
-"Merk: du vil ikke bli spurt etter et passord før du kobler til første gang"
-
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:68
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr ""
 "Alternativet vil ignoreres hvis det finnes treff for egendefinerte "
 "meldingshoder for uønsket e-post."
 
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:69
 #: ../plugins/publish-calendar/publish-calendar.ui.h:10
 msgid "Optional Information"
 msgstr "Valgfri informasjon"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:71
 msgid "Or_ganization:"
 msgstr "Or_ganisasjon:"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:72
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG-nø_kkel ID:"
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:73
 msgid "Pass_word:"
 msgstr "Pass_ord:"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:75
 msgid "Port:"
 msgstr "Port:"
 
-#: ../mail/mail-config.ui.h:87
-msgid "Pr_ompt when sending messages with only Bcc recipients defined"
-msgstr "Spø_r ved sending av meldinger med kun Bcc-mottakere definert"
-
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:76
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: ../mail/mail-config.ui.h:90
-msgid "Printed Fonts"
-msgstr "Skrifter på utskrift"
-
-#: ../mail/mail-config.ui.h:91
-msgid "Prompt when mailing list redirects private reply back to list"
-msgstr "Spør når e-postlister omdirigerer private svar tilbake til listen"
-
-#: ../mail/mail-config.ui.h:92
-msgid "Prompt when sending private replies to mailing _list messages"
-msgstr "Spør når det sendes privat svar til meldinger fra e-post_lister"
-
-#: ../mail/mail-config.ui.h:93
-msgid "Prompt when sending replies to _many recipients"
-msgstr "Spø_r når det sendes svar til _mange mottakere"
-
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:78
 msgid "Proxy Settings"
 msgstr "Innstillinger for proxy"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:79
 msgid "Quoted"
 msgstr "Sitert"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:80
 msgid "Re_member password"
 msgstr "_Husk passord"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:81
 msgid "Re_ply-To:"
 msgstr "S_var-til:"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:82
 msgid "Remember _password"
 msgstr "Husk _passord"
 
-#: ../mail/mail-config.ui.h:100
+#: ../mail/mail-config.ui.h:83
+msgid "Replies and Forwards"
+msgstr "Svar og videresending"
+
+#: ../mail/mail-config.ui.h:84
 msgid "Required Information"
 msgstr "Nødvendig informasjon"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:85
 msgid "SHA1"
 msgstr "SHA1"
 
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:86
 msgid "SHA256"
 msgstr "SHA256"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:87
 msgid "SHA384"
 msgstr "SHA384"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:88
 msgid "SHA512"
 msgstr "SHA512"
 
-#: ../mail/mail-config.ui.h:106
+#: ../mail/mail-config.ui.h:90
 msgid "SSL is not supported in this build of Evolution"
 msgstr "SSL er ikke støttet i denne versjonen av Evolution  "
 
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:91
 msgid "S_earch for sender photograph only in local address books"
 msgstr "Kun søk etter bilde av avs_ender i lokale adressebøker"
 
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:92
 msgid "S_elect..."
 msgstr "V_elg..."
 
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:93
 msgid "S_end message receipts:"
 msgstr "Send kvittering for m_eldinger:"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:94
 msgid "S_tandard Font:"
 msgstr "Forvalg_t skrift:"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:95
 msgid "Secure MIME (S/MIME)"
 msgstr "Sikker MIME (S/MIME)"
 
-#: ../mail/mail-config.ui.h:113
-msgid "Select Drafts Folder"
-msgstr "Velg mappe for skisser"
-
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:97
 msgid "Select HTML fixed width font"
 msgstr "Velg skrift med fast bredde for HTML"
 
-#: ../mail/mail-config.ui.h:115
-msgid "Select HTML fixed width font for printing"
-msgstr "Velg skrift med fast bredde for bruk ved utskrift av HTML"
-
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:98
 msgid "Select HTML variable width font"
 msgstr "Velg skrift med variabel bredde for HTML"
 
-#: ../mail/mail-config.ui.h:117
-msgid "Select HTML variable width font for printing"
-msgstr "Velg skrift med variabel bredde for bruk ved utskrift av HTML"
-
-#: ../mail/mail-config.ui.h:118
-msgid "Select Junk Folder"
-msgstr "Velg mappe for uønsket e-post"
+#: ../mail/mail-config.ui.h:99
+msgid "Sender Photograph"
+msgstr "Bilde av avsender"
 
-#: ../mail/mail-config.ui.h:119
-msgid "Select Sent Folder"
-msgstr "Velg mappe for sendte meldinger"
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:101
+msgid "Sending a _private reply to a mailing list message"
+msgstr "Ved sending av _privat svar til meldinger fra e-postlister"
 
-#: ../mail/mail-config.ui.h:120
-msgid "Select Trash Folder"
-msgstr "Velg mappe for papirkurv"
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:103
+msgid "Sending a message with an _empty subject line"
+msgstr "Ved sending av en melding med tomt _emnefelt"
 
-#: ../mail/mail-config.ui.h:121
-msgid "Sender Photograph"
-msgstr "Bilde av avsender"
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:105
+msgid "Sending a message with only _Bcc recipients defined"
+msgstr "Ved sending av en melding med kun _Bcc-mottakere definert"
 
-#: ../mail/mail-config.ui.h:122
-msgid "Sending Mail"
-msgstr "Utgående e-post"
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:107
+msgid "Sending a reply to a large _number of recipients"
+msgstr "Ved sending av svar til et stort a_ntall mottakere"
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:108
 msgid "Sent _Messages Folder:"
 msgstr "Mappe for sendte _meldinger:"
 
-#: ../mail/mail-config.ui.h:124
-msgid "Sent and Draft Messages"
-msgstr "Sendte meldinger og skisser"
-
-#: ../mail/mail-config.ui.h:125
+#: ../mail/mail-config.ui.h:109
 msgid "Ser_ver requires authentication"
 msgstr "Tjener kre_ver autentisering"
 
-#: ../mail/mail-config.ui.h:126
+#: ../mail/mail-config.ui.h:110
 msgid "Server Configuration"
 msgstr "Tjenerkonfigurasjon"
 
-#: ../mail/mail-config.ui.h:127
+#: ../mail/mail-config.ui.h:111
 msgid "Server _Type:"
 msgstr "Tjener_type:"
 
-#: ../mail/mail-config.ui.h:128
+#: ../mail/mail-config.ui.h:112
 msgid "Si_gning algorithm:"
 msgstr "Si_gneringsalgoritme:"
 
-#: ../mail/mail-config.ui.h:129
+#: ../mail/mail-config.ui.h:113
 msgid "Sig_natures"
 msgstr "Sig_naturer"
 
-#: ../mail/mail-config.ui.h:130
+#: ../mail/mail-config.ui.h:114
 msgid "Sig_ning certificate:"
 msgstr "Sertifikat for sig_nering:"
 
-#: ../mail/mail-config.ui.h:131
+#: ../mail/mail-config.ui.h:115
 msgid "Signat_ure:"
 msgstr "Signat_ur:"
 
-#: ../mail/mail-config.ui.h:132
+#: ../mail/mail-config.ui.h:116
 msgid "Signatures"
 msgstr "Signaturer"
 
-#: ../mail/mail-config.ui.h:133
+#: ../mail/mail-config.ui.h:117
 msgid "Signing _algorithm:"
 msgstr "Signerings_algoritme:"
 
-#: ../mail/mail-config.ui.h:134
+#: ../mail/mail-config.ui.h:118
+msgid "Special Folders"
+msgstr "Spesielle mapper"
+
+#: ../mail/mail-config.ui.h:119
 msgid "Spell Checking"
 msgstr "Stavekontroll"
 
-#: ../mail/mail-config.ui.h:135
+#: ../mail/mail-config.ui.h:120
 msgid "Start _typing at the bottom on replying"
 msgstr "S_tart skriving under meldingen ved svar"
 
-#: ../mail/mail-config.ui.h:137
+#: ../mail/mail-config.ui.h:122
 msgid "T_ype:"
 msgstr "T_ype:"
 
-#: ../mail/mail-config.ui.h:138
+#: ../mail/mail-config.ui.h:123
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -12670,7 +12631,7 @@ msgstr ""
 "Språklisten som vises her reflekterer kun de språkene du har installert en "
 "ordbok for."
 
-#: ../mail/mail-config.ui.h:139
+#: ../mail/mail-config.ui.h:124
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12680,12 +12641,13 @@ msgstr ""
 "signatur. Navnet du oppgir vil kun brukes\n"
 "for visning på skjermen."
 
-#. Translators: Section name for options related to Top Posting. See Edit|Preferences|Composer Preferences for better understanding
-#: ../mail/mail-config.ui.h:143
-msgid "Top Posting Option"
-msgstr "Alternativ for «topp-posting»"
+#: ../mail/mail-config.ui.h:127
+msgid ""
+"To help avoid email accidents and embarrassments, ask for confirmation "
+"before taking the following checkmarked actions:"
+msgstr "Spør om bekreftelse før utføring av følgende avkryssede handlinger for å hjelpe med å unngå uhell og flauser med e-post:"
 
-#: ../mail/mail-config.ui.h:144
+#: ../mail/mail-config.ui.h:128
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12693,166 +12655,141 @@ msgstr ""
 "Skriv navnet du vil referere til denne kontoen.\n"
 "For eksempel «Arbeid» eller «Personlig»"
 
-#: ../mail/mail-config.ui.h:146
+#: ../mail/mail-config.ui.h:130
 msgid "Us_ername:"
 msgstr "Bruk_ernavn:"
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:131
 msgid "Use Authe_ntication"
 msgstr "Bruk aute_ntisering"
 
-#: ../mail/mail-config.ui.h:148 ../plugins/caldav/caldav-source.c:225
-#: ../plugins/google-account-setup/google-contacts-source.c:286
-#: ../plugins/google-account-setup/google-source.c:623
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:260
-msgid "User_name:"
+#: ../mail/mail-config.ui.h:132
+msgid "User _Name:"
 msgstr "Bruker_navn:"
 
-#: ../mail/mail-config.ui.h:149
-msgid "V_ariable-width:"
-msgstr "V_ariabel bredde:"
-
-#: ../mail/mail-config.ui.h:150
+#: ../mail/mail-config.ui.h:133
 msgid "_Add Signature"
 msgstr "_Legg til signatur"
 
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:134
 msgid "_Always load images from the Internet"
 msgstr "_Alltid last bilder fra Internett"
 
-#: ../mail/mail-config.ui.h:152
+#: ../mail/mail-config.ui.h:135
 msgid "_Authentication Type"
 msgstr "_Autentiseringstype"
 
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:136
 msgid "_Default junk plugin:"
 msgstr "_Forvalgt tillegg for uønsket e-post:"
 
-#: ../mail/mail-config.ui.h:154
+#: ../mail/mail-config.ui.h:137
 msgid "_Direct connection to the Internet"
 msgstr "_Direkte tilkobling til internett"
 
-#: ../mail/mail-config.ui.h:155
+#: ../mail/mail-config.ui.h:138
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "Ikke signer _møteforespørsler (for kompatibilitet med Outlook)"
 
-#: ../mail/mail-config.ui.h:156
+#: ../mail/mail-config.ui.h:139
 msgid "_Forward style:"
 msgstr "_Videresendingsstil:"
 
-#: ../mail/mail-config.ui.h:157
+#: ../mail/mail-config.ui.h:140
 msgid "_Junk Folder:"
 msgstr "Mappe for _uønsket e-post:"
 
-#: ../mail/mail-config.ui.h:158
-msgid "_Keep Signature above the original message on replying"
-msgstr "_Behold signaturen over opprinnelig melding ved svar"
+#: ../mail/mail-config.ui.h:141
+msgid "_Keep signature above the original message on replying"
+msgstr "_Plasser signaturen over opprinnelig melding ved svar"
 
-#: ../mail/mail-config.ui.h:159
+#: ../mail/mail-config.ui.h:142
 msgid "_Languages"
 msgstr "_Språk"
 
-#: ../mail/mail-config.ui.h:160
-msgid "_Load images in messages from contacts"
-msgstr "_Last bilder i meldinger fra kontakter"
+#: ../mail/mail-config.ui.h:143
+msgid "_Load images only in messages from contacts"
+msgstr "_Last kun bilder i meldinger fra kontakter"
 
-#: ../mail/mail-config.ui.h:161
+#: ../mail/mail-config.ui.h:144
 msgid "_Lookup in local address book only"
 msgstr "S_lå kun opp i lokale adressebokmapper"
 
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:145
 msgid "_Make this my default account"
 msgstr "_Bruk denne som forvalgt konto"
 
-#: ../mail/mail-config.ui.h:163
+#: ../mail/mail-config.ui.h:146
 msgid "_Manual proxy configuration:"
 msgstr "_Manuell konfigurasjon av proxy:"
 
-#: ../mail/mail-config.ui.h:164
-msgid "_Mark messages as read after"
-msgstr "_Merk meldinger som lest etter"
-
-#: ../mail/mail-config.ui.h:166
+#: ../mail/mail-config.ui.h:148
 msgid "_Never load images from the Internet"
 msgstr "Aldri last bilder fra Internett"
 
-#: ../mail/mail-config.ui.h:167
+#: ../mail/mail-config.ui.h:149
 msgid "_Path:"
 msgstr "S_ti:"
 
-#: ../mail/mail-config.ui.h:168
+#: ../mail/mail-config.ui.h:150
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "S_pør ved sending av HTML-meldinger til kontakter som ikke ønsker dem"
 
-#: ../mail/mail-config.ui.h:169
-msgid "_Prompt when sending messages with an empty subject line"
-msgstr "S_pør ved sending av meldinger med tomt emnefelt"
-
-#: ../mail/mail-config.ui.h:170
+#: ../mail/mail-config.ui.h:151
 msgid "_Reply style:"
 msgstr "Sva_rstil:"
 
-#: ../mail/mail-config.ui.h:171
+#: ../mail/mail-config.ui.h:152
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: ../mail/mail-config.ui.h:172
+#: ../mail/mail-config.ui.h:153
 msgid "_Secure HTTP Proxy:"
 msgstr "_Sikker HTTP-proxy:"
 
-#: ../mail/mail-config.ui.h:174 ../modules/addressbook/ldap-config.ui.h:29
+#: ../mail/mail-config.ui.h:155 ../modules/addressbook/ldap-config.ui.h:29
 #: ../plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "_Server:"
 msgstr "Tj_ener:"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:176
-msgid "_Show image animations"
-msgstr "Vi_s animasjoner"
+#: ../mail/mail-config.ui.h:157
+msgid "_Show animated images"
+msgstr "Vi_s animerte bilder"
 
-#: ../mail/mail-config.ui.h:177
+#: ../mail/mail-config.ui.h:158
 msgid "_Show the photograph of sender in the message preview"
 msgstr "Vi_s bilde av avsender i forhåndsvisning av meldingen"
 
-#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
-#: ../mail/mail-config.ui.h:179
-msgid "_Shrink To / Cc / Bcc headers to "
-msgstr "_Slå sammen Til/Cc/Bcc-hoder til "
-
-#: ../mail/mail-config.ui.h:180
+#: ../mail/mail-config.ui.h:159
 msgid "_Trash Folder:"
 msgstr "Mappe for _papirkurv:"
 
-#: ../mail/mail-config.ui.h:181
+#: ../mail/mail-config.ui.h:160
 msgid "_Use Secure Connection:"
 msgstr "Br_uk sikker forbindelse:"
 
-#: ../mail/mail-config.ui.h:182
+#: ../mail/mail-config.ui.h:161
 msgid "_Use system defaults"
 msgstr "Br_uk systemets forvalg"
 
-#: ../mail/mail-config.ui.h:183
+#: ../mail/mail-config.ui.h:162
 msgid "_Use the same fonts as other applications"
 msgstr "Br_uk samme skrifter som andre programmer"
 
-#: ../mail/mail-config.ui.h:184 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/mail-config.ui.h:163 ../smime/gui/smime-ui.ui.h:48
 msgid "a"
 msgstr "a"
 
-#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
-#: ../mail/mail-config.ui.h:186
-msgid "addresses"
-msgstr "adresser"
-
-#: ../mail/mail-config.ui.h:187 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:164 ../smime/gui/smime-ui.ui.h:49
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:188
+#: ../mail/mail-config.ui.h:165
 msgid "color"
 msgstr "farge"
 
-#: ../mail/mail-config.ui.h:189
+#: ../mail/mail-config.ui.h:166
 msgid "description"
 msgstr "beskrivelse"
 
@@ -12877,78 +12814,58 @@ msgid "Co_mpleted"
 msgstr "Fu_llført"
 
 #: ../mail/mail-dialogs.ui.h:6
-msgid "Collapse _all"
-msgstr "Slå sammen _alle"
-
-#: ../mail/mail-dialogs.ui.h:7
 msgid "Digital Signature"
 msgstr "Digital signatur"
 
-#: ../mail/mail-dialogs.ui.h:8
+#: ../mail/mail-dialogs.ui.h:7
 msgid "Do Not Forward"
 msgstr "Ikke videresend"
 
-#: ../mail/mail-dialogs.ui.h:9
-msgid "E_xpand all"
-msgstr "Ut_vid alle"
-
-#: ../mail/mail-dialogs.ui.h:10
+#: ../mail/mail-dialogs.ui.h:8
 msgid "Encryption"
 msgstr "Kryptering"
 
-#: ../mail/mail-dialogs.ui.h:11
-msgid "Folder Subscriptions"
-msgstr "Abonnement på mapper"
-
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:9
 msgid "Follow-Up"
 msgstr "Følg opp"
 
-#: ../mail/mail-dialogs.ui.h:13
+#: ../mail/mail-dialogs.ui.h:10
 msgid "For Your Information"
 msgstr "Til din informasjon"
 
-#: ../mail/mail-dialogs.ui.h:14
+#: ../mail/mail-dialogs.ui.h:11
 msgid "Forward"
 msgstr "Videresend"
 
-#: ../mail/mail-dialogs.ui.h:15
+#: ../mail/mail-dialogs.ui.h:12
 msgid "License Agreement"
 msgstr "Lisensavtale"
 
-#: ../mail/mail-dialogs.ui.h:16
+#: ../mail/mail-dialogs.ui.h:13
 msgid "No Response Necessary"
 msgstr "Ingen respons nødvendig"
 
-#: ../mail/mail-dialogs.ui.h:20
+#: ../mail/mail-dialogs.ui.h:17
 msgid "Reply to All"
 msgstr "Svar til alle"
 
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:18
 msgid "Review"
 msgstr "Gjennomgå"
 
-#: ../mail/mail-dialogs.ui.h:22
-msgid "S_erver:"
-msgstr "Tj_ener:"
-
-#: ../mail/mail-dialogs.ui.h:23
-msgid "S_how only items containing:"
-msgstr "V_is kun oppføringer som inneholder:"
-
-#: ../mail/mail-dialogs.ui.h:24
+#: ../mail/mail-dialogs.ui.h:19
 msgid "Search Folder Sources"
 msgstr "Kilder for søkemapper"
 
-#: ../mail/mail-dialogs.ui.h:25
+#: ../mail/mail-dialogs.ui.h:20
 msgid "Security Information"
 msgstr "Sikkerhetsinformasjon"
 
-#: ../mail/mail-dialogs.ui.h:26
+#: ../mail/mail-dialogs.ui.h:21
 msgid "Specific folders"
 msgstr "Spesifikke mapper"
 
-#: ../mail/mail-dialogs.ui.h:27
+#: ../mail/mail-dialogs.ui.h:22
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -12956,23 +12873,23 @@ msgstr ""
 "Meldingene du har valgt for oppfølging er listet under.\n"
 "Vennligst velg en handling for oppfølging fra menyen «Flagg»."
 
-#: ../mail/mail-dialogs.ui.h:29
+#: ../mail/mail-dialogs.ui.h:24
 msgid "_Accept License"
 msgstr "Godt_a lisensen"
 
-#: ../mail/mail-dialogs.ui.h:30
+#: ../mail/mail-dialogs.ui.h:25
 msgid "_Due By:"
 msgstr "_Ferdig til:"
 
-#: ../mail/mail-dialogs.ui.h:31
+#: ../mail/mail-dialogs.ui.h:26
 msgid "_Flag:"
 msgstr "_Flagg:"
 
-#: ../mail/mail-dialogs.ui.h:32
+#: ../mail/mail-dialogs.ui.h:27
 msgid "_Tick this to accept the license agreement"
 msgstr "_Kryss av her for å godta lisensen"
 
-#: ../mail/mail-folder-cache.c:783
+#: ../mail/mail-folder-cache.c:792
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinger %s"
@@ -12981,16 +12898,16 @@ msgstr "Pinger %s"
 msgid "Filtering Selected Messages"
 msgstr "Filtrerer valgte meldinger"
 
-#: ../mail/mail-ops.c:245
+#: ../mail/mail-ops.c:229
 msgid "Fetching Mail"
 msgstr "Henter e-post"
 
-#: ../mail/mail-ops.c:592
+#: ../mail/mail-ops.c:586
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Feil under påføring av utgående filtre: %s"
 
-#: ../mail/mail-ops.c:608 ../mail/mail-ops.c:635
+#: ../mail/mail-ops.c:602 ../mail/mail-ops.c:633
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -12999,163 +12916,146 @@ msgstr ""
 "Kunne ikke legge til i %s: %s\n"
 "Legger til i lokal «Sendt»-mappe i stedet."
 
-#: ../mail/mail-ops.c:654
+#: ../mail/mail-ops.c:653
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "Kunne ikke legge til i lokal Sendt-mappe: %s"
 
-#: ../mail/mail-ops.c:774 ../mail/mail-ops.c:866
+#: ../mail/mail-ops.c:769 ../mail/mail-ops.c:862
 msgid "Sending message"
 msgstr "Sender melding"
 
-#: ../mail/mail-ops.c:782
+#: ../mail/mail-ops.c:780
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sender melding %d av %d"
 
-#: ../mail/mail-ops.c:826
+#: ../mail/mail-ops.c:827
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Feil under sending av %d av %d meldinger"
 
-#: ../mail/mail-ops.c:828 ../mail/mail-send-recv.c:783
+#: ../mail/mail-ops.c:829 ../mail/mail-send-recv.c:782
 msgid "Canceled."
 msgstr "Avbrutt."
 
-#: ../mail/mail-ops.c:830 ../mail/mail-send-recv.c:785
+#: ../mail/mail-ops.c:831 ../mail/mail-send-recv.c:784
 msgid "Complete."
 msgstr "Fullført."
 
-#: ../mail/mail-ops.c:938
+#: ../mail/mail-ops.c:936
 #, c-format
 msgid "Saving message to folder '%s'"
 msgstr "Lagrer melding til mappe «%s»"
 
-#: ../mail/mail-ops.c:1018
+#: ../mail/mail-ops.c:1021
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Flytter meldinger til «%s»"
 
-#: ../mail/mail-ops.c:1018
+#: ../mail/mail-ops.c:1021
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Kopierer meldinger til «%s»"
 
-#: ../mail/mail-ops.c:1127
+#: ../mail/mail-ops.c:1137
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "Skanner mapper i «%s»"
 
-#: ../mail/mail-ops.c:1235
+#: ../mail/mail-ops.c:1249
 msgid "Forwarded messages"
 msgstr "Videresendte meldinger"
 
-#: ../mail/mail-ops.c:1276
+#: ../mail/mail-ops.c:1290
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "�pner mappe «%s»"
 
-#: ../mail/mail-ops.c:1342
+#: ../mail/mail-ops.c:1357
 #, c-format
 msgid "Retrieving quota information for folder '%s'"
 msgstr "Henter kvoteinformasjon for mappe «%s»"
 
-#: ../mail/mail-ops.c:1414
+#: ../mail/mail-ops.c:1429
 #, c-format
 msgid "Opening store '%s'"
 msgstr "�pner lager «%s»"
 
-#: ../mail/mail-ops.c:1485
+#: ../mail/mail-ops.c:1502
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "Fjerner mappe «%s»"
 
-#: ../mail/mail-ops.c:1609
+#: ../mail/mail-ops.c:1639
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Lagrer mappe «%s»"
 
-#: ../mail/mail-ops.c:1672
+#: ../mail/mail-ops.c:1703
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Tømmer og lagrer konto «%s»"
 
-#: ../mail/mail-ops.c:1673
+#: ../mail/mail-ops.c:1704
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Lagrer konto «%s»"
 
-#: ../mail/mail-ops.c:1727
+#: ../mail/mail-ops.c:1760
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "Oppdaterer mappe «%s»"
 
-#: ../mail/mail-ops.c:1767
+#: ../mail/mail-ops.c:1798
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "Tømmer mappe «%s»"
 
-#: ../mail/mail-ops.c:1812
+#: ../mail/mail-ops.c:1844
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Tømmer søppel i «%s»"
 
-#: ../mail/mail-ops.c:1813
+#: ../mail/mail-ops.c:1845
 msgid "Local Folders"
 msgstr "Lokale mapper"
 
-#: ../mail/mail-ops.c:2016
+#: ../mail/mail-ops.c:2060
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Henter %d melding"
 msgstr[1] "Henter %d melding(er)"
 
-#: ../mail/mail-ops.c:2105
+#: ../mail/mail-ops.c:2152
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "Lagrer %d melding"
 msgstr[1] "Lagrer %d meldinger"
 
-#: ../mail/mail-ops.c:2192
+#: ../mail/mail-ops.c:2248
 #, c-format
 msgid "Error saving messages to: %s:\n"
 msgstr "Feil under lagring av av meldinger til: %s:\n"
 
-#: ../mail/mail-ops.c:2265
-msgid "Saving attachment"
-msgstr "Lagrer vedlegg"
-
-#: ../mail/mail-ops.c:2285 ../mail/mail-ops.c:2295
-#, c-format
-msgid ""
-"Cannot create output file: %s:\n"
-" %s"
-msgstr ""
-"Kunne ikke opprette utdatafil: %s\n"
-" %s"
-
-#: ../mail/mail-ops.c:2310
-msgid "Could not write data: "
-msgstr "Kan ikke skrive data:"
-
-#: ../mail/mail-ops.c:2454
+#: ../mail/mail-ops.c:2400
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "Kobler fra «%s»"
 
-#: ../mail/mail-ops.c:2454
+#: ../mail/mail-ops.c:2400
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "Kobler til «%s» på nytt"
 
-#: ../mail/mail-ops.c:2550
+#: ../mail/mail-ops.c:2494
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Forbereder konto «%s» for frakoblet bruk"
 
-#: ../mail/mail-ops.c:2636
+#: ../mail/mail-ops.c:2582
 msgid "Checking Service"
 msgstr "Sjekker tjeneste"
 
@@ -13163,19 +13063,19 @@ msgstr "Sjekker tjeneste"
 msgid "Canceling..."
 msgstr "Avbryter..."
 
-#: ../mail/mail-send-recv.c:440
+#: ../mail/mail-send-recv.c:431
 msgid "Send & Receive Mail"
 msgstr "Send & motta e-post"
 
-#: ../mail/mail-send-recv.c:457
+#: ../mail/mail-send-recv.c:448
 msgid "Cancel _All"
 msgstr "Avbryt _alle"
 
-#: ../mail/mail-send-recv.c:569
+#: ../mail/mail-send-recv.c:564
 msgid "Updating..."
 msgstr "Oppdaterer..."
 
-#: ../mail/mail-send-recv.c:569 ../mail/mail-send-recv.c:649
+#: ../mail/mail-send-recv.c:564 ../mail/mail-send-recv.c:648
 msgid "Waiting..."
 msgstr "Venter..."
 
@@ -13184,60 +13084,60 @@ msgstr "Venter..."
 msgid "Checking for new mail"
 msgstr "Ser etter nye meldinger"
 
-#: ../mail/mail-session.c:225
+#: ../mail/mail-session.c:218
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Skriv inn passord for %s"
 
-#: ../mail/mail-session.c:227
+#: ../mail/mail-session.c:220
 msgid "Enter Passphrase"
 msgstr "Skriv inn passord"
 
-#: ../mail/mail-session.c:230
+#: ../mail/mail-session.c:223
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Skriv inn passord for %s"
 
-#: ../mail/mail-session.c:232
+#: ../mail/mail-session.c:225
 msgid "Enter Password"
 msgstr "Skriv inn passord"
 
-#: ../mail/mail-session.c:277
+#: ../mail/mail-session.c:270
 #, c-format
 msgid "User canceled operation."
 msgstr "Operasjon avbrutt av bruker."
 
-#: ../mail/mail-session.c:724
+#: ../mail/mail-session.c:704
 #, 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/mail-session.c:733
+#: ../mail/mail-session.c:713
 #, 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/mail-tools.c:128
+#: ../mail/mail-tools.c:132
 #, c-format
 msgid "Could not create spool directory '%s': %s"
 msgstr "Kan ikke opprette spool-katalog «%s»: %s"
 
-#: ../mail/mail-tools.c:161
+#: ../mail/mail-tools.c:165
 #, c-format
 msgid "Trying to movemail a non-mbox source '%s'"
 msgstr "Prøver å bruke movemail på en kilde, «%s», som ikke er i mbox-format"
 
-#: ../mail/mail-tools.c:273
+#: ../mail/mail-tools.c:277
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Videresendt melding - %s"
 
-#: ../mail/mail-tools.c:275
+#: ../mail/mail-tools.c:279
 msgid "Forwarded message"
 msgstr "Videresendt melding"
 
-#: ../mail/mail-tools.c:318
+#: ../mail/mail-tools.c:325
 #, c-format
 msgid "Invalid folder: '%s'"
 msgstr "Ugyldig mappe: «%s»"
@@ -13247,42 +13147,44 @@ msgstr "Ugyldig mappe: «%s»"
 msgid "Setting up Search Folder: %s"
 msgstr "Setter opp søkemappe: %s"
 
-#: ../mail/mail-vfolder.c:224
+#: ../mail/mail-vfolder.c:225
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "Oppdaterer søkemapper for «%s:%s»"
 
-#: ../mail/mail-vfolder.c:231
+#: ../mail/mail-vfolder.c:232
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "Oppdaterer søkemapper for «%s»"
 
-#. Translators: The first %s is name of the affected search folder(s),
-#. the second %s is uri of the 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:674
+#. Translators: The first %s is name of the affected
+#. * search folder(s), the second %s is the URI of the
+#. * 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:678
 #, c-format
 msgid ""
-"The Search Folder \"%s\" has been updated, because it used just removed "
+"The Search Folder \"%s\" has been modified to account for the deleted "
 "folder\n"
 "\"%s\"."
 msgid_plural ""
 "The following Search Folders\n"
-"%s have been updated, because they used just removed folder\n"
+"%s have been modified to account for the deleted folder\n"
 "\"%s\"."
 msgstr[0] ""
-"Søkemappe «%s» ble oppdatert fordi den bruke en mappe som er fjernet"
+"Søkemappe «%s» ble oppdatert for å ta høyde for slettet mappe\n"
+"«%s»."
 msgstr[1] ""
 "Følgende søkemapper\n"
-"%s ble oppdatert fordi de brukte en mappe som ble fjernet\n"
+"%s ble oppdatert fordi de brukte en mappe som ble slettet\n"
 "«%s»."
 
-#: ../mail/mail-vfolder.c:1182
+#: ../mail/mail-vfolder.c:1198
 msgid "Edit Search Folder"
 msgstr "Rediger søkemappe"
 
-#: ../mail/mail-vfolder.c:1287
+#: ../mail/mail-vfolder.c:1303
 msgid "New Search Folder"
 msgstr "Ny søkemappe"
 
@@ -13906,7 +13808,7 @@ msgid "_Discard changes"
 msgstr "_Forkast endringene"
 
 #: ../mail/mail.error.xml.h:137
-#: ../modules/mail/e-mail-shell-view-actions.c:887
+#: ../modules/mail/e-mail-shell-view-actions.c:899
 msgid "_Empty Trash"
 msgstr "_Tøm papirkurven"
 
@@ -13926,82 +13828,82 @@ msgstr "_Send kvittering"
 msgid "_Synchronize"
 msgstr "_Synkroniser"
 
-#: ../mail/message-list.c:1170
+#: ../mail/message-list.c:1175
 msgid "Unseen"
 msgstr "Ulest"
 
-#: ../mail/message-list.c:1171
+#: ../mail/message-list.c:1176
 msgid "Seen"
 msgstr "Lest"
 
-#: ../mail/message-list.c:1172
+#: ../mail/message-list.c:1177
 msgid "Answered"
 msgstr "Besvart"
 
-#: ../mail/message-list.c:1173
+#: ../mail/message-list.c:1178
 msgid "Forwarded"
 msgstr "Videresendt"
 
-#: ../mail/message-list.c:1174
+#: ../mail/message-list.c:1179
 msgid "Multiple Unseen Messages"
 msgstr "Flere uleste meldinger"
 
-#: ../mail/message-list.c:1175
+#: ../mail/message-list.c:1180
 msgid "Multiple Messages"
 msgstr "Flere meldinger"
 
-#: ../mail/message-list.c:1179
+#: ../mail/message-list.c:1184
 msgid "Lowest"
 msgstr "Lavest"
 
-#: ../mail/message-list.c:1180
+#: ../mail/message-list.c:1185
 msgid "Lower"
 msgstr "Lavere"
 
-#: ../mail/message-list.c:1184
+#: ../mail/message-list.c:1189
 msgid "Higher"
 msgstr "Høyere"
 
-#: ../mail/message-list.c:1185
+#: ../mail/message-list.c:1190
 msgid "Highest"
 msgstr "Høyest"
 
-#: ../mail/message-list.c:1795 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1800 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1802 ../plugins/itip-formatter/itip-view.c:205
+#: ../mail/message-list.c:1807 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "I dag %l:%M %p"
 
-#: ../mail/message-list.c:1811
+#: ../mail/message-list.c:1816
 msgid "Yesterday %l:%M %p"
 msgstr "I går %l:%M %p"
 
-#: ../mail/message-list.c:1823
+#: ../mail/message-list.c:1828
 msgid "%a %l:%M %p"
 msgstr "%a %H.%M"
 
-#: ../mail/message-list.c:1831
+#: ../mail/message-list.c:1836
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H.%M"
 
-#: ../mail/message-list.c:1833
+#: ../mail/message-list.c:1838
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../mail/message-list.c:2598
+#: ../mail/message-list.c:2599
 msgid "Select all visible messages"
 msgstr "Velg alle synlige meldinger"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4412 ../mail/message-list.c:4820
+#: ../mail/message-list.c:4410 ../mail/message-list.c:4819
 msgid "Generating message list"
 msgstr "Genererer meldingsliste"
 
-#: ../mail/message-list.c:4643
+#: ../mail/message-list.c:4641
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -14009,7 +13911,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:4645
+#: ../mail/message-list.c:4643
 msgid "There are no messages in this folder."
 msgstr "Det er ingen meldinger i denne mappen."
 
@@ -14047,27 +13949,27 @@ msgid "Subject - Trimmed"
 msgstr "Forkortet emne"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1278
+#: ../modules/mail/e-mail-shell-view-actions.c:1308
 msgid "Body contains"
 msgstr "Kropp inneholder"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1285
+#: ../modules/mail/e-mail-shell-view-actions.c:1315
 msgid "Message contains"
 msgstr "Melding inneholder"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1292
+#: ../modules/mail/e-mail-shell-view-actions.c:1322
 msgid "Recipients contain"
 msgstr "Mottakere inneholder"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1299
+#: ../modules/mail/e-mail-shell-view-actions.c:1329
 msgid "Sender contains"
 msgstr "Avsender inneholder"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1306
+#: ../modules/mail/e-mail-shell-view-actions.c:1336
 msgid "Subject contains"
 msgstr "Emne inneholder"
 
@@ -14243,7 +14145,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:162
-#: ../modules/mail/em-mailer-prefs.c:1141
+#: ../modules/mail/em-mailer-prefs.c:1061
 msgid "_Table column:"
 msgstr "Kolonne i _tabell:"
 
@@ -14349,7 +14251,7 @@ msgstr "Vis egenskaper for valgt adressebok"
 #: ../modules/calendar/e-cal-shell-view-actions.c:1354
 #: ../modules/calendar/e-memo-shell-view-actions.c:620
 #: ../modules/calendar/e-task-shell-view-actions.c:744
-#: ../modules/mail/e-mail-shell-view-actions.c:971
+#: ../modules/mail/e-mail-shell-view-actions.c:983
 msgid "_Rename..."
 msgstr "End_re navn..."
 
@@ -14438,7 +14340,7 @@ msgstr "H_andlinger"
 #: ../modules/addressbook/e-book-shell-view-actions.c:808
 #: ../modules/calendar/e-memo-shell-view-actions.c:657
 #: ../modules/calendar/e-task-shell-view-actions.c:809
-#: ../modules/mail/e-mail-shell-view-actions.c:1094
+#: ../modules/mail/e-mail-shell-view-actions.c:1120
 msgid "_Preview"
 msgstr "_Forhåndsvis"
 
@@ -14470,7 +14372,7 @@ msgstr "Vis vindu for forhåndsvisning av kontakter"
 #: ../modules/addressbook/e-book-shell-view-actions.c:879
 #: ../modules/calendar/e-memo-shell-view-actions.c:727
 #: ../modules/calendar/e-task-shell-view-actions.c:891
-#: ../modules/mail/e-mail-shell-view-actions.c:1188
+#: ../modules/mail/e-mail-shell-view-actions.c:1218
 msgid "_Classic View"
 msgstr "_Klassisk visning"
 
@@ -14481,7 +14383,7 @@ msgstr "Vis forhåndsvisning av kontakt under kontaktlisten"
 #: ../modules/addressbook/e-book-shell-view-actions.c:886
 #: ../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:1195
+#: ../modules/mail/e-mail-shell-view-actions.c:1225
 msgid "_Vertical View"
 msgstr "_Vertikal visning"
 
@@ -14507,8 +14409,8 @@ msgstr "Ingen treff"
 #: ../modules/calendar/e-cal-shell-view-actions.c:1680
 #: ../modules/calendar/e-memo-shell-view-actions.c:761
 #: ../modules/calendar/e-task-shell-view-actions.c:960
-#: ../modules/mail/e-mail-shell-view-actions.c:1271
-#: ../shell/e-shell-content.c:462
+#: ../modules/mail/e-mail-shell-view-actions.c:1301
+#: ../shell/e-shell-content.c:467
 msgid "Advanced Search"
 msgstr "Avansert søk"
 
@@ -14670,19 +14572,19 @@ msgstr "kort"
 msgid "I_mport"
 msgstr "I_mporter"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:341
+#: ../modules/calendar/e-cal-attachment-handler.c:343
 msgid "Select a Calendar"
 msgstr "Velg en kalender"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:368
+#: ../modules/calendar/e-cal-attachment-handler.c:370
 msgid "Select a Task List"
 msgstr "Velg en oppgaveliste"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:378
+#: ../modules/calendar/e-cal-attachment-handler.c:380
 msgid "I_mport to Calendar"
 msgstr "I_mporter til kalenderen"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:385
+#: ../modules/calendar/e-cal-attachment-handler.c:387
 msgid "I_mport to Tasks"
 msgstr "I_mporter til oppgaver"
 
@@ -14745,19 +14647,17 @@ msgid "Create a new calendar"
 msgstr "Opprett en ny kalender"
 
 #: ../modules/calendar/e-cal-shell-backend.c:717
-#: ../plugins/itip-formatter/itip-formatter.c:2669
+#: ../plugins/itip-formatter/itip-formatter.c:2778
 msgid "Calendar and Tasks"
 msgstr "Kalender og oppgaver"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:171
-#: ../modules/calendar/e-memo-shell-sidebar.c:165
-#: ../modules/calendar/e-task-shell-sidebar.c:165
+#: ../modules/calendar/e-cal-shell-sidebar.c:172
 #, c-format
 msgid ""
-"Error on %s\n"
+"Error on %s: %s\n"
 "%s"
 msgstr ""
-"Feil på %s\n"
+"Feil på %s: %s\n"
 " %s"
 
 #: ../modules/calendar/e-cal-shell-sidebar.c:239
@@ -15186,6 +15086,16 @@ msgstr "Notatli_ste"
 msgid "Create a new memo list"
 msgstr "Lag en ny notatliste"
 
+#: ../modules/calendar/e-memo-shell-sidebar.c:165
+#: ../modules/calendar/e-task-shell-sidebar.c:165
+#, c-format
+msgid ""
+"Error on %s\n"
+"%s"
+msgstr ""
+"Feil på %s\n"
+" %s"
+
 #: ../modules/calendar/e-memo-shell-sidebar.c:233
 msgid "Loading memos"
 msgstr "Laster notater"
@@ -15265,15 +15175,15 @@ msgstr "Skriv ut denne listen med notater"
 msgid "Preview the list of memos to be printed"
 msgstr "Forhåndsvis listen med notater som skal skrives ut"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:416
+#: ../modules/calendar/e-memo-shell-view-private.c:417
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d notat"
 msgstr[1] "%d notater"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:420
-#: ../modules/calendar/e-task-shell-view-private.c:569
+#: ../modules/calendar/e-memo-shell-view-private.c:421
+#: ../modules/calendar/e-task-shell-view-private.c:570
 #, c-format
 msgid "%d selected"
 msgstr "%d valgt"
@@ -15437,23 +15347,23 @@ msgstr "Forhåndsvis listen over oppgaver som skal skrives ut"
 msgid "Expunging"
 msgstr "Tømmer"
 
-#: ../modules/calendar/e-task-shell-view-private.c:565
+#: ../modules/calendar/e-task-shell-view-private.c:566
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d oppgave"
 msgstr[1] "%d oppgaver"
 
-#: ../modules/calendar/e-task-shell-view.c:351
+#: ../modules/calendar/e-task-shell-view.c:354
 msgid "Delete Tasks"
 msgstr "Slett oppgaver"
 
-#: ../modules/calendar/e-task-shell-view.c:353
+#: ../modules/calendar/e-task-shell-view.c:356
 msgid "Delete Task"
 msgstr "Slett oppgave"
 
 #. Translators: This is only for multiple messages.
-#: ../modules/mail/e-mail-attachment-handler.c:345
+#: ../modules/mail/e-mail-attachment-handler.c:349
 #, c-format
 msgid "%d attached messages"
 msgstr "%d vedlagte meldinger"
@@ -15483,285 +15393,282 @@ msgstr "E-post_mappe"
 msgid "Create a new mail folder"
 msgstr "Opprett en ny e-postmappe"
 
-#: ../modules/mail/e-mail-shell-backend.c:489
+#: ../modules/mail/e-mail-shell-backend.c:481
 msgid "Mail Accounts"
 msgstr "E-post-konti"
 
-#: ../modules/mail/e-mail-shell-backend.c:497
+#: ../modules/mail/e-mail-shell-backend.c:489
 msgid "Mail Preferences"
 msgstr "Brukervalg for e-post"
 
-#: ../modules/mail/e-mail-shell-backend.c:505
+#: ../modules/mail/e-mail-shell-backend.c:497
 msgid "Composer Preferences"
 msgstr "Brukervalg for redigering"
 
-#: ../modules/mail/e-mail-shell-backend.c:513
+#: ../modules/mail/e-mail-shell-backend.c:505
 msgid "Network Preferences"
 msgstr "Brukervalg for nettverk"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:880
-#: ../modules/mail/e-mail-shell-view.c:883
+#: ../modules/mail/e-mail-shell-view-actions.c:892
+#: ../modules/mail/e-mail-shell-view.c:933
 msgid "_Disable Account"
 msgstr "_Deaktiver konto"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:882
+#: ../modules/mail/e-mail-shell-view-actions.c:894
 msgid "Disable this account"
 msgstr "Deaktiver denne kontoen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:889
+#: ../modules/mail/e-mail-shell-view-actions.c:901
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "Fjern alle slettede meldinger fra alle mapper permanent"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:894
+#: ../modules/mail/e-mail-shell-view-actions.c:906
 msgid "C_reate Search Folder From Search..."
 msgstr "Opp_rett søkemappe fra søk..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:901
+#: ../modules/mail/e-mail-shell-view-actions.c:913
 msgid "_Download Messages for Offline Usage"
 msgstr "Last ne_d meldinger for frakoblet bruk"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:903
+#: ../modules/mail/e-mail-shell-view-actions.c:915
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr ""
 "Last ned meldinger fra kontoer og mapper som er merket for frakoblet bruk"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:908
+#: ../modules/mail/e-mail-shell-view-actions.c:920
 msgid "Fl_ush Outbox"
 msgstr "T_øm utboks"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:915
+#: ../modules/mail/e-mail-shell-view-actions.c:927
 msgid "_Copy Folder To..."
 msgstr "_Kopier mappe til..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:917
+#: ../modules/mail/e-mail-shell-view-actions.c:929
 msgid "Copy the selected folder into another folder"
 msgstr "Kopier valgt mappe til en annen mappe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:924
+#: ../modules/mail/e-mail-shell-view-actions.c:936
 msgid "Permanently remove this folder"
 msgstr "Fjern denne mappen permanent"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:929
+#: ../modules/mail/e-mail-shell-view-actions.c:941
 msgid "E_xpunge"
 msgstr "T_øm"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:931
+#: ../modules/mail/e-mail-shell-view-actions.c:943
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Fjern alle slettede meldinger fra denne mappen permanent"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:936
+#: ../modules/mail/e-mail-shell-view-actions.c:948
 msgid "Mar_k All Messages as Read"
 msgstr "Mer_k alle meldinger som lest"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:938
+#: ../modules/mail/e-mail-shell-view-actions.c:950
 msgid "Mark all messages in the folder as read"
 msgstr "Merk alle meldinger i en mappe som lest"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:943
+#: ../modules/mail/e-mail-shell-view-actions.c:955
 msgid "_Move Folder To..."
 msgstr "Flytt _mappe til..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:945
+#: ../modules/mail/e-mail-shell-view-actions.c:957
 msgid "Move the selected folder into another folder"
 msgstr "Flytt valgt mappe til en annen mappe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:950
+#: ../modules/mail/e-mail-shell-view-actions.c:962
 msgid "_New..."
 msgstr "_Ny..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:952
+#: ../modules/mail/e-mail-shell-view-actions.c:964
 msgid "Create a new folder for storing mail"
 msgstr "Lag en ny mappe for lagring av meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:959
+#: ../modules/mail/e-mail-shell-view-actions.c:971
 msgid "Change the properties of this folder"
 msgstr "Endre egenskaper for denne mappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:966
+#: ../modules/mail/e-mail-shell-view-actions.c:978
 msgid "Refresh the folder"
 msgstr "Oppdater mappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:973
+#: ../modules/mail/e-mail-shell-view-actions.c:985
 msgid "Change the name of this folder"
 msgstr "Endre navn på denne mappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:978
+#: ../modules/mail/e-mail-shell-view-actions.c:990
 msgid "Select Message _Thread"
 msgstr "Velg meldings_tråd"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:980
+#: ../modules/mail/e-mail-shell-view-actions.c:992
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Velg alle meldinger i samme tråd som den valgte meldingen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:985
+#: ../modules/mail/e-mail-shell-view-actions.c:997
 msgid "Select Message S_ubthread"
 msgstr "Velg _undertråd for melding"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:987
+#: ../modules/mail/e-mail-shell-view-actions.c:999
 msgid "Select all replies to the currently selected message"
 msgstr "Velg alle svar til den valgt melding"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:992
-msgid "_Unsubscribe"
-msgstr "_Fjern abonnement"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:994
-msgid "Unsubscribe from the selected folder"
-msgstr "Fjern abonnement på valgt mappe"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:999
+#: ../modules/mail/e-mail-shell-view-actions.c:1011
 msgid "Empty _Trash"
 msgstr "Tøm _papirkurven"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1001
+#: ../modules/mail/e-mail-shell-view-actions.c:1013
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "Fjern alle slettede meldinger fra alle kontoer permanent"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1006
+#: ../modules/mail/e-mail-shell-view-actions.c:1018
 msgid "_New Label"
 msgstr "_Ny etikett"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1015
+#: ../modules/mail/e-mail-shell-view-actions.c:1027
 msgid "N_one"
 msgstr "_Ingen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1038
+#: ../modules/mail/e-mail-shell-view-actions.c:1041
+msgid "_Manage Subscriptions"
+msgstr "_HÃ¥ndter abonnement"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1043
+#: ../modules/mail/e-mail-shell-view-actions.c:1099
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr "Abonner eller fjern abonnement på mapper på eksterne tjenere"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1064
 msgid "Cancel the current mail operation"
 msgstr "Avbryt aktiv e-postoperasjon"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1043
+#: ../modules/mail/e-mail-shell-view-actions.c:1069
 msgid "Collapse All _Threads"
 msgstr "Slå sammen alle _tråder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1045
+#: ../modules/mail/e-mail-shell-view-actions.c:1071
 msgid "Collapse all message threads"
 msgstr "Slå sammen alle meldingstråder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1050
+#: ../modules/mail/e-mail-shell-view-actions.c:1076
 msgid "E_xpand All Threads"
 msgstr "Ut_vid alle tråder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1052
+#: ../modules/mail/e-mail-shell-view-actions.c:1078
 msgid "Expand all message threads"
 msgstr "Utvid alle meldingstråder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1057
+#: ../modules/mail/e-mail-shell-view-actions.c:1083
 msgid "_Message Filters"
 msgstr "_Meldingsfiltre"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1059
+#: ../modules/mail/e-mail-shell-view-actions.c:1085
 msgid "Create or edit rules for filtering new mail"
 msgstr "Opprett eller rediger regler for filtrering av ny e-post"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1064
+#: ../modules/mail/e-mail-shell-view-actions.c:1090
 msgid "Search F_olders"
 msgstr "Søk i _mapper"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1066
+#: ../modules/mail/e-mail-shell-view-actions.c:1092
 msgid "Create or edit search folder definitions"
 msgstr "Opprett eller rediger søkemappedefinisjoner"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1071
+#: ../modules/mail/e-mail-shell-view-actions.c:1097
 msgid "_Subscriptions..."
 msgstr "_Abonnement..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1073
-msgid "Subscribe or unsubscribe to folders on remote servers"
-msgstr "Abonner eller fjern abonnement på mapper på eksterne tjenere"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1080
+#: ../modules/mail/e-mail-shell-view-actions.c:1106
 msgid "F_older"
 msgstr "M_appe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1087
+#: ../modules/mail/e-mail-shell-view-actions.c:1113
 msgid "_Label"
 msgstr "_Etikett"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1127
+#: ../modules/mail/e-mail-shell-view-actions.c:1153
 msgid "_New Folder..."
 msgstr "_Ny mappe..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1151
+#: ../modules/mail/e-mail-shell-view-actions.c:1181
 msgid "Show Message _Preview"
 msgstr "Vis _forhåndsvisning av melding"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1153
+#: ../modules/mail/e-mail-shell-view-actions.c:1183
 msgid "Show message preview pane"
 msgstr "Vis område for forhåndsvisning av melding"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1159
+#: ../modules/mail/e-mail-shell-view-actions.c:1189
 msgid "Show _Deleted Messages"
 msgstr "Vis slette_de meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1161
+#: ../modules/mail/e-mail-shell-view-actions.c:1191
 msgid "Show deleted messages with a line through them"
 msgstr "Vis slettede meldinger som gjennomstreket i meldingslisten."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1167
+#: ../modules/mail/e-mail-shell-view-actions.c:1197
 msgid "_Group By Threads"
 msgstr "_Grupper etter tråder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1169
+#: ../modules/mail/e-mail-shell-view-actions.c:1199
 msgid "Threaded message list"
 msgstr "Meldingsliste med tråder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1190
+#: ../modules/mail/e-mail-shell-view-actions.c:1220
 msgid "Show message preview below the message list"
 msgstr "Vis meldingen under meldingslisten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1197
+#: ../modules/mail/e-mail-shell-view-actions.c:1227
 msgid "Show message preview alongside the message list"
 msgstr "Vis meldingen ved siden av meldingslisten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1205
+#: ../modules/mail/e-mail-shell-view-actions.c:1235
 msgid "All Messages"
 msgstr "Alle meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1212
+#: ../modules/mail/e-mail-shell-view-actions.c:1242
 msgid "Important Messages"
 msgstr "Viktige meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1219
+#: ../modules/mail/e-mail-shell-view-actions.c:1249
 msgid "Last 5 Days' Messages"
 msgstr "Meldinger fra de siste 5 dagene"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1226
+#: ../modules/mail/e-mail-shell-view-actions.c:1256
 msgid "Messages Not Junk"
 msgstr "Meldinger som ikke er uønsket e-post"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1233
+#: ../modules/mail/e-mail-shell-view-actions.c:1263
 msgid "Messages with Attachments"
 msgstr "Meldinger med vedlegg"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1240
+#: ../modules/mail/e-mail-shell-view-actions.c:1270
 msgid "No Label"
 msgstr "Ingen etikett"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1247
+#: ../modules/mail/e-mail-shell-view-actions.c:1277
 msgid "Read Messages"
 msgstr "Leste meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1254
+#: ../modules/mail/e-mail-shell-view-actions.c:1284
 msgid "Recent Messages"
 msgstr "Nye meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1261
+#: ../modules/mail/e-mail-shell-view-actions.c:1291
 msgid "Unread Messages"
 msgstr "Uleste meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1313
+#: ../modules/mail/e-mail-shell-view-actions.c:1343
 msgid "Subject or Addresses contain"
 msgstr "Emne eller adresser inneholder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1323
+#: ../modules/mail/e-mail-shell-view-actions.c:1353
 msgid "All Accounts"
 msgstr "Alle konti"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1330
+#: ../modules/mail/e-mail-shell-view-actions.c:1360
 msgid "Current Account"
 msgstr "Denne kontoen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1337
+#: ../modules/mail/e-mail-shell-view-actions.c:1367
 msgid "Current Folder"
 msgstr "Denne mappen"
 
@@ -15822,15 +15729,15 @@ msgid_plural "%d total"
 msgstr[0] "%d totalt"
 msgstr[1] "%d totalt"
 
-#: ../modules/mail/e-mail-shell-view.c:559
+#: ../modules/mail/e-mail-shell-view.c:557
 msgid "All Account Search"
 msgstr "Søk i alle konti"
 
-#: ../modules/mail/e-mail-shell-view.c:686
+#: ../modules/mail/e-mail-shell-view.c:733
 msgid "Account Search"
 msgstr "Søk i konto"
 
-#: ../modules/mail/e-mail-shell-view.c:881
+#: ../modules/mail/e-mail-shell-view.c:931
 msgid "Proxy _Logout"
 msgstr "_Logg ut proxy"
 
@@ -15842,14 +15749,14 @@ msgstr "Evolution kontoassistent"
 msgid "Account Editor"
 msgstr "Kontoredigering"
 
-#: ../modules/mail/em-composer-prefs.c:505
-#: ../plugins/plugin-manager/plugin-manager.c:349
+#: ../modules/mail/em-composer-prefs.c:500
+#: ../modules/plugin-manager/evolution-plugin-manager.c:357
 #: ../plugins/publish-calendar/publish-calendar.c:827
 #: ../widgets/misc/e-account-tree-view.c:211
 msgid "Enabled"
 msgstr "Aktivert"
 
-#: ../modules/mail/em-composer-prefs.c:509
+#: ../modules/mail/em-composer-prefs.c:504
 msgid "Language(s)"
 msgstr "Språk"
 
@@ -15869,50 +15776,50 @@ msgstr "En gang i uken"
 msgid "Once per month"
 msgstr "En gang i måneden"
 
-#: ../modules/mail/em-mailer-prefs.c:201
+#: ../modules/mail/em-mailer-prefs.c:173
 msgid "Add Custom Junk Header"
 msgstr "Legg til egendefinert meldingshoder for uønsket e-post"
 
-#: ../modules/mail/em-mailer-prefs.c:209
+#: ../modules/mail/em-mailer-prefs.c:181
 msgid "Header Name:"
 msgstr "Navn på meldingshode:"
 
-#: ../modules/mail/em-mailer-prefs.c:210
+#: ../modules/mail/em-mailer-prefs.c:182
 msgid "Header Value Contains:"
 msgstr "Verdi i meldingshode inneholder:"
 
-#: ../modules/mail/em-mailer-prefs.c:310
+#: ../modules/mail/em-mailer-prefs.c:282
 msgid "Header"
 msgstr "Topptekst"
 
-#: ../modules/mail/em-mailer-prefs.c:314
+#: ../modules/mail/em-mailer-prefs.c:286
 msgid "Contains Value"
 msgstr "Inneholder verdi"
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:707 ../modules/mail/em-mailer-prefs.c:778
+#: ../modules/mail/em-mailer-prefs.c:677 ../modules/mail/em-mailer-prefs.c:748
 #, 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:715 ../modules/mail/em-mailer-prefs.c:787
+#: ../modules/mail/em-mailer-prefs.c:685 ../modules/mail/em-mailer-prefs.c:757
 #, 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:751
+#: ../modules/mail/em-mailer-prefs.c:721
 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:1143
+#: ../modules/mail/em-mailer-prefs.c:1063
 msgid "_Date header:"
 msgstr "_Datohode:"
 
-#: ../modules/mail/em-mailer-prefs.c:1144
+#: ../modules/mail/em-mailer-prefs.c:1064
 msgid "Show _original header value"
 msgstr "Vis _opprinnelig verdi for hode"
 
@@ -15926,10 +15833,40 @@ msgid ""
 msgstr ""
 "Undersøk om Evolution er den forvalgte e-postklienten ved hver oppstart."
 
-#: ../modules/mailto-handler/evolution-mailto-handler.c:138
+#: ../modules/mailto-handler/evolution-mailto-handler.c:140
 msgid "Do you want to make Evolution your default email client?"
 msgstr "Vil du sette Evolution som forvalgt e-postprogram?"
 
+#: ../modules/plugin-manager/evolution-plugin-manager.c:67
+msgid "Author(s)"
+msgstr "Fofatter(e)"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:251
+msgid "Plugin Manager"
+msgstr "Tilleggshåndterer"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:267
+msgid "Note: Some changes will not take effect until restart"
+msgstr ""
+"Merk: Noen endringer vil ikke tre i kraft før programmet startes på nytt"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:296
+msgid "Overview"
+msgstr "Oversikt"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:365
+#: ../modules/plugin-manager/evolution-plugin-manager.c:448
+msgid "Plugin"
+msgstr "Tillegg"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:486
+msgid "_Plugins"
+msgstr "_Tillegg"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:487
+msgid "Enable and disable plugins"
+msgstr "Aktiver og deaktiver tillegg"
+
 #: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
 msgid "Hello Python"
 msgstr "Hallo Python"
@@ -15947,12 +15884,12 @@ msgid "Test Plugin for Python EPlugin loader."
 msgstr "Testtillegg for Python EPlugin laster."
 
 #: ../modules/startup-wizard/evolution-startup-wizard.c:275
-#: ../widgets/misc/e-import-assistant.c:396
+#: ../widgets/misc/e-import-assistant.c:399
 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:307
-#: ../widgets/misc/e-import-assistant.c:552
+#: ../widgets/misc/e-import-assistant.c:555
 #, c-format
 msgid "From %s:"
 msgstr "Fra %s:"
@@ -16106,106 +16043,105 @@ msgstr "Gj_enopprett innstillinger for Evolution..."
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "Gjenopprett data og innstillinger fra en arkivfil"
 
-#: ../plugins/backup-restore/backup.c:63
+#: ../plugins/backup-restore/backup.c:80
 msgid "Backup Evolution directory"
 msgstr "Ta sikkerhetskopi av Evolution-mapper"
 
-#: ../plugins/backup-restore/backup.c:65
+#: ../plugins/backup-restore/backup.c:82
 msgid "Restore Evolution directory"
 msgstr "Gjenopprett Evolution-mapper"
 
-#: ../plugins/backup-restore/backup.c:67
+#: ../plugins/backup-restore/backup.c:84
 msgid "Check Evolution Backup"
 msgstr "Sjekk sikkerhetskopi for Evolution"
 
-#: ../plugins/backup-restore/backup.c:69
+#: ../plugins/backup-restore/backup.c:86
 msgid "Restart Evolution"
 msgstr "Start Evolution på nytt"
 
-#: ../plugins/backup-restore/backup.c:71
+#: ../plugins/backup-restore/backup.c:88
 msgid "With Graphical User Interface"
 msgstr "Med grafisk brukergrensesnitt"
 
-#: ../plugins/backup-restore/backup.c:189
-#: ../plugins/backup-restore/backup.c:251
+#: ../plugins/backup-restore/backup.c:290
+#: ../plugins/backup-restore/backup.c:400
 msgid "Shutting down Evolution"
 msgstr "Avslutter Evolution"
 
-#: ../plugins/backup-restore/backup.c:196
+#: ../plugins/backup-restore/backup.c:297
 msgid "Backing Evolution accounts and settings"
 msgstr "Sikkerhetskopiering av kontoer og innstillinger for Evolution"
 
-#: ../plugins/backup-restore/backup.c:202
+#: ../plugins/backup-restore/backup.c:305
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Sikkerhetskopiering av data (e-post, kontakter, kalendere, oppgaver, notater)"
 
-#: ../plugins/backup-restore/backup.c:213
+#: ../plugins/backup-restore/backup.c:318
 msgid "Backup complete"
 msgstr "Sikkerhetskopiering fullført"
 
-#: ../plugins/backup-restore/backup.c:218
-#: ../plugins/backup-restore/backup.c:239
-#: ../plugins/backup-restore/backup.c:285
+#: ../plugins/backup-restore/backup.c:323
+#: ../plugins/backup-restore/backup.c:497
 msgid "Restarting Evolution"
 msgstr "Starter Evolution på nytt"
 
-#: ../plugins/backup-restore/backup.c:255
+#: ../plugins/backup-restore/backup.c:404
 msgid "Back up current Evolution data"
 msgstr "Ta sikkerhetskopi av data for Evolution"
 
-#: ../plugins/backup-restore/backup.c:260
+#: ../plugins/backup-restore/backup.c:410
 msgid "Extracting files from backup"
 msgstr "Henter ut filer fra sikkerhetskopien"
 
-#: ../plugins/backup-restore/backup.c:267
+#: ../plugins/backup-restore/backup.c:467
 msgid "Loading Evolution settings"
 msgstr "Laster innstillinger for Evolution"
 
-#: ../plugins/backup-restore/backup.c:274
+#: ../plugins/backup-restore/backup.c:482
 msgid "Removing temporary backup files"
 msgstr "Fjerner midlertidige sikkerhetskopier"
 
-#: ../plugins/backup-restore/backup.c:281
+#: ../plugins/backup-restore/backup.c:492
 msgid "Ensuring local sources"
 msgstr "Sikrer lokale kilder"
 
-#: ../plugins/backup-restore/backup.c:428
+#: ../plugins/backup-restore/backup.c:679
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Sikkerhetskopierer til mappe %s"
 
-#: ../plugins/backup-restore/backup.c:433
+#: ../plugins/backup-restore/backup.c:684
 #, 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:455
+#: ../plugins/backup-restore/backup.c:706
 msgid "Evolution Backup"
 msgstr "Evolution sikkerhetskopiering"
 
-#: ../plugins/backup-restore/backup.c:455
+#: ../plugins/backup-restore/backup.c:706
 msgid "Evolution Restore"
 msgstr "Evolution gjenoppretting"
 
-#: ../plugins/backup-restore/backup.c:494
+#: ../plugins/backup-restore/backup.c:747
 msgid "Backing up Evolution Data"
 msgstr "Ta sikkerhetskopi av data for Evolution"
 
-#: ../plugins/backup-restore/backup.c:495
+#: ../plugins/backup-restore/backup.c:748
 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:497
+#: ../plugins/backup-restore/backup.c:750
 msgid "Restoring Evolution Data"
 msgstr "Gjenoppretter data for Evolution"
 
-#: ../plugins/backup-restore/backup.c:498
+#: ../plugins/backup-restore/backup.c:751
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Vennligst vent mens Evolution gjenoppretter dine data."
 
-#: ../plugins/backup-restore/backup.c:516
+#: ../plugins/backup-restore/backup.c:769
 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."
 
@@ -16323,33 +16259,33 @@ msgstr ""
 "som du svarer på meldinger. Fyller også ut IM-kontaktinformasjon fra dine "
 "vennelister."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:154
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:163
 #, c-format
 msgid "Bogofilter is not available. Please install it first."
 msgstr "Bogofilter er ikke tilgjengelig. Vennligst installer programmet først."
 
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:167
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "En feil oppsto under start av %s: %s."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:187
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:196
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "Underprosess til Bogofilter svarer ikke. Terminerer..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:189
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:198
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "Venting på underprosess til Bogofilter avbrutt. Terminerer..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:212
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:221
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "Rør til Bogofilter feilet. Feilkode: %d."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:397
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:406
 msgid "Convert message text to _Unicode"
 msgstr "Konverter tekst i meldinger til _Unicode"
 
@@ -16479,6 +16415,13 @@ msgstr "_URL:"
 msgid "Use _SSL"
 msgstr "Bruk _SSL"
 
+#: ../plugins/caldav/caldav-source.c:225
+#: ../plugins/google-account-setup/google-contacts-source.c:286
+#: ../plugins/google-account-setup/google-source.c:623
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:260
+msgid "User_name:"
+msgstr "Bruker_navn:"
+
 #: ../plugins/caldav/caldav-source.c:235
 msgid "Brows_e server for a calendar"
 msgstr "Bla gj_ennom tjener etter en kalender"
@@ -16768,7 +16711,7 @@ msgstr ""
 "Start redigeringsprogram automatisk når tasten trykkes i e-postredigering"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
-#: ../plugins/external-editor/external-editor.c:126
+#: ../plugins/external-editor/external-editor.c:129
 msgid "Automatically launch when a new mail is edited"
 msgstr "Start automatisk når en ny e-post redigeres"
 
@@ -16780,11 +16723,11 @@ msgstr "Forvalgt eksternt redigeringsprogram"
 msgid "The default command that must be used as the editor."
 msgstr "Forvalgt kommando som må brukes som redigeringsprogram."
 
-#: ../plugins/external-editor/external-editor.c:115
+#: ../plugins/external-editor/external-editor.c:118
 msgid "Command to be executed to launch the editor: "
 msgstr "Kommando som skal kjøres for å starte redigering: "
 
-#: ../plugins/external-editor/external-editor.c:116
+#: ../plugins/external-editor/external-editor.c:119
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim -f\""
@@ -16792,8 +16735,8 @@ msgstr ""
 "Bruk «xemacs» for Emacs\n"
 "Bruk «gvim -f» for VI"
 
-#: ../plugins/external-editor/external-editor.c:382
-#: ../plugins/external-editor/external-editor.c:384
+#: ../plugins/external-editor/external-editor.c:385
+#: ../plugins/external-editor/external-editor.c:387
 msgid "Compose in External Editor"
 msgstr "Skriv i eksternt redigeringsprogram"
 
@@ -16921,8 +16864,8 @@ msgstr ""
 "%s"
 
 #: ../plugins/google-account-setup/google-source.c:548
-#: ../plugins/mail-to-task/mail-to-task.c:736
-#: ../plugins/mail-to-task/mail-to-task.c:952
+#: ../plugins/mail-to-task/mail-to-task.c:737
+#: ../plugins/mail-to-task/mail-to-task.c:956
 msgid "Unknown error."
 msgstr "Ukjent feil."
 
@@ -16974,12 +16917,12 @@ msgstr "Godta tentativt"
 msgid "Rese_nd Meeting..."
 msgstr "Se_nd møte på nytt..."
 
-#: ../plugins/groupwise-features/install-shared.c:165
-#: ../plugins/groupwise-features/share-folder-common.c:343
+#: ../plugins/groupwise-features/install-shared.c:170
+#: ../plugins/groupwise-features/share-folder-common.c:347
 msgid "Create folder"
 msgstr "Opprett mappe"
 
-#: ../plugins/groupwise-features/install-shared.c:217
+#: ../plugins/groupwise-features/install-shared.c:222
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -17004,11 +16947,11 @@ msgstr ""
 "Klikk «Bruk» for å installere den delte mappen\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:229
+#: ../plugins/groupwise-features/install-shared.c:234
 msgid "Install the shared folder"
 msgstr "Installer delt mappe"
 
-#: ../plugins/groupwise-features/install-shared.c:233
+#: ../plugins/groupwise-features/install-shared.c:238
 msgid "Shared Folder Installation"
 msgstr "Installering av delt mappe"
 
@@ -17038,7 +16981,7 @@ msgid "_Junk List"
 msgstr "_Uønsket e-postliste"
 
 #: ../plugins/groupwise-features/junk-settings.ui.h:8
-#: ../plugins/groupwise-features/properties.ui.h:13
+#: ../plugins/groupwise-features/properties.ui.h:12
 #: ../widgets/table/e-table-config.ui.h:21
 msgid "_Remove"
 msgstr "Fje_rn"
@@ -17063,6 +17006,11 @@ msgstr "Melding kalt tilbake"
 msgid "Insert Send options"
 msgstr "Sett inn alternativer for sending"
 
+#: ../plugins/groupwise-features/notification.ui.h:3
+#: ../plugins/groupwise-features/properties.ui.h:6
+msgid "The participants will receive the following notification.\n"
+msgstr "Deltakerene vil motta følgende varsel.\n"
+
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
 msgid "Add Send Options to GroupWise messages"
 msgstr "Legg til sendingsalternativer for GroupWise-meldinger"
@@ -17185,30 +17133,22 @@ msgstr "_Tilpass varslingsmelding"
 msgid "Con_tacts..."
 msgstr "Kon_takter..."
 
-#: ../plugins/groupwise-features/properties.ui.h:5
+#: ../plugins/groupwise-features/properties.ui.h:4
 msgid "Shared Folder Notification"
 msgstr "Melding om delte mapper"
 
-#: ../plugins/groupwise-features/properties.ui.h:7
-msgid "The participants will receive the following notification.\n"
-msgstr "Deltakerene vil motta følgende varsel.\n"
-
-#: ../plugins/groupwise-features/properties.ui.h:9
+#: ../plugins/groupwise-features/properties.ui.h:8
 msgid "Users:"
 msgstr "Brukere:"
 
-#: ../plugins/groupwise-features/properties.ui.h:12
+#: ../plugins/groupwise-features/properties.ui.h:11
 msgid "_Not Shared"
 msgstr "_Ikke delt"
 
-#: ../plugins/groupwise-features/properties.ui.h:14
+#: ../plugins/groupwise-features/properties.ui.h:13
 msgid "_Shared With..."
 msgstr "_Delt med..."
 
-#: ../plugins/groupwise-features/properties.ui.h:15
-msgid "_Sharing"
-msgstr "_Deling"
-
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:1
 msgid "Access Rights"
 msgstr "Tilgangsrettigheter"
@@ -17291,20 +17231,20 @@ msgstr "Proxy"
 msgid "Add User"
 msgstr "Legg til bruker"
 
-#: ../plugins/groupwise-features/send-options.c:212
+#: ../plugins/groupwise-features/send-options.c:214
 msgid "Advanced send options"
 msgstr "Avanserte alternativer for sending"
 
-#: ../plugins/groupwise-features/share-folder-common.c:309
+#: ../plugins/groupwise-features/share-folder-common.c:315
 #: ../plugins/groupwise-features/share-folder.c:726
 msgid "Users"
 msgstr "Brukere"
 
-#: ../plugins/groupwise-features/share-folder-common.c:310
+#: ../plugins/groupwise-features/share-folder-common.c:316
 msgid "Enter the users and set permissions"
 msgstr "Oppgi brukere og sett rettigheter"
 
-#: ../plugins/groupwise-features/share-folder-common.c:410
+#: ../plugins/groupwise-features/share-folder-common.c:412
 msgid "Sharing"
 msgstr "Deling"
 
@@ -17316,52 +17256,56 @@ msgstr "Egendefinert varsling"
 msgid "Add   "
 msgstr "Legg til"
 
-#: ../plugins/groupwise-features/status-track.c:123
+#: ../plugins/groupwise-features/share-folder.c:737
+msgid "Modify"
+msgstr "Endre"
+
+#: ../plugins/groupwise-features/status-track.c:125
 msgid "Message Status"
 msgstr "Meldingsstatus"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:137
+#: ../plugins/groupwise-features/status-track.c:139
 msgid "Subject:"
 msgstr "Emne:"
 
-#: ../plugins/groupwise-features/status-track.c:151
+#: ../plugins/groupwise-features/status-track.c:153
 msgid "From:"
 msgstr "Fra:"
 
-#: ../plugins/groupwise-features/status-track.c:166
+#: ../plugins/groupwise-features/status-track.c:168
 msgid "Creation date:"
 msgstr "Dato for opprettelse:"
 
-#: ../plugins/groupwise-features/status-track.c:206
+#: ../plugins/groupwise-features/status-track.c:208
 msgid "Recipient: "
 msgstr "Mottaker: "
 
-#: ../plugins/groupwise-features/status-track.c:213
+#: ../plugins/groupwise-features/status-track.c:215
 msgid "Delivered: "
 msgstr "Levert: "
 
-#: ../plugins/groupwise-features/status-track.c:219
+#: ../plugins/groupwise-features/status-track.c:221
 msgid "Opened: "
 msgstr "Ã?pnet: "
 
-#: ../plugins/groupwise-features/status-track.c:224
+#: ../plugins/groupwise-features/status-track.c:226
 msgid "Accepted: "
 msgstr "Godtatt: "
 
-#: ../plugins/groupwise-features/status-track.c:229
+#: ../plugins/groupwise-features/status-track.c:231
 msgid "Deleted: "
 msgstr "Slettet: "
 
-#: ../plugins/groupwise-features/status-track.c:234
+#: ../plugins/groupwise-features/status-track.c:236
 msgid "Declined: "
 msgstr "Avslått: "
 
-#: ../plugins/groupwise-features/status-track.c:239
+#: ../plugins/groupwise-features/status-track.c:241
 msgid "Completed: "
 msgstr "Fullført: "
 
-#: ../plugins/groupwise-features/status-track.c:244
+#: ../plugins/groupwise-features/status-track.c:246
 msgid "Undelivered: "
 msgstr "Ikke levert: "
 
@@ -17429,140 +17373,140 @@ 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:486
 #, c-format
 msgid "Failed to load the calendar '%s' (%s)"
 msgstr "Kunne ikke åpne kalender «%s» (%s)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:649
+#: ../plugins/itip-formatter/itip-formatter.c:650
 #, 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:685
+#: ../plugins/itip-formatter/itip-formatter.c:686
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Fant avtalen i kalender «%s»"
 
-#: ../plugins/itip-formatter/itip-formatter.c:784
+#: ../plugins/itip-formatter/itip-formatter.c:785
 msgid "Unable to find any calendars"
 msgstr "Kan ikke finne noen kalendere"
 
-#: ../plugins/itip-formatter/itip-formatter.c:791
+#: ../plugins/itip-formatter/itip-formatter.c:792
 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:795
+#: ../plugins/itip-formatter/itip-formatter.c:796
 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:799
+#: ../plugins/itip-formatter/itip-formatter.c:800
 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:873
+#: ../plugins/itip-formatter/itip-formatter.c:876
 msgid "Opening the calendar. Please wait.."
 msgstr "Ã?pner kalender. Vennligst vent..."
 
-#: ../plugins/itip-formatter/itip-formatter.c:876
+#: ../plugins/itip-formatter/itip-formatter.c:879
 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:1057
+#: ../plugins/itip-formatter/itip-formatter.c:1162
 msgid "Unable to parse item"
 msgstr "Kunne ikke lese oppføring"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1144
+#: ../plugins/itip-formatter/itip-formatter.c:1251
 #, 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:1156
+#: ../plugins/itip-formatter/itip-formatter.c:1263
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Sendt til kalender «%s» som godtatt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1160
+#: ../plugins/itip-formatter/itip-formatter.c:1267
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Sendt til kalender «%s» som tentativ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1165
+#: ../plugins/itip-formatter/itip-formatter.c:1272
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Sendt til kalender «%s» som avslått"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1170
+#: ../plugins/itip-formatter/itip-formatter.c:1277
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Sendt til kalender «%s» som avlyst"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1264
+#: ../plugins/itip-formatter/itip-formatter.c:1371
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organisator har fjernet delegat %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1271
+#: ../plugins/itip-formatter/itip-formatter.c:1378
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Avlysningsvarsel sendt til delegat"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1273
+#: ../plugins/itip-formatter/itip-formatter.c:1380
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Kunne ikke sende avlysningsmelding til delegaten"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1384
+#: ../plugins/itip-formatter/itip-formatter.c:1491
 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:1413
+#: ../plugins/itip-formatter/itip-formatter.c:1520
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Kan ikke oppdatere deltaker. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1524
 msgid "Attendee status updated"
 msgstr "Deltakerstatus oppdatert"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1443
+#: ../plugins/itip-formatter/itip-formatter.c:1550
 msgid "Meeting information sent"
 msgstr "Informasjon om møte sendt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1446
+#: ../plugins/itip-formatter/itip-formatter.c:1553
 msgid "Task information sent"
 msgstr "Informasjon om oppgave sendt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1449
+#: ../plugins/itip-formatter/itip-formatter.c:1556
 msgid "Memo information sent"
 msgstr "Informasjon om notat sendt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1458
+#: ../plugins/itip-formatter/itip-formatter.c:1565
 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:1461
+#: ../plugins/itip-formatter/itip-formatter.c:1568
 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:1464
+#: ../plugins/itip-formatter/itip-formatter.c:1571
 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:1529
+#: ../plugins/itip-formatter/itip-formatter.c:1636
 msgid "calendar.ics"
 msgstr "kalender.ics"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1534
+#: ../plugins/itip-formatter/itip-formatter.c:1641
 msgid "Save Calendar"
 msgstr "Lagre kalender"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1586
-#: ../plugins/itip-formatter/itip-formatter.c:1597
+#: ../plugins/itip-formatter/itip-formatter.c:1693
+#: ../plugins/itip-formatter/itip-formatter.c:1704
 msgid "The calendar attached is not valid"
 msgstr "Vedlagt kalender er ugyldig"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1587
-#: ../plugins/itip-formatter/itip-formatter.c:1598
+#: ../plugins/itip-formatter/itip-formatter.c:1694
+#: ../plugins/itip-formatter/itip-formatter.c:1705
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -17570,15 +17514,15 @@ msgstr ""
 "Meldingen påstår at den inneholder en kalender, men kalenderen er ikke en "
 "gyldig iCalendar."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1638
-#: ../plugins/itip-formatter/itip-formatter.c:1666
-#: ../plugins/itip-formatter/itip-formatter.c:1775
+#: ../plugins/itip-formatter/itip-formatter.c:1745
+#: ../plugins/itip-formatter/itip-formatter.c:1773
+#: ../plugins/itip-formatter/itip-formatter.c:1882
 msgid "The item in the calendar is not valid"
 msgstr "Oppføringen i kalenderen er ikke gyldig"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1639
-#: ../plugins/itip-formatter/itip-formatter.c:1667
-#: ../plugins/itip-formatter/itip-formatter.c:1776
+#: ../plugins/itip-formatter/itip-formatter.c:1746
+#: ../plugins/itip-formatter/itip-formatter.c:1774
+#: ../plugins/itip-formatter/itip-formatter.c:1883
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -17586,11 +17530,11 @@ msgstr ""
 "Meldingen inneholder en kalender, men kalenderen inneholder ingen hendelser, "
 "oppgaver eller ledig/opptatt-informasjon"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1680
+#: ../plugins/itip-formatter/itip-formatter.c:1787
 msgid "The calendar attached contains multiple items"
 msgstr "Vedlagt kalender inneholder flere oppføringer"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1681
+#: ../plugins/itip-formatter/itip-formatter.c:1788
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -17598,31 +17542,31 @@ msgstr ""
 "Du må lagre filen og importere kalenderen for å prosessere alle disse "
 "oppføringene"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2454
+#: ../plugins/itip-formatter/itip-formatter.c:2563
 msgid "This meeting recurs"
 msgstr "Dettee møtet gjeninntreffer"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2457
+#: ../plugins/itip-formatter/itip-formatter.c:2566
 msgid "This task recurs"
 msgstr "Denne oppgaven gjeninntreffer"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2460
+#: ../plugins/itip-formatter/itip-formatter.c:2569
 msgid "This memo recurs"
 msgstr "Dette notatet gjeninntreffer"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2694
+#: ../plugins/itip-formatter/itip-formatter.c:2803
 msgid "_Delete message after acting"
 msgstr "_Slett melding etter utført handling"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2704
-#: ../plugins/itip-formatter/itip-formatter.c:2737
+#: ../plugins/itip-formatter/itip-formatter.c:2813
+#: ../plugins/itip-formatter/itip-formatter.c:2846
 msgid "Conflict Search"
 msgstr "Søk etter konflikter"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2719
+#: ../plugins/itip-formatter/itip-formatter.c:2828
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Velg kalendere som skal gjennomsøkes for å finne møtekonflikter"
 
@@ -18125,88 +18069,80 @@ msgid "Beep or play sound file."
 msgstr "Pip eller spill av en lydfil."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
-msgid "Blink icon in notification area."
-msgstr "Blinkende ikon i varslingsområdet."
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
 msgid "Enable D-Bus messages."
 msgstr "Aktiver D-Bus-meldinger"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
 msgid "Enable icon in notification area."
 msgstr "Aktiver ikon i varslingsområdet."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
 msgid "Generates a D-Bus message when new mail messages arrive."
 msgstr "Genererer en D-BUS-melding når nye meldinger ankommer."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
 msgid ""
 "If \"true\", then beep, otherwise will play sound file when new messages "
 "arrive."
 msgstr "Pip hvis «true», eller spill en lydfil når nye meldinger ankommer."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
 msgid "Notify new messages for Inbox only."
 msgstr "Varslingsmelding kun for innboks."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
 msgid "Play sound when new messages arrive."
 msgstr "Spill en lyd når nye meldinger ankommer."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
 msgid "Play themed sound when new messages arrive, if not in beep mode."
 msgstr ""
 "Spill av lyd fra lydtema når nye meldinger ankommer hvis ikke pip-modus er "
 "aktivert."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
 msgid "Popup message together with the icon."
 msgstr "Vis melding sammen med ikonet."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
 msgid "Show new mail icon in notification area when new messages arrive."
 msgstr "Vis ikon for ny melding i varslingsområdet når nye meldinger ankommer."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
 msgid "Sound file name to be played."
 msgstr "Navn på lydfil som skal spilles av."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
 msgid "Sound file to be played when new messages arrive, if not in beep mode."
 msgstr ""
 "Lydfil som skal spilles av når nye meldinger ankommer hvis pip-modus ikke er "
 "aktivert."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
 msgid "Use sound theme"
 msgstr "Bruk lydtema"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
 msgid "Whether play sound or beep when new messages arrive."
 msgstr "Om en lydfil eller et pip skal spilles av når nye meldinger ankommer."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
 msgid "Whether show message over the icon when new messages arrive."
 msgstr "Om en melding skal vises over ikonet når nye meldinger ankommer."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:17
-msgid "Whether the icon should blink or not."
-msgstr "Om ikonet skal blinke eller ikke."
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:18
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "Im nye meldinger kun skal varsles i innboksen."
 
-#: ../plugins/mail-notification/mail-notification.c:369
+#: ../plugins/mail-notification/mail-notification.c:352
 msgid "Evolution's Mail Notification"
 msgstr "Varsling om ny e-post for Evolution"
 
-#: ../plugins/mail-notification/mail-notification.c:391
+#: ../plugins/mail-notification/mail-notification.c:374
 msgid "Mail Notification Properties"
 msgstr "Egenskaper for varsling om ny e-post"
 
-#: ../plugins/mail-notification/mail-notification.c:527
+#: ../plugins/mail-notification/mail-notification.c:507
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18223,67 +18159,63 @@ msgstr[1] ""
 
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user example com"
-#: ../plugins/mail-notification/mail-notification.c:539
+#: ../plugins/mail-notification/mail-notification.c:519
 #, c-format
 msgid "From: %s"
 msgstr "Fra: %s"
 
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:552
+#: ../plugins/mail-notification/mail-notification.c:532
 #, c-format
 msgid "Subject: %s"
 msgstr "Emne: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:562
+#: ../plugins/mail-notification/mail-notification.c:542
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "Du har mottatt %d ny melding."
 msgstr[1] "Du har mottatt %d nye meldinger."
 
-#: ../plugins/mail-notification/mail-notification.c:584
-#: ../plugins/mail-notification/mail-notification.c:591
+#: ../plugins/mail-notification/mail-notification.c:559
+#: ../plugins/mail-notification/mail-notification.c:566
 msgid "New email"
 msgstr "Ny e-post"
 
-#: ../plugins/mail-notification/mail-notification.c:652
+#: ../plugins/mail-notification/mail-notification.c:627
 msgid "Show icon in _notification area"
 msgstr "Vis ikon i varslingsområdet"
 
-#: ../plugins/mail-notification/mail-notification.c:680
-msgid "B_link icon in notification area"
-msgstr "B_linkende ikon i varslingsområdet"
-
-#: ../plugins/mail-notification/mail-notification.c:690
+#: ../plugins/mail-notification/mail-notification.c:656
 msgid "Popup _message together with the icon"
 msgstr "Vis _melding sammen med ikonet"
 
-#: ../plugins/mail-notification/mail-notification.c:877
+#: ../plugins/mail-notification/mail-notification.c:843
 msgid "_Play sound when new messages arrive"
 msgstr "S_pill en lydfil når nye meldinger ankommer"
 
-#: ../plugins/mail-notification/mail-notification.c:906
+#: ../plugins/mail-notification/mail-notification.c:872
 msgid "_Beep"
 msgstr "_Pip"
 
-#: ../plugins/mail-notification/mail-notification.c:919
+#: ../plugins/mail-notification/mail-notification.c:885
 msgid "Use sound _theme"
 msgstr "Bruk lyd_tema"
 
-#: ../plugins/mail-notification/mail-notification.c:938
+#: ../plugins/mail-notification/mail-notification.c:904
 msgid "Play _file:"
 msgstr "Spill av lyd_fil:"
 
-#: ../plugins/mail-notification/mail-notification.c:949
+#: ../plugins/mail-notification/mail-notification.c:915
 msgid "Select sound file"
 msgstr "Velg en lydfil"
 
-#: ../plugins/mail-notification/mail-notification.c:1007
+#: ../plugins/mail-notification/mail-notification.c:973
 msgid "Notify new messages for _Inbox only"
 msgstr "Varslingsmelding kun for _innboks"
 
-#: ../plugins/mail-notification/mail-notification.c:1016
+#: ../plugins/mail-notification/mail-notification.c:982
 msgid "Generate a _D-Bus message"
 msgstr "Genererer en _D-Bus-melding"
 
@@ -18301,7 +18233,7 @@ msgstr "Varsler når nye meldinger ankommer."
 msgid "Created from a mail by %s"
 msgstr "Opprettet av en e-post fra %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:489
+#: ../plugins/mail-to-task/mail-to-task.c:490
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
@@ -18310,7 +18242,7 @@ msgstr ""
 "Valgt kalender inneholder hendelsen «%s» allerede. Vil du redigere den gamle "
 "hendelsen?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:492
+#: ../plugins/mail-to-task/mail-to-task.c:493
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
@@ -18319,7 +18251,7 @@ msgstr ""
 "Valgt oppgaveliste inneholder oppgave «%s» allerede. Vil du redigere den "
 "gamle oppgaven?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:495
+#: ../plugins/mail-to-task/mail-to-task.c:496
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -18331,7 +18263,7 @@ msgstr ""
 #. 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:515
+#: ../plugins/mail-to-task/mail-to-task.c:516
 msgid ""
 "Selected calendar contains some events for the given mails already. Would "
 "you like to create new events anyway?"
@@ -18342,7 +18274,7 @@ msgstr ""
 #. 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:521
+#: ../plugins/mail-to-task/mail-to-task.c:522
 msgid ""
 "Selected task list contains some tasks for the given mails already. Would "
 "you like to create new tasks anyway?"
@@ -18353,7 +18285,7 @@ msgstr ""
 #. 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:527
+#: ../plugins/mail-to-task/mail-to-task.c:528
 msgid ""
 "Selected memo list contains some memos for the given mails already. Would "
 "you like to create new memos anyway?"
@@ -18364,7 +18296,7 @@ msgstr ""
 #. 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:548
+#: ../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?"
@@ -18381,7 +18313,7 @@ msgstr[1] ""
 #. 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:557
+#: ../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?"
@@ -18398,7 +18330,7 @@ msgstr[1] ""
 #. 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:566
+#: ../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?"
@@ -18412,25 +18344,25 @@ msgstr[1] ""
 "Valgt notatliste inneholder notater for gitte meldinger allerede. Vil du "
 "lage nye notater likevel?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:625
+#: ../plugins/mail-to-task/mail-to-task.c:626
 msgid "[No Summary]"
 msgstr "[Ingen sammendrag]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:636
+#: ../plugins/mail-to-task/mail-to-task.c:637
 msgid "Invalid object returned from a server"
 msgstr "Ugyldig objekt returnert fra en tjener"
 
-#: ../plugins/mail-to-task/mail-to-task.c:707
+#: ../plugins/mail-to-task/mail-to-task.c:708
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "En feil oppsto under prosessering: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:736
+#: ../plugins/mail-to-task/mail-to-task.c:737
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Kan ikke åpne kalender. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:743
+#: ../plugins/mail-to-task/mail-to-task.c:744
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
@@ -18438,7 +18370,7 @@ msgstr ""
 "Valgt kilde er skrivebeskyttet og hendelser kan ikke opprettes der. Velg en "
 "annen kilde."
 
-#: ../plugins/mail-to-task/mail-to-task.c:746
+#: ../plugins/mail-to-task/mail-to-task.c:747
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -18446,7 +18378,7 @@ msgstr ""
 "Valgt kilde er skrivebeskyttet og oppgaver kan ikke opprettes der. Velg en "
 "annen kilde."
 
-#: ../plugins/mail-to-task/mail-to-task.c:749
+#: ../plugins/mail-to-task/mail-to-task.c:750
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
@@ -18454,40 +18386,40 @@ msgstr ""
 "Valgt kilde er skrivebeskyttet og notater kan ikke opprettes der. Velg en "
 "annen kilde."
 
-#: ../plugins/mail-to-task/mail-to-task.c:952
+#: ../plugins/mail-to-task/mail-to-task.c:956
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "Fant ikke kildeliste %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1071
+#: ../plugins/mail-to-task/mail-to-task.c:1075
 msgid "Create an _Event"
 msgstr "Lag en h_endelse"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1073
+#: ../plugins/mail-to-task/mail-to-task.c:1077
 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:1078
+#: ../plugins/mail-to-task/mail-to-task.c:1082
 msgid "Create a Mem_o"
 msgstr "Lag et n_otat"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1080
+#: ../plugins/mail-to-task/mail-to-task.c:1084
 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:1085
+#: ../plugins/mail-to-task/mail-to-task.c:1089
 msgid "Create a _Task"
 msgstr "Lag en o_ppgave"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1087
+#: ../plugins/mail-to-task/mail-to-task.c:1091
 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:1095
+#: ../plugins/mail-to-task/mail-to-task.c:1099
 msgid "Create a _Meeting"
 msgstr "Lag et _møte"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1097
+#: ../plugins/mail-to-task/mail-to-task.c:1101
 msgid "Create a new meeting from the selected message"
 msgstr "Lag et nytt møte fra den valgte meldingen"
 
@@ -18647,15 +18579,15 @@ msgstr ""
 "Vil du merke meldinger som lest kun i denne mappen, eller i valgt mappe og "
 "undermapper i tillegg?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:194
+#: ../plugins/mark-all-read/mark-all-read.c:196
 msgid "In Current Folder and _Subfolders"
 msgstr "I denne mappen og _undermapper"
 
-#: ../plugins/mark-all-read/mark-all-read.c:208
+#: ../plugins/mark-all-read/mark-all-read.c:210
 msgid "In Current _Folder Only"
 msgstr "Kun i _denne mappen"
 
-#: ../plugins/mark-all-read/mark-all-read.c:437
+#: ../plugins/mark-all-read/mark-all-read.c:443
 msgid "Mark Me_ssages as Read"
 msgstr "Merk meldinger _som lest"
 
@@ -18667,41 +18599,6 @@ msgstr "Merk alle som lest"
 msgid "Mark all messages in a folder as read."
 msgstr "Merk alle meldinger i en mappe som lest."
 
-#: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
-msgid "Manage your Evolution plugins."
-msgstr "HÃ¥ndter tillegg for Evolution."
-
-#: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:244
-msgid "Plugin Manager"
-msgstr "Tilleggshåndterer"
-
-#: ../plugins/plugin-manager/plugin-manager.c:59
-msgid "Author(s)"
-msgstr "Fofatter(e)"
-
-#: ../plugins/plugin-manager/plugin-manager.c:259
-msgid "Note: Some changes will not take effect until restart"
-msgstr ""
-"Merk: Noen endringer vil ikke tre i kraft før programmet startes på nytt"
-
-#: ../plugins/plugin-manager/plugin-manager.c:285
-msgid "Overview"
-msgstr "Oversikt"
-
-#: ../plugins/plugin-manager/plugin-manager.c:356
-#: ../plugins/plugin-manager/plugin-manager.c:418
-msgid "Plugin"
-msgstr "Tillegg"
-
-#: ../plugins/plugin-manager/plugin-manager.c:430
-msgid "_Plugins"
-msgstr "_Tillegg"
-
-#: ../plugins/plugin-manager/plugin-manager.c:432
-msgid "Enable and disable plugins"
-msgstr "Aktiver og deaktiver tillegg"
-
 #. but then we also need to create our own section frame
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:2
 msgid "Plain Text Mode"
@@ -18716,19 +18613,19 @@ msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr ""
 "Vis e-postmeldinger som vanlig tekst, selv om de inneholder HTML-innhold."
 
-#: ../plugins/prefer-plain/prefer-plain.c:198
+#: ../plugins/prefer-plain/prefer-plain.c:214
 msgid "Show HTML if present"
 msgstr "Vis HTML hvis det finnes"
 
-#: ../plugins/prefer-plain/prefer-plain.c:198
+#: ../plugins/prefer-plain/prefer-plain.c:214
 msgid "Let Evolution choose the best part to show."
 msgstr "La Evolution velge den beste delen å vise."
 
-#: ../plugins/prefer-plain/prefer-plain.c:199
+#: ../plugins/prefer-plain/prefer-plain.c:215
 msgid "Show plain text if present"
 msgstr "Vis ren tekst hvis det finnes"
 
-#: ../plugins/prefer-plain/prefer-plain.c:199
+#: ../plugins/prefer-plain/prefer-plain.c:215
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
@@ -18736,22 +18633,22 @@ msgstr ""
 "Vis tekstdelen hvis den finnes. La Evolution velge hvilken del som skal "
 "vises ellers."
 
-#: ../plugins/prefer-plain/prefer-plain.c:200
+#: ../plugins/prefer-plain/prefer-plain.c:216
 msgid "Only ever show plain text"
 msgstr "Vis kun ren tekst"
 
-#: ../plugins/prefer-plain/prefer-plain.c:200
+#: ../plugins/prefer-plain/prefer-plain.c:216
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
 msgstr ""
 "Alltid vis ren tekst delen og vis de andre delene som vedlegg hvis forespurt."
 
-#: ../plugins/prefer-plain/prefer-plain.c:247
+#: ../plugins/prefer-plain/prefer-plain.c:263
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "Vis _undertrykte HTML-deler som vedlegg"
 
-#: ../plugins/prefer-plain/prefer-plain.c:267
+#: ../plugins/prefer-plain/prefer-plain.c:283
 msgid "HTML _Mode"
 msgstr "HTML-_modus"
 
@@ -18775,35 +18672,35 @@ msgstr "Outlook PST-import"
 msgid "Outlook personal folders (.pst)"
 msgstr "Outlook personlige mapper (.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:295
+#: ../plugins/pst-import/pst-importer.c:297
 msgid "_Mail"
 msgstr "_E-post"
 
-#: ../plugins/pst-import/pst-importer.c:307
+#: ../plugins/pst-import/pst-importer.c:309
 msgid "Destination folder:"
 msgstr "MÃ¥lmappe:"
 
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:313
+#: ../plugins/pst-import/pst-importer.c:315
 msgid "_Address Book"
 msgstr "_Adressebok"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:320
+#: ../plugins/pst-import/pst-importer.c:322
 msgid "A_ppointments"
 msgstr "A_vtaler"
 
 #. Tasks
-#: ../plugins/pst-import/pst-importer.c:326 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:328 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Oppgaver"
 
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:332
+#: ../plugins/pst-import/pst-importer.c:334
 msgid "_Journal entries"
 msgstr "_Journaloppføringer"
 
-#: ../plugins/pst-import/pst-importer.c:347
+#: ../plugins/pst-import/pst-importer.c:349
 msgid "Importing Outlook data"
 msgstr "Importerer data fra Outlook"
 
@@ -18961,56 +18858,56 @@ msgstr "iCal"
 msgid "Could not publish calendar: Calendar backend no longer exists"
 msgstr "Kunne ikke publisere kalender: Kalendermotor eksisterer ikke lenger"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:476
+#: ../plugins/publish-calendar/url-editor-dialog.c:478
 msgid "New Location"
 msgstr "Ny lokasjon"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:478
+#: ../plugins/publish-calendar/url-editor-dialog.c:480
 msgid "Edit Location"
 msgstr "Rediger lokasjon"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:121
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:128
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "SpamAssassin ble ikke funnet, kode: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:129
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:137
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:136
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:144
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr "Klarte ikke å opprette rør: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:176
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:183
 #, c-format
 msgid "Error after fork: %s"
 msgstr "Feil etter kjøring av fork(): %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:232
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:241
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
 msgstr "Underprosess til SpamAssassin svarer ikke. Terminerer..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:234
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
 #, c-format
 msgid "Wait for SpamAssassin child process interrupted, terminating..."
 msgstr "Venting på underprosess til SpamAssassin avbrutt. Terminerer..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:252
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr "Rør til SpamAssassin feilet. Feilkode: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:506
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:519
 #, c-format
 msgid "SpamAssassin is not available. Please install it first."
 msgstr ""
 "SpamAssassin er ikke tilgjengelig. Vennligst installer programmet først."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:927
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:940
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "Dette vil gjøre SpamAssassin mer pålitelig, men tregere"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:935
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:948
 msgid "I_nclude remote tests"
 msgstr "Inkluder eksterne tester"
 
@@ -19147,23 +19044,6 @@ msgstr "Lagre valgt notatliste til disk"
 msgid "Save the selected task list to disk"
 msgstr "Lagre valgt oppgaveliste til disk"
 
-#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
-msgid "Sort mail message threads by subject."
-msgstr "Sorter e-postmeldingstråder etter emne."
-
-#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
-msgid "Subject Threading"
-msgstr "Meldingstråder på emne"
-
-#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:3
-msgid "Thread messages by subject"
-msgstr "Vis meldingstråder etter emne"
-
-#. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
-#: ../plugins/subject-thread/subject-thread.c:63
-msgid "F_all back to threading messages by subject"
-msgstr "F_all tilbake til tråding av meldinger etter emne"
-
 #: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
 msgid ""
 "List of keyword/value pairs for the Templates plugin to substitute in a "
@@ -19176,15 +19056,15 @@ msgstr ""
 msgid "Drafts based template plugin"
 msgstr "Tillegg for å lage maler av skisser"
 
-#: ../plugins/templates/templates.c:621
+#: ../plugins/templates/templates.c:625
 msgid "No Title"
 msgstr "Ingen tittel"
 
-#: ../plugins/templates/templates.c:715
+#: ../plugins/templates/templates.c:719
 msgid "Save as _Template"
 msgstr "Lagre som _mal"
 
-#: ../plugins/templates/templates.c:717
+#: ../plugins/templates/templates.c:721
 msgid "Save as Template"
 msgstr "Lagre som mal"
 
@@ -19204,27 +19084,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:181
-#: ../plugins/vcard-inline/vcard-inline.c:266
+#: ../plugins/vcard-inline/vcard-inline.c:182
+#: ../plugins/vcard-inline/vcard-inline.c:267
 msgid "Show Full vCard"
 msgstr "Vis alle data i vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:184
+#: ../plugins/vcard-inline/vcard-inline.c:185
 msgid "Show Compact vCard"
 msgstr "Vis kompakt vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:245
+#: ../plugins/vcard-inline/vcard-inline.c:246
 msgid "There is one other contact."
 msgstr "Det finnes en annen kontakt."
 
-#: ../plugins/vcard-inline/vcard-inline.c:254
+#: ../plugins/vcard-inline/vcard-inline.c:255
 #, 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:275
+#: ../plugins/vcard-inline/vcard-inline.c:276
 msgid "Save in Address Book"
 msgstr "Lagre i adressebok"
 
@@ -19402,7 +19282,7 @@ msgstr "Sidelinjen er synlig"
 msgid "Skip development warning dialog"
 msgstr "Hopp over varseldialogen om utviklingsversjonen"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:330
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:337
 msgid "Start in offline mode"
 msgstr "Start i frakoblet modus"
 
@@ -19554,11 +19434,11 @@ msgstr "Knappestil for vindu"
 msgid "Window buttons are visible"
 msgstr "Vindusknapper er synlige"
 
-#: ../shell/e-shell-content.c:523 ../shell/e-shell-content.c:524
+#: ../shell/e-shell-content.c:528 ../shell/e-shell-content.c:529
 msgid "Searches"
 msgstr "Søk"
 
-#: ../shell/e-shell-content.c:566
+#: ../shell/e-shell-content.c:571
 msgid "Save Search"
 msgstr "Lagre søk"
 
@@ -19566,19 +19446,19 @@ msgstr "Lagre søk"
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:924
+#: ../shell/e-shell-searchbar.c:932
 msgid "Sho_w:"
 msgstr "_Vis:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:955
+#: ../shell/e-shell-searchbar.c:963
 msgid "Sear_ch:"
 msgstr "Sø_k:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1016
+#: ../shell/e-shell-searchbar.c:1024
 msgid "i_n"
 msgstr " _i"
 
@@ -19887,20 +19767,20 @@ msgstr "%s - Evolution"
 msgid "New"
 msgstr "Ny"
 
-#: ../shell/e-shell.c:229
+#: ../shell/e-shell.c:247
 msgid "Preparing to go offline..."
 msgstr "Forbereder frakoblet bruk..."
 
-#: ../shell/e-shell.c:279
+#: ../shell/e-shell.c:300
 msgid "Preparing to go online..."
 msgstr "Forbereder tilkoblet bruk..."
 
-#: ../shell/e-shell.c:338
+#: ../shell/e-shell.c:362
 msgid "Preparing to quit..."
 msgstr "Forbereder avslutting..."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:179
+#: ../shell/main.c:186
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19935,7 +19815,7 @@ msgstr ""
 "Vi håper at du nyter resultatene av vårt harde arbeid, og vi venter i\n"
 "spenning på at du tilbyr din hjelp!\n"
 
-#: ../shell/main.c:203
+#: ../shell/main.c:210
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19943,55 +19823,55 @@ msgstr ""
 "Takk\n"
 "Evolution utviklerene\n"
 
-#: ../shell/main.c:210
+#: ../shell/main.c:217
 msgid "Do not tell me again"
 msgstr "Ikke gi beskjed igjen"
 
-#: ../shell/main.c:326
+#: ../shell/main.c:333
 msgid "Start Evolution activating the specified component"
 msgstr "Aktiver oppgitt komponent ved oppstart av Evolution"
 
-#: ../shell/main.c:328
+#: ../shell/main.c:335
 msgid "Apply the given geometry to the main window"
 msgstr "Bruk oppgitt geometri på hovedvinduet"
 
-#: ../shell/main.c:332
+#: ../shell/main.c:339
 msgid "Start in online mode"
 msgstr "Start i tilkoblet modus"
 
-#: ../shell/main.c:334
+#: ../shell/main.c:341
 msgid "Start in \"express\" mode"
 msgstr "Start i «ekspress»-modus"
 
-#: ../shell/main.c:337
+#: ../shell/main.c:344
 msgid "Forcibly shut down Evolution"
 msgstr "Tvungen nedstenging av Evolution"
 
-#: ../shell/main.c:340
+#: ../shell/main.c:347
 msgid "Send the debugging output of all components to a file."
 msgstr "Send feilsøkingsutskrift for alle komponentene til en fil."
 
-#: ../shell/main.c:342
+#: ../shell/main.c:349
 msgid "Disable loading of any plugins."
 msgstr "Slå av lasting av tillegg."
 
-#: ../shell/main.c:344
+#: ../shell/main.c:351
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Deaktiver forhåndsvisningsområdet for e-post, kontakter og oppgaver."
 
-#: ../shell/main.c:348
+#: ../shell/main.c:355
 msgid "Import URIs or file names given as rest of arguments."
 msgstr "Importer URIer eller filnavn gitt som argumenter."
 
-#: ../shell/main.c:350
+#: ../shell/main.c:357
 msgid "Request a running Evolution process to quit"
 msgstr "Be en kjørende Evolution-prosess om å stenge ned"
 
-#: ../shell/main.c:474 ../shell/main.c:482
+#: ../shell/main.c:501 ../shell/main.c:509
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution personlig informasjonshåndterer og e-postklient"
 
-#: ../shell/main.c:544
+#: ../shell/main.c:571
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20081,28 +19961,28 @@ msgstr "Filen er ikke en gyldig .desktop-fil"
 msgid "Unrecognized desktop file Version '%s'"
 msgstr "Ikke gjenkjent Version «%s» i skrivebordsfil"
 
-#: ../smclient/eggdesktopfile.c:958
+#: ../smclient/eggdesktopfile.c:957
 #, c-format
 msgid "Starting %s"
 msgstr "Starter %s"
 
-#: ../smclient/eggdesktopfile.c:1100
+#: ../smclient/eggdesktopfile.c:1098
 #, c-format
 msgid "Application does not accept documents on command line"
 msgstr "Programmet tar ikke dokumenter som argumenter på kommandolinjen"
 
-#: ../smclient/eggdesktopfile.c:1168
+#: ../smclient/eggdesktopfile.c:1166
 #, c-format
 msgid "Unrecognized launch option: %d"
 msgstr "Ukjent oppstartsalternativ: %d"
 
-#: ../smclient/eggdesktopfile.c:1373
+#: ../smclient/eggdesktopfile.c:1365
 #, c-format
 msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
 msgstr ""
 "Kan ikke sende dokument-URIer til en skrivebordsoppføring med «Type=Link»"
 
-#: ../smclient/eggdesktopfile.c:1394
+#: ../smclient/eggdesktopfile.c:1386
 #, c-format
 msgid "Not a launchable item"
 msgstr "Ikke en oppstartbar oppføring"
@@ -20426,11 +20306,12 @@ msgstr "Du har sertifikater som identifiserer disse menneskene på lager:"
 msgid "Your Certificates"
 msgstr "Dine sertifikater"
 
-#: ../smime/gui/smime-ui.ui.h:43
+#. This is a verb, as in "make a backup".
+#: ../smime/gui/smime-ui.ui.h:44
 msgid "_Backup"
 msgstr "_Sikkerhetskopier"
 
-#: ../smime/gui/smime-ui.ui.h:44
+#: ../smime/gui/smime-ui.ui.h:45
 msgid "_Edit CA Trust"
 msgstr "R_ediger tillit til CA"
 
@@ -20758,7 +20639,7 @@ msgstr "Definer visninger for «%s»"
 msgid "Table"
 msgstr "Tabell"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:274
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:276
 msgid "Save Current View"
 msgstr "Lagre aktiv visning"
 
@@ -20786,7 +20667,7 @@ msgstr "Type visning"
 msgid "Type of view:"
 msgstr "Type visning:"
 
-#: ../widgets/misc/e-account-manager.c:351
+#: ../widgets/misc/e-account-manager.c:354
 msgid "De_fault"
 msgstr "_Forvalgt"
 
@@ -20798,15 +20679,15 @@ msgstr "Protokoll"
 msgid "Attachment Properties"
 msgstr "Egenskaper for vedlegg"
 
-#: ../widgets/misc/e-attachment-dialog.c:330
+#: ../widgets/misc/e-attachment-dialog.c:332
 msgid "_Filename:"
 msgstr "_Filnavn:"
 
-#: ../widgets/misc/e-attachment-dialog.c:365
+#: ../widgets/misc/e-attachment-dialog.c:367
 msgid "MIME Type:"
 msgstr "MIME-type:"
 
-#: ../widgets/misc/e-attachment-dialog.c:373
+#: ../widgets/misc/e-attachment-dialog.c:375
 #: ../widgets/misc/e-attachment-store.c:525
 msgid "_Suggest automatic display of attachment"
 msgstr "Fore_slå automatisk visning av vedlegg"
@@ -20848,7 +20729,7 @@ msgid "Hide Attachment _Bar"
 msgstr "Skjul ve_dleggsfelt"
 
 #: ../widgets/misc/e-attachment-paned.c:100
-#: ../widgets/misc/e-attachment-paned.c:631
+#: ../widgets/misc/e-attachment-paned.c:615
 msgid "Show Attachment _Bar"
 msgstr "Vis ve_dleggsfelt"
 
@@ -20868,40 +20749,40 @@ msgstr[1] "Lagre vedlegg"
 
 #. Translators: Default attachment filename.
 #: ../widgets/misc/e-attachment-store.c:608
-#: ../widgets/misc/e-attachment.c:1785 ../widgets/misc/e-attachment.c:2327
+#: ../widgets/misc/e-attachment.c:1786 ../widgets/misc/e-attachment.c:2328
 msgid "attachment.dat"
 msgstr "vedlegg.dat"
 
-#: ../widgets/misc/e-attachment-view.c:351
+#: ../widgets/misc/e-attachment-view.c:353
 msgid "S_ave All"
 msgstr "L_agre alle"
 
-#: ../widgets/misc/e-attachment-view.c:377
+#: ../widgets/misc/e-attachment-view.c:379
 msgid "A_dd Attachment..."
 msgstr "Legg til ve_dlegg..."
 
-#: ../widgets/misc/e-attachment-view.c:401
+#: ../widgets/misc/e-attachment-view.c:403
 msgid "_Hide"
 msgstr "_Skjul"
 
-#: ../widgets/misc/e-attachment-view.c:408
+#: ../widgets/misc/e-attachment-view.c:410
 msgid "Hid_e All"
 msgstr "Skj_ul alle"
 
-#: ../widgets/misc/e-attachment-view.c:415
+#: ../widgets/misc/e-attachment-view.c:417
 msgid "_View Inline"
 msgstr "_Vis i meldingsteksten"
 
-#: ../widgets/misc/e-attachment-view.c:422
+#: ../widgets/misc/e-attachment-view.c:424
 msgid "Vie_w All Inline"
 msgstr "_Vis alle i meldingsteksten"
 
-#: ../widgets/misc/e-attachment-view.c:739
+#: ../widgets/misc/e-attachment-view.c:741
 #, c-format
 msgid "Open with \"%s\""
 msgstr "�pne med «%s»"
 
-#: ../widgets/misc/e-attachment-view.c:742
+#: ../widgets/misc/e-attachment-view.c:744
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "Ã?pne dette vedlegget i %s"
@@ -20914,55 +20795,55 @@ msgstr "Ã?pne dette vedlegget i %s"
 msgid "Attached message"
 msgstr "Vedlagt melding"
 
-#: ../widgets/misc/e-attachment.c:1828 ../widgets/misc/e-attachment.c:2629
+#: ../widgets/misc/e-attachment.c:1829 ../widgets/misc/e-attachment.c:2630
 msgid "A load operation is already in progress"
 msgstr "En lasteoperasjon er allerede i gang"
 
-#: ../widgets/misc/e-attachment.c:1836 ../widgets/misc/e-attachment.c:2637
+#: ../widgets/misc/e-attachment.c:1837 ../widgets/misc/e-attachment.c:2638
 msgid "A save operation is already in progress"
 msgstr "En lagreoperasjon er allerede i gang"
 
-#: ../widgets/misc/e-attachment.c:1928
+#: ../widgets/misc/e-attachment.c:1929
 #, c-format
 msgid "Could not load '%s'"
 msgstr "Kunne ikke laste «%s»"
 
-#: ../widgets/misc/e-attachment.c:1931
+#: ../widgets/misc/e-attachment.c:1932
 #, c-format
 msgid "Could not load the attachment"
 msgstr "Kunne ikke laste vedlegget"
 
-#: ../widgets/misc/e-attachment.c:2207
+#: ../widgets/misc/e-attachment.c:2208
 #, c-format
 msgid "Could not open '%s'"
 msgstr "Kunne ikke åpne «%s»"
 
-#: ../widgets/misc/e-attachment.c:2210
+#: ../widgets/misc/e-attachment.c:2211
 #, c-format
 msgid "Could not open the attachment"
 msgstr "Kunne ikke åpne vedlegget"
 
-#: ../widgets/misc/e-attachment.c:2645
+#: ../widgets/misc/e-attachment.c:2646
 msgid "Attachment contents not loaded"
 msgstr "Vedleggets innhold ble ikke lastet"
 
-#: ../widgets/misc/e-attachment.c:2721
+#: ../widgets/misc/e-attachment.c:2722
 #, c-format
 msgid "Could not save '%s'"
 msgstr "Kunne ikke lagre «%s»"
 
-#: ../widgets/misc/e-attachment.c:2724
+#: ../widgets/misc/e-attachment.c:2725
 #, c-format
 msgid "Could not save the attachment"
 msgstr "Kunne ikke lagre vedlegget"
 
 #. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
-#: ../widgets/misc/e-buffer-tagger.c:359
+#: ../widgets/misc/e-buffer-tagger.c:362
 msgid "Ctrl-click to open a link"
 msgstr "Ctrl-klikk for å åpne en lenke"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1258
+#: ../widgets/misc/e-calendar-item.c:1261
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -20974,60 +20855,60 @@ msgstr "MÃ¥nedskalender"
 msgid "Character Encoding"
 msgstr "Tegnkoding"
 
-#: ../widgets/misc/e-charset-combo-box.c:120
+#: ../widgets/misc/e-charset-combo-box.c:122
 msgid "Enter the character set to use"
 msgstr "Skriv inn tegnsett som skal brukes"
 
-#: ../widgets/misc/e-charset-combo-box.c:339
+#: ../widgets/misc/e-charset-combo-box.c:341
 msgid "Other..."
 msgstr "Andre..."
 
-#: ../widgets/misc/e-dateedit.c:505
+#: ../widgets/misc/e-dateedit.c:508
 msgid "Date and Time"
 msgstr "Dato og klokkeslett"
 
-#: ../widgets/misc/e-dateedit.c:526
+#: ../widgets/misc/e-dateedit.c:529
 msgid "Text entry to input date"
 msgstr "Tekstfelt for å oppgi dato"
 
-#: ../widgets/misc/e-dateedit.c:548
+#: ../widgets/misc/e-dateedit.c:551
 msgid "Click this button to show a calendar"
 msgstr "Klikk på denne knappen for å vise en kalender"
 
-#: ../widgets/misc/e-dateedit.c:594
+#: ../widgets/misc/e-dateedit.c:597
 msgid "Drop-down combination box to select time"
 msgstr "Kombinasjonsboks med nedtrekksmeny for å velge tid"
 
-#: ../widgets/misc/e-dateedit.c:666
+#: ../widgets/misc/e-dateedit.c:669
 msgid "No_w"
 msgstr "N_Ã¥"
 
-#: ../widgets/misc/e-dateedit.c:672
+#: ../widgets/misc/e-dateedit.c:675
 msgid "_Today"
 msgstr "I _dag"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../widgets/misc/e-dateedit.c:680
+#: ../widgets/misc/e-dateedit.c:683
 msgid "_None"
 msgstr "I_ngen"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1685 ../widgets/misc/e-dateedit.c:1917
+#: ../widgets/misc/e-dateedit.c:1688 ../widgets/misc/e-dateedit.c:1920
 msgctxt "date"
 msgid "None"
 msgstr "Ingen"
 
-#: ../widgets/misc/e-dateedit.c:1812
+#: ../widgets/misc/e-dateedit.c:1815
 msgid "Invalid Date Value"
 msgstr "Ugyldig datoverdi"
 
-#: ../widgets/misc/e-dateedit.c:1856
+#: ../widgets/misc/e-dateedit.c:1859
 msgid "Invalid Time Value"
 msgstr "Ugyldig verdi for tid"
 
-#: ../widgets/misc/e-import-assistant.c:249
+#: ../widgets/misc/e-import-assistant.c:252
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
@@ -21035,37 +20916,37 @@ msgstr ""
 "Velg filen du ønsker å importere til Evolution og velg hvilken type fil det "
 "er fra listen."
 
-#: ../widgets/misc/e-import-assistant.c:266
+#: ../widgets/misc/e-import-assistant.c:269
 msgid "F_ilename:"
 msgstr "F_ilnavn:"
 
-#: ../widgets/misc/e-import-assistant.c:276
+#: ../widgets/misc/e-import-assistant.c:279
 msgid "Select a file"
 msgstr "Velg en fil"
 
-#: ../widgets/misc/e-import-assistant.c:290
-#: ../widgets/misc/e-import-assistant.c:465
+#: ../widgets/misc/e-import-assistant.c:293
+#: ../widgets/misc/e-import-assistant.c:468
 msgid "File _type:"
 msgstr "Fil_type:"
 
-#: ../widgets/misc/e-import-assistant.c:333
-#: ../widgets/misc/e-import-assistant.c:916
+#: ../widgets/misc/e-import-assistant.c:336
+#: ../widgets/misc/e-import-assistant.c:912
 msgid "Choose the destination for this import"
 msgstr "Velg mål det skal importeres til"
 
-#: ../widgets/misc/e-import-assistant.c:358
+#: ../widgets/misc/e-import-assistant.c:361
 msgid "Choose the type of importer to run:"
 msgstr "Velg type importerer som skal kjøres:"
 
-#: ../widgets/misc/e-import-assistant.c:366
+#: ../widgets/misc/e-import-assistant.c:369
 msgid "Import data and settings from _older programs"
 msgstr "Importer data og innstillinger fra _eldre programmer"
 
-#: ../widgets/misc/e-import-assistant.c:374
+#: ../widgets/misc/e-import-assistant.c:377
 msgid "Import a _single file"
 msgstr "Importer en en_kelt fil"
 
-#: ../widgets/misc/e-import-assistant.c:526
+#: ../widgets/misc/e-import-assistant.c:529
 msgid ""
 "Evolution checked for settings to import from the following applications: "
 "Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
@@ -21076,37 +20957,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:773
+#: ../widgets/misc/e-import-assistant.c:769
 msgid "_Cancel Import"
 msgstr "A_vbryt import"
 
-#: ../widgets/misc/e-import-assistant.c:915
+#: ../widgets/misc/e-import-assistant.c:911
 msgid "Preview data to be imported"
 msgstr "Forhåndsvis data som skal importeres"
 
-#: ../widgets/misc/e-import-assistant.c:921
-#: ../widgets/misc/e-import-assistant.c:934
-#: ../widgets/misc/e-import-assistant.c:1284
-#: ../widgets/misc/e-import-assistant.c:1350
-#: ../widgets/misc/e-import-assistant.c:1359
+#: ../widgets/misc/e-import-assistant.c:917
+#: ../widgets/misc/e-import-assistant.c:930
+#: ../widgets/misc/e-import-assistant.c:1280
+#: ../widgets/misc/e-import-assistant.c:1346
+#: ../widgets/misc/e-import-assistant.c:1355
 msgid "Import Data"
 msgstr "Importer data"
 
-#: ../widgets/misc/e-import-assistant.c:929
+#: ../widgets/misc/e-import-assistant.c:925
 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:1274
-#: ../widgets/misc/e-import-assistant.c:1308
+#: ../widgets/misc/e-import-assistant.c:1270
+#: ../widgets/misc/e-import-assistant.c:1304
 msgid "Evolution Import Assistant"
 msgstr "Importeringsassistent for Evolution"
 
-#: ../widgets/misc/e-import-assistant.c:1291
-#: ../widgets/misc/e-import-assistant.c:1338
+#: ../widgets/misc/e-import-assistant.c:1287
+#: ../widgets/misc/e-import-assistant.c:1334
 msgid "Import Location"
 msgstr "Importer lokasjon"
 
-#: ../widgets/misc/e-import-assistant.c:1302
+#: ../widgets/misc/e-import-assistant.c:1298
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
@@ -21116,27 +20997,27 @@ msgstr ""
 "Gjennom denne veiviseren vil du ledes gjennom import av eksterne filer til "
 "Evolution."
 
-#: ../widgets/misc/e-import-assistant.c:1316
+#: ../widgets/misc/e-import-assistant.c:1312
 msgid "Importer Type"
 msgstr "Type import"
 
-#: ../widgets/misc/e-import-assistant.c:1324
+#: ../widgets/misc/e-import-assistant.c:1320
 msgid "Select Information to Import"
 msgstr "Velg informasjon som skal importeres"
 
-#: ../widgets/misc/e-import-assistant.c:1331
+#: ../widgets/misc/e-import-assistant.c:1327
 msgid "Select a File"
 msgstr "Velg en fil"
 
-#: ../widgets/misc/e-import-assistant.c:1345
+#: ../widgets/misc/e-import-assistant.c:1341
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "Klikk på «Bruk» for å starte import av filen til Evolution."
 
-#: ../widgets/misc/e-map.c:557
+#: ../widgets/misc/e-map.c:560
 msgid "World Map"
 msgstr "Verdenskart"
 
-#: ../widgets/misc/e-map.c:559
+#: ../widgets/misc/e-map.c:562
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -21158,52 +21039,52 @@ msgstr ""
 msgid "Evolution is currently offline because the network is unavailable."
 msgstr "Evolution er frakoblet fordi nettverket ikke er tilgjengelig."
 
-#: ../widgets/misc/e-preferences-window.c:278
+#: ../widgets/misc/e-preferences-window.c:281
 msgid "Evolution Preferences"
 msgstr "Evolution brukervalg"
 
-#: ../widgets/misc/e-search-bar.c:81
+#: ../widgets/misc/e-search-bar.c:84
 #, c-format
 msgid "Matches: %d"
 msgstr "Treff på: %d"
 
-#: ../widgets/misc/e-search-bar.c:557
+#: ../widgets/misc/e-search-bar.c:560
 msgid "Close the find bar"
 msgstr "Lukk søkelinjen"
 
-#: ../widgets/misc/e-search-bar.c:565
+#: ../widgets/misc/e-search-bar.c:568
 msgid "Fin_d:"
 msgstr "Fin_n:"
 
-#: ../widgets/misc/e-search-bar.c:577
+#: ../widgets/misc/e-search-bar.c:580
 msgid "Clear the search"
 msgstr "Tøm søket"
 
-#: ../widgets/misc/e-search-bar.c:600
+#: ../widgets/misc/e-search-bar.c:603
 msgid "_Previous"
 msgstr "_Forrige"
 
-#: ../widgets/misc/e-search-bar.c:606
+#: ../widgets/misc/e-search-bar.c:609
 msgid "Find the previous occurrence of the phrase"
 msgstr "Finn forrige oppføring av teksten"
 
-#: ../widgets/misc/e-search-bar.c:616
+#: ../widgets/misc/e-search-bar.c:619
 msgid "_Next"
 msgstr "_Neste"
 
-#: ../widgets/misc/e-search-bar.c:622
+#: ../widgets/misc/e-search-bar.c:625
 msgid "Find the next occurrence of the phrase"
 msgstr "Finn neste oppføring av teksten"
 
-#: ../widgets/misc/e-search-bar.c:632
+#: ../widgets/misc/e-search-bar.c:635
 msgid "Mat_ch case"
 msgstr "Tre_ff på små/store bokstaver"
 
-#: ../widgets/misc/e-search-bar.c:660
+#: ../widgets/misc/e-search-bar.c:663
 msgid "Reached bottom of page, continued from top"
 msgstr "NÃ¥dde bunnen av siden og fortsatte fra toppen"
 
-#: ../widgets/misc/e-search-bar.c:682
+#: ../widgets/misc/e-search-bar.c:685
 msgid "Reached top of page, continued from bottom"
 msgstr "NÃ¥dde toppen av siden og fortsatte fra bunnen"
 
@@ -21338,38 +21219,38 @@ msgctxt "send-options"
 msgid "None"
 msgstr "Ingen"
 
-#: ../widgets/misc/e-signature-editor.c:136
-#: ../widgets/misc/e-signature-editor.c:524
-#: ../widgets/misc/e-signature-manager.c:353
+#: ../widgets/misc/e-signature-editor.c:138
+#: ../widgets/misc/e-signature-editor.c:526
+#: ../widgets/misc/e-signature-manager.c:356
 #: ../widgets/misc/e-signature-script-dialog.c:220
 msgid "Unnamed"
 msgstr "Uten navn"
 
-#: ../widgets/misc/e-signature-editor.c:213
+#: ../widgets/misc/e-signature-editor.c:215
 msgid "_Save and Close"
 msgstr "L_agre og lukk"
 
-#: ../widgets/misc/e-signature-editor.c:391
+#: ../widgets/misc/e-signature-editor.c:393
 msgid "Edit Signature"
 msgstr "Rediger signatur"
 
-#: ../widgets/misc/e-signature-editor.c:406
+#: ../widgets/misc/e-signature-editor.c:408
 msgid "_Signature Name:"
 msgstr "Navn på _signatur:"
 
-#: ../widgets/misc/e-signature-manager.c:298
+#: ../widgets/misc/e-signature-manager.c:301
 msgid "Add Signature Script"
 msgstr "Legg til signaturskript"
 
-#: ../widgets/misc/e-signature-manager.c:363
+#: ../widgets/misc/e-signature-manager.c:366
 msgid "Edit Signature Script"
 msgstr "Rediger signaturskript"
 
-#: ../widgets/misc/e-signature-manager.c:579
+#: ../widgets/misc/e-signature-manager.c:582
 msgid "Add _Script"
 msgstr "Legg til _skript"
 
-#: ../widgets/misc/e-signature-script-dialog.c:268
+#: ../widgets/misc/e-signature-script-dialog.c:270
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -21379,11 +21260,11 @@ msgstr ""
 "signatur. Navnet du oppgir vil kun brukes for\n"
 "visning på skjermen."
 
-#: ../widgets/misc/e-signature-script-dialog.c:313
+#: ../widgets/misc/e-signature-script-dialog.c:315
 msgid "S_cript:"
 msgstr "S_kript:"
 
-#: ../widgets/misc/e-signature-script-dialog.c:344
+#: ../widgets/misc/e-signature-script-dialog.c:346
 msgid "Script file must be executable."
 msgstr "Skriptfilen må være kjørbar."
 
@@ -21444,7 +21325,7 @@ msgstr "Kalender (fra %s til %s)"
 msgid "evolution calendar item"
 msgstr "Evolution kalenderoppføring"
 
-#: ../widgets/table/e-cell-combo.c:174
+#: ../widgets/table/e-cell-combo.c:177
 msgid "popup list"
 msgstr "oppsprettliste"
 
@@ -21471,34 +21352,34 @@ msgstr "Datoen må skrives inn på formatet: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Prosentverdien må være mellom 0 og 100, inklusive"
 
-#: ../widgets/table/e-table-click-to-add.c:595
+#: ../widgets/table/e-table-click-to-add.c:598
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:135
 msgid "click to add"
 msgstr "klikk for å legge til"
 
-#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
+#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
 msgid "(Ascending)"
 msgstr "(Stigende)"
 
-#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
+#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
 msgid "(Descending)"
 msgstr "(Synkende)"
 
-#: ../widgets/table/e-table-config.c:388
+#: ../widgets/table/e-table-config.c:392
 msgid "Not sorted"
 msgstr "Ikke sortert"
 
-#: ../widgets/table/e-table-config.c:429
+#: ../widgets/table/e-table-config.c:433
 msgid "No grouping"
 msgstr "Ingen gruppering"
 
-#: ../widgets/table/e-table-config.c:647
+#: ../widgets/table/e-table-config.c:654
 #: ../widgets/table/e-table-config.ui.h:11
 msgid "Show Fields"
 msgstr "Vis felter"
 
-#: ../widgets/table/e-table-config.c:667
+#: ../widgets/table/e-table-config.c:674
 msgid "Available Fields"
 msgstr "Tilgjengelige felt"
 
@@ -21507,7 +21388,7 @@ msgid "A_vailable Fields:"
 msgstr "T_ilgjengelige felter:"
 
 #: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1702
+#: ../widgets/table/e-table-header-item.c:1704
 msgid "Ascending"
 msgstr "Stigende"
 
@@ -21520,7 +21401,7 @@ msgid "Clear _All"
 msgstr "Fjern _alt"
 
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1702
+#: ../widgets/table/e-table-header-item.c:1704
 msgid "Descending"
 msgstr "Synkende"
 
@@ -21599,7 +21480,7 @@ msgstr ""
 #. Finally the %d is replaced with count of items in this group.
 #. Example: "Family name: Smith (13 items)"
 #.
-#: ../widgets/table/e-table-group-container.c:351
+#: ../widgets/table/e-table-group-container.c:354
 #, c-format
 msgid "%s: %s (%d item)"
 msgid_plural "%s: %s (%d items)"
@@ -21612,72 +21493,72 @@ msgstr[1] "%s: %s (%d oppføringer)"
 #. The %d is replaced with count of items in this group.
 #. Example: "Smith (13 items)"
 #.
-#: ../widgets/table/e-table-group-container.c:363
+#: ../widgets/table/e-table-group-container.c:366
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d oppføring)"
 msgstr[1] "%s (%d oppføringer)"
 
-#: ../widgets/table/e-table-header-item.c:1546
+#: ../widgets/table/e-table-header-item.c:1548
 msgid "Customize Current View"
 msgstr "Tilpass aktiv visning"
 
-#: ../widgets/table/e-table-header-item.c:1567
+#: ../widgets/table/e-table-header-item.c:1569
 msgid "Sort _Ascending"
 msgstr "Sorter s_tigende"
 
-#: ../widgets/table/e-table-header-item.c:1570
+#: ../widgets/table/e-table-header-item.c:1572
 msgid "Sort _Descending"
 msgstr "Sorter s_ynkende"
 
-#: ../widgets/table/e-table-header-item.c:1573
+#: ../widgets/table/e-table-header-item.c:1575
 msgid "_Unsort"
 msgstr "_Fjern sortering"
 
-#: ../widgets/table/e-table-header-item.c:1576
+#: ../widgets/table/e-table-header-item.c:1578
 msgid "Group By This _Field"
 msgstr "Grupper etter dette _feltet"
 
-#: ../widgets/table/e-table-header-item.c:1579
+#: ../widgets/table/e-table-header-item.c:1581
 msgid "Group By _Box"
 msgstr "Grupper etter _boks"
 
-#: ../widgets/table/e-table-header-item.c:1583
+#: ../widgets/table/e-table-header-item.c:1585
 msgid "Remove This _Column"
 msgstr "Fjern denne _kolonnen"
 
-#: ../widgets/table/e-table-header-item.c:1586
+#: ../widgets/table/e-table-header-item.c:1588
 msgid "Add a C_olumn..."
 msgstr "Legg til en k_olonne..."
 
-#: ../widgets/table/e-table-header-item.c:1590
+#: ../widgets/table/e-table-header-item.c:1592
 msgid "A_lignment"
 msgstr "_Justering"
 
-#: ../widgets/table/e-table-header-item.c:1593
+#: ../widgets/table/e-table-header-item.c:1595
 msgid "B_est Fit"
 msgstr "B_este tilpasning"
 
-#: ../widgets/table/e-table-header-item.c:1596
+#: ../widgets/table/e-table-header-item.c:1598
 msgid "Format Column_s..."
 msgstr "For_mater kolonner..."
 
-#: ../widgets/table/e-table-header-item.c:1600
+#: ../widgets/table/e-table-header-item.c:1602
 msgid "Custo_mize Current View..."
 msgstr "T_ilpass aktiv visning..."
 
-#: ../widgets/table/e-table-header-item.c:1659
+#: ../widgets/table/e-table-header-item.c:1661
 msgid "_Sort By"
 msgstr "_Sorter etter"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1677
+#: ../widgets/table/e-table-header-item.c:1679
 msgid "_Custom"
 msgstr "E_gendefinert"
 
 #. Translators: description of a "popup" action
-#: ../widgets/table/gal-a11y-e-cell-popup.c:123
+#: ../widgets/table/gal-a11y-e-cell-popup.c:126
 msgid "popup a child"
 msgstr "vis et avkom"
 
@@ -21713,14 +21594,10 @@ msgstr "klikk"
 msgid "sort"
 msgstr "sortere"
 
-#: ../widgets/text/e-text.c:2533
+#: ../widgets/text/e-text.c:2538
 msgid "Select All"
 msgstr "Velg alle"
 
-#: ../widgets/text/e-text.c:2545
+#: ../widgets/text/e-text.c:2550
 msgid "Input Methods"
 msgstr "Inndatametoder"
-
-#~ msgctxt "yes"
-#~ msgid "_Select..."
-#~ msgstr "_Velg..."



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