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



commit bb3487625b354038f490fdf30ffc4490fd31c035
Author: Kjartan Maraas <kmaraas gnome org>
Date:   Mon Jul 23 12:17:28 2012 +0200

    Updated Norwegian bokmÃl translation

 po/nb.po | 1113 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 557 insertions(+), 556 deletions(-)
---
diff --git a/po/nb.po b/po/nb.po
index cc3cac1..fb32db7 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution 3.5.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-09 09:43+0200\n"
-"PO-Revision-Date: 2012-07-09 13:58+0200\n"
+"POT-Creation-Date: 2012-07-23 12:11+0200\n"
+"PO-Revision-Date: 2012-07-23 12:17+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas gnome org>\n"
 "Language-Team: Norwegian bokmÃl <i18n-nb lister ping uio no>\n"
 "Language: Norsk bokmÃl\n"
@@ -84,7 +84,7 @@ msgid "This address book will be removed permanently."
 msgstr "Denne adresseboken vil bli slettet for godt."
 
 #: ../addressbook/addressbook.error.xml.h:13
-#: ../calendar/calendar.error.xml.h:7 ../mail/mail.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:7 ../mail/mail.error.xml.h:66
 msgid "Do _Not Delete"
 msgstr "Ikke s_lett"
 
@@ -177,7 +177,7 @@ msgstr ""
 "kontakt med samme adresse likevel?"
 
 #: ../addressbook/addressbook.error.xml.h:33
-#: ../mail/em-vfolder-editor-rule.c:364 ../widgets/table/e-table-config.ui.h:6
+#: ../mail/em-vfolder-editor-rule.c:388 ../widgets/table/e-table-config.ui.h:6
 msgid "_Add"
 msgstr "_Legg til"
 
@@ -331,7 +331,7 @@ msgstr "_Hjemmeside:"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
 #: ../calendar/gui/dialogs/event-page.c:722
 #: ../calendar/gui/dialogs/event-page.ui.h:22
-#: ../modules/itip-formatter/itip-view.c:1786
+#: ../modules/itip-formatter/itip-view.c:1822
 msgid "_Calendar:"
 msgstr "_Kalender:"
 
@@ -1567,21 +1567,38 @@ msgid "Appointments"
 msgstr "Avtaler"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:2
+msgid "Dismiss _All"
+msgstr "Lukk _alle"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:3
 msgid "_Snooze"
 msgstr "_Utsett"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:3
+#: ../calendar/alarm-notify/alarm-notify.ui.h:4
 #: ../libevolution-utils/e-alert-dialog.c:162
 msgid "_Dismiss"
 msgstr "_Lukk"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:4
+#: ../calendar/alarm-notify/alarm-notify.ui.h:5
+#: ../calendar/alarm-notify/alarm-queue.c:1755
+#: ../calendar/alarm-notify/alarm-queue.c:1765
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:191
+#: ../modules/itip-formatter/itip-view.c:1449
+#: ../modules/itip-formatter/itip-view.c:1549
+msgid "Location:"
+msgstr "Sted:"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:6
+msgid "location of appointment"
+msgstr "sted for avtalen"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:7
 msgid "Snooze _time:"
 msgstr "_Tid for utsettelse av alarm:"
 
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../calendar/alarm-notify/alarm-notify.ui.h:5
+#: ../calendar/alarm-notify/alarm-notify.ui.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:10 ../filter/filter.ui.h:8
 #: ../modules/calendar/e-cal-shell-view-actions.c:352
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
@@ -1589,7 +1606,7 @@ msgstr "_Tid for utsettelse av alarm:"
 msgid "days"
 msgstr "dager"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:6
+#: ../calendar/alarm-notify/alarm-notify.ui.h:9
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
 #: ../calendar/gui/dialogs/event-page.ui.h:18 ../filter/filter.ui.h:7
 #: ../widgets/misc/e-interval-chooser.c:141
@@ -1597,59 +1614,42 @@ msgid "hours"
 msgstr "timer"
 
 #. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
-#: ../calendar/alarm-notify/alarm-notify.ui.h:7
+#: ../calendar/alarm-notify/alarm-notify.ui.h:10
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
 #: ../calendar/gui/dialogs/event-page.ui.h:19 ../filter/filter.ui.h:6
-#: ../mail/e-mail-config-provider-page.c:541
+#: ../mail/e-mail-config-provider-page.c:527
 #: ../modules/addressbook/ldap-config.ui.h:29
 #: ../widgets/misc/e-interval-chooser.c:139
 msgid "minutes"
 msgstr "minutter"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:8
-msgid "location of appointment"
-msgstr "sted for avtalen"
-
-#: ../calendar/alarm-notify/alarm-notify.ui.h:9
-#: ../calendar/alarm-notify/alarm-queue.c:1754
-#: ../calendar/alarm-notify/alarm-queue.c:1764
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:216
-#: ../modules/itip-formatter/itip-view.c:1413
-#: ../modules/itip-formatter/itip-view.c:1513
-msgid "Location:"
-msgstr "Sted:"
-
-#: ../calendar/alarm-notify/alarm-notify.ui.h:10
-msgid "Dismiss _All"
-msgstr "Lukk _alle"
-
-#: ../calendar/alarm-notify/alarm-queue.c:1603
-#: ../calendar/alarm-notify/alarm-queue.c:1735
+#: ../calendar/alarm-notify/alarm-queue.c:1604
+#: ../calendar/alarm-notify/alarm-queue.c:1736
 msgid "No summary available."
 msgstr "Sammendrag er ikke tilgjengelig."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1612
-#: ../calendar/alarm-notify/alarm-queue.c:1614
+#: ../calendar/alarm-notify/alarm-queue.c:1613
+#: ../calendar/alarm-notify/alarm-queue.c:1615
 msgid "No description available."
 msgstr "Ingen beskrivelse tilgjengelig."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1622
+#: ../calendar/alarm-notify/alarm-queue.c:1623
 msgid "No location information available."
 msgstr "Stedsinformasjon er ikke tilgjengelig."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1668
+#: ../calendar/alarm-notify/alarm-queue.c:1669
 #, c-format
 msgid "You have %d reminder"
 msgid_plural "You have %d reminders"
 msgstr[0] "Du har %d pÃminnelse"
 msgstr[1] "Du har %d pÃminnelser"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1864
-#: ../calendar/alarm-notify/alarm-queue.c:1899
+#: ../calendar/alarm-notify/alarm-queue.c:1865
+#: ../calendar/alarm-notify/alarm-queue.c:1900
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1868
+#: ../calendar/alarm-notify/alarm-queue.c:1869
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -1661,7 +1661,7 @@ msgstr ""
 "er konfigurert til à sende e-post. Evolution vil vise\n"
 "en vanlig dialog med pÃminnelsen i stedet."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1905
+#: ../calendar/alarm-notify/alarm-queue.c:1906
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -1677,7 +1677,7 @@ msgstr ""
 "\n"
 "Er du sikker pà at du vil kjÃre dette programmet?"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1920
+#: ../calendar/alarm-notify/alarm-queue.c:1921
 msgid "Do not ask me about this program again."
 msgstr "Ikke spÃr meg om dette programmet igjen."
 
@@ -1942,7 +1942,7 @@ msgstr ""
 "hvis den blir lagret nÃ."
 
 #: ../calendar/calendar.error.xml.h:47 ../composer/e-composer-actions.c:316
-#: ../modules/itip-formatter/itip-view.c:3022
+#: ../modules/itip-formatter/itip-view.c:3057
 msgid "_Save"
 msgstr "_Lagre"
 
@@ -2142,7 +2142,7 @@ msgstr ""
 msgid "Could not perform this operation."
 msgstr "Kunne ikke utfÃre denne operasjonen."
 
-#: ../calendar/calendar.error.xml.h:92 ../mail/mail.error.xml.h:166
+#: ../calendar/calendar.error.xml.h:92 ../mail/mail.error.xml.h:169
 msgid "You must be working online to complete this operation."
 msgstr "Du mà arbeide frakoblet for à fullfÃre denne operasjonen."
 
@@ -2514,11 +2514,11 @@ msgstr "Ingen sammendrag"
 msgid "Keep original item?"
 msgstr "Behold opprinnelig oppfÃring?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1153
+#: ../calendar/gui/dialogs/comp-editor.c:1157
 msgid "Close the current window"
 msgstr "Lukk aktiv vindu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1160 ../mail/e-mail-browser.c:134
+#: ../calendar/gui/dialogs/comp-editor.c:1164 ../mail/e-mail-browser.c:134
 #: ../shell/e-shell-window-actions.c:1446
 #: ../widgets/misc/e-focus-tracker.c:121 ../widgets/misc/e-focus-tracker.c:558
 #: ../widgets/misc/e-web-view.c:327 ../widgets/misc/e-web-view.c:1413
@@ -2527,53 +2527,53 @@ msgstr "Lukk aktiv vindu"
 msgid "Copy the selection"
 msgstr "Kopier utvalget"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1167 ../mail/e-mail-browser.c:141
+#: ../calendar/gui/dialogs/comp-editor.c:1171 ../mail/e-mail-browser.c:141
 #: ../shell/e-shell-window-actions.c:1453
 #: ../widgets/misc/e-focus-tracker.c:114 ../widgets/misc/e-focus-tracker.c:553
 #: ../widgets/misc/e-web-view.c:1407 ../widgets/misc/e-web-view-gtkhtml.c:1293
 msgid "Cut the selection"
 msgstr "Klipp ut utvalget"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1174
+#: ../calendar/gui/dialogs/comp-editor.c:1178
 #: ../shell/e-shell-window-actions.c:1460
 #: ../widgets/misc/e-focus-tracker.c:135 ../widgets/misc/e-focus-tracker.c:568
 msgid "Delete the selection"
 msgstr "Slett utvalget"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1181
+#: ../calendar/gui/dialogs/comp-editor.c:1185
 msgid "View help"
 msgstr "Vis hjelp"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1188 ../mail/e-mail-browser.c:148
+#: ../calendar/gui/dialogs/comp-editor.c:1192 ../mail/e-mail-browser.c:148
 #: ../shell/e-shell-window-actions.c:1481
 #: ../widgets/misc/e-focus-tracker.c:128 ../widgets/misc/e-focus-tracker.c:563
 #: ../widgets/misc/e-web-view.c:1419 ../widgets/misc/e-web-view-gtkhtml.c:1305
 msgid "Paste the clipboard"
 msgstr "Lim inn fra utklippstavlen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1209
+#: ../calendar/gui/dialogs/comp-editor.c:1213
 msgid "Save current changes"
 msgstr "Lagre endringer"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1214
+#: ../calendar/gui/dialogs/comp-editor.c:1218
 msgid "Save and Close"
 msgstr "Lagre og lukk"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1216
+#: ../calendar/gui/dialogs/comp-editor.c:1220
 msgid "Save current changes and close editor"
 msgstr "Lagre endringer og lukk redigering"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1223 ../mail/e-mail-browser.c:155
+#: ../calendar/gui/dialogs/comp-editor.c:1227 ../mail/e-mail-browser.c:155
 #: ../shell/e-shell-window-actions.c:1558
 #: ../widgets/misc/e-focus-tracker.c:142 ../widgets/misc/e-focus-tracker.c:573
 msgid "Select all text"
 msgstr "Velg all tekst"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1230
+#: ../calendar/gui/dialogs/comp-editor.c:1234
 msgid "_Classification"
 msgstr "K_lassifisering"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1237
+#: ../calendar/gui/dialogs/comp-editor.c:1241
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:19 ../filter/filter.ui.h:16
 #: ../mail/e-mail-browser.c:169
 #: ../plugins/publish-calendar/publish-calendar.ui.h:32
@@ -2582,133 +2582,133 @@ msgstr "K_lassifisering"
 msgid "_Edit"
 msgstr "R_ediger"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1244 ../mail/e-mail-browser.c:162
+#: ../calendar/gui/dialogs/comp-editor.c:1248 ../mail/e-mail-browser.c:162
 #: ../shell/e-shell-window-actions.c:1593
 #: ../widgets/misc/e-mail-signature-editor.c:299
 msgid "_File"
 msgstr "_Fil"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1251
+#: ../calendar/gui/dialogs/comp-editor.c:1255
 #: ../shell/e-shell-window-actions.c:1600
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1258
+#: ../calendar/gui/dialogs/comp-editor.c:1262
 msgid "_Insert"
 msgstr "Sett _inn"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1265
+#: ../calendar/gui/dialogs/comp-editor.c:1269
 #: ../composer/e-composer-actions.c:339
 msgid "_Options"
 msgstr "_Alternativer"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1272 ../mail/e-mail-browser.c:176
+#: ../calendar/gui/dialogs/comp-editor.c:1276 ../mail/e-mail-browser.c:176
 #: ../shell/e-shell-window-actions.c:1635 ../smime/gui/smime-ui.ui.h:28
 msgid "_View"
 msgstr "_Vis"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1282
+#: ../calendar/gui/dialogs/comp-editor.c:1286
 #: ../composer/e-composer-actions.c:288
 msgid "_Attachment..."
 msgstr "_Vedlegg â"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1284
+#: ../calendar/gui/dialogs/comp-editor.c:1288
 #: ../composer/e-composer-actions.c:290
 #: ../widgets/misc/e-attachment-view.c:414
 msgid "Attach a file"
 msgstr "Legg ved en fil"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1292
+#: ../calendar/gui/dialogs/comp-editor.c:1296
 msgid "_Categories"
 msgstr "_Kategorier"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1294
+#: ../calendar/gui/dialogs/comp-editor.c:1298
 msgid "Toggles whether to display categories"
 msgstr "SlÃr av/pà visning av kategorier"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1300
+#: ../calendar/gui/dialogs/comp-editor.c:1304
 msgid "Time _Zone"
 msgstr "Tids_sone"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1302
+#: ../calendar/gui/dialogs/comp-editor.c:1306
 msgid "Toggles whether the time zone is displayed"
 msgstr "SlÃr av/pà visning av tidssone"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1311
+#: ../calendar/gui/dialogs/comp-editor.c:1315
 msgid "Pu_blic"
 msgstr "O_ffentlig"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1313
+#: ../calendar/gui/dialogs/comp-editor.c:1317
 msgid "Classify as public"
 msgstr "Klassifiser som offentlig"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1318
+#: ../calendar/gui/dialogs/comp-editor.c:1322
 msgid "_Private"
 msgstr "_Privat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1320
+#: ../calendar/gui/dialogs/comp-editor.c:1324
 msgid "Classify as private"
 msgstr "Klassifiser som privat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1325
+#: ../calendar/gui/dialogs/comp-editor.c:1329
 msgid "_Confidential"
 msgstr "_Konfidensiell"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1327
+#: ../calendar/gui/dialogs/comp-editor.c:1331
 msgid "Classify as confidential"
 msgstr "Klassifiser som konfidensiell"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1335
+#: ../calendar/gui/dialogs/comp-editor.c:1339
 msgid "R_ole Field"
 msgstr "R_olle-felt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1337
+#: ../calendar/gui/dialogs/comp-editor.c:1341
 msgid "Toggles whether the Role field is displayed"
 msgstr "SlÃr av/pà visning av rolle-feltet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1343
+#: ../calendar/gui/dialogs/comp-editor.c:1347
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1345
+#: ../calendar/gui/dialogs/comp-editor.c:1349
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "SlÃr av/pà visning av RSVP-feltet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1351
+#: ../calendar/gui/dialogs/comp-editor.c:1355
 msgid "_Status Field"
 msgstr "_Status-felt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1353
+#: ../calendar/gui/dialogs/comp-editor.c:1357
 msgid "Toggles whether the Status field is displayed"
 msgstr "SlÃr av/pà visning av status-feltet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1359
+#: ../calendar/gui/dialogs/comp-editor.c:1363
 msgid "_Type Field"
 msgstr "_Type felt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1361
+#: ../calendar/gui/dialogs/comp-editor.c:1365
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "SlÃr av/pà visning av deltakertype-feltet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2110
+#: ../calendar/gui/dialogs/comp-editor.c:2114
 #: ../composer/e-composer-actions.c:507
 msgid "Attach"
 msgstr "Legg ved"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2459
-#: ../calendar/gui/dialogs/comp-editor.c:2643
-#: ../calendar/gui/dialogs/comp-editor.c:3647
+#: ../calendar/gui/dialogs/comp-editor.c:2463
+#: ../calendar/gui/dialogs/comp-editor.c:2647
+#: ../calendar/gui/dialogs/comp-editor.c:3651
 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:3611
+#: ../calendar/gui/dialogs/comp-editor.c:3615
 #: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:115
 msgid "attachment"
 msgstr "vedlegg"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3679
+#: ../calendar/gui/dialogs/comp-editor.c:3683
 msgid "Unable to use current version!"
 msgstr "Kan ikke bruke denne versjonen!"
 
@@ -3140,14 +3140,14 @@ msgstr "Kan ikke Ãpne notater i Â%sÂ: %s"
 
 #: ../calendar/gui/dialogs/memo-page.c:983
 #: ../em-format/e-mail-parser-application-mbox.c:111
-#: ../em-format/e-mail-parser-application-smime.c:105
+#: ../em-format/e-mail-parser-application-smime.c:107
 #: ../em-format/e-mail-parser-inlinepgp-encrypted.c:94
 #: ../em-format/e-mail-parser-inlinepgp-signed.c:96
 #: ../em-format/e-mail-parser-multipart-encrypted.c:122
 #: ../em-format/e-mail-parser-multipart-signed.c:147
-#: ../libemail-engine/mail-ops.c:715 ../mail/e-mail-reader.c:1748
-#: ../mail/em-folder-tree.c:678 ../modules/itip-formatter/itip-view.c:4459
-#: ../modules/itip-formatter/itip-view.c:4857 ../plugins/face/face.c:174
+#: ../libemail-engine/mail-ops.c:716 ../mail/e-mail-reader.c:1748
+#: ../mail/em-folder-tree.c:678 ../modules/itip-formatter/itip-view.c:4494
+#: ../modules/itip-formatter/itip-view.c:4892 ../plugins/face/face.c:174
 #: ../smime/gui/certificate-manager.c:317
 msgid "Unknown error"
 msgstr "Ukjent feil"
@@ -3533,7 +3533,7 @@ msgstr "FullfÃrt"
 #: ../calendar/gui/e-cal-model-tasks.c:495
 #: ../calendar/gui/e-cal-model-tasks.c:780 ../calendar/gui/e-task-table.c:233
 #: ../calendar/gui/e-task-table.c:248 ../calendar/gui/e-task-table.c:659
-#: ../calendar/gui/print.c:3414
+#: ../calendar/gui/print.c:3414 ../mail/mail-send-recv.c:869
 msgid "Canceled"
 msgstr "Avbrutt"
 
@@ -3887,7 +3887,7 @@ msgid "calendar view for one or more weeks"
 msgstr "kalendervisning for en eller flere uker"
 
 #: ../calendar/gui/e-cal-component-preview.c:206 ../filter/e-filter-rule.c:748
-#: ../mail/e-mail-config-page.c:65
+#: ../mail/e-mail-config-page.c:126
 msgid "Untitled"
 msgstr "Uten navn"
 
@@ -3912,8 +3912,8 @@ msgid "Due Date:"
 msgstr "Ferdig-dato:"
 
 #: ../calendar/gui/e-cal-component-preview.c:286
-#: ../modules/itip-formatter/itip-view.c:1416
-#: ../modules/itip-formatter/itip-view.c:1522
+#: ../modules/itip-formatter/itip-view.c:1452
+#: ../modules/itip-formatter/itip-view.c:1558
 msgid "Status:"
 msgstr "Status:"
 
@@ -3922,7 +3922,7 @@ msgid "Priority:"
 msgstr "Prioritet:"
 
 #: ../calendar/gui/e-cal-component-preview.c:336
-#: ../mail/e-mail-config-service-page.c:720
+#: ../mail/e-mail-config-service-page.c:672
 msgid "Description:"
 msgstr "Beskrivelse:"
 
@@ -3942,7 +3942,7 @@ msgstr "Startdato"
 #: ../calendar/gui/e-meeting-list-view.c:644
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:4
 #: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../mail/e-mail-account-tree-view.c:139
+#: ../mail/e-mail-account-tree-view.c:157
 #: ../widgets/misc/e-attachment-tree-view.c:586
 msgid "Type"
 msgstr "Type"
@@ -3951,7 +3951,7 @@ msgstr "Type"
 msgid "Completion date"
 msgstr "Ferdigstillingsdato"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:6
+#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:871
 msgid "Complete"
 msgstr "FullfÃrt"
 
@@ -4053,8 +4053,8 @@ msgstr "Sluttdato"
 #: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:174
 #: ../calendar/gui/e-meeting-store.c:237 ../calendar/gui/print.c:1159
 #: ../calendar/gui/print.c:1176 ../e-util/e-charset.c:52
-#: ../modules/itip-formatter/itip-view.c:3406
-#: ../modules/itip-formatter/itip-view.c:5937
+#: ../modules/itip-formatter/itip-view.c:3441
+#: ../modules/itip-formatter/itip-view.c:5972
 #: ../modules/plugin-manager/evolution-plugin-manager.c:101
 msgid "Unknown"
 msgstr "Ukjent"
@@ -4088,14 +4088,14 @@ msgstr "Ãpner %s"
 #: ../calendar/gui/e-cal-model.c:3559
 #: ../calendar/gui/e-meeting-list-view.c:222
 #: ../calendar/gui/e-meeting-store.c:201 ../calendar/gui/e-meeting-store.c:224
-#: ../modules/itip-formatter/itip-view.c:5925
+#: ../modules/itip-formatter/itip-view.c:5960
 msgid "Accepted"
 msgstr "Godtatt"
 
 #: ../calendar/gui/e-cal-model.c:3560
 #: ../calendar/gui/e-meeting-list-view.c:223
 #: ../calendar/gui/e-meeting-store.c:203 ../calendar/gui/e-meeting-store.c:226
-#: ../modules/itip-formatter/itip-view.c:5931
+#: ../modules/itip-formatter/itip-view.c:5966
 msgid "Declined"
 msgstr "AvslÃtt"
 
@@ -4109,7 +4109,7 @@ msgstr "Tentativ"
 #: ../calendar/gui/e-cal-model.c:3562
 #: ../calendar/gui/e-meeting-list-view.c:225
 #: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/e-meeting-store.c:230
-#: ../modules/itip-formatter/itip-view.c:5934
+#: ../modules/itip-formatter/itip-view.c:5969
 msgid "Delegated"
 msgstr "Delegert"
 
@@ -4885,7 +4885,7 @@ msgstr "Avtaler og mÃter"
 
 #: ../calendar/importers/icalendar-importer.c:468
 #: ../calendar/importers/icalendar-importer.c:905
-#: ../modules/itip-formatter/itip-view.c:5536
+#: ../modules/itip-formatter/itip-view.c:5571
 msgid "Opening calendar"
 msgstr "Ãpner kalender"
 
@@ -7278,7 +7278,7 @@ msgstr ""
 msgid "An error occurred while sending. How do you want to proceed?"
 msgstr "En feil oppsto under sending. Hvordan vil du fortsette?"
 
-#: ../composer/mail-composer.error.xml.h:30 ../mail/mail.error.xml.h:151
+#: ../composer/mail-composer.error.xml.h:30 ../mail/mail.error.xml.h:154
 msgid "The reported error was &quot;{0}&quot;."
 msgstr "Feilen som ble rapportert var &quot;{0}&quot;."
 
@@ -7858,7 +7858,7 @@ msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:88
 msgid "Search range for time-based searching in years"
-msgstr ""
+msgstr "SÃkeomrÃde for tidsbaserte sÃk i Ãr"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:89
 msgid ""
@@ -8368,15 +8368,15 @@ msgstr "SV"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
 msgid "Save file format for drag-and-drop operation"
-msgstr ""
+msgstr "Filformat for lagring ved dra-og-slipp operasjon"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
 msgid "Can be either 'mbox' or 'pdf'."
-msgstr ""
+msgstr "Kan vÃre enten Âmbox eller ÂpdfÂ."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
 msgid "Save name format for drag-and-drop operation"
-msgstr ""
+msgstr "Format for lagring av navn ved dra-og-slipp operasjon"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
 msgid ""
@@ -9606,9 +9606,11 @@ msgstr "Cc"
 msgid "Bcc"
 msgstr "Bcc"
 
-#: ../em-format/e-mail-formatter.c:1367 ../mail/e-mail-tag-editor.c:332
-#: ../mail/em-filter-i18n.h:76 ../mail/message-list.etspec.h:6
-#: ../modules/mail/em-mailer-prefs.c:72 ../smime/lib/e-cert.c:1125
+#: ../em-format/e-mail-formatter.c:1367
+#: ../em-format/e-mail-formatter-quote-headers.c:166
+#: ../mail/e-mail-tag-editor.c:332 ../mail/em-filter-i18n.h:76
+#: ../mail/message-list.etspec.h:6 ../modules/mail/em-mailer-prefs.c:72
+#: ../smime/lib/e-cert.c:1125
 msgid "Subject"
 msgstr "Emne"
 
@@ -9663,7 +9665,7 @@ msgstr "Formater del som en RFC822-melding"
 
 #: ../em-format/e-mail-formatter-print.c:53
 #: ../mail/e-mail-label-tree-view.c:99
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1236
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1238
 #: ../modules/cal-config-google/e-google-chooser.c:209
 #: ../modules/plugin-manager/evolution-plugin-manager.c:68
 #: ../widgets/menus/gal-define-views-dialog.c:352
@@ -9700,6 +9702,13 @@ msgstr "Signert med S/MIME"
 msgid "S/MIME encrpyted"
 msgstr "Kryptert med S/MIME"
 
+#. pseudo-header
+#: ../em-format/e-mail-formatter-quote-headers.c:177
+#: ../em-format/e-mail-formatter-utils.c:316
+#: ../modules/mail/em-mailer-prefs.c:1048
+msgid "Mailer"
+msgstr "E-postprogram"
+
 #: ../em-format/e-mail-formatter-quote-text-enriched.c:102
 #: ../em-format/e-mail-formatter-text-enriched.c:115
 msgid "Richtext"
@@ -9721,12 +9730,12 @@ msgid "Format part as HTML"
 msgstr "Formater del som HTML"
 
 #: ../em-format/e-mail-formatter-quote-text-plain.c:123
-#: ../em-format/e-mail-formatter-text-plain.c:179
+#: ../em-format/e-mail-formatter-text-plain.c:182
 msgid "Plain Text"
 msgstr "Ren tekst"
 
 #: ../em-format/e-mail-formatter-quote-text-plain.c:129
-#: ../em-format/e-mail-formatter-text-plain.c:185
+#: ../em-format/e-mail-formatter-text-plain.c:188
 msgid "Format part as plain text"
 msgstr "Formater del som ren tekst"
 
@@ -9858,18 +9867,12 @@ msgstr "Kilde"
 msgid "Display source of a MIME part"
 msgstr "Vis kilde av en MIME-del"
 
-#. pseudo-header
-#: ../em-format/e-mail-formatter-utils.c:316
-#: ../modules/mail/em-mailer-prefs.c:1048
-msgid "Mailer"
-msgstr "E-postprogram"
-
 #: ../em-format/e-mail-parser-application-mbox.c:108
 #, c-format
 msgid "Error parsing MBOX part: %s"
 msgstr "Feil ved lesing av MBOX-del: %s"
 
-#: ../em-format/e-mail-parser-application-smime.c:102
+#: ../em-format/e-mail-parser-application-smime.c:104
 #, c-format
 msgid "Could not parse S/MIME message: %s"
 msgstr "Kunne ikke lese S/MIME-melding: %s"
@@ -10418,7 +10421,7 @@ msgstr "Ugyldig regulÃrt uttrykk &quot;{0}&quot;."
 msgid "Could not compile regular expression &quot;{1}&quot;."
 msgstr "Kunne ikke sette sammen regulÃrt uttrykk &quot;{1}&quot;."
 
-#: ../filter/filter.error.xml.h:8 ../mail/mail.error.xml.h:97
+#: ../filter/filter.error.xml.h:8 ../mail/mail.error.xml.h:100
 msgid "Missing name."
 msgstr "Mangler navn."
 
@@ -10512,58 +10515,58 @@ msgstr ""
 msgid "Invalid authentication result code (%d)"
 msgstr "Ugyldig resultatkode for autentisering (%d)"
 
-#: ../libemail-engine/e-mail-folder-utils.c:109
+#: ../libemail-engine/e-mail-folder-utils.c:112
 #, c-format
 msgid "Saving message to folder '%s'"
 msgstr "Lagrer melding til mappe Â%sÂ"
 
-#: ../libemail-engine/e-mail-folder-utils.c:272
+#: ../libemail-engine/e-mail-folder-utils.c:557
 msgid "Forwarded messages"
 msgstr "Videresendte meldinger"
 
-#: ../libemail-engine/e-mail-folder-utils.c:382
-#: ../libemail-engine/e-mail-folder-utils.c:633
+#: ../libemail-engine/e-mail-folder-utils.c:667
+#: ../libemail-engine/e-mail-folder-utils.c:918
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Henter %d melding"
 msgstr[1] "Henter %d melding(er)"
 
-#: ../libemail-engine/e-mail-folder-utils.c:476
+#: ../libemail-engine/e-mail-folder-utils.c:761
 msgid "Scanning messages for duplicates"
 msgstr "Sjekker meldinger for duplikater"
 
-#: ../libemail-engine/e-mail-folder-utils.c:883
+#: ../libemail-engine/e-mail-folder-utils.c:1169
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "Fjerner mappe Â%sÂ"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1019
+#: ../libemail-engine/e-mail-folder-utils.c:1306
 #, c-format
 msgid "File \"%s\" has been removed."
 msgstr "Filen Â%s ble fjernet."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1023
+#: ../libemail-engine/e-mail-folder-utils.c:1310
 msgid "File has been removed."
 msgstr "Filen er fjernet."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1082
+#: ../libemail-engine/e-mail-folder-utils.c:1369
 msgid "Removing attachments"
 msgstr "Fjerner vedlegg"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1246
+#: ../libemail-engine/e-mail-folder-utils.c:1533
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "Lagrer %d melding"
 msgstr[1] "Lagrer %d meldinger"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1602 ../mail/em-folder-utils.c:609
+#: ../libemail-engine/e-mail-folder-utils.c:1889 ../mail/em-folder-utils.c:609
 #, c-format
 msgid "Invalid folder URI '%s'"
 msgstr "Ugyldig URI for mappe Â%sÂ"
 
-#: ../libemail-engine/e-mail-session.c:111 ../mail/em-folder-properties.c:333
+#: ../libemail-engine/e-mail-session.c:113 ../mail/em-folder-properties.c:333
 #: ../mail/em-folder-tree-model.c:765
 #: ../modules/mail/e-mail-shell-view-private.c:1033
 #: ../modules/mail/e-mail-shell-view-private.c:1044
@@ -10571,25 +10574,25 @@ msgid "Inbox"
 msgstr "Innboks"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../libemail-engine/e-mail-session.c:112 ../mail/em-folder-tree-model.c:758
+#: ../libemail-engine/e-mail-session.c:114 ../mail/em-folder-tree-model.c:758
 #: ../modules/mail/e-mail-shell-view-private.c:1031
 msgid "Drafts"
 msgstr "Skisser"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../libemail-engine/e-mail-session.c:113 ../mail/em-folder-tree-model.c:769
+#: ../libemail-engine/e-mail-session.c:115 ../mail/em-folder-tree-model.c:769
 #: ../modules/mail/e-mail-shell-view-private.c:1035
 msgid "Outbox"
 msgstr "Utboks"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../libemail-engine/e-mail-session.c:114 ../mail/em-folder-tree-model.c:773
+#: ../libemail-engine/e-mail-session.c:116 ../mail/em-folder-tree-model.c:773
 #: ../modules/mail/e-mail-shell-view-private.c:1037
 msgid "Sent"
 msgstr "Sendt"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../libemail-engine/e-mail-session.c:115 ../mail/em-folder-tree-model.c:761
+#: ../libemail-engine/e-mail-session.c:117 ../mail/em-folder-tree-model.c:761
 #: ../modules/mail/e-mail-shell-view-private.c:1039
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
 #: ../plugins/templates/templates.c:1049 ../plugins/templates/templates.c:1349
@@ -10597,29 +10600,29 @@ msgstr "Sendt"
 msgid "Templates"
 msgstr "Maler"
 
-#: ../libemail-engine/e-mail-session.c:1246
+#: ../libemail-engine/e-mail-session.c:1326
 #, c-format
 msgid "User cancelled operation"
 msgstr "Operasjon avbrutt av bruker"
 
-#: ../libemail-engine/e-mail-session.c:1371
+#: ../libemail-engine/e-mail-session.c:1451
 #, c-format
 msgid ""
 "No destination address provided, forwarding of the message has been "
 "cancelled."
 msgstr "Ingen mÃladresse oppgitt. Videresending av meldingen ble avbrutt."
 
-#: ../libemail-engine/e-mail-session.c:1384
+#: ../libemail-engine/e-mail-session.c:1464
 #, c-format
 msgid "No identity found to use, forwarding of the message has been cancelled."
 msgstr "Fant ingen identitet à bruke. Videresending av meldingen ble avbrutt."
 
-#: ../libemail-engine/e-mail-session.c:1546
+#: ../libemail-engine/e-mail-session.c:1626
 #, c-format
 msgid "%s authentication failed"
 msgstr "%s autentisering feilet"
 
-#: ../libemail-engine/e-mail-session.c:1591
+#: ../libemail-engine/e-mail-session.c:1671
 #, c-format
 msgid "No data source found for UID '%s'"
 msgstr "Fant ingen datakilde for UID Â%sÂ"
@@ -10630,14 +10633,14 @@ msgid "Cannot get transport for account '%s'"
 msgstr "Kan ikke hente transport for konto Â%sÂ"
 
 #: ../libemail-engine/e-mail-session-utils.c:508
-#: ../libemail-engine/mail-ops.c:693
+#: ../libemail-engine/mail-ops.c:694
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Feil under pÃfÃring av utgÃende filtre: %s"
 
 #: ../libemail-engine/e-mail-session-utils.c:537
 #: ../libemail-engine/e-mail-session-utils.c:571
-#: ../libemail-engine/mail-ops.c:710 ../libemail-engine/mail-ops.c:746
+#: ../libemail-engine/mail-ops.c:711 ../libemail-engine/mail-ops.c:747
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -10647,21 +10650,16 @@ msgstr ""
 "Legger til i lokal ÂSendtÂ-mappe i stedet."
 
 #: ../libemail-engine/e-mail-session-utils.c:591
-#: ../libemail-engine/mail-ops.c:768
+#: ../libemail-engine/mail-ops.c:769
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "Kunne ikke legge til i lokal Sendt-mappe: %s"
 
 #: ../libemail-engine/e-mail-session-utils.c:821
-#: ../libemail-engine/mail-ops.c:896 ../libemail-engine/mail-ops.c:997
+#: ../libemail-engine/mail-ops.c:897 ../libemail-engine/mail-ops.c:998
 msgid "Sending message"
 msgstr "Sender melding"
 
-#: ../libemail-engine/e-mail-session-utils.c:897
-#, c-format
-msgid "Unsubscribing from folder '%s'"
-msgstr "Fjerner abonnement pà mappe Â%sÂ"
-
 #: ../libemail-engine/e-mail-store-utils.c:171
 #, c-format
 msgid "Disconnecting from '%s'"
@@ -10677,20 +10675,20 @@ msgstr "Kobler til Â%s pà nytt"
 msgid "Preparing account '%s' for offline"
 msgstr "Forbereder konto Â%s for frakoblet bruk"
 
-#: ../libemail-engine/mail-folder-cache.c:887
+#: ../libemail-engine/mail-folder-cache.c:884
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinger %s"
 
-#: ../libemail-engine/mail-ops.c:93
+#: ../libemail-engine/mail-ops.c:94
 msgid "Filtering Selected Messages"
 msgstr "Filtrerer valgte meldinger"
 
-#: ../libemail-engine/mail-ops.c:215
+#: ../libemail-engine/mail-ops.c:216
 msgid "Fetching Mail"
 msgstr "Henter e-post"
 
-#: ../libemail-engine/mail-ops.c:907
+#: ../libemail-engine/mail-ops.c:908
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sender melding %d av %d"
@@ -10698,62 +10696,52 @@ msgstr "Sender melding %d av %d"
 #. Translators: The string is distinguished by total
 #. * count of messages to be sent.  Failed messages is
 #. * always more than zero.
-#: ../libemail-engine/mail-ops.c:958
+#: ../libemail-engine/mail-ops.c:959
 #, c-format
 msgid "Failed to send a message"
 msgid_plural "Failed to send %d of %d messages"
 msgstr[0] "Klarte ikke à sende en melding"
 msgstr[1] "Klarte ikke à sende %d av %d meldinger"
 
-#: ../libemail-engine/mail-ops.c:964 ../mail/mail-send-recv.c:854
+#: ../libemail-engine/mail-ops.c:965
 msgid "Canceled."
 msgstr "Avbrutt."
 
-#: ../libemail-engine/mail-ops.c:966 ../mail/mail-send-recv.c:856
+#: ../libemail-engine/mail-ops.c:967
 msgid "Complete."
 msgstr "FullfÃrt."
 
-#: ../libemail-engine/mail-ops.c:1078
+#: ../libemail-engine/mail-ops.c:1079
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Flytter meldinger til Â%sÂ"
 
-#: ../libemail-engine/mail-ops.c:1079
+#: ../libemail-engine/mail-ops.c:1080
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Kopierer meldinger til Â%sÂ"
 
-#: ../libemail-engine/mail-ops.c:1196
+#: ../libemail-engine/mail-ops.c:1197
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Lagrer mappe Â%sÂ"
 
-#: ../libemail-engine/mail-ops.c:1269
+#: ../libemail-engine/mail-ops.c:1270
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "TÃmmer og lagrer konto Â%sÂ"
 
-#: ../libemail-engine/mail-ops.c:1270
+#: ../libemail-engine/mail-ops.c:1271
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Lagrer konto Â%sÂ"
 
-#: ../libemail-engine/mail-ops.c:1332
-#, c-format
-msgid "Refreshing folder '%s'"
-msgstr "Oppdaterer mappe Â%sÂ"
-
-#: ../libemail-engine/mail-ops.c:1562
-#, c-format
-msgid "Expunging folder '%s'"
-msgstr "TÃmmer mappe Â%sÂ"
-
-#: ../libemail-engine/mail-ops.c:1655
+#: ../libemail-engine/mail-ops.c:1345
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "TÃmmer sÃppel i Â%sÂ"
 
-#: ../libemail-engine/mail-ops.c:1751
+#: ../libemail-engine/mail-ops.c:1431
 #, c-format
 msgid "Disconnecting %s"
 msgstr "Kobler fra %s"
@@ -10777,12 +10765,12 @@ msgstr "Videresendt melding - %s"
 msgid "Forwarded message"
 msgstr "Videresendt melding"
 
-#: ../libemail-engine/mail-vfolder.c:77
+#: ../libemail-engine/mail-vfolder.c:129
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "Setter opp sÃkemappe: %s"
 
-#: ../libemail-engine/mail-vfolder.c:218
+#: ../libemail-engine/mail-vfolder.c:282
 #, c-format
 msgid "Updating Search Folders for '%s' - %s"
 msgstr "Oppdaterer sÃkemapper for Â%s - %s"
@@ -10792,7 +10780,7 @@ msgstr "Oppdaterer sÃkemapper for Â%s - %s"
 #. * removed folder. For more than one search folder is
 #. * each of them on a separate line, with four spaces
 #. * in front of its name, without quotes.
-#: ../libemail-engine/mail-vfolder.c:560
+#: ../libemail-engine/mail-vfolder.c:647
 #, c-format
 msgid ""
 "The Search Folder \"%s\" has been modified to account for the deleted "
@@ -10829,11 +10817,11 @@ msgstr "_Forvalgt"
 msgid "Enabled"
 msgstr "Aktivert"
 
-#: ../mail/e-mail-account-tree-view.c:105
+#: ../mail/e-mail-account-tree-view.c:109
 msgid "Account Name"
 msgstr "Kontonavn"
 
-#: ../mail/e-mail-account-tree-view.c:116
+#: ../mail/e-mail-account-tree-view.c:134
 #: ../mail/e-mail-config-security-page.c:333
 #: ../mail/e-mail-config-security-page.c:472 ../mail/e-mail-reader.c:3661
 #: ../mail/mail-config.ui.h:44
@@ -10886,7 +10874,7 @@ msgstr "(Uten emne)"
 msgid "Evolution Account Assistant"
 msgstr "Evolution kontoassistent"
 
-#: ../mail/e-mail-config-auth-check.c:346
+#: ../mail/e-mail-config-auth-check.c:347
 msgid "Check for Supported Types"
 msgstr "Sjekk stÃttede typer"
 
@@ -11041,15 +11029,15 @@ msgstr "Legg til n_y signatur â"
 msgid "Looking up account details..."
 msgstr "SlÃr opp detaljer om konto â"
 
-#: ../mail/e-mail-config-provider-page.c:499
+#: ../mail/e-mail-config-provider-page.c:485
 msgid "Checking for New Mail"
 msgstr "Ser etter nye meldinger"
 
-#: ../mail/e-mail-config-provider-page.c:515
+#: ../mail/e-mail-config-provider-page.c:501
 msgid "Check for _new messages every"
 msgstr "Se etter _nye meldinger hver(t)"
 
-#: ../mail/e-mail-config-provider-page.c:787
+#: ../mail/e-mail-config-provider-page.c:700
 msgid "Receiving Options"
 msgstr "Alternativer for mottak"
 
@@ -11151,7 +11139,7 @@ msgstr "Alltid krypter til meg selv ved sending av krypterte meldinger"
 msgid "Sending Email"
 msgstr "UtgÃende e-post"
 
-#: ../mail/e-mail-config-service-page.c:688
+#: ../mail/e-mail-config-service-page.c:640
 msgid "Server _Type:"
 msgstr "Tjener_type:"
 
@@ -11286,7 +11274,7 @@ msgid "_Later"
 msgstr "_Senere"
 
 #: ../mail/e-mail-label-manager.c:170
-#: ../modules/mail/e-mail-shell-view-actions.c:745
+#: ../modules/mail/e-mail-shell-view-actions.c:718
 msgid "Add Label"
 msgstr "Legg til etikett"
 
@@ -11320,21 +11308,21 @@ msgstr "Vennligst velg en mappe"
 msgid "Page %d of %d"
 msgstr "Side %d av %d"
 
-#: ../mail/e-mail-printer.c:520
+#: ../mail/e-mail-printer.c:521
 #: ../modules/calendar/e-cal-shell-view-actions.c:216
 #: ../modules/calendar/e-cal-shell-view-actions.c:245
 msgid "Print"
 msgstr "Skriv ut"
 
-#: ../mail/e-mail-printer.c:526
+#: ../mail/e-mail-printer.c:527
 msgid "Header Name"
 msgstr "Navn pà meldingshode"
 
-#: ../mail/e-mail-printer.c:532
+#: ../mail/e-mail-printer.c:533
 msgid "Header Value"
 msgstr "Verdi for meldingshode"
 
-#: ../mail/e-mail-printer.c:580 ../mail/mail-config.ui.h:100
+#: ../mail/e-mail-printer.c:581 ../mail/mail-config.ui.h:100
 msgid "Headers"
 msgstr "Meldingshoder"
 
@@ -11950,7 +11938,7 @@ msgstr "Neste"
 msgid "Previous"
 msgstr "Forrige"
 
-#: ../mail/e-mail-reader.c:3981 ../mail/mail-dialogs.ui.h:20
+#: ../mail/e-mail-reader.c:3981 ../mail/mail-dialogs.ui.h:15
 msgid "Reply"
 msgstr "Svar"
 
@@ -11959,17 +11947,17 @@ msgstr "Svar"
 msgid "Folder '%s'"
 msgstr "Mappe Â%sÂ"
 
-#: ../mail/e-mail-reader-utils.c:152
+#: ../mail/e-mail-reader-utils.c:154
 msgid "Do not warn me again"
 msgstr "Ikke varsle meg igjen"
 
-#: ../mail/e-mail-reader-utils.c:551
+#: ../mail/e-mail-reader-utils.c:949
 msgid "Printing"
 msgstr "Skriver ut"
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:730
+#: ../mail/e-mail-reader-utils.c:1130
 #, c-format
 msgid ""
 "Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -11984,7 +11972,7 @@ msgstr[1] ""
 "Mappen Â%s inneholder %u duplikatmeldinger. Er du sikker pà at du vil "
 "slette dem?"
 
-#: ../mail/e-mail-reader-utils.c:1134
+#: ../mail/e-mail-reader-utils.c:1534
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Lagre melding"
@@ -11995,13 +11983,13 @@ msgstr[1] "Lagre meldinger"
 #. * mbox format, when the first message doesn't have a
 #. * subject.  The extension ".mbox" is appended to the
 #. * string; for example "Message.mbox".
-#: ../mail/e-mail-reader-utils.c:1155
+#: ../mail/e-mail-reader-utils.c:1555
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Melding"
 msgstr[1] "Meldinger"
 
-#: ../mail/e-mail-reader-utils.c:1609
+#: ../mail/e-mail-reader-utils.c:2009
 msgid "Parsing message"
 msgstr "Leser melding"
 
@@ -12018,7 +12006,7 @@ msgstr "Merk for oppfÃlging"
 #. * when quoting messages.  Each ${Variable} gets replaced
 #. * with a value.  To see a full list of available variables,
 #. * see mail/em-composer-utils.c:attribvars array.
-#: ../mail/em-composer-utils.c:1286
+#: ../mail/em-composer-utils.c:1287
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -12026,23 +12014,23 @@ msgstr ""
 "${AbbrevWeekdayName}, ${Day}.${Month}.${Year} kl. ${24Hour}.${Minute} "
 "${TimeZone}, skrev ${Sender}:"
 
-#: ../mail/em-composer-utils.c:1292
+#: ../mail/em-composer-utils.c:1293
 msgid "-------- Forwarded Message --------"
 msgstr "---------Videresendt melding-------"
 
-#: ../mail/em-composer-utils.c:1297
+#: ../mail/em-composer-utils.c:1298
 msgid "-----Original Message-----"
 msgstr "-----Opprinnelig melding-----"
 
-#: ../mail/em-composer-utils.c:2577
+#: ../mail/em-composer-utils.c:2578
 msgid "an unknown sender"
 msgstr "en ukjent avsender"
 
-#: ../mail/em-composer-utils.c:2995
+#: ../mail/em-composer-utils.c:2996
 msgid "Posting destination"
 msgstr "Destinasjon for post"
 
-#: ../mail/em-composer-utils.c:2996
+#: ../mail/em-composer-utils.c:2997
 msgid "Choose folders to post the message to."
 msgstr "Velg mapper meldingen skal postes til."
 
@@ -12220,7 +12208,7 @@ msgid "Play Sound"
 msgstr "Spill lyd"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:56 ../mail/mail-dialogs.ui.h:19
+#: ../mail/em-filter-i18n.h:56 ../mail/mail-dialogs.ui.h:14
 msgid "Read"
 msgstr "Les"
 
@@ -12428,7 +12416,7 @@ msgid "Subscribe To _All"
 msgstr "Abonner pà _alle"
 
 #: ../mail/em-subscription-editor.c:986 ../mail/em-subscription-editor.c:1844
-#: ../modules/mail/e-mail-shell-view-actions.c:1363
+#: ../modules/mail/e-mail-shell-view-actions.c:1336
 msgid "_Unsubscribe"
 msgstr "_Fjern abonnement"
 
@@ -12465,7 +12453,7 @@ msgid "Su_bscribe"
 msgstr "A_bonner"
 
 #: ../mail/em-subscription-editor.c:1843
-#: ../modules/mail/e-mail-shell-view-actions.c:1365
+#: ../modules/mail/e-mail-shell-view-actions.c:1338
 msgid "Unsubscribe from the selected folder"
 msgstr "Fjern abonnement pà valgt mappe"
 
@@ -12513,7 +12501,7 @@ msgstr "Ikke vis _denne meldingen igjen"
 msgid "Message Filters"
 msgstr "Meldingsfiltre"
 
-#: ../mail/em-utils.c:1000
+#: ../mail/em-utils.c:1064
 #, c-format
 msgid "Messages from %s"
 msgstr "Meldinger fra %s"
@@ -12522,16 +12510,44 @@ msgstr "Meldinger fra %s"
 msgid "Search _Folders"
 msgstr "SÃke_mapper"
 
-#: ../mail/em-vfolder-editor-rule.c:364
+#: ../mail/em-vfolder-editor-rule.c:388
 msgid "Add Folder"
 msgstr "Legg til mappe"
 
+#: ../mail/em-vfolder-editor-rule.c:514
+msgid "Search Folder Sources"
+msgstr "Kilder for sÃkemapper"
+
+#: ../mail/em-vfolder-editor-rule.c:544
+msgid "Automatically update on any _source folder change"
+msgstr "Oppdater automati_sk ved endring i en hvilken som helst kildemappe"
+
+#: ../mail/em-vfolder-editor-rule.c:556
+msgid "All local folders"
+msgstr "Alle lokale mapper"
+
+#: ../mail/em-vfolder-editor-rule.c:557
+msgid "All active remote folders"
+msgstr "Alle aktive eksterne mapper"
+
+#: ../mail/em-vfolder-editor-rule.c:558
+msgid "All local and active remote folders"
+msgstr "Alle lokale og aktive eksterne mapper"
+
+#: ../mail/em-vfolder-editor-rule.c:559
+msgid "Specific folders"
+msgstr "Spesifikke mapper"
+
+#: ../mail/em-vfolder-editor-rule.c:594
+msgid "include subfolders"
+msgstr "ta med undermapper"
+
 #: ../mail/importers/elm-importer.c:179
 msgid "Importing Elm data"
 msgstr "Importerer data fra Elm"
 
 #: ../mail/importers/elm-importer.c:332 ../mail/importers/pine-importer.c:423
-#: ../modules/mail/e-mail-shell-view.c:1069
+#: ../modules/mail/e-mail-shell-view.c:1071
 #: ../widgets/misc/e-send-options.c:538
 msgid "Mail"
 msgstr "E-post"
@@ -13070,26 +13086,6 @@ msgid "SSL encryption"
 msgstr "SSL-kryptering"
 
 #: ../mail/mail-dialogs.ui.h:1
-msgid "Search Folder Sources"
-msgstr "Kilder for sÃkemapper"
-
-#: ../mail/mail-dialogs.ui.h:2
-msgid "All local folders"
-msgstr "Alle lokale mapper"
-
-#: ../mail/mail-dialogs.ui.h:3
-msgid "All active remote folders"
-msgstr "Alle aktive eksterne mapper"
-
-#: ../mail/mail-dialogs.ui.h:4
-msgid "All local and active remote folders"
-msgstr "Alle lokale og aktive eksterne mapper"
-
-#: ../mail/mail-dialogs.ui.h:5
-msgid "Specific folders"
-msgstr "Spesifikke mapper"
-
-#: ../mail/mail-dialogs.ui.h:6
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -13097,72 +13093,72 @@ 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:8
+#: ../mail/mail-dialogs.ui.h:3
 msgid "_Flag:"
 msgstr "_Flagg:"
 
-#: ../mail/mail-dialogs.ui.h:9
+#: ../mail/mail-dialogs.ui.h:4
 msgid "_Due By:"
 msgstr "_Ferdig til:"
 
 #. Translators: Flag Completed
-#: ../mail/mail-dialogs.ui.h:11
+#: ../mail/mail-dialogs.ui.h:6
 msgid "Co_mpleted"
 msgstr "Fu_llfÃrt"
 
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:7
 msgid "Call"
 msgstr "Ring"
 
-#: ../mail/mail-dialogs.ui.h:13
+#: ../mail/mail-dialogs.ui.h:8
 msgid "Do Not Forward"
 msgstr "Ikke videresend"
 
-#: ../mail/mail-dialogs.ui.h:14
+#: ../mail/mail-dialogs.ui.h:9
 msgid "Follow-Up"
 msgstr "FÃlg opp"
 
-#: ../mail/mail-dialogs.ui.h:15
+#: ../mail/mail-dialogs.ui.h:10
 msgid "For Your Information"
 msgstr "Til din informasjon"
 
-#: ../mail/mail-dialogs.ui.h:16
+#: ../mail/mail-dialogs.ui.h:11
 msgid "Forward"
 msgstr "Videresend"
 
-#: ../mail/mail-dialogs.ui.h:17
+#: ../mail/mail-dialogs.ui.h:12
 msgid "No Response Necessary"
 msgstr "Ingen respons nÃdvendig"
 
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:16
 msgid "Reply to All"
 msgstr "Svar til alle"
 
-#: ../mail/mail-dialogs.ui.h:22
+#: ../mail/mail-dialogs.ui.h:17
 msgid "Review"
 msgstr "GjennomgÃ"
 
-#: ../mail/mail-dialogs.ui.h:23
+#: ../mail/mail-dialogs.ui.h:18
 msgid "License Agreement"
 msgstr "Lisensavtale"
 
-#: ../mail/mail-dialogs.ui.h:24
+#: ../mail/mail-dialogs.ui.h:19
 msgid "_Tick this to accept the license agreement"
 msgstr "_Kryss av her for à godta lisensen"
 
-#: ../mail/mail-dialogs.ui.h:25
+#: ../mail/mail-dialogs.ui.h:20
 msgid "_Accept License"
 msgstr "Godt_a lisensen"
 
-#: ../mail/mail-dialogs.ui.h:26
+#: ../mail/mail-dialogs.ui.h:21
 msgid "Security Information"
 msgstr "Sikkerhetsinformasjon"
 
-#: ../mail/mail-dialogs.ui.h:27
+#: ../mail/mail-dialogs.ui.h:22
 msgid "Digital Signature"
 msgstr "Digital signatur"
 
-#: ../mail/mail-dialogs.ui.h:28
+#: ../mail/mail-dialogs.ui.h:23
 msgid "Encryption"
 msgstr "Kryptering"
 
@@ -13365,7 +13361,7 @@ msgstr ""
 "permanent?"
 
 #: ../mail/mail.error.xml.h:39
-#: ../modules/mail/e-mail-shell-view-actions.c:1258
+#: ../modules/mail/e-mail-shell-view-actions.c:1231
 msgid "_Empty Trash"
 msgstr "_TÃm papirkurven"
 
@@ -13449,14 +13445,26 @@ msgstr ""
 "endre navn pÃ, flytte eller slette disse."
 
 #: ../mail/mail.error.xml.h:60
+msgid "Failed to expunge folder &quot;{0}&quot;."
+msgstr "Klarte ikke à tÃmme mappe &quot;{0}&quot;."
+
+#: ../mail/mail.error.xml.h:61
+msgid "The reported error was &quot;{1}&quot;."
+msgstr "Feilen som ble rapportert var &quot;{1}&quot;."
+
+#: ../mail/mail.error.xml.h:62
+msgid "Failed to refresh folder &quot;{0}&quot;."
+msgstr "Klarte ikke à oppdatere mappe &quot;{0}&quot;."
+
+#: ../mail/mail.error.xml.h:63
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "Kan ikke endre navn pà eller flytte systemmappe Â{0}Â."
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:64
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "Vil du virkelig slette mappen Â{0}Â og alle undermapper?"
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:65
 msgid ""
 "If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
@@ -13464,20 +13472,20 @@ msgstr ""
 "Hvis du sletter mappen vil alt innhold i denne og undermapper slettes "
 "permanent."
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:67
 msgid "Really delete folder \"{0}\"?"
 msgstr "Vil du virkelig slette mappen Â{0}Â?"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:68
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
 msgstr "Hvis du sletter mappen vil alt innhold i denne bli slettet permanent."
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:69
 msgid "These messages are not copies."
 msgstr "Disse meldingene er ikke kopier."
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:70
 msgid ""
 "Messages shown in Search Folders are not copies. Deleting them from a Search "
 "Folder will delete the actual messages from the folder or folders in which "
@@ -13487,65 +13495,65 @@ msgstr ""
 "sÃkemappe sletter du de faktiske meldingene fra dine lokale eller eksterne "
 "mapper. Vil du virkelig slette disse meldingene?"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:71
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "Kan ikke endre navn pà Â{0} til Â{1}Â."
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:72
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr ""
 "En mappe med navn Â{1}Â eksisterer allerede. Vennligst bruk et annet navn."
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:73
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Kunne ikke flytte mappe Â{0}Â til Â{1}Â."
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:74
 msgid "Cannot open source \"{2}\"."
 msgstr "Kan ikke Ãpne kilde Â{2}Â."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:75
 msgid "Cannot open target \"{2}\"."
 msgstr "Kan ikke Ãpne mÃl Â{2}Â."
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:76
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "Kan ikke kopiere mappe Â{0}Â til Â{1}Â."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:77
 msgid "Cannot create folder \"{0}\"."
 msgstr "Kan ikke opprette mappe Â{0}Â."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:78
 msgid "Cannot open source \"{1}\"."
 msgstr "Kan ikke Ãpne kilde Â{1}Â."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:79
 msgid "Cannot save changes to account."
 msgstr "Kan ikke lagre endringer for kontoen."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:80
 msgid "You have not filled in all of the required information."
 msgstr "Du har ikke fylt ut all nÃdvendig informasjon."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:81
 msgid "You may not create two accounts with the same name."
 msgstr "Du kan ikke opprette to kontoer med samme navn."
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:82
 msgid "Are you sure you want to delete this account?"
 msgstr "Er du sikker pà at du vil slette denne kontoen?"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:83
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Hvis du fortsetter vil kontoinformasjonen bli slettet permanent."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:84
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr ""
 "Er du sikker pà at du vil slette denne kontoen med alle stedfortredere?"
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:85
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -13553,30 +13561,30 @@ msgstr ""
 "Hvis du fortsetter vil all kontoinformasjon og\n"
 "mellomtjenerinformasjon bli slettet permanent."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:87
 msgid ""
 "Are you sure you want to disable this account and delete all its proxies?"
 msgstr ""
 "Er du sikker pà at du vil slette denne kontoen med alle stedfortredere?"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:88
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "Hvis du fortsetter vil stedfortrederkontoer bli slettet permanent."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:89
 msgid "Do _Not Disable"
 msgstr "I_kke slà av"
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:90
 #: ../plugins/publish-calendar/publish-calendar.c:628
 msgid "_Disable"
 msgstr "_Deaktiver"
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:91
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr "Kan ikke redigere sÃkemappe Â{0}Â da den ikke eksisterer."
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:92
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -13584,40 +13592,40 @@ msgstr ""
 "Denne mappen er lagt til implisitt. GÃ til redigering av sÃkemapper og legg "
 "den inn eksplisitt hvis det er nÃdvendig."
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:94
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr "Kan ikke legge til sÃkemappe Â{0}Â."
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:95
 msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgstr ""
 "En mappe med navn Â{0}Â eksisterer allerede. Vennligst bruk et annet navn."
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:96
 msgid "Search Folders automatically updated."
 msgstr "SÃkemapper oppdatert automatisk."
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:97
 msgid "Mail filters automatically updated."
 msgstr "E-postfiltre oppdatert automatisk."
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:98
 msgid "Missing folder."
 msgstr "Mangler mappe."
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:99
 msgid "You must specify a folder."
 msgstr "Du mà oppgi en mappe."
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:101
 msgid "You must name this Search Folder."
 msgstr "Du mà gi navn til denne sÃkemappen."
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:102
 msgid "No sources selected."
 msgstr "Ingen kilder valgt."
 
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:103
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -13627,11 +13635,11 @@ msgstr ""
 "Enten ved à velge mappene individuelt og/eller à velge alle lokale mapper, "
 "alle eksterne mapper eller begge deler."
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:105
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Det oppsto et problem under migrering av gammel meldingsmappe Â{0}Â."
 
-#: ../mail/mail.error.xml.h:103
+#: ../mail/mail.error.xml.h:106
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -13643,23 +13651,23 @@ msgstr ""
 "Du kan velge à ignorere denne mappen, overskrive eller legge til innhold "
 "der, eller avslutte."
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:109
 msgid "Ignore"
 msgstr "Ignorer"
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:110
 msgid "_Overwrite"
 msgstr "_Overskriv"
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:111
 msgid "_Append"
 msgstr "_Legg til"
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:112
 msgid "Evolution's local mail format has changed."
 msgstr "Evolutions lokale e-postformat er endret."
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:113
 msgid ""
 "Evolution's local mail format has changed from mbox to Maildir. Your local "
 "mail must be migrated to the new format before Evolution can proceed. Do you "
@@ -13677,19 +13685,19 @@ msgstr ""
 "slette denne etter à ha sjekket at data ble migrert uten problemer. "
 "Vennligst sjekk at det er nok plass hvis du velger à migrere."
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:116
 msgid "_Exit Evolution"
 msgstr "Avslutt _Evolution"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:117
 msgid "_Migrate Now"
 msgstr "_Migrer nÃ"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:118
 msgid "Unable to read license file."
 msgstr "Kan ikke lese lisensfilen."
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:119
 msgid ""
 "Cannot read the license file \"{0}\", due to an installation problem. You "
 "will not be able to use this provider until you can accept its license."
@@ -13697,190 +13705,190 @@ msgstr ""
 "Kan ikke lese lisensfil Â{0}Â pga et installasjonsproblem. Du vil ikke kunne "
 "bruke denne tilbyderen fÃr du har mulighet til à godta lisensen."
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:120
 msgid "Please wait."
 msgstr "Vennligst vent."
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:121
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "SpÃr tjener etter en liste med stÃttede autentiseringsmekanismer."
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:122
 msgid ""
 "Failed to query server for a list of supported authentication mechanisms."
 msgstr ""
 "Klarte ikke à spÃrre tjener etter en liste med stÃttede "
 "autentiseringsmekanismer."
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:123
 msgid "Unable to connect to the GroupWise server."
 msgstr "Kunne ikke koble til GroupWise-tjener."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:124
 msgid "Please check your account settings and try again."
 msgstr "Vennligst sjekk innstillingene for kontoen og prÃv igjen."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:125
 msgid "Synchronize folders locally for offline usage?"
 msgstr "Synkroniser mapper lokalt for frakoblet bruk?"
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:126
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
 msgstr "Vil du synkronisere mapper som er merket for frakoblet bruk lokalt?"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:127
 msgid "Do _Not Synchronize"
 msgstr "Ikke sy_nkroniser"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:128
 msgid "_Synchronize"
 msgstr "_Synkroniser"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:129
 msgid "Do you want to mark all messages as read?"
 msgstr "Vil du merke alle meldinger som lest?"
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:130
 msgid "This will mark all messages as read in the selected folder."
 msgstr "Dette vil merke alle meldinger i valgt mappe som lest."
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:131
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
 msgstr "Dette vil merke alle meldinger i valgt mappe med undermapper som lest."
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:132
 msgid "Close message window."
 msgstr "Lukk meldingsvinduet."
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:133
 msgid "Would you like to close the message window?"
 msgstr "Vil du lukke meldingsvinduet?"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:134
 msgid "_Yes"
 msgstr "_Ja"
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:135
 msgid "_No"
 msgstr "_Nei"
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:136
 msgid "_Always"
 msgstr "_Alltid"
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:137
 msgid "N_ever"
 msgstr "A_ldri"
 
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:138
 msgid "Copy folder in folder tree."
 msgstr "Kopierer mappe i mappetre."
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:139
 msgid "Are you sure you want to copy folder '{0}' to folder '{1}'?"
 msgstr "Er du sikker pà at du vil kopiere mappe Â{0} til mappe Â{1}Â?"
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:140
 msgid "Move folder in folder tree."
 msgstr "Flytt mappe i mappetre."
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:141
 msgid "Are you sure you want to to move folder '{0}' to folder '{1}'?"
 msgstr "Er du sikker pà at du vil flytte mappe Â{0} til mappe Â{1}Â?"
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:142
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr ""
 "Denne meldingen kan ikke sendes fordi kontoen du sender med ikke er aktiv"
 
-#: ../mail/mail.error.xml.h:140
+#: ../mail/mail.error.xml.h:143
 msgid "Please enable the account or send using another account."
 msgstr "Vennligst sjekk kontoen eller send fra en annen konto."
 
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:144
 msgid "Mail Deletion Failed"
 msgstr "Sletting av e-post feilet"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:145
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Du har ikke tilstrekkelige rettigheter til à slette denne meldingen."
 
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:146
 msgid "\"Check Junk\" Failed"
 msgstr "Sjekk etter uÃnsket e-post feilet"
 
-#: ../mail/mail.error.xml.h:144
+#: ../mail/mail.error.xml.h:147
 msgid "\"Report Junk\" Failed"
 msgstr "Feil under rapportering av uÃnsket e-post"
 
-#: ../mail/mail.error.xml.h:145
+#: ../mail/mail.error.xml.h:148
 msgid "\"Report Not Junk\" Failed"
 msgstr "Feil under rapportering av e-post som Ãnsket"
 
-#: ../mail/mail.error.xml.h:146
+#: ../mail/mail.error.xml.h:149
 msgid "Remove duplicate messages?"
 msgstr "Fjern duplikatmeldinger?"
 
-#: ../mail/mail.error.xml.h:147
+#: ../mail/mail.error.xml.h:150
 msgid "No duplicate messages found."
 msgstr "Ingen duplikatmeldinger funnet."
 
 #. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:149
+#: ../mail/mail.error.xml.h:152
 msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr "Mappe Â{0}Â inneholder ingen duplikatmeldinger."
 
-#: ../mail/mail.error.xml.h:150
+#: ../mail/mail.error.xml.h:153
 msgid "Failed to disconnect account &quot;{0}&quot;."
 msgstr "Klarte ikke à koble fra konto &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:152
-msgid "Failed to unsubscribe from folder."
-msgstr "Klarte ikke à fjerne abonnement pà mappe."
+#: ../mail/mail.error.xml.h:155
+msgid "Failed to unsubscribe from folder &quot;{0}&quot;."
+msgstr "Klarte ikke à fjerne abonnement pà mappe &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:153
+#: ../mail/mail.error.xml.h:156
 msgid "Unable to retrieve message."
 msgstr "Kunne ikke hente melding."
 
-#: ../mail/mail.error.xml.h:154
+#: ../mail/mail.error.xml.h:157
 msgid "{0}"
 msgstr "{0}"
 
-#: ../mail/mail.error.xml.h:155
+#: ../mail/mail.error.xml.h:158
 msgid "Failed to open folder."
 msgstr "Klarte ikke à Ãpne mappe."
 
-#: ../mail/mail.error.xml.h:156
+#: ../mail/mail.error.xml.h:159
 msgid "Failed to find duplicate messages."
 msgstr "Klarte ikke à finne duplikatmeldinger."
 
-#: ../mail/mail.error.xml.h:157
+#: ../mail/mail.error.xml.h:160
 msgid "Failed to retrieve messages."
 msgstr "Klarte ikke à hente meldinger."
 
-#: ../mail/mail.error.xml.h:158
+#: ../mail/mail.error.xml.h:161
 msgid "Failed to remove attachments from messages."
 msgstr "Klarte ikke à fjerne vedlegg fra meldinger."
 
-#: ../mail/mail.error.xml.h:159
+#: ../mail/mail.error.xml.h:162
 msgid "Failed to download messages for offline viewing."
 msgstr "Klarte ikke à laste ned meldinger for frakoblet visning."
 
-#: ../mail/mail.error.xml.h:160
+#: ../mail/mail.error.xml.h:163
 msgid "Failed to save messages to disk."
 msgstr "Klarte ikke à lagre meldinger til disk."
 
-#: ../mail/mail.error.xml.h:161
+#: ../mail/mail.error.xml.h:164
 msgid "Hidden file is attached."
 msgstr "Skjult fil er vedlagt."
 
-#: ../mail/mail.error.xml.h:162
+#: ../mail/mail.error.xml.h:165
 msgid ""
 "The attachment named {0} is a hidden file and may contain sensitive data. "
 "Please review it before sending."
@@ -13888,39 +13896,39 @@ msgstr ""
 "Vedleg med navn {0} er en skjult fil og kan inneholde sensitive data. "
 "Vennlist se gjennom den fÃr du sender meldingen."
 
-#: ../mail/mail.error.xml.h:163
+#: ../mail/mail.error.xml.h:166
 msgid "Printing failed."
 msgstr "Utskrift feilet."
 
-#: ../mail/mail.error.xml.h:164
+#: ../mail/mail.error.xml.h:167
 msgid "The printer replied &quot;{0}&quot;."
 msgstr "Skriveren svarte &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:165
+#: ../mail/mail.error.xml.h:168
 msgid "Could not perform this operation on {0}."
 msgstr "Kunne ikke utfÃre denne operasjonen pà {0}."
 
-#: ../mail/mail-send-recv.c:202
+#: ../mail/mail-send-recv.c:203
 msgid "Canceling..."
 msgstr "Avbryter â"
 
-#: ../mail/mail-send-recv.c:518
+#: ../mail/mail-send-recv.c:537
 msgid "Send & Receive Mail"
 msgstr "Send & motta e-post"
 
-#: ../mail/mail-send-recv.c:534
+#: ../mail/mail-send-recv.c:553
 msgid "Cancel _All"
 msgstr "Avbryt _alle"
 
-#: ../mail/mail-send-recv.c:626 ../mail/mail-send-recv.c:1003
+#: ../mail/mail-send-recv.c:646 ../mail/mail-send-recv.c:1030
 msgid "Updating..."
 msgstr "Oppdaterer â"
 
-#: ../mail/mail-send-recv.c:626 ../mail/mail-send-recv.c:708
+#: ../mail/mail-send-recv.c:646 ../mail/mail-send-recv.c:727
 msgid "Waiting..."
 msgstr "Venter â"
 
-#: ../mail/mail-send-recv.c:983
+#: ../mail/mail-send-recv.c:1010
 #, c-format
 msgid "Checking for new mail"
 msgstr "Ser etter nye meldinger"
@@ -13933,7 +13941,7 @@ msgstr "SÃkemapper"
 msgid "Edit Search Folder"
 msgstr "Rediger sÃkemappe"
 
-#: ../mail/mail-vfolder-ui.c:270
+#: ../mail/mail-vfolder-ui.c:280
 msgid "New Search Folder"
 msgstr "Ny sÃkemappe"
 
@@ -14003,25 +14011,25 @@ msgstr "%d %b %H.%M"
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../mail/message-list.c:2753
+#: ../mail/message-list.c:2777
 msgid "Select all visible messages"
 msgstr "Velg alle synlige meldinger"
 
-#: ../mail/message-list.c:2889 ../mail/message-list.etspec.h:17
+#: ../mail/message-list.c:2913 ../mail/message-list.etspec.h:17
 msgid "Messages"
 msgstr "Meldinger"
 
 #. default follow-up flag name to use when clicked in the message list column
-#: ../mail/message-list.c:4108
+#: ../mail/message-list.c:4136
 msgid "Follow-up"
 msgstr "FÃlg opp"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4667 ../mail/message-list.c:5087
+#: ../mail/message-list.c:4695 ../mail/message-list.c:5115
 msgid "Generating message list"
 msgstr "Genererer meldingsliste"
 
-#: ../mail/message-list.c:4901
+#: ../mail/message-list.c:4929
 msgid ""
 "No message satisfies your search criteria. Change search criteria by "
 "selecting a new Show message filter from the drop down list above or by "
@@ -14033,7 +14041,7 @@ msgstr ""
 "starte et nytt sÃk enten ved à tÃmme det med SÃk->TÃm menyoppfÃringen eller "
 "ved à endre spÃrringen over."
 
-#: ../mail/message-list.c:4906
+#: ../mail/message-list.c:4934
 msgid "There are no messages in this folder."
 msgstr "Det er ingen meldinger i denne mappen."
 
@@ -14070,27 +14078,27 @@ msgid "Subject or Addresses contains"
 msgstr "Emne eller adresser inneholder"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1730
+#: ../modules/mail/e-mail-shell-view-actions.c:1696
 msgid "Recipients contain"
 msgstr "Mottakere inneholder"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1723
+#: ../modules/mail/e-mail-shell-view-actions.c:1689
 msgid "Message contains"
 msgstr "Melding inneholder"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1744
+#: ../modules/mail/e-mail-shell-view-actions.c:1710
 msgid "Subject contains"
 msgstr "Emne inneholder"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1737
+#: ../modules/mail/e-mail-shell-view-actions.c:1703
 msgid "Sender contains"
 msgstr "Avsender inneholder"
 
 #: ../mail/searchtypes.xml.h:6
-#: ../modules/mail/e-mail-shell-view-actions.c:1716
+#: ../modules/mail/e-mail-shell-view-actions.c:1682
 msgid "Body contains"
 msgstr "Kropp inneholder"
 
@@ -14238,7 +14246,7 @@ msgstr "Vis kart med alle kontakter fra valgt adressebok"
 #: ../modules/calendar/e-cal-shell-view-actions.c:1447
 #: ../modules/calendar/e-memo-shell-view-actions.c:664
 #: ../modules/calendar/e-task-shell-view-actions.c:788
-#: ../modules/mail/e-mail-shell-view-actions.c:1342
+#: ../modules/mail/e-mail-shell-view-actions.c:1315
 msgid "_Rename..."
 msgstr "End_re navn â"
 
@@ -14319,7 +14327,7 @@ msgstr "H_andlinger"
 #: ../modules/addressbook/e-book-shell-view-actions.c:927
 #: ../modules/calendar/e-memo-shell-view-actions.c:701
 #: ../modules/calendar/e-task-shell-view-actions.c:853
-#: ../modules/mail/e-mail-shell-view-actions.c:1500
+#: ../modules/mail/e-mail-shell-view-actions.c:1473
 msgid "_Preview"
 msgstr "_ForhÃndsvis"
 
@@ -14331,7 +14339,7 @@ msgid "_Delete"
 msgstr "_Slett"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:940
-#: ../modules/mail/e-mail-shell-view-actions.c:1265
+#: ../modules/mail/e-mail-shell-view-actions.c:1238
 msgid "_Properties"
 msgstr "Egenska_per â"
 
@@ -14358,7 +14366,7 @@ msgstr "Vis kart i forhÃndsvisning av kontakter"
 #: ../modules/addressbook/e-book-shell-view-actions.c:1005
 #: ../modules/calendar/e-memo-shell-view-actions.c:771
 #: ../modules/calendar/e-task-shell-view-actions.c:935
-#: ../modules/mail/e-mail-shell-view-actions.c:1626
+#: ../modules/mail/e-mail-shell-view-actions.c:1599
 msgid "_Classic View"
 msgstr "_Klassisk visning"
 
@@ -14369,7 +14377,7 @@ msgstr "Vis forhÃndsvisning av kontakt under kontaktlisten"
 #: ../modules/addressbook/e-book-shell-view-actions.c:1012
 #: ../modules/calendar/e-memo-shell-view-actions.c:778
 #: ../modules/calendar/e-task-shell-view-actions.c:942
-#: ../modules/mail/e-mail-shell-view-actions.c:1633
+#: ../modules/mail/e-mail-shell-view-actions.c:1606
 msgid "_Vertical View"
 msgstr "_Vertikal visning"
 
@@ -14395,7 +14403,7 @@ msgstr "Ingen treff"
 #: ../modules/calendar/e-cal-shell-view-actions.c:1790
 #: ../modules/calendar/e-memo-shell-view-actions.c:805
 #: ../modules/calendar/e-task-shell-view-actions.c:1004
-#: ../modules/mail/e-mail-shell-view-actions.c:1709
+#: ../modules/mail/e-mail-shell-view-actions.c:1675
 #: ../shell/e-shell-content.c:664
 msgid "Advanced Search"
 msgstr "Avansert sÃk"
@@ -14571,7 +14579,8 @@ msgid ""
 "This will restore all your personal data, settings mail filters, etc."
 msgstr ""
 "Du kan gjenopprette Evolution fra din sikkerhetskopi.\n"
-"Dette vil gjenopprette alle dine personlige data, innstillinger, e-postfiltre osv.."
+"Dette vil gjenopprette alle dine personlige data, innstillinger, e-"
+"postfiltre osv.."
 
 #: ../modules/backup-restore/e-mail-config-restore-page.c:182
 msgid "_Restore from a backup file:"
@@ -14854,7 +14863,9 @@ msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Using email address\" requires anonymous access to your "
 "LDAP server."
-msgstr "Dette er metoden Evolution bruker for à autentisere deg. Merk at hvis du setter denne til ÂE-post-adresse kreves anonym tilgang til din LDAP-tjener."
+msgstr ""
+"Dette er metoden Evolution bruker for à autentisere deg. Merk at hvis du "
+"setter denne til ÂE-post-adresse kreves anonym tilgang til din LDAP-tjener."
 
 #. Page 2
 #: ../modules/book-config-ldap/evolution-book-config-ldap.c:699
@@ -14862,7 +14873,7 @@ msgid "Using LDAP"
 msgstr "Bruker LDAP"
 
 #: ../modules/book-config-ldap/evolution-book-config-ldap.c:716
-#: ../modules/mail/e-mail-shell-view.c:58
+#: ../modules/mail/e-mail-shell-view.c:116
 msgid "Searching"
 msgstr "SÃker"
 
@@ -14892,7 +14903,11 @@ msgid ""
 "the directory tree.  A search scope of \"Subtree\" will include all entries "
 "below your search base.  A search scope of \"One Level\" will only include "
 "the entries one level beneath your search base."
-msgstr "SÃkeomrÃdet definerer hvor dypt du Ãnsker at sÃket skal gà ned i katalogtreet. Et sÃkeomrÃde som ÂUndertre vil ta med alle oppfÃringer under din sÃkebase. Et sÃkeomrÃde som ÂEtt nivàvil kun ta med oppfÃringer ett nivà under startnivÃet."
+msgstr ""
+"SÃkeomrÃdet definerer hvor dypt du Ãnsker at sÃket skal gà ned i "
+"katalogtreet. Et sÃkeomrÃde som ÂUndertre vil ta med alle oppfÃringer under "
+"din sÃkebase. Et sÃkeomrÃde som ÂEtt nivÃÂ vil kun ta med oppfÃringer ett "
+"nivà under startnivÃet."
 
 #: ../modules/book-config-ldap/evolution-book-config-ldap.c:786
 msgid "Search Filter:"
@@ -14919,28 +14934,28 @@ msgstr "URL:"
 msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "Unngà IfMatch (kreves med Apache < 2.2.8)"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:398
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:400
 #, c-format
 msgid "HTTP Error: %s"
 msgstr "HTTP-feil: %s"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:428
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:430
 msgid "Could not parse response"
 msgstr "Kunne ikke lese svar"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:437
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:439
 msgid "Empty response"
 msgstr "Tomt svar"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:445
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:447
 msgid "Unexpected reply from server"
 msgstr "Uventet svar fra tjener"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1032
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1034
 msgid "Could not locate user's calendars"
 msgstr "Fant ikke brukers kalender"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1256
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1258
 msgid "Path"
 msgstr "Sti"
 
@@ -15022,18 +15037,6 @@ msgstr "Fil:"
 msgid "Allow Evolution to update the file"
 msgstr "La Evolution oppdatere filen"
 
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:224
-msgid "Metric (Celsius, cm, etc)"
-msgstr "Metrisk (celcius, cm, osv)"
-
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:227
-msgid "Imperial (Fahrenheit, inches, etc)"
-msgstr "Imerisk (Fahrenheit, tommer, osv)"
-
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:229
-msgid "Units:"
-msgstr "Enheter:"
-
 #: ../modules/calendar/e-cal-attachment-handler.c:323
 #: ../smime/gui/smime-ui.ui.h:32
 msgid "I_mport"
@@ -16123,7 +16126,9 @@ msgstr "Egendefinerte meldingshoder"
 msgid ""
 "Specify any extra headers to fetch in addition to the predefined set of "
 "headers selected above."
-msgstr "Oppgi ekstra meldingshoder som skal hentes i tillegg til det predefinerte settet med meldingshoder over."
+msgstr ""
+"Oppgi ekstra meldingshoder som skal hentes i tillegg til det predefinerte "
+"settet med meldingshoder over."
 
 #: ../modules/itip-formatter/e-mail-formatter-itip.c:135
 msgid "ITIP"
@@ -16505,7 +16510,7 @@ msgid "Start day:"
 msgstr "Startdag:"
 
 #: ../modules/itip-formatter/itip-view.c:693
-#: ../modules/itip-formatter/itip-view.c:1414
+#: ../modules/itip-formatter/itip-view.c:1450
 msgid "Start time:"
 msgstr "Start-tid:"
 
@@ -16514,7 +16519,7 @@ msgid "End day:"
 msgstr "Sluttdag:"
 
 #: ../modules/itip-formatter/itip-view.c:702
-#: ../modules/itip-formatter/itip-view.c:1415
+#: ../modules/itip-formatter/itip-view.c:1451
 msgid "End time:"
 msgstr "Slutt-tid:"
 
@@ -16558,199 +16563,199 @@ msgstr "_Oppdater status for deltaker"
 msgid "_Update"
 msgstr "_Oppdater"
 
-#: ../modules/itip-formatter/itip-view.c:1417
-#: ../modules/itip-formatter/itip-view.c:1459
-#: ../modules/itip-formatter/itip-view.c:1525
+#: ../modules/itip-formatter/itip-view.c:1453
+#: ../modules/itip-formatter/itip-view.c:1495
+#: ../modules/itip-formatter/itip-view.c:1561
 msgid "Comment:"
 msgstr "Kommentar:"
 
 #. RSVP area
-#: ../modules/itip-formatter/itip-view.c:1448
+#: ../modules/itip-formatter/itip-view.c:1484
 msgid "Send reply to sender"
 msgstr "Send svar til avsender"
 
 #. Updates
-#: ../modules/itip-formatter/itip-view.c:1462
+#: ../modules/itip-formatter/itip-view.c:1498
 msgid "Send _updates to attendees"
 msgstr "Send _oppdateringer til deltakere"
 
 #. The recurrence check button
-#: ../modules/itip-formatter/itip-view.c:1465
+#: ../modules/itip-formatter/itip-view.c:1501
 msgid "_Apply to all instances"
 msgstr "Bruk pà _alle instanser"
 
-#: ../modules/itip-formatter/itip-view.c:1466
+#: ../modules/itip-formatter/itip-view.c:1502
 msgid "Show time as _free"
 msgstr "Vis tid som _ledig"
 
-#: ../modules/itip-formatter/itip-view.c:1467
+#: ../modules/itip-formatter/itip-view.c:1503
 msgid "_Preserve my reminder"
 msgstr "_Bevar min pÃminnelse"
 
-#: ../modules/itip-formatter/itip-view.c:1468
+#: ../modules/itip-formatter/itip-view.c:1504
 msgid "_Inherit reminder"
 msgstr "Arv pÃm_innelse"
 
-#: ../modules/itip-formatter/itip-view.c:1789
+#: ../modules/itip-formatter/itip-view.c:1825
 msgid "_Tasks:"
 msgstr "_Oppgaver:"
 
-#: ../modules/itip-formatter/itip-view.c:1792
+#: ../modules/itip-formatter/itip-view.c:1828
 msgid "_Memos:"
 msgstr "_Notater:"
 
 #. Translators: The first '%s' is replaced with a calendar name,
 #. * the second '%s' with an error message
-#: ../modules/itip-formatter/itip-view.c:3437
+#: ../modules/itip-formatter/itip-view.c:3472
 #, c-format
 msgid "Failed to load the calendar '%s' (%s)"
 msgstr "Kunne ikke Ãpne kalender Â%s (%s)"
 
-#: ../modules/itip-formatter/itip-view.c:3594
+#: ../modules/itip-formatter/itip-view.c:3629
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "En avtale i kalender Â%s er i konflikt med dette mÃtet"
 
-#: ../modules/itip-formatter/itip-view.c:3618
+#: ../modules/itip-formatter/itip-view.c:3653
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Fant avtalen i kalender Â%sÂ"
 
-#: ../modules/itip-formatter/itip-view.c:3713
+#: ../modules/itip-formatter/itip-view.c:3748
 msgid "Unable to find any calendars"
 msgstr "Kan ikke finne noen kalendere"
 
-#: ../modules/itip-formatter/itip-view.c:3721
+#: ../modules/itip-formatter/itip-view.c:3756
 msgid "Unable to find this meeting in any calendar"
 msgstr "Kan ikke finne dette mÃtet i noen kalender"
 
-#: ../modules/itip-formatter/itip-view.c:3726
+#: ../modules/itip-formatter/itip-view.c:3761
 msgid "Unable to find this task in any task list"
 msgstr "Kan ikke finne denne oppgaven i noen oppgaveliste"
 
-#: ../modules/itip-formatter/itip-view.c:3731
+#: ../modules/itip-formatter/itip-view.c:3766
 msgid "Unable to find this memo in any memo list"
 msgstr "Kan ikke finne dette notatet i noen notatliste"
 
-#: ../modules/itip-formatter/itip-view.c:4071
+#: ../modules/itip-formatter/itip-view.c:4106
 msgid "Opening the calendar. Please wait..."
 msgstr "Ãpner kalender. Vennligst vent â"
 
-#: ../modules/itip-formatter/itip-view.c:4076
+#: ../modules/itip-formatter/itip-view.c:4111
 msgid "Searching for an existing version of this appointment"
 msgstr "SÃker etter en eksisterende versjon av denne avtalen"
 
-#: ../modules/itip-formatter/itip-view.c:4458
+#: ../modules/itip-formatter/itip-view.c:4493
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Kunne ikke sende oppfÃring til kalender Â%sÂ. %s"
 
-#: ../modules/itip-formatter/itip-view.c:4473
+#: ../modules/itip-formatter/itip-view.c:4508
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Sendt til kalender Â%s som godtatt"
 
-#: ../modules/itip-formatter/itip-view.c:4478
+#: ../modules/itip-formatter/itip-view.c:4513
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Sendt til kalender Â%s som tentativ"
 
-#: ../modules/itip-formatter/itip-view.c:4484
+#: ../modules/itip-formatter/itip-view.c:4519
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Sendt til kalender Â%s som avslÃtt"
 
-#: ../modules/itip-formatter/itip-view.c:4490
+#: ../modules/itip-formatter/itip-view.c:4525
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Sendt til kalender Â%s som avlyst"
 
-#: ../modules/itip-formatter/itip-view.c:4560
-#: ../modules/itip-formatter/itip-view.c:4994
-#: ../modules/itip-formatter/itip-view.c:5101
+#: ../modules/itip-formatter/itip-view.c:4595
+#: ../modules/itip-formatter/itip-view.c:5029
+#: ../modules/itip-formatter/itip-view.c:5136
 msgid "Saving changes to the calendar. Please wait..."
 msgstr "Lagrer endringer i kalender. Vennligst vent â"
 
-#: ../modules/itip-formatter/itip-view.c:4599
+#: ../modules/itip-formatter/itip-view.c:4634
 msgid "Unable to parse item"
 msgstr "Kunne ikke lese oppfÃring"
 
-#: ../modules/itip-formatter/itip-view.c:4788
+#: ../modules/itip-formatter/itip-view.c:4823
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organisator har fjernet delegat %s"
 
-#: ../modules/itip-formatter/itip-view.c:4803
+#: ../modules/itip-formatter/itip-view.c:4838
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Avlysningsvarsel sendt til delegat"
 
-#: ../modules/itip-formatter/itip-view.c:4807
+#: ../modules/itip-formatter/itip-view.c:4842
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Kunne ikke sende avlysningsmelding til delegaten"
 
-#: ../modules/itip-formatter/itip-view.c:4856
+#: ../modules/itip-formatter/itip-view.c:4891
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Kan ikke oppdatere deltaker. %s"
 
-#: ../modules/itip-formatter/itip-view.c:4863
+#: ../modules/itip-formatter/itip-view.c:4898
 msgid "Attendee status updated"
 msgstr "Deltakerstatus oppdatert"
 
-#: ../modules/itip-formatter/itip-view.c:4886
+#: ../modules/itip-formatter/itip-view.c:4921
 msgid "The meeting is invalid and cannot be updated"
 msgstr "MÃtet er ugyldig og kan ikke oppdateres"
 
-#: ../modules/itip-formatter/itip-view.c:4959
+#: ../modules/itip-formatter/itip-view.c:4994
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Deltakerstatus kunne ikke oppdateres pga ugyldig status"
 
-#: ../modules/itip-formatter/itip-view.c:5031
-#: ../modules/itip-formatter/itip-view.c:5071
+#: ../modules/itip-formatter/itip-view.c:5066
+#: ../modules/itip-formatter/itip-view.c:5106
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Deltakerstatus kan ikke oppdateres fordi oppfÃringen ikke eksisterer lenger"
 
-#: ../modules/itip-formatter/itip-view.c:5134
+#: ../modules/itip-formatter/itip-view.c:5169
 msgid "Meeting information sent"
 msgstr "Informasjon om mÃte sendt"
 
-#: ../modules/itip-formatter/itip-view.c:5139
+#: ../modules/itip-formatter/itip-view.c:5174
 msgid "Task information sent"
 msgstr "Informasjon om oppgave sendt"
 
-#: ../modules/itip-formatter/itip-view.c:5144
+#: ../modules/itip-formatter/itip-view.c:5179
 msgid "Memo information sent"
 msgstr "Informasjon om notat sendt"
 
-#: ../modules/itip-formatter/itip-view.c:5155
+#: ../modules/itip-formatter/itip-view.c:5190
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Kan ikke sende mÃteinformasjon. MÃtet eksisterer ikke"
 
-#: ../modules/itip-formatter/itip-view.c:5160
+#: ../modules/itip-formatter/itip-view.c:5195
 msgid "Unable to send task information, the task does not exist"
 msgstr "Kan ikke sende informasjon om oppgave. Oppgaven eksisterer ikke"
 
-#: ../modules/itip-formatter/itip-view.c:5165
+#: ../modules/itip-formatter/itip-view.c:5200
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Kan ikke sende informasjon om notat. Notatet eksisterer ikke"
 
 #. Translators: This is a default filename for a calendar.
-#: ../modules/itip-formatter/itip-view.c:5230
+#: ../modules/itip-formatter/itip-view.c:5265
 msgid "calendar.ics"
 msgstr "kalender.ics"
 
-#: ../modules/itip-formatter/itip-view.c:5235
+#: ../modules/itip-formatter/itip-view.c:5270
 msgid "Save Calendar"
 msgstr "Lagre kalender"
 
-#: ../modules/itip-formatter/itip-view.c:5287
-#: ../modules/itip-formatter/itip-view.c:5299
+#: ../modules/itip-formatter/itip-view.c:5322
+#: ../modules/itip-formatter/itip-view.c:5334
 msgid "The calendar attached is not valid"
 msgstr "Vedlagt kalender er ugyldig"
 
-#: ../modules/itip-formatter/itip-view.c:5288
-#: ../modules/itip-formatter/itip-view.c:5300
+#: ../modules/itip-formatter/itip-view.c:5323
+#: ../modules/itip-formatter/itip-view.c:5335
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -16758,15 +16763,15 @@ msgstr ""
 "Meldingen pÃstÃr at den inneholder en kalender, men kalenderen er ikke en "
 "gyldig iCalendar."
 
-#: ../modules/itip-formatter/itip-view.c:5341
-#: ../modules/itip-formatter/itip-view.c:5370
-#: ../modules/itip-formatter/itip-view.c:5468
+#: ../modules/itip-formatter/itip-view.c:5376
+#: ../modules/itip-formatter/itip-view.c:5405
+#: ../modules/itip-formatter/itip-view.c:5503
 msgid "The item in the calendar is not valid"
 msgstr "OppfÃringen i kalenderen er ikke gyldig"
 
-#: ../modules/itip-formatter/itip-view.c:5342
-#: ../modules/itip-formatter/itip-view.c:5371
-#: ../modules/itip-formatter/itip-view.c:5469
+#: ../modules/itip-formatter/itip-view.c:5377
+#: ../modules/itip-formatter/itip-view.c:5406
+#: ../modules/itip-formatter/itip-view.c:5504
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -16774,11 +16779,11 @@ msgstr ""
 "Meldingen inneholder en kalender, men kalenderen inneholder ingen hendelser, "
 "oppgaver eller ledig/opptatt-informasjon"
 
-#: ../modules/itip-formatter/itip-view.c:5385
+#: ../modules/itip-formatter/itip-view.c:5420
 msgid "The calendar attached contains multiple items"
 msgstr "Vedlagt kalender inneholder flere oppfÃringer"
 
-#: ../modules/itip-formatter/itip-view.c:5386
+#: ../modules/itip-formatter/itip-view.c:5421
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -16786,24 +16791,24 @@ msgstr ""
 "Du mà lagre filen og importere kalenderen for à prosessere alle disse "
 "oppfÃringene"
 
-#: ../modules/itip-formatter/itip-view.c:5912
+#: ../modules/itip-formatter/itip-view.c:5947
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Ingen"
 
-#: ../modules/itip-formatter/itip-view.c:5928
+#: ../modules/itip-formatter/itip-view.c:5963
 msgid "Tentatively Accepted"
 msgstr "Akseptert tentativt"
 
-#: ../modules/itip-formatter/itip-view.c:6071
+#: ../modules/itip-formatter/itip-view.c:6106
 msgid "This meeting recurs"
 msgstr "Dettee mÃtet gjeninntreffer"
 
-#: ../modules/itip-formatter/itip-view.c:6074
+#: ../modules/itip-formatter/itip-view.c:6109
 msgid "This task recurs"
 msgstr "Denne oppgaven gjeninntreffer"
 
-#: ../modules/itip-formatter/itip-view.c:6077
+#: ../modules/itip-formatter/itip-view.c:6112
 msgid "This memo recurs"
 msgstr "Dette notatet gjeninntreffer"
 
@@ -16982,337 +16987,332 @@ msgstr "E-post_mappe"
 msgid "Create a new mail folder"
 msgstr "Opprett en ny e-postmappe"
 
-#: ../modules/mail/e-mail-shell-backend.c:554
+#: ../modules/mail/e-mail-shell-backend.c:563
 msgid "Mail Accounts"
 msgstr "E-post-konti"
 
-#: ../modules/mail/e-mail-shell-backend.c:563
+#: ../modules/mail/e-mail-shell-backend.c:572
 msgid "Mail Preferences"
 msgstr "Brukervalg for e-post"
 
-#: ../modules/mail/e-mail-shell-backend.c:572
+#: ../modules/mail/e-mail-shell-backend.c:581
 msgid "Composer Preferences"
 msgstr "Brukervalg for redigering"
 
-#: ../modules/mail/e-mail-shell-backend.c:581
+#: ../modules/mail/e-mail-shell-backend.c:590
 msgid "Network Preferences"
 msgstr "Brukervalg for nettverk"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1251
-#: ../modules/mail/e-mail-shell-view.c:970
+#: ../modules/mail/e-mail-shell-view-actions.c:1224
+#: ../modules/mail/e-mail-shell-view.c:972
 msgid "_Disable Account"
 msgstr "_Deaktiver konto"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1253
+#: ../modules/mail/e-mail-shell-view-actions.c:1226
 msgid "Disable this account"
 msgstr "Deaktiver denne kontoen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1260
+#: ../modules/mail/e-mail-shell-view-actions.c:1233
 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:1267
+#: ../modules/mail/e-mail-shell-view-actions.c:1240
 msgid "Edit properties of this account"
 msgstr "Rediger egenskaper for denne kontoen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1272
+#: ../modules/mail/e-mail-shell-view-actions.c:1245
 msgid "_Download Messages for Offline Usage"
 msgstr "Last ne_d meldinger for frakoblet bruk"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1274
+#: ../modules/mail/e-mail-shell-view-actions.c:1247
 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:1279
+#: ../modules/mail/e-mail-shell-view-actions.c:1252
 msgid "Fl_ush Outbox"
 msgstr "T_Ãm utboks"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1286
+#: ../modules/mail/e-mail-shell-view-actions.c:1259
 msgid "_Copy Folder To..."
 msgstr "_Kopier mappe til â"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1288
+#: ../modules/mail/e-mail-shell-view-actions.c:1261
 msgid "Copy the selected folder into another folder"
 msgstr "Kopier valgt mappe til en annen mappe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1295
+#: ../modules/mail/e-mail-shell-view-actions.c:1268
 msgid "Permanently remove this folder"
 msgstr "Fjern denne mappen permanent"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1300
+#: ../modules/mail/e-mail-shell-view-actions.c:1273
 msgid "E_xpunge"
 msgstr "T_Ãm"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1302
+#: ../modules/mail/e-mail-shell-view-actions.c:1275
 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:1307
+#: ../modules/mail/e-mail-shell-view-actions.c:1280
 msgid "Mar_k All Messages as Read"
 msgstr "Mer_k alle meldinger som lest"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1309
+#: ../modules/mail/e-mail-shell-view-actions.c:1282
 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:1314
+#: ../modules/mail/e-mail-shell-view-actions.c:1287
 msgid "_Move Folder To..."
 msgstr "Flytt _mappe til â"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1316
+#: ../modules/mail/e-mail-shell-view-actions.c:1289
 msgid "Move the selected folder into another folder"
 msgstr "Flytt valgt mappe til en annen mappe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1321
+#: ../modules/mail/e-mail-shell-view-actions.c:1294
 msgid "_New..."
 msgstr "_Ny â"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1323
+#: ../modules/mail/e-mail-shell-view-actions.c:1296
 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:1330
+#: ../modules/mail/e-mail-shell-view-actions.c:1303
 msgid "Change the properties of this folder"
 msgstr "Endre egenskaper for denne mappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1337
+#: ../modules/mail/e-mail-shell-view-actions.c:1310
 msgid "Refresh the folder"
 msgstr "Oppdater mappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1344
+#: ../modules/mail/e-mail-shell-view-actions.c:1317
 msgid "Change the name of this folder"
 msgstr "Endre navn pà denne mappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1349
+#: ../modules/mail/e-mail-shell-view-actions.c:1322
 msgid "Select Message _Thread"
 msgstr "Velg meldings_trÃd"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1351
+#: ../modules/mail/e-mail-shell-view-actions.c:1324
 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:1356
+#: ../modules/mail/e-mail-shell-view-actions.c:1329
 msgid "Select Message S_ubthread"
 msgstr "Velg _undertrÃd for melding"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1358
+#: ../modules/mail/e-mail-shell-view-actions.c:1331
 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:1370
+#: ../modules/mail/e-mail-shell-view-actions.c:1343
 msgid "Empty _Trash"
 msgstr "TÃm _papirkurven"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1372
+#: ../modules/mail/e-mail-shell-view-actions.c:1345
 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:1377
+#: ../modules/mail/e-mail-shell-view-actions.c:1350
 msgid "_New Label"
 msgstr "_Ny etikett"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1386
+#: ../modules/mail/e-mail-shell-view-actions.c:1359
 msgid "N_one"
 msgstr "_Ingen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1400
+#: ../modules/mail/e-mail-shell-view-actions.c:1373
 msgid "_Manage Subscriptions"
 msgstr "_HÃndter abonnement"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1402
-#: ../modules/mail/e-mail-shell-view-actions.c:1479
+#: ../modules/mail/e-mail-shell-view-actions.c:1375
+#: ../modules/mail/e-mail-shell-view-actions.c:1452
 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:1407
-#: ../modules/mail/e-mail-shell-view-actions.c:1428
+#: ../modules/mail/e-mail-shell-view-actions.c:1380
+#: ../modules/mail/e-mail-shell-view-actions.c:1401
 msgid "Send / _Receive"
 msgstr "Send / _motta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1409
+#: ../modules/mail/e-mail-shell-view-actions.c:1382
 msgid "Send queued items and retrieve new items"
 msgstr "Send kÃlagte oppfÃringer og hent nye oppfÃringer"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1414
+#: ../modules/mail/e-mail-shell-view-actions.c:1387
 msgid "R_eceive All"
 msgstr "Motta all_e"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1416
+#: ../modules/mail/e-mail-shell-view-actions.c:1389
 msgid "Receive new items from all accounts"
 msgstr "Motta nye oppfÃringer fra alle kontoer"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1421
+#: ../modules/mail/e-mail-shell-view-actions.c:1394
 msgid "_Send All"
 msgstr "_Send alle"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1423
+#: ../modules/mail/e-mail-shell-view-actions.c:1396
 msgid "Send queued items in all accounts"
 msgstr "Send kÃlagte oppfÃringer i alle kontoer"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1449
+#: ../modules/mail/e-mail-shell-view-actions.c:1422
 #: ../widgets/misc/e-activity-proxy.c:313
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1451
+#: ../modules/mail/e-mail-shell-view-actions.c:1424
 msgid "Cancel the current mail operation"
 msgstr "Avbryt aktiv e-postoperasjon"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1456
+#: ../modules/mail/e-mail-shell-view-actions.c:1429
 msgid "Collapse All _Threads"
 msgstr "Slà sammen alle _trÃder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1458
+#: ../modules/mail/e-mail-shell-view-actions.c:1431
 msgid "Collapse all message threads"
 msgstr "Slà sammen alle meldingstrÃder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1463
+#: ../modules/mail/e-mail-shell-view-actions.c:1436
 msgid "E_xpand All Threads"
 msgstr "Ut_vid alle trÃder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1465
+#: ../modules/mail/e-mail-shell-view-actions.c:1438
 msgid "Expand all message threads"
 msgstr "Utvid alle meldingstrÃder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1470
+#: ../modules/mail/e-mail-shell-view-actions.c:1443
 msgid "_Message Filters"
 msgstr "_Meldingsfiltre"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1472
+#: ../modules/mail/e-mail-shell-view-actions.c:1445
 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:1477
+#: ../modules/mail/e-mail-shell-view-actions.c:1450
 msgid "_Subscriptions..."
 msgstr "_Abonnement â"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1486
+#: ../modules/mail/e-mail-shell-view-actions.c:1459
 msgid "F_older"
 msgstr "M_appe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1493
+#: ../modules/mail/e-mail-shell-view-actions.c:1466
 msgid "_Label"
 msgstr "_Etikett"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1510
+#: ../modules/mail/e-mail-shell-view-actions.c:1483
 msgid "C_reate Search Folder From Search..."
 msgstr "Opp_rett sÃkemappe fra sÃk â"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1517
+#: ../modules/mail/e-mail-shell-view-actions.c:1490
 msgid "Search F_olders"
 msgstr "SÃk i _mapper"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1519
+#: ../modules/mail/e-mail-shell-view-actions.c:1492
 msgid "Create or edit search folder definitions"
 msgstr "Opprett eller rediger sÃkemappedefinisjoner"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1554
+#: ../modules/mail/e-mail-shell-view-actions.c:1527
 msgid "_New Folder..."
 msgstr "_Ny mappe â"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1582
+#: ../modules/mail/e-mail-shell-view-actions.c:1555
 msgid "Show Message _Preview"
 msgstr "Vis _forhÃndsvisning av melding"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1584
+#: ../modules/mail/e-mail-shell-view-actions.c:1557
 msgid "Show message preview pane"
 msgstr "Vis omrÃde for forhÃndsvisning av melding"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1590
+#: ../modules/mail/e-mail-shell-view-actions.c:1563
 msgid "Show _Deleted Messages"
 msgstr "Vis slette_de meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1592
+#: ../modules/mail/e-mail-shell-view-actions.c:1565
 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:1598
+#: ../modules/mail/e-mail-shell-view-actions.c:1571
 msgid "_Group By Threads"
 msgstr "_Grupper etter trÃder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1600
+#: ../modules/mail/e-mail-shell-view-actions.c:1573
 msgid "Threaded message list"
 msgstr "Meldingsliste med trÃder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1606
+#: ../modules/mail/e-mail-shell-view-actions.c:1579
 msgid "_Unmatched Folder Enabled"
-msgstr ""
+msgstr "Mapper _uten treff er aktivert"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1608
-#, fuzzy
+#: ../modules/mail/e-mail-shell-view-actions.c:1581
 msgid "Toggles whether Unmatched search folder is enabled"
-msgstr "SlÃr av/pà visning av rolle-feltet"
+msgstr "SlÃr av/pà sÃkemapper for oppfÃringer uten treff"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1628
+#: ../modules/mail/e-mail-shell-view-actions.c:1601
 msgid "Show message preview below the message list"
 msgstr "Vis meldingen under meldingslisten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1635
+#: ../modules/mail/e-mail-shell-view-actions.c:1608
 msgid "Show message preview alongside the message list"
 msgstr "Vis meldingen ved siden av meldingslisten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1643
+#: ../modules/mail/e-mail-shell-view-actions.c:1616
 msgid "All Messages"
 msgstr "Alle meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1650
+#: ../modules/mail/e-mail-shell-view-actions.c:1623
 msgid "Important Messages"
 msgstr "Viktige meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1657
+#: ../modules/mail/e-mail-shell-view-actions.c:1630
 msgid "Last 5 Days' Messages"
 msgstr "Meldinger fra de siste 5 dagene"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1664
+#: ../modules/mail/e-mail-shell-view-actions.c:1637
 msgid "Messages Not Junk"
 msgstr "Meldinger som ikke er uÃnsket e-post"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1671
+#: ../modules/mail/e-mail-shell-view-actions.c:1644
 msgid "Messages with Attachments"
 msgstr "Meldinger med vedlegg"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1678
+#: ../modules/mail/e-mail-shell-view-actions.c:1651
 msgid "No Label"
 msgstr "Ingen etikett"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1685
+#: ../modules/mail/e-mail-shell-view-actions.c:1658
 msgid "Read Messages"
 msgstr "Leste meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1692
-msgid "Recent Messages"
-msgstr "Nye meldinger"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1699
+#: ../modules/mail/e-mail-shell-view-actions.c:1665
 msgid "Unread Messages"
 msgstr "Uleste meldinger"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1751
+#: ../modules/mail/e-mail-shell-view-actions.c:1717
 msgid "Subject or Addresses contain"
 msgstr "Emne eller adresser inneholder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1761
+#: ../modules/mail/e-mail-shell-view-actions.c:1727
 msgid "All Accounts"
 msgstr "Alle konti"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1768
+#: ../modules/mail/e-mail-shell-view-actions.c:1734
 msgid "Current Account"
 msgstr "Denne kontoen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1775
+#: ../modules/mail/e-mail-shell-view-actions.c:1741
 msgid "Current Folder"
 msgstr "Denne mappen"
 
-#: ../modules/mail/e-mail-shell-view.c:562
+#: ../modules/mail/e-mail-shell-view.c:613
 msgid "All Account Search"
 msgstr "SÃk i alle konti"
 
-#: ../modules/mail/e-mail-shell-view.c:723
+#: ../modules/mail/e-mail-shell-view.c:709
 msgid "Account Search"
 msgstr "SÃk i konto"
 
-#: ../modules/mail/e-mail-shell-view.c:968
+#: ../modules/mail/e-mail-shell-view.c:970
 msgid "Proxy _Logout"
 msgstr "_Logg ut proxy"
 
@@ -17669,7 +17669,8 @@ msgid ""
 msgstr ""
 "Velkommen til Evolution.\n"
 "\n"
-"De neste skjermene lar deg konfigurere Evolution til à koble til dine e-post kontoer, og importere filer fra andre programmer."
+"De neste skjermene lar deg konfigurere Evolution til à koble til dine e-post "
+"kontoer, og importere filer fra andre programmer."
 
 #: ../modules/startup-wizard/evolution-startup-wizard.c:259
 msgid "Loading accounts..."
@@ -20068,49 +20069,49 @@ msgid "Attached message"
 msgstr "Vedlagt melding"
 
 #. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment.c:1821 ../widgets/misc/e-attachment.c:2371
+#: ../widgets/misc/e-attachment.c:1829 ../widgets/misc/e-attachment.c:2384
 #: ../widgets/misc/e-attachment-store.c:525
 msgid "attachment.dat"
 msgstr "vedlegg.dat"
 
-#: ../widgets/misc/e-attachment.c:1869 ../widgets/misc/e-attachment.c:2673
+#: ../widgets/misc/e-attachment.c:1874 ../widgets/misc/e-attachment.c:2686
 msgid "A load operation is already in progress"
 msgstr "En lasteoperasjon er allerede i gang"
 
-#: ../widgets/misc/e-attachment.c:1877 ../widgets/misc/e-attachment.c:2681
+#: ../widgets/misc/e-attachment.c:1882 ../widgets/misc/e-attachment.c:2694
 msgid "A save operation is already in progress"
 msgstr "En lagreoperasjon er allerede i gang"
 
-#: ../widgets/misc/e-attachment.c:1976
+#: ../widgets/misc/e-attachment.c:1989
 #, c-format
 msgid "Could not load '%s'"
 msgstr "Kunne ikke laste Â%sÂ"
 
-#: ../widgets/misc/e-attachment.c:1979
+#: ../widgets/misc/e-attachment.c:1992
 #, c-format
 msgid "Could not load the attachment"
 msgstr "Kunne ikke laste vedlegget"
 
-#: ../widgets/misc/e-attachment.c:2252
+#: ../widgets/misc/e-attachment.c:2265
 #, c-format
 msgid "Could not open '%s'"
 msgstr "Kunne ikke Ãpne Â%sÂ"
 
-#: ../widgets/misc/e-attachment.c:2255
+#: ../widgets/misc/e-attachment.c:2268
 #, c-format
 msgid "Could not open the attachment"
 msgstr "Kunne ikke Ãpne vedlegget"
 
-#: ../widgets/misc/e-attachment.c:2689
+#: ../widgets/misc/e-attachment.c:2702
 msgid "Attachment contents not loaded"
 msgstr "Vedleggets innhold ble ikke lastet"
 
-#: ../widgets/misc/e-attachment.c:2765
+#: ../widgets/misc/e-attachment.c:2778
 #, c-format
 msgid "Could not save '%s'"
 msgstr "Kunne ikke lagre Â%sÂ"
 
-#: ../widgets/misc/e-attachment.c:2768
+#: ../widgets/misc/e-attachment.c:2781
 #, c-format
 msgid "Could not save the attachment"
 msgstr "Kunne ikke lagre vedlegget"



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