Added Norwegian bokmål translation

1 files changed, 737 insertions, 391 deletions

diff --git a/po/nb.po b/po/nb.po
index cdbdcdff95..904c1a9cae 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -4,13 +4,13 @@
 # Terance Edward Sola <terance@lyse.net>, 2005.
 #
 #
-#: ../shell/main.c:502
+#: ../shell/main.c:519
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution 2.30.x\n"
+"Project-Id-Version: evolution 2.31.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-13 23:37+0200\n"
-"PO-Revision-Date: 2010-06-13 23:51+0200\n"
+"POT-Creation-Date: 2010-06-19 13:06+0200\n"
+"PO-Revision-Date: 2010-06-19 13:11+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian bokmal <i18n-nb@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
@@ -232,20 +232,6 @@ msgstr "End_re størrelse"
 msgid "_Use as it is"
 msgstr "Br_uk som den er"
 
-#: ../addressbook/conduit/address-conduit.c:597
-msgid "Default Sync Address:"
-msgstr "Forvalgt synkroniseringsadresse:"
-
-#: ../addressbook/conduit/address-conduit.c:1631
-#: ../addressbook/conduit/address-conduit.c:1632
-msgid "Could not load address book"
-msgstr "Kunne ikke laste adressebok"
-
-#: ../addressbook/conduit/address-conduit.c:1709
-#: ../addressbook/conduit/address-conduit.c:1712
-msgid "Could not read pilot's Address application block"
-msgstr "Kunne ikke lese pilotens adresseapplikasjonsblokk"
-
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:583
 #: ../calendar/gui/e-calendar-view.c:2022
@@ -260,7 +246,7 @@ msgstr "Bryllupsdag"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
 #: ../addressbook/gui/widgets/eab-contact-display.c:582
 #: ../calendar/gui/e-calendar-view.c:2021 ../capplet/anjal-settings-main.c:118
-#: ../shell/main.c:116
+#: ../shell/main.c:118
 msgid "Birthday"
 msgstr "Fødselsdag"
 
@@ -1102,7 +1088,7 @@ msgid "Home Email"
 msgstr "E-post hjemme"
 
 #: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:805
+#: ../addressbook/gui/widgets/e-minicard.c:807
 msgid "Other Email"
 msgstr "Annen e-post"
 
@@ -2025,7 +2011,7 @@ msgstr ""
 msgid "_Discard Changes"
 msgstr "_Forkast endringer"
 
-#: ../calendar/calendar.error.xml.h:81 ../composer/e-composer-actions.c:309
+#: ../calendar/calendar.error.xml.h:81 ../composer/e-composer-actions.c:268
 msgid "_Save"
 msgstr "_Lagre"
 
@@ -2043,48 +2029,6 @@ msgstr "_Send"
 msgid "_Send Notice"
 msgstr "_Send melding"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:252
-msgid "Split Multi-Day Events:"
-msgstr "Del opp hendelser som går over flere dager:"
-
-#: ../calendar/conduits/calendar/calendar-conduit.c:1532
-#: ../calendar/conduits/calendar/calendar-conduit.c:1533
-#: ../calendar/conduits/memo/memo-conduit.c:821
-#: ../calendar/conduits/memo/memo-conduit.c:822
-#: ../calendar/conduits/todo/todo-conduit.c:1022
-#: ../calendar/conduits/todo/todo-conduit.c:1023
-msgid "Could not start evolution-data-server"
-msgstr "Kunne ikke starte evolution-data-server"
-
-#: ../calendar/conduits/calendar/calendar-conduit.c:1640
-#: ../calendar/conduits/calendar/calendar-conduit.c:1643
-msgid "Could not read pilot's Calendar application block"
-msgstr "Kunne ikke lese pilotens kalender-applikasjonsblokk"
-
-#: ../calendar/conduits/memo/memo-conduit.c:915
-#: ../calendar/conduits/memo/memo-conduit.c:918
-msgid "Could not read pilot's Memo application block"
-msgstr "Kunne ikke lese pilotens applikasjonsblokk for notatliste"
-
-#: ../calendar/conduits/memo/memo-conduit.c:962
-#: ../calendar/conduits/memo/memo-conduit.c:965
-msgid "Could not write pilot's Memo application block"
-msgstr "Kunne ikke skrive til pilotens applikasjonsblokk for notatliste"
-
-#: ../calendar/conduits/todo/todo-conduit.c:231
-msgid "Default Priority:"
-msgstr "Forvalgt prioritet:"
-
-#: ../calendar/conduits/todo/todo-conduit.c:1106
-#: ../calendar/conduits/todo/todo-conduit.c:1109
-msgid "Could not read pilot's ToDo application block"
-msgstr "Kunne ikke lese pilotens applikasjonsblokk for oppgaveliste"
-
-#: ../calendar/conduits/todo/todo-conduit.c:1151
-#: ../calendar/conduits/todo/todo-conduit.c:1154
-msgid "Could not write pilot's ToDo application block"
-msgstr "Kunne ikke skrive til pilotens applikasjonsblokk for oppgaveliste"
-
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
 msgid "minute"
 msgid_plural "minutes"
@@ -2132,7 +2076,7 @@ msgstr "A_vvis"
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
 #: ../mail/e-mail-browser.c:151
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1646
+#: ../shell/e-shell-window-actions.c:1607
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "R_ediger"
@@ -3407,7 +3351,7 @@ msgstr "Type:"
 msgid "_Type:"
 msgstr "_Type:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:157
+#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:160
 #: ../modules/addressbook/ldap-config.ui.h:26
 #: ../plugins/groupwise-features/properties.ui.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
@@ -3560,21 +3504,21 @@ msgid "Click here to close the current window"
 msgstr "Klikk her for å lukke dette vinduet"
 
 #: ../calendar/gui/dialogs/comp-editor.c:951 ../mail/e-mail-browser.c:116
-#: ../shell/e-shell-window-actions.c:1485
+#: ../shell/e-shell-window-actions.c:1453
 #: ../widgets/misc/e-focus-tracker.c:115 ../widgets/misc/e-focus-tracker.c:550
 #: ../widgets/misc/e-web-view.c:398 ../widgets/misc/e-web-view.c:1051
 msgid "Copy the selection"
 msgstr "Kopier utvalget"
 
 #: ../calendar/gui/dialogs/comp-editor.c:958 ../mail/e-mail-browser.c:123
-#: ../shell/e-shell-window-actions.c:1492
+#: ../shell/e-shell-window-actions.c:1460
 #: ../widgets/misc/e-focus-tracker.c:108 ../widgets/misc/e-focus-tracker.c:545
 #: ../widgets/misc/e-web-view.c:1045
 msgid "Cut the selection"
 msgstr "Klipp ut utvalget"
 
 #: ../calendar/gui/dialogs/comp-editor.c:965
-#: ../shell/e-shell-window-actions.c:1499
+#: ../shell/e-shell-window-actions.c:1467
 #: ../widgets/misc/e-focus-tracker.c:129 ../widgets/misc/e-focus-tracker.c:560
 msgid "Delete the selection"
 msgstr "Slett utvalget"
@@ -3584,7 +3528,7 @@ msgid "Click here to view help available"
 msgstr "klikk her for å vise tilgjengelig hjelp"
 
 #: ../calendar/gui/dialogs/comp-editor.c:979 ../mail/e-mail-browser.c:130
-#: ../shell/e-shell-window-actions.c:1534
+#: ../shell/e-shell-window-actions.c:1502
 #: ../widgets/misc/e-focus-tracker.c:122 ../widgets/misc/e-focus-tracker.c:555
 #: ../widgets/misc/e-web-view.c:1057
 msgid "Paste the clipboard"
@@ -3595,7 +3539,7 @@ msgid "Click here to save the current window"
 msgstr "Klikk her for å lagre dette vinduet"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1007 ../mail/e-mail-browser.c:137
-#: ../shell/e-shell-window-actions.c:1604
+#: ../shell/e-shell-window-actions.c:1572
 #: ../widgets/misc/e-focus-tracker.c:136 ../widgets/misc/e-focus-tracker.c:565
 msgid "Select all text"
 msgstr "Velg all tekst"
@@ -3605,13 +3549,13 @@ msgid "_Classification"
 msgstr "K_lassifisering"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1028 ../mail/e-mail-browser.c:144
-#: ../shell/e-shell-window-actions.c:1653
+#: ../shell/e-shell-window-actions.c:1614
 #: ../widgets/misc/e-signature-editor.c:217
 msgid "_File"
 msgstr "_Fil"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1035
-#: ../shell/e-shell-window-actions.c:1660
+#: ../shell/e-shell-window-actions.c:1621
 msgid "_Help"
 msgstr "_Hjelp"
 
@@ -3620,17 +3564,17 @@ msgid "_Insert"
 msgstr "Sett _inn"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1049
-#: ../composer/e-composer-actions.c:353
+#: ../composer/e-composer-actions.c:312
 msgid "_Options"
 msgstr "_Alternativer"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1056 ../mail/e-mail-browser.c:158
-#: ../shell/e-shell-window-actions.c:1695 ../smime/gui/smime-ui.ui.h:45
+#: ../shell/e-shell-window-actions.c:1656 ../smime/gui/smime-ui.ui.h:45
 msgid "_View"
 msgstr "_Vis"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1066
-#: ../composer/e-composer-actions.c:281
+#: ../composer/e-composer-actions.c:240
 msgid "_Attachment..."
 msgstr "_Vedlegg..."
 
@@ -3716,7 +3660,7 @@ msgid "Recent _Documents"
 msgstr "Siste _dokumenter"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1704
-#: ../composer/e-composer-actions.c:469
+#: ../composer/e-composer-actions.c:428
 msgid "Attach"
 msgstr "Legg ved"
 
@@ -4356,7 +4300,7 @@ msgstr "Fullført"
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
 #: ../calendar/gui/e-cal-component-preview.c:314
 #: ../calendar/gui/e-task-table.c:510 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1132 ../widgets/misc/e-send-options.ui.h:13
+#: ../mail/message-list.c:1172 ../widgets/misc/e-send-options.ui.h:13
 msgid "High"
 msgstr "Høy"
 
@@ -4375,7 +4319,7 @@ msgstr "Under arbeid"
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
 #: ../calendar/gui/e-cal-component-preview.c:318
 #: ../calendar/gui/e-task-table.c:512 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1130 ../widgets/misc/e-send-options.ui.h:14
+#: ../mail/message-list.c:1170 ../widgets/misc/e-send-options.ui.h:14
 msgid "Low"
 msgstr "Lav"
 
@@ -4383,7 +4327,7 @@ msgstr "Lav"
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
 #: ../calendar/gui/e-cal-component-preview.c:316
 #: ../calendar/gui/e-cal-model.c:1254 ../calendar/gui/e-task-table.c:511
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1131
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1171
 #: ../widgets/misc/e-send-options.ui.h:16
 msgid "Normal"
 msgstr "Normal"
@@ -4922,7 +4866,7 @@ msgid "pm"
 msgstr "pm"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2637
+#: ../calendar/gui/e-day-view.c:2645
 #, c-format
 msgid "Week %d"
 msgstr "Uke %d"
@@ -7945,149 +7889,145 @@ msgstr "Stillehavet/Wallis"
 msgid "Pacific/Yap"
 msgstr "Stillahavet/Yap"
 
-#: ../composer/e-composer-actions.c:81
-msgid "Untitled Message"
-msgstr "Melding uten navn"
-
-#: ../composer/e-composer-actions.c:204
+#: ../composer/e-composer-actions.c:163
 msgid "Save as..."
 msgstr "Lagre som..."
 
-#: ../composer/e-composer-actions.c:283
+#: ../composer/e-composer-actions.c:242
 #: ../widgets/misc/e-attachment-view.c:329
 msgid "Attach a file"
 msgstr "Legg ved en fil"
 
-#: ../composer/e-composer-actions.c:288
+#: ../composer/e-composer-actions.c:247
 #: ../widgets/misc/e-signature-editor.c:203
 msgid "_Close"
 msgstr "L_ukk"
 
-#: ../composer/e-composer-actions.c:290
+#: ../composer/e-composer-actions.c:249
 msgid "Close the current file"
 msgstr "Lukk aktiv fil"
 
-#: ../composer/e-composer-actions.c:295
+#: ../composer/e-composer-actions.c:254
 msgid "_Print..."
 msgstr "S_kriv ut..."
 
-#: ../composer/e-composer-actions.c:302
+#: ../composer/e-composer-actions.c:261
 msgid "Print Pre_view"
 msgstr "Forhåndsvisning av utskrift"
 
-#: ../composer/e-composer-actions.c:311
+#: ../composer/e-composer-actions.c:270
 msgid "Save the current file"
 msgstr "Lagre aktiv fil"
 
-#: ../composer/e-composer-actions.c:316
+#: ../composer/e-composer-actions.c:275
 msgid "Save _As..."
 msgstr "L_agre som..."
 
-#: ../composer/e-composer-actions.c:318
+#: ../composer/e-composer-actions.c:277
 msgid "Save the current file with a different name"
 msgstr "Lagre aktiv fil med et nytt navn"
 
-#: ../composer/e-composer-actions.c:323
+#: ../composer/e-composer-actions.c:282
 msgid "Save as _Draft"
 msgstr "Lagre som ut_kast"
 
-#: ../composer/e-composer-actions.c:325
+#: ../composer/e-composer-actions.c:284
 msgid "Save as draft"
 msgstr "Lagre som utkast"
 
-#: ../composer/e-composer-actions.c:330 ../composer/e-composer-private.c:290
+#: ../composer/e-composer-actions.c:289 ../composer/e-composer-private.c:290
 msgid "S_end"
 msgstr "S_end"
 
-#: ../composer/e-composer-actions.c:332
+#: ../composer/e-composer-actions.c:291
 msgid "Send this message"
 msgstr "Send denne meldingen"
 
-#: ../composer/e-composer-actions.c:337
+#: ../composer/e-composer-actions.c:296
 msgid "New _Message"
 msgstr "Ny _melding"
 
-#: ../composer/e-composer-actions.c:339
+#: ../composer/e-composer-actions.c:298
 msgid "Open New Message window"
 msgstr "Åpne nytt meldingsvindu"
 
-#: ../composer/e-composer-actions.c:346
+#: ../composer/e-composer-actions.c:305
 msgid "Character _Encoding"
 msgstr "T_egnkoding"
 
-#: ../composer/e-composer-actions.c:363
+#: ../composer/e-composer-actions.c:322
 msgid "PGP _Encrypt"
 msgstr "Krypt_er med PGP"
 
-#: ../composer/e-composer-actions.c:365
+#: ../composer/e-composer-actions.c:324
 msgid "Encrypt this message with PGP"
 msgstr "Krypter denne meldingen med PGP"
 
-#: ../composer/e-composer-actions.c:371
+#: ../composer/e-composer-actions.c:330
 msgid "PGP _Sign"
 msgstr "_Signer med PGP"
 
-#: ../composer/e-composer-actions.c:373
+#: ../composer/e-composer-actions.c:332
 msgid "Sign this message with your PGP key"
 msgstr "Signer denne meldingen med din PGP-nøkkel"
 
-#: ../composer/e-composer-actions.c:379
+#: ../composer/e-composer-actions.c:338
 msgid "_Prioritize Message"
 msgstr "_Prioriter melding"
 
-#: ../composer/e-composer-actions.c:381
+#: ../composer/e-composer-actions.c:340
 msgid "Set the message priority to high"
 msgstr "Sett meldingsprioritet til høy"
 
-#: ../composer/e-composer-actions.c:387
+#: ../composer/e-composer-actions.c:346
 msgid "Re_quest Read Receipt"
 msgstr "S_pør om lesekvittering"
 
-#: ../composer/e-composer-actions.c:389
+#: ../composer/e-composer-actions.c:348
 msgid "Get delivery notification when your message is read"
 msgstr "Motta leveringsmelding når meldingen blir lest"
 
-#: ../composer/e-composer-actions.c:395
+#: ../composer/e-composer-actions.c:354
 msgid "S/MIME En_crypt"
 msgstr "_Krypter med S/MIME"
 
-#: ../composer/e-composer-actions.c:397
+#: ../composer/e-composer-actions.c:356
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Krypter denne meldingen med ditt S/MIME-krypteringssertifikat"
 
-#: ../composer/e-composer-actions.c:403
+#: ../composer/e-composer-actions.c:362
 msgid "S/MIME Sig_n"
 msgstr "Sig_ner med S/MIME"
 
-#: ../composer/e-composer-actions.c:405
+#: ../composer/e-composer-actions.c:364
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Signer denne meldingen med ditt S/MIME signatursertifikat"
 
-#: ../composer/e-composer-actions.c:411
+#: ../composer/e-composer-actions.c:370
 msgid "_Bcc Field"
 msgstr "_Bcc-felt"
 
-#: ../composer/e-composer-actions.c:413
+#: ../composer/e-composer-actions.c:372
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Slå av/på visning av BCC-feltet"
 
-#: ../composer/e-composer-actions.c:419
+#: ../composer/e-composer-actions.c:378
 msgid "_Cc Field"
 msgstr "_Cc-felt"
 
-#: ../composer/e-composer-actions.c:421
+#: ../composer/e-composer-actions.c:380
 msgid "Toggles whether the CC field is displayed"
 msgstr "Slå av/på visning av CC-feltet"
 
-#: ../composer/e-composer-actions.c:427
+#: ../composer/e-composer-actions.c:386
 msgid "_Reply-To Field"
 msgstr "Svar-til felt"
 
-#: ../composer/e-composer-actions.c:429
+#: ../composer/e-composer-actions.c:388
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Slå av/på visning av Svar-til feltet"
 
-#: ../composer/e-composer-actions.c:472
+#: ../composer/e-composer-actions.c:431
 msgid "Save Draft"
 msgstr "Lagre utkast"
 
@@ -8192,16 +8132,20 @@ msgstr ""
 msgid "Unable to reconstruct message from autosave file"
 msgstr "Kunne ikke gjenopprette melding fra automatisk lagret fil"
 
-#: ../composer/e-msg-composer.c:1528 ../composer/e-msg-composer.c:1735
+#: ../composer/e-msg-composer.c:1528 ../composer/e-msg-composer.c:1773
 msgid "Compose Message"
 msgstr "Skriv melding"
 
-#: ../composer/e-msg-composer.c:3436
+#: ../composer/e-msg-composer.c:3486
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr ""
 "Redigering inneholder en meldingskropp som ikke er tekst, og som ikke kan "
 "redigeres."
 
+#: ../composer/e-msg-composer.c:4091
+msgid "Untitled Message"
+msgstr "Melding uten navn"
+
 #: ../composer/mail-composer.error.xml.h:1
 msgid ""
 " There are few attachments getting downloaded. Sending the mail will cause "
@@ -8461,7 +8405,7 @@ msgstr ""
 "posten din."
 
 #: ../capplet/settings/mail-account-view.c:608
-#: ../mail/em-account-editor.c:2086 ../mail/em-account-editor.c:2217
+#: ../mail/em-account-editor.c:2096 ../mail/em-account-editor.c:2227
 #: ../mail/mail-config.ui.h:61
 msgid "Identity"
 msgstr "Identitet"
@@ -8514,7 +8458,7 @@ msgid "Back - Receiving options"
 msgstr "Tilbake - Alternativer for mottak"
 
 #: ../capplet/settings/mail-account-view.c:613
-#: ../mail/em-account-editor.c:2791 ../mail/mail-config.ui.h:34
+#: ../mail/em-account-editor.c:2982 ../mail/mail-config.ui.h:34
 msgid "Defaults"
 msgstr "Forvalg"
 
@@ -8548,7 +8492,8 @@ msgstr "Du må kanskje slå på IMAP-tilgang."
 
 #: ../capplet/settings/mail-account-view.c:733
 msgid "<span size=\"large\" weight=\"bold\">Google account settings:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">Innstillinger for Google-konto:</span>"
+msgstr ""
+"<span size=\"large\" weight=\"bold\">Innstillinger for Google-konto:</span>"
 
 #: ../capplet/settings/mail-account-view.c:757
 msgid "Setup Yahoo calendar with Evolution"
@@ -8559,11 +8504,15 @@ msgid ""
 "Yahoo calendars are named as firstname_lastname. We have tried to form the "
 "calendar name. So please confirm and re-enter the calendar name if it is not "
 "correct."
-msgstr "Yahoo-kalendere har navn som fornavn_etternavn. Vi har prøvd å utforme kalendernavnet. Vennligst bekreft og oppgi kalendernavnet på nytt hvis det ikke er korrekt."
+msgstr ""
+"Yahoo-kalendere har navn som fornavn_etternavn. Vi har prøvd å utforme "
+"kalendernavnet. Vennligst bekreft og oppgi kalendernavnet på nytt hvis det "
+"ikke er korrekt."
 
 #: ../capplet/settings/mail-account-view.c:768
 msgid "<span size=\"large\" weight=\"bold\">Yahoo account settings:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">Innstillinger for Yahoo-konto:</span>"
+msgstr ""
+"<span size=\"large\" weight=\"bold\">Innstillinger for Yahoo-konto:</span>"
 
 #: ../capplet/settings/mail-account-view.c:780
 msgid "Yahoo Calendar name:"
@@ -8592,7 +8541,7 @@ msgstr "Evolution kontoassistent"
 #: ../mail/em-folder-tree-model.c:151 ../mail/em-folder-tree-model.c:154
 #: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:163
 #: ../mail/em-folder-tree-model.c:165 ../mail/mail-vfolder.c:211
-#: ../mail/message-list.c:1614
+#: ../mail/message-list.c:1654
 #: ../modules/addressbook/e-book-shell-backend.c:125
 #: ../modules/addressbook/e-book-shell-migrate.c:130
 #: ../modules/calendar/e-cal-shell-backend.c:121
@@ -8850,15 +8799,15 @@ msgstr "Loggmeldinger:"
 msgid "Log Level"
 msgstr "Loggnivå"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2696
+#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2736
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Meldinger"
 
 #: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:109
-#: ../shell/e-shell-window-actions.c:1457
-#: ../shell/e-shell-window-actions.c:1464
-#: ../shell/e-shell-window-actions.c:1471
+#: ../shell/e-shell-window-actions.c:1425
+#: ../shell/e-shell-window-actions.c:1432
+#: ../shell/e-shell-window-actions.c:1439
 msgid "Close this window"
 msgstr "Lukk dette vinduet"
 
@@ -9331,7 +9280,7 @@ msgstr "i fremtiden"
 msgid "months"
 msgstr "måneder"
 
-#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:181
+#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:185
 msgid "seconds"
 msgstr "sekunder"
 
@@ -9347,6 +9296,415 @@ msgstr "tiden du oppgir"
 msgid "years"
 msgstr "år"
 
+#: ../libgnomecanvas/gnome-canvas-rich-text.c:210
+#: ../libgnomecanvas/gnome-canvas-text.c:204
+msgid "Text"
+msgstr "Tekst"
+
+#: ../libgnomecanvas/gnome-canvas-rich-text.c:211
+msgid "Text to display"
+msgstr "Tekst som skal vises"
+
+#: ../libgnomecanvas/gnome-canvas-rich-text.c:218
+#: ../libgnomecanvas/gnome-canvas.c:1417 ../libgnomecanvas/gnome-canvas.c:1418
+msgid "X"
+msgstr "X"
+
+#: ../libgnomecanvas/gnome-canvas-rich-text.c:219
+msgid "X position"
+msgstr "X-posisjon"
+
+#: ../libgnomecanvas/gnome-canvas-rich-text.c:226
+#: ../libgnomecanvas/gnome-canvas.c:1424 ../libgnomecanvas/gnome-canvas.c:1425
+msgid "Y"
+msgstr "Y"
+
+#: ../libgnomecanvas/gnome-canvas-rich-text.c:227
+msgid "Y position"
+msgstr "Y-posisjon"
+
+#: ../libgnomecanvas/gnome-canvas-rich-text.c:234
+msgid "Width"
+msgstr "Bredde"
+
+#: ../libgnomecanvas/gnome-canvas-rich-text.c:235
+msgid "Width for text box"
+msgstr "Bredde på tekstboks"
+
+#: ../libgnomecanvas/gnome-canvas-rich-text.c:242
+msgid "Height"
+msgstr "Høyde"
+
+#: ../libgnomecanvas/gnome-canvas-rich-text.c:243
+msgid "Height for text box"
+msgstr "Høyde på tekstboks"
+
+#: ../libgnomecanvas/gnome-canvas-rich-text.c:250
+msgid "Editable"
+msgstr "Redigerbar"
+
+#: ../libgnomecanvas/gnome-canvas-rich-text.c:251
+msgid "Is this rich text item editable?"
+msgstr "Er denne tekstoppføringen redigerbar?"
+
+#: ../libgnomecanvas/gnome-canvas-rich-text.c:258
+msgid "Visible"
+msgstr "Synlig"
+
+#: ../libgnomecanvas/gnome-canvas-rich-text.c:259
+msgid "Is this rich text item visible?"
+msgstr "Er denne tekstoppføringen synlig?"
+
+#: ../libgnomecanvas/gnome-canvas-rich-text.c:266
+msgid "Cursor Visible"
+msgstr "Synlig markør"
+
+#: ../libgnomecanvas/gnome-canvas-rich-text.c:267
+msgid "Is the cursor visible in this rich text item?"
+msgstr "Er markøren synlig i denne tekstoppføringen?"
+
+#: ../libgnomecanvas/gnome-canvas-rich-text.c:274
+msgid "Cursor Blink"
+msgstr "Markøren blinker"
+
+#: ../libgnomecanvas/gnome-canvas-rich-text.c:275
+msgid "Does the cursor blink in this rich text item?"
+msgstr "Blinker markøren i denne tekstoppføringen?"
+
+#: ../libgnomecanvas/gnome-canvas-rich-text.c:282
+msgid "Grow Height"
+msgstr "Voks i høyden"
+
+#: ../libgnomecanvas/gnome-canvas-rich-text.c:283
+msgid "Should the text box height grow if the text does not fit?"
+msgstr ""
+
+#: ../libgnomecanvas/gnome-canvas-rich-text.c:290
+msgid "Wrap Mode"
+msgstr "Brytningsmodus"
+
+#: ../libgnomecanvas/gnome-canvas-rich-text.c:291
+msgid "Wrap mode for multiline text"
+msgstr ""
+
+#: ../libgnomecanvas/gnome-canvas-rich-text.c:299
+msgid "Justification"
+msgstr ""
+
+#: ../libgnomecanvas/gnome-canvas-rich-text.c:300
+#, fuzzy
+msgid "Justification mode"
+msgstr "Egendefinert varsling"
+
+#: ../libgnomecanvas/gnome-canvas-rich-text.c:308
+msgid "Direction"
+msgstr "Retning"
+
+#: ../libgnomecanvas/gnome-canvas-rich-text.c:309
+msgid "Text direction"
+msgstr "Tekstretning"
+
+#: ../libgnomecanvas/gnome-canvas-rich-text.c:317
+msgid "Anchor"
+msgstr "Anker"
+
+#: ../libgnomecanvas/gnome-canvas-rich-text.c:318
+msgid "Anchor point for text"
+msgstr "Ankerpunkt for tekst"
+
+#: ../libgnomecanvas/gnome-canvas-rich-text.c:326
+msgid "Pixels Above Lines"
+msgstr ""
+
+#: ../libgnomecanvas/gnome-canvas-rich-text.c:327
+msgid "Number of pixels to put above lines"
+msgstr ""
+
+#: ../libgnomecanvas/gnome-canvas-rich-text.c:335
+msgid "Pixels Below Lines"
+msgstr ""
+
+#: ../libgnomecanvas/gnome-canvas-rich-text.c:336
+msgid "Number of pixels to put below lines"
+msgstr ""
+
+#: ../libgnomecanvas/gnome-canvas-rich-text.c:344
+msgid "Pixels Inside Wrap"
+msgstr ""
+
+#: ../libgnomecanvas/gnome-canvas-rich-text.c:345
+msgid "Number of pixels to put inside the wrap"
+msgstr ""
+
+#: ../libgnomecanvas/gnome-canvas-rich-text.c:353
+msgid "Left Margin"
+msgstr "Venstre marg"
+
+#: ../libgnomecanvas/gnome-canvas-rich-text.c:354
+msgid "Number of pixels in the left margin"
+msgstr ""
+
+#: ../libgnomecanvas/gnome-canvas-rich-text.c:362
+msgid "Right Margin"
+msgstr "Høyre marg"
+
+#: ../libgnomecanvas/gnome-canvas-rich-text.c:363
+msgid "Number of pixels in the right margin"
+msgstr ""
+
+#: ../libgnomecanvas/gnome-canvas-rich-text.c:371
+msgid "Indentation"
+msgstr "Innrykk"
+
+#: ../libgnomecanvas/gnome-canvas-rich-text.c:372
+#, fuzzy
+msgid "Number of pixels for indentation"
+msgstr "Antall enheter for å bestemme en forvalgt påminnelse."
+
+#: ../libgnomecanvas/gnome-canvas-text.c:205
+#, fuzzy
+msgid "Text to render"
+msgstr "Sva_r til avsender"
+
+#: ../libgnomecanvas/gnome-canvas-text.c:213
+msgid "Markup"
+msgstr ""
+
+#: ../libgnomecanvas/gnome-canvas-text.c:214
+#, fuzzy
+msgid "Marked up text to render"
+msgstr "Send _oppdateringer til deltakere"
+
+#: ../libgnomecanvas/gnome-canvas-text.c:239
+msgid "Font"
+msgstr "Skrift"
+
+#: ../libgnomecanvas/gnome-canvas-text.c:240
+#, fuzzy
+msgid "Font description as a string"
+msgstr "Ingen beskrivelse tilgjengelig."
+
+#: ../libgnomecanvas/gnome-canvas-text.c:248
+msgid "Font description"
+msgstr "Beskrivelse av skrift"
+
+#: ../libgnomecanvas/gnome-canvas-text.c:249
+msgid "Font description as a PangoFontDescription struct"
+msgstr ""
+
+#: ../libgnomecanvas/gnome-canvas-text.c:257
+msgid "Font family"
+msgstr "Skriftfamilie"
+
+#: ../libgnomecanvas/gnome-canvas-text.c:258
+msgid "Name of the font family, e.g. Sans, Helvetica, Times, Monospace"
+msgstr ""
+
+#: ../libgnomecanvas/gnome-canvas-text.c:274
+#: ../libgnomecanvas/gnome-canvas-text.c:275
+msgid "Font style"
+msgstr "Stil for skrift"
+
+#: ../libgnomecanvas/gnome-canvas-text.c:284
+#: ../libgnomecanvas/gnome-canvas-text.c:285
+#, fuzzy
+msgid "Font variant"
+msgstr "inneholder"
+
+#: ../libgnomecanvas/gnome-canvas-text.c:294
+#: ../libgnomecanvas/gnome-canvas-text.c:295
+msgid "Font weight"
+msgstr ""
+
+#: ../libgnomecanvas/gnome-canvas-text.c:306
+#: ../libgnomecanvas/gnome-canvas-text.c:307
+msgid "Font stretch"
+msgstr ""
+
+#: ../libgnomecanvas/gnome-canvas-text.c:316
+msgid "Font size"
+msgstr "Skriftstørrelse"
+
+#: ../libgnomecanvas/gnome-canvas-text.c:317
+msgid ""
+"Font size (as a multiple of PANGO_SCALE, eg. 12*PANGO_SCALE for a 12pt font "
+"size)"
+msgstr ""
+
+#: ../libgnomecanvas/gnome-canvas-text.c:327
+#, fuzzy
+msgid "Font points"
+msgstr "inneholder"
+
+#: ../libgnomecanvas/gnome-canvas-text.c:328
+msgid "Font size in points (eg. 12 for a 12pt font size)"
+msgstr ""
+
+#: ../libgnomecanvas/gnome-canvas-text.c:338
+msgid "Rise"
+msgstr "Hev"
+
+#: ../libgnomecanvas/gnome-canvas-text.c:339
+msgid ""
+"Offset of text above the baseline (below the baseline if rise is negative)"
+msgstr ""
+
+#: ../libgnomecanvas/gnome-canvas-text.c:349
+msgid "Strikethrough"
+msgstr "Gjennomstrek"
+
+#: ../libgnomecanvas/gnome-canvas-text.c:350
+msgid "Whether to strike through the text"
+msgstr ""
+
+#: ../libgnomecanvas/gnome-canvas-text.c:358
+msgid "Underline"
+msgstr "Understrek"
+
+#: ../libgnomecanvas/gnome-canvas-text.c:359
+msgid "Style of underline for this text"
+msgstr ""
+
+#: ../libgnomecanvas/gnome-canvas-text.c:368
+msgid "Scale"
+msgstr "Skaler"
+
+#: ../libgnomecanvas/gnome-canvas-text.c:369
+msgid "Size of font, relative to default size"
+msgstr ""
+
+#: ../libgnomecanvas/gnome-canvas-text.c:423
+#: ../libgnomecanvas/gnome-canvas-text.c:431
+#: ../libgnomecanvas/gnome-canvas-text.c:439
+#: ../mail/e-mail-label-tree-view.c:86
+msgid "Color"
+msgstr "Farge"
+
+#: ../libgnomecanvas/gnome-canvas-text.c:424
+msgid "Text color, as string"
+msgstr "Tekstfarge som en streng"
+
+#: ../libgnomecanvas/gnome-canvas-text.c:432
+msgid "Text color, as a GdkColor"
+msgstr "Tekstfarge som en GdkColor"
+
+#: ../libgnomecanvas/gnome-canvas-text.c:440
+msgid "Text color, as an R/G/B/A combined integer"
+msgstr ""
+
+#: ../libgnomecanvas/gnome-canvas-text.c:453
+msgid "Text width"
+msgstr "Tekstbredde"
+
+#: ../libgnomecanvas/gnome-canvas-text.c:454
+#, fuzzy
+msgid "Width of the rendered text"
+msgstr "Bredde på e-postlistefeltet"
+
+#: ../libgnomecanvas/gnome-canvas-text.c:461
+msgid "Text height"
+msgstr "Teksthøyde"
+
+#: ../libgnomecanvas/gnome-canvas-text.c:462
+#, fuzzy
+msgid "Height of the rendered text"
+msgstr "Høyde på e-postlistefeltet"
+
+#: ../libgnomecanvas/gnome-canvas-text.c:470
+#, fuzzy
+msgid "Font family set"
+msgstr "Etternavn"
+
+#: ../libgnomecanvas/gnome-canvas-text.c:471
+msgid "Whether this tag affects the font family"
+msgstr ""
+
+#: ../libgnomecanvas/gnome-canvas-text.c:474
+#, fuzzy
+msgid "Font style set"
+msgstr "Stil for utforming"
+
+#: ../libgnomecanvas/gnome-canvas-text.c:475
+msgid "Whether this tag affects the font style"
+msgstr ""
+
+#: ../libgnomecanvas/gnome-canvas-text.c:478
+msgid "Font variant set"
+msgstr ""
+
+#: ../libgnomecanvas/gnome-canvas-text.c:479
+msgid "Whether this tag affects the font variant"
+msgstr ""
+
+#: ../libgnomecanvas/gnome-canvas-text.c:482
+msgid "Font weight set"
+msgstr ""
+
+#: ../libgnomecanvas/gnome-canvas-text.c:483
+msgid "Whether this tag affects the font weight"
+msgstr ""
+
+#: ../libgnomecanvas/gnome-canvas-text.c:486
+msgid "Font stretch set"
+msgstr ""
+
+#: ../libgnomecanvas/gnome-canvas-text.c:487
+msgid "Whether this tag affects the font stretch"
+msgstr ""
+
+#: ../libgnomecanvas/gnome-canvas-text.c:490
+msgid "Font size set"
+msgstr ""
+
+#: ../libgnomecanvas/gnome-canvas-text.c:491
+msgid "Whether this tag affects the font size"
+msgstr ""
+
+#: ../libgnomecanvas/gnome-canvas-text.c:494
+#, fuzzy
+msgid "Rise set"
+msgstr "er satt"
+
+#: ../libgnomecanvas/gnome-canvas-text.c:495
+msgid "Whether this tag affects the rise"
+msgstr ""
+
+#: ../libgnomecanvas/gnome-canvas-text.c:498
+msgid "Strikethrough set"
+msgstr ""
+
+#: ../libgnomecanvas/gnome-canvas-text.c:499
+msgid "Whether this tag affects strikethrough"
+msgstr ""
+
+#: ../libgnomecanvas/gnome-canvas-text.c:502
+#, fuzzy
+msgid "Underline set"
+msgstr "Udefinert"
+
+#: ../libgnomecanvas/gnome-canvas-text.c:503
+msgid "Whether this tag affects underlining"
+msgstr ""
+
+#: ../libgnomecanvas/gnome-canvas-text.c:506
+#, fuzzy
+msgid "Scale set"
+msgstr "Dato sendt"
+
+#: ../libgnomecanvas/gnome-canvas-text.c:507
+msgid "Whether this tag affects font scaling"
+msgstr ""
+
+#: ../libgnomecanvas/gnome-canvas.c:2068
+#, fuzzy
+msgid "Antialiased"
+msgstr "Uten navn"
+
+#: ../libgnomecanvas/gnome-canvas.c:2069
+#, fuzzy
+msgid "The antialiasing mode of the canvas."
+msgstr "Det finnes en annen kontakt."
+
 #: ../mail/e-mail-attachment-bar.c:90 ../mail/e-mail-attachment-bar.c:95
 #: ../mail/em-format-html-display.c:1028 ../mail/mail-config.ui.h:15
 #: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:118
@@ -9431,10 +9789,6 @@ msgstr ""
 "Merk: Understrek i etikettnavnet brukes som\n"
 "hurtigtastidentifikator i menyen."
 
-#: ../mail/e-mail-label-tree-view.c:86
-msgid "Color"
-msgstr "Farge"
-
 #: ../mail/e-mail-label-tree-view.c:96
 #: ../plugins/caldav/caldav-browse-server.c:1163
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
@@ -10028,7 +10382,7 @@ msgid "Unable to retrieve message"
 msgstr "Kunne ikke hente ut melding"
 
 #: ../mail/e-mail-reader.c:1886 ../mail/e-mail-reader.c:1946
-#: ../mail/mail-ops.c:1843
+#: ../mail/mail-ops.c:1842
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "Henter melding «%s»"
@@ -10079,7 +10433,7 @@ msgstr "Merk for oppfølging"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:499 ../mail/mail-config.ui.h:75
+#: ../mail/em-account-editor.c:506 ../mail/mail-config.ui.h:75
 #: ../modules/addressbook/ldap-config.ui.h:9
 msgid "No encryption"
 msgstr "Ingen kryptering"
@@ -10087,7 +10441,7 @@ msgstr "Ingen kryptering"
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
-#: ../mail/em-account-editor.c:503 ../mail/mail-config.ui.h:129
+#: ../mail/em-account-editor.c:510 ../mail/mail-config.ui.h:131
 #: ../modules/addressbook/ldap-config.ui.h:20
 msgid "TLS encryption"
 msgstr "TLS-kryptering"
@@ -10095,17 +10449,17 @@ msgstr "TLS-kryptering"
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
-#: ../mail/em-account-editor.c:507 ../mail/mail-config.ui.h:100
+#: ../mail/em-account-editor.c:514 ../mail/mail-config.ui.h:100
 #: ../modules/addressbook/ldap-config.ui.h:12
 msgid "SSL encryption"
 msgstr "SSL-kryptering"
 
-#: ../mail/em-account-editor.c:594
+#: ../mail/em-account-editor.c:601
 #, c-format
 msgid "%s License Agreement"
 msgstr "Lisensavtale for %s"
 
-#: ../mail/em-account-editor.c:601
+#: ../mail/em-account-editor.c:608
 #, c-format
 msgid ""
 "\n"
@@ -10119,34 +10473,34 @@ msgstr ""
 "og kryss av i ruten for å akseptere den\n"
 
 #. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:885 ../widgets/misc/e-signature-combo-box.c:75
+#: ../mail/em-account-editor.c:895 ../widgets/misc/e-signature-combo-box.c:75
 msgctxt "mail-signature"
 msgid "None"
 msgstr "Ingen"
 
-#: ../mail/em-account-editor.c:969
+#: ../mail/em-account-editor.c:979
 msgid "Never"
 msgstr "Aldri"
 
-#: ../mail/em-account-editor.c:970
+#: ../mail/em-account-editor.c:980
 msgid "Always"
 msgstr "Alltid"
 
-#: ../mail/em-account-editor.c:971
+#: ../mail/em-account-editor.c:981
 msgid "Ask for each message"
 msgstr "Spør for hver melding"
 
 #. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1708 ../widgets/misc/e-account-tree-view.c:124
+#: ../mail/em-account-editor.c:1718 ../widgets/misc/e-account-tree-view.c:124
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "Ingen"
 
-#: ../mail/em-account-editor.c:2083
+#: ../mail/em-account-editor.c:2093
 msgid "Mail Configuration"
 msgstr "E-post-konfigurasjon"
 
-#: ../mail/em-account-editor.c:2084
+#: ../mail/em-account-editor.c:2094
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -10156,7 +10510,7 @@ msgstr ""
 "\n"
 "Klikk «Framover» for å begynne."
 
-#: ../mail/em-account-editor.c:2087
+#: ../mail/em-account-editor.c:2097
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -10166,20 +10520,20 @@ msgstr ""
 "må ikke nødvendigvis fylles ut, hvis du ikke ønsker å inkludere denne "
 "informasjonen i meldingene du sender."
 
-#: ../mail/em-account-editor.c:2089 ../mail/em-account-editor.c:2256
+#: ../mail/em-account-editor.c:2099 ../mail/em-account-editor.c:2266
 #: ../mail/mail-config.ui.h:93
 msgid "Receiving Email"
 msgstr "Innkommende e-post"
 
-#: ../mail/em-account-editor.c:2090
+#: ../mail/em-account-editor.c:2100
 msgid "Please configure the following account settings."
 msgstr "Vennligst konfigurer følgende kontoinnstillinger."
 
-#: ../mail/em-account-editor.c:2092 ../mail/em-account-editor.c:2727
+#: ../mail/em-account-editor.c:2102 ../mail/em-account-editor.c:2737
 msgid "Sending Email"
 msgstr "Utgående e-post"
 
-#: ../mail/em-account-editor.c:2093
+#: ../mail/em-account-editor.c:2103
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -10187,11 +10541,11 @@ msgstr ""
 "Vennligst skriv inn informasjon om måten du sender e-post. Hvis du ikke er "
 "sikker, kontakt din systemadministrator eller din Internett tjenestetilbyder."
 
-#: ../mail/em-account-editor.c:2095
+#: ../mail/em-account-editor.c:2105
 msgid "Account Management"
 msgstr "Håndtering av konti"
 
-#: ../mail/em-account-editor.c:2096
+#: ../mail/em-account-editor.c:2106
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -10199,11 +10553,11 @@ msgstr ""
 "Vennligst oppgi et beskrivende navn for denne kontoen i feltet under.\n"
 "Dette navnet vil kun bli brukt som et visningsnavn."
 
-#: ../mail/em-account-editor.c:2100
+#: ../mail/em-account-editor.c:2110
 msgid "Done"
 msgstr "Ferdig"
 
-#: ../mail/em-account-editor.c:2101
+#: ../mail/em-account-editor.c:2111
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10217,25 +10571,29 @@ msgstr ""
 "\n"
 "Klikk «Bruk» for å lagre dine innstillinger."
 
-#: ../mail/em-account-editor.c:2543
+#: ../mail/em-account-editor.c:2553
 msgid "Check for _new messages every"
 msgstr "Se etter _nye meldinger hver(t)"
 
-#: ../mail/em-account-editor.c:2551
+#: ../mail/em-account-editor.c:2561
 msgid "minu_tes"
 msgstr "minu_tter"
 
-#: ../mail/em-account-editor.c:2914 ../mail/mail-config.ui.h:107
+#: ../mail/em-account-editor.c:2835
+msgid "Please select a folder from the current account."
+msgstr "Vennligst velg en mappe fra valgt konto."
+
+#: ../mail/em-account-editor.c:3105 ../mail/mail-config.ui.h:107
 msgid "Security"
 msgstr "Sikkerhet"
 
 #. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2959 ../mail/em-account-editor.c:3027
+#: ../mail/em-account-editor.c:3150 ../mail/em-account-editor.c:3218
 msgid "Receiving Options"
 msgstr "Alternativer for mottak"
 
-#: ../mail/em-account-editor.c:2960 ../mail/em-account-editor.c:3028
+#: ../mail/em-account-editor.c:3151 ../mail/em-account-editor.c:3219
 msgid "Checking for New Messages"
 msgstr "Ser etter nye meldinger"
 
@@ -10639,12 +10997,12 @@ msgstr "Flytter mappe %s"
 msgid "Copying folder %s"
 msgstr "Kopierer mappe %s"
 
-#: ../mail/em-folder-tree.c:1602 ../mail/message-list.c:2113
+#: ../mail/em-folder-tree.c:1602 ../mail/message-list.c:2153
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Flytter meldinger til mappe %s"
 
-#: ../mail/em-folder-tree.c:1604 ../mail/message-list.c:2115
+#: ../mail/em-folder-tree.c:1604 ../mail/message-list.c:2155
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopierer meldinger til mappe %s"
@@ -12513,74 +12871,82 @@ msgid "Select HTML variable width font for printing"
 msgstr "Velg skrift med variabel bredde for bruk ved utskrift av HTML"
 
 #: ../mail/mail-config.ui.h:113
+msgid "Select Junk Folder"
+msgstr "Velg mappe for uønsket e-post"
+
+#: ../mail/mail-config.ui.h:114
 msgid "Select Sent Folder"
 msgstr "Velg mappe for sendte meldinger"
 
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:115
+msgid "Select Trash Folder"
+msgstr "Velg mappe for papirkurv"
+
+#: ../mail/mail-config.ui.h:116
 msgid "Sender Photograph"
 msgstr "Bilde av avsender"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:117
 msgid "Sending Mail"
 msgstr "Utgående e-post"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:118
 msgid "Sent _Messages Folder:"
 msgstr "Mappe for sendte _meldinger:"
 
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:119
 msgid "Sent and Draft Messages"
 msgstr "Sendte meldinger og skisser"
 
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:120
 msgid "Ser_ver requires authentication"
 msgstr "Tjener kre_ver autentisering"
 
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:121
 msgid "Server Configuration"
 msgstr "Tjenerkonfigurasjon"
 
-#: ../mail/mail-config.ui.h:120
+#: ../mail/mail-config.ui.h:122
 msgid "Server _Type:"
 msgstr "Tjener_type:"
 
-#: ../mail/mail-config.ui.h:121
+#: ../mail/mail-config.ui.h:123
 msgid "Si_gning algorithm:"
 msgstr "Si_gneringsalgoritme:"
 
-#: ../mail/mail-config.ui.h:122
+#: ../mail/mail-config.ui.h:124
 msgid "Sig_natures"
 msgstr "Sig_naturer"
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:125
 msgid "Sig_ning certificate:"
 msgstr "Sertifikat for sig_nering:"
 
-#: ../mail/mail-config.ui.h:124
+#: ../mail/mail-config.ui.h:126
 msgid "Signat_ure:"
 msgstr "Signat_ur:"
 
-#: ../mail/mail-config.ui.h:125
+#: ../mail/mail-config.ui.h:127
 msgid "Signatures"
 msgstr "Signaturer"
 
-#: ../mail/mail-config.ui.h:126
+#: ../mail/mail-config.ui.h:128
 msgid "Signing _algorithm:"
 msgstr "Signerings_algoritme:"
 
-#: ../mail/mail-config.ui.h:127
+#: ../mail/mail-config.ui.h:129
 msgid "Spell Checking"
 msgstr "Stavekontroll"
 
-#: ../mail/mail-config.ui.h:128
+#: ../mail/mail-config.ui.h:130
 msgid "Start _typing at the bottom on replying"
 msgstr "S_tart skriving under meldingen ved svar"
 
-#: ../mail/mail-config.ui.h:130
+#: ../mail/mail-config.ui.h:132
 msgid "T_ype:"
 msgstr "T_ype:"
 
-#: ../mail/mail-config.ui.h:131
+#: ../mail/mail-config.ui.h:133
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -12588,7 +12954,7 @@ msgstr ""
 "Språklisten som vises her reflekterer kun de språkene du har installert en "
 "ordbok for."
 
-#: ../mail/mail-config.ui.h:132
+#: ../mail/mail-config.ui.h:134
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12599,11 +12965,11 @@ msgstr ""
 "for visning på skjermen."
 
 #. Translators: Section name for options related to Top Posting. See Edit|Preferences|Composer Preferences for better understanding
-#: ../mail/mail-config.ui.h:136
+#: ../mail/mail-config.ui.h:138
 msgid "Top Posting Option"
 msgstr "Alternativ for «topp-posting»"
 
-#: ../mail/mail-config.ui.h:137
+#: ../mail/mail-config.ui.h:139
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12611,162 +12977,170 @@ msgstr ""
 "Skriv navnet du vil referere til denne kontoen.\n"
 "For eksempel «Arbeid» eller «Personlig»"
 
-#: ../mail/mail-config.ui.h:139
+#: ../mail/mail-config.ui.h:141
 msgid "Us_ername:"
 msgstr "Bruk_ernavn:"
 
-#: ../mail/mail-config.ui.h:140
+#: ../mail/mail-config.ui.h:142
 msgid "Use Authe_ntication"
 msgstr "Bruk aute_ntisering"
 
-#: ../mail/mail-config.ui.h:141 ../plugins/caldav/caldav-source.c:225
+#: ../mail/mail-config.ui.h:143 ../plugins/caldav/caldav-source.c:225
 #: ../plugins/google-account-setup/google-contacts-source.c:286
 #: ../plugins/google-account-setup/google-source.c:623
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:260
 msgid "User_name:"
 msgstr "Bruker_navn:"
 
-#: ../mail/mail-config.ui.h:142
+#: ../mail/mail-config.ui.h:144
 msgid "V_ariable-width:"
 msgstr "V_ariabel bredde:"
 
-#: ../mail/mail-config.ui.h:143
+#: ../mail/mail-config.ui.h:145
 msgid "_Add Signature"
 msgstr "_Legg til signatur"
 
-#: ../mail/mail-config.ui.h:144
+#: ../mail/mail-config.ui.h:146
 msgid "_Always load images from the Internet"
 msgstr "_Alltid last bilder fra Internett"
 
-#: ../mail/mail-config.ui.h:145
+#: ../mail/mail-config.ui.h:147
 msgid "_Authentication Type"
 msgstr "_Autentiseringstype"
 
-#: ../mail/mail-config.ui.h:146
+#: ../mail/mail-config.ui.h:148
 msgid "_Default junk plugin:"
 msgstr "_Forvalgt tillegg for uønsket e-post:"
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:149
 msgid "_Direct connection to the Internet"
 msgstr "_Direkte tilkobling til internett"
 
-#: ../mail/mail-config.ui.h:148
+#: ../mail/mail-config.ui.h:150
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "Ikke signer _møteforespørsler (for kompatibilitet med Outlook)"
 
-#: ../mail/mail-config.ui.h:149
+#: ../mail/mail-config.ui.h:151
 msgid "_Forward style:"
 msgstr "_Videresendingsstil:"
 
-#: ../mail/mail-config.ui.h:150
+#: ../mail/mail-config.ui.h:152
+msgid "_Junk Folder:"
+msgstr "Mappe for _uønsket e-post:"
+
+#: ../mail/mail-config.ui.h:153
 msgid "_Keep Signature above the original message on replying"
 msgstr "_Behold signaturen over opprinnelig melding ved svar"
 
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:154
 msgid "_Languages"
 msgstr "_Språk"
 
-#: ../mail/mail-config.ui.h:152
+#: ../mail/mail-config.ui.h:155
 msgid "_Load images in messages from contacts"
 msgstr "_Last bilder i meldinger fra kontakter"
 
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:156
 msgid "_Lookup in local address book only"
 msgstr "S_lå kun opp i lokale adressebokmapper"
 
-#: ../mail/mail-config.ui.h:154
+#: ../mail/mail-config.ui.h:157
 msgid "_Make this my default account"
 msgstr "_Bruk denne som forvalgt konto"
 
-#: ../mail/mail-config.ui.h:155
+#: ../mail/mail-config.ui.h:158
 msgid "_Manual proxy configuration:"
 msgstr "_Manuell konfigurasjon av proxy:"
 
-#: ../mail/mail-config.ui.h:156
+#: ../mail/mail-config.ui.h:159
 msgid "_Mark messages as read after"
 msgstr "_Merk meldinger som lest etter"
 
-#: ../mail/mail-config.ui.h:158
+#: ../mail/mail-config.ui.h:161
 msgid "_Never load images from the Internet"
 msgstr "Aldri last bilder fra Internett"
 
-#: ../mail/mail-config.ui.h:159
+#: ../mail/mail-config.ui.h:162
 msgid "_Path:"
 msgstr "S_ti:"
 
-#: ../mail/mail-config.ui.h:160
+#: ../mail/mail-config.ui.h:163
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "S_pør ved sending av HTML-meldinger til kontakter som ikke ønsker dem"
 
-#: ../mail/mail-config.ui.h:161
+#: ../mail/mail-config.ui.h:164
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "S_pør ved sending av meldinger med tomt emnefelt"
 
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:165
 msgid "_Reply style:"
 msgstr "Sva_rstil:"
 
-#: ../mail/mail-config.ui.h:163
+#: ../mail/mail-config.ui.h:166
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: ../mail/mail-config.ui.h:164
+#: ../mail/mail-config.ui.h:167
 msgid "_Secure HTTP Proxy:"
 msgstr "_Sikker HTTP-proxy:"
 
-#: ../mail/mail-config.ui.h:165
+#: ../mail/mail-config.ui.h:168
 msgid "_Select..."
 msgstr "_Velg..."
 
-#: ../mail/mail-config.ui.h:166 ../modules/addressbook/ldap-config.ui.h:29
+#: ../mail/mail-config.ui.h:169 ../modules/addressbook/ldap-config.ui.h:29
 #: ../plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "_Server:"
 msgstr "Tj_ener:"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:168
+#: ../mail/mail-config.ui.h:171
 msgid "_Show image animations"
 msgstr "Vi_s animasjoner"
 
-#: ../mail/mail-config.ui.h:169
+#: ../mail/mail-config.ui.h:172
 msgid "_Show the photograph of sender in the message preview"
 msgstr "Vi_s bilde av avsender i forhåndsvisning av meldingen"
 
 #. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
-#: ../mail/mail-config.ui.h:171
+#: ../mail/mail-config.ui.h:174
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_Slå sammen Til/Cc/Bcc-hoder til "
 
-#: ../mail/mail-config.ui.h:172
+#: ../mail/mail-config.ui.h:175
+msgid "_Trash Folder:"
+msgstr "Mappe for _papirkurv:"
+
+#: ../mail/mail-config.ui.h:176
 msgid "_Use Secure Connection:"
 msgstr "Br_uk sikker forbindelse:"
 
-#: ../mail/mail-config.ui.h:173
+#: ../mail/mail-config.ui.h:177
 msgid "_Use system defaults"
 msgstr "Br_uk systemets forvalg"
 
-#: ../mail/mail-config.ui.h:174
+#: ../mail/mail-config.ui.h:178
 msgid "_Use the same fonts as other applications"
 msgstr "Br_uk samme skrifter som andre programmer"
 
-#: ../mail/mail-config.ui.h:175 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/mail-config.ui.h:179 ../smime/gui/smime-ui.ui.h:47
 msgid "a"
 msgstr "a"
 
 #. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
-#: ../mail/mail-config.ui.h:177
+#: ../mail/mail-config.ui.h:181
 msgid "addresses"
 msgstr "adresser"
 
-#: ../mail/mail-config.ui.h:178 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:182 ../smime/gui/smime-ui.ui.h:48
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:179
+#: ../mail/mail-config.ui.h:183
 msgid "color"
 msgstr "farge"
 
-#: ../mail/mail-config.ui.h:180
+#: ../mail/mail-config.ui.h:184
 msgid "description"
 msgstr "beskrivelse"
 
@@ -12886,7 +13260,7 @@ msgstr "_Flagg:"
 msgid "_Tick this to accept the license agreement"
 msgstr "_Kryss av her for å godta lisensen"
 
-#: ../mail/mail-folder-cache.c:754
+#: ../mail/mail-folder-cache.c:762
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinger %s"
@@ -12900,12 +13274,12 @@ msgid "Fetching Mail"
 msgstr "Henter e-post"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:576
+#: ../mail/mail-ops.c:575
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Feil under påføring av utgående filtre: %s"
 
-#: ../mail/mail-ops.c:588 ../mail/mail-ops.c:616
+#: ../mail/mail-ops.c:587 ../mail/mail-ops.c:615
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -12914,126 +13288,126 @@ msgstr ""
 "Kunne ikke legge til i %s: %s\n"
 "Legger til i lokal «Sendt»-mappe i stedet."
 
-#: ../mail/mail-ops.c:633
+#: ../mail/mail-ops.c:632
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "Kunne ikke legge til i lokal Sendt-mappe: %s"
 
-#: ../mail/mail-ops.c:744 ../mail/mail-ops.c:825
+#: ../mail/mail-ops.c:743 ../mail/mail-ops.c:824
 msgid "Sending message"
 msgstr "Sender melding"
 
-#: ../mail/mail-ops.c:754
+#: ../mail/mail-ops.c:753
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sender melding %d av %d"
 
-#: ../mail/mail-ops.c:781
+#: ../mail/mail-ops.c:780
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Feil under sending av %d av %d meldinger"
 
-#: ../mail/mail-ops.c:783 ../mail/mail-send-recv.c:761
+#: ../mail/mail-ops.c:782 ../mail/mail-send-recv.c:761
 msgid "Canceled."
 msgstr "Avbrutt."
 
-#: ../mail/mail-ops.c:785 ../mail/mail-send-recv.c:763
+#: ../mail/mail-ops.c:784 ../mail/mail-send-recv.c:763
 msgid "Complete."
 msgstr "Fullført."
 
-#: ../mail/mail-ops.c:897
+#: ../mail/mail-ops.c:896
 #, c-format
 msgid "Saving message to folder '%s'"
 msgstr "Lagrer melding til mappe «%s»"
 
-#: ../mail/mail-ops.c:974
+#: ../mail/mail-ops.c:973
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Flytter meldinger til «%s»"
 
-#: ../mail/mail-ops.c:974
+#: ../mail/mail-ops.c:973
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Kopierer meldinger til «%s»"
 
-#: ../mail/mail-ops.c:1083
+#: ../mail/mail-ops.c:1082
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "Skanner mapper i «%s»"
 
-#: ../mail/mail-ops.c:1191
+#: ../mail/mail-ops.c:1190
 msgid "Forwarded messages"
 msgstr "Videresendte meldinger"
 
-#: ../mail/mail-ops.c:1232
+#: ../mail/mail-ops.c:1231
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "Åpner mappe «%s»"
 
-#: ../mail/mail-ops.c:1298
+#: ../mail/mail-ops.c:1297
 #, c-format
 msgid "Retrieving quota information for folder '%s'"
 msgstr "Henter kvoteinformasjon for mappe «%s»"
 
-#: ../mail/mail-ops.c:1370
+#: ../mail/mail-ops.c:1369
 #, c-format
 msgid "Opening store '%s'"
 msgstr "Åpner lager «%s»"
 
-#: ../mail/mail-ops.c:1441
+#: ../mail/mail-ops.c:1440
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "Fjerner mappe «%s»"
 
-#: ../mail/mail-ops.c:1561
+#: ../mail/mail-ops.c:1560
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Lagrer mappe «%s»"
 
-#: ../mail/mail-ops.c:1624
+#: ../mail/mail-ops.c:1623
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Tømmer og lagrer konto «%s»"
 
-#: ../mail/mail-ops.c:1625
+#: ../mail/mail-ops.c:1624
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Lagrer konto «%s»"
 
-#: ../mail/mail-ops.c:1679
+#: ../mail/mail-ops.c:1678
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "Oppdaterer mappe «%s»"
 
-#: ../mail/mail-ops.c:1719
+#: ../mail/mail-ops.c:1718
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "Tømmer mappe «%s»"
 
-#: ../mail/mail-ops.c:1764
+#: ../mail/mail-ops.c:1763
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Tømmer søppel i «%s»"
 
-#: ../mail/mail-ops.c:1765
+#: ../mail/mail-ops.c:1764
 msgid "Local Folders"
 msgstr "Lokale mapper"
 
-#: ../mail/mail-ops.c:1961
+#: ../mail/mail-ops.c:1960
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Henter %d melding"
 msgstr[1] "Henter %d melding(er)"
 
-#: ../mail/mail-ops.c:2050
+#: ../mail/mail-ops.c:2049
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "Lagrer %d melding"
 msgstr[1] "Lagrer %d meldinger"
 
-#: ../mail/mail-ops.c:2131
+#: ../mail/mail-ops.c:2130
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13042,11 +13416,11 @@ msgstr ""
 "Feil under lagring av av meldinger til: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2203
+#: ../mail/mail-ops.c:2202
 msgid "Saving attachment"
 msgstr "Lagrer vedlegg"
 
-#: ../mail/mail-ops.c:2221 ../mail/mail-ops.c:2229
+#: ../mail/mail-ops.c:2220 ../mail/mail-ops.c:2228
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13055,27 +13429,27 @@ msgstr ""
 "Kunne ikke opprette utdatafil: %s\n"
 " %s"
 
-#: ../mail/mail-ops.c:2244
+#: ../mail/mail-ops.c:2243
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kan ikke skrive data: %s"
 
-#: ../mail/mail-ops.c:2389
+#: ../mail/mail-ops.c:2388
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "Kobler fra «%s»"
 
-#: ../mail/mail-ops.c:2389
+#: ../mail/mail-ops.c:2388
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "Kobler til «%s» på nytt"
 
-#: ../mail/mail-ops.c:2485
+#: ../mail/mail-ops.c:2484
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Forbereder konto «%s» for frakoblet bruk"
 
-#: ../mail/mail-ops.c:2571
+#: ../mail/mail-ops.c:2570
 msgid "Checking Service"
 msgstr "Sjekker tjeneste"
 
@@ -13800,82 +14174,82 @@ msgstr "_Send kvittering"
 msgid "_Synchronize"
 msgstr "_Synkroniser"
 
-#: ../mail/message-list.c:1119
+#: ../mail/message-list.c:1159
 msgid "Unseen"
 msgstr "Ulest"
 
-#: ../mail/message-list.c:1120
+#: ../mail/message-list.c:1160
 msgid "Seen"
 msgstr "Lest"
 
-#: ../mail/message-list.c:1121
+#: ../mail/message-list.c:1161
 msgid "Answered"
 msgstr "Besvart"
 
-#: ../mail/message-list.c:1122
+#: ../mail/message-list.c:1162
 msgid "Forwarded"
 msgstr "Videresendt"
 
-#: ../mail/message-list.c:1123
+#: ../mail/message-list.c:1163
 msgid "Multiple Unseen Messages"
 msgstr "Flere uleste meldinger"
 
-#: ../mail/message-list.c:1124
+#: ../mail/message-list.c:1164
 msgid "Multiple Messages"
 msgstr "Flere meldinger"
 
-#: ../mail/message-list.c:1128
+#: ../mail/message-list.c:1168
 msgid "Lowest"
 msgstr "Lavest"
 
-#: ../mail/message-list.c:1129
+#: ../mail/message-list.c:1169
 msgid "Lower"
 msgstr "Lavere"
 
-#: ../mail/message-list.c:1133
+#: ../mail/message-list.c:1173
 msgid "Higher"
 msgstr "Høyere"
 
-#: ../mail/message-list.c:1134
+#: ../mail/message-list.c:1174
 msgid "Highest"
 msgstr "Høyest"
 
-#: ../mail/message-list.c:1744 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1784 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1751 ../plugins/itip-formatter/itip-view.c:205
+#: ../mail/message-list.c:1791 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "I dag %l:%M %p"
 
-#: ../mail/message-list.c:1760
+#: ../mail/message-list.c:1800
 msgid "Yesterday %l:%M %p"
 msgstr "I går %l:%M %p"
 
-#: ../mail/message-list.c:1772
+#: ../mail/message-list.c:1812
 msgid "%a %l:%M %p"
 msgstr "%a %H.%M"
 
-#: ../mail/message-list.c:1780
+#: ../mail/message-list.c:1820
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H.%M"
 
-#: ../mail/message-list.c:1782
+#: ../mail/message-list.c:1822
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../mail/message-list.c:2537
+#: ../mail/message-list.c:2577
 msgid "Select all visible messages"
 msgstr "Velg alle synlige meldinger"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4222 ../mail/message-list.c:4616
+#: ../mail/message-list.c:4328 ../mail/message-list.c:4725
 msgid "Generating message list"
 msgstr "Genererer meldingsliste"
 
-#: ../mail/message-list.c:4455
+#: ../mail/message-list.c:4564
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -13883,7 +14257,7 @@ msgstr ""
 "Ingen meldinger passer dine søkekriterier. Du kan enten tømme søket med "
 "menyoppføringen Søk->Tøm eller endre det."
 
-#: ../mail/message-list.c:4457
+#: ../mail/message-list.c:4566
 msgid "There are no messages in this folder."
 msgstr "Det er ingen meldinger i denne mappen."
 
@@ -18488,15 +18862,15 @@ msgstr ""
 "Vil du merke meldinger som lest kun i denne mappen, eller i valgt mappe og "
 "undermapper i tillegg?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:188
+#: ../plugins/mark-all-read/mark-all-read.c:194
 msgid "In Current Folder and _Subfolders"
 msgstr "I denne mappen og _undermapper"
 
-#: ../plugins/mark-all-read/mark-all-read.c:202
+#: ../plugins/mark-all-read/mark-all-read.c:208
 msgid "In Current _Folder Only"
 msgstr "Kun i _denne mappen"
 
-#: ../plugins/mark-all-read/mark-all-read.c:425
+#: ../plugins/mark-all-read/mark-all-read.c:438
 msgid "Mark Me_ssages as Read"
 msgstr "Merk meldinger _som lest"
 
@@ -19243,7 +19617,7 @@ msgstr "Sidelinjen er synlig"
 msgid "Skip development warning dialog"
 msgstr "Hopp over varseldialogen om utviklingsversjonen"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:320
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:326
 msgid "Start in offline mode"
 msgstr "Start i frakoblet modus"
 
@@ -19453,283 +19827,267 @@ msgstr "Bug Buddy er ikke installert."
 msgid "Bug Buddy could not be run."
 msgstr "Bug Buddy kunne ikke kjøres."
 
-#: ../shell/e-shell-window-actions.c:1354
-msgid "GNOME Pilot is not installed."
-msgstr "GNOME Pilot er ikke installert."
-
-#: ../shell/e-shell-window-actions.c:1356
-msgid "GNOME Pilot could not be run."
-msgstr "GNOME Pilot kunne ikke kjøres."
-
-#: ../shell/e-shell-window-actions.c:1450
+#: ../shell/e-shell-window-actions.c:1418
 msgid "Show information about Evolution"
 msgstr "Vis informasjon om Evolution"
 
-#: ../shell/e-shell-window-actions.c:1455
-#: ../shell/e-shell-window-actions.c:1469
+#: ../shell/e-shell-window-actions.c:1423
+#: ../shell/e-shell-window-actions.c:1437
 msgid "_Close Window"
 msgstr "_Lukk vindu"
 
-#: ../shell/e-shell-window-actions.c:1476
+#: ../shell/e-shell-window-actions.c:1444
 msgid "_Contents"
 msgstr "_Innhold"
 
-#: ../shell/e-shell-window-actions.c:1478
+#: ../shell/e-shell-window-actions.c:1446
 msgid "Open the Evolution User Guide"
 msgstr "Åpne Evolutions brukermanual"
 
-#: ../shell/e-shell-window-actions.c:1504
+#: ../shell/e-shell-window-actions.c:1472
 msgid "Evolution _FAQ"
 msgstr "Evolution _OSS"
 
-#: ../shell/e-shell-window-actions.c:1506
+#: ../shell/e-shell-window-actions.c:1474
 msgid "Open the Frequently Asked Questions webpage"
 msgstr "Åpne nettside med ofte stilte spørsmål"
 
-#: ../shell/e-shell-window-actions.c:1511
+#: ../shell/e-shell-window-actions.c:1479
 msgid "_Forget Passwords"
 msgstr "_Glem passord"
 
-#: ../shell/e-shell-window-actions.c:1513
+#: ../shell/e-shell-window-actions.c:1481
 msgid "Forget all remembered passwords"
 msgstr "Glem alle lagrede passord"
 
-#: ../shell/e-shell-window-actions.c:1518
+#: ../shell/e-shell-window-actions.c:1486
 msgid "I_mport..."
 msgstr "I_mporter..."
 
-#: ../shell/e-shell-window-actions.c:1520
+#: ../shell/e-shell-window-actions.c:1488
 msgid "Import data from other programs"
 msgstr "Importer data fra andre programmer"
 
-#: ../shell/e-shell-window-actions.c:1525
+#: ../shell/e-shell-window-actions.c:1493
 msgid "New _Window"
 msgstr "Nytt _vindu"
 
-#: ../shell/e-shell-window-actions.c:1527
+#: ../shell/e-shell-window-actions.c:1495
 msgid "Create a new window displaying this view"
 msgstr "Opprett et nytt vindu med denne visningen"
 
-#: ../shell/e-shell-window-actions.c:1541
+#: ../shell/e-shell-window-actions.c:1509
 msgid "Configure Evolution"
 msgstr "Konfigurer Evolution"
 
-#: ../shell/e-shell-window-actions.c:1546
+#: ../shell/e-shell-window-actions.c:1514
 msgid "_Quick Reference"
 msgstr "_Hurtigreferanse"
 
-#: ../shell/e-shell-window-actions.c:1548
+#: ../shell/e-shell-window-actions.c:1516
 msgid "Show Evolution's shortcut keys"
 msgstr "Vis snarveitaster for Evolution"
 
-#: ../shell/e-shell-window-actions.c:1555
+#: ../shell/e-shell-window-actions.c:1523
 msgid "Exit the program"
 msgstr "Avslutt programmet"
 
-#: ../shell/e-shell-window-actions.c:1560
+#: ../shell/e-shell-window-actions.c:1528
 msgid "_Advanced Search..."
 msgstr "_Avansert søk..."
 
-#: ../shell/e-shell-window-actions.c:1562
+#: ../shell/e-shell-window-actions.c:1530
 msgid "Construct a more advanced search"
 msgstr "Sett sammen et mer avansert søk"
 
-#: ../shell/e-shell-window-actions.c:1569
+#: ../shell/e-shell-window-actions.c:1537
 msgid "Clear the current search parameters"
 msgstr "Tøm aktive søkeparametere"
 
-#: ../shell/e-shell-window-actions.c:1574
+#: ../shell/e-shell-window-actions.c:1542
 msgid "_Edit Saved Searches..."
 msgstr "R_ediger lagrede søk..."
 
-#: ../shell/e-shell-window-actions.c:1576
+#: ../shell/e-shell-window-actions.c:1544
 msgid "Manage your saved searches"
 msgstr "Håndter dine lagrede søk"
 
-#: ../shell/e-shell-window-actions.c:1583
+#: ../shell/e-shell-window-actions.c:1551
 msgid "Click here to change the search type"
 msgstr "Klikk her for å endre søketype"
 
-#: ../shell/e-shell-window-actions.c:1588
+#: ../shell/e-shell-window-actions.c:1556
 msgid "_Find Now"
 msgstr "_Finn nå "
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1590
+#: ../shell/e-shell-window-actions.c:1558
 msgid "Execute the current search parameters"
 msgstr "Kjør aktive søkeparametere"
 
-#: ../shell/e-shell-window-actions.c:1595
+#: ../shell/e-shell-window-actions.c:1563
 msgid "_Save Search..."
 msgstr "_Lagre søk..."
 
-#: ../shell/e-shell-window-actions.c:1597
+#: ../shell/e-shell-window-actions.c:1565
 msgid "Save the current search parameters"
 msgstr "Lagre aktive søkeparametere"
 
-#: ../shell/e-shell-window-actions.c:1609
+#: ../shell/e-shell-window-actions.c:1577
 msgid "Send / _Receive"
 msgstr "Send / _motta"
 
-#: ../shell/e-shell-window-actions.c:1611
+#: ../shell/e-shell-window-actions.c:1579
 msgid "Send queued items and retrieve new items"
 msgstr "Send kølagte oppføringer og hent nye oppføringer"
 
-#: ../shell/e-shell-window-actions.c:1616
+#: ../shell/e-shell-window-actions.c:1584
 msgid "Submit _Bug Report..."
 msgstr "Sen_d inn feilrapport..."
 
-#: ../shell/e-shell-window-actions.c:1618
+#: ../shell/e-shell-window-actions.c:1586
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Send inn en feilrapport med Bug Buddy"
 
-#: ../shell/e-shell-window-actions.c:1623
-msgid "GNOME Pilot _Synchronization..."
-msgstr "GNOME-pilot-_synkronisering..."
-
-#: ../shell/e-shell-window-actions.c:1625
-msgid "Set up GNOME Pilot configuration"
-msgstr "Konfigurer konfigurasjon av GNOME-pilot"
-
-#: ../shell/e-shell-window-actions.c:1630
+#: ../shell/e-shell-window-actions.c:1591
 msgid "_Work Offline"
 msgstr "Ar_beid frakoblet"
 
-#: ../shell/e-shell-window-actions.c:1632
+#: ../shell/e-shell-window-actions.c:1593
 msgid "Put Evolution into offline mode"
 msgstr "Sett Evolution i frakoblet modus"
 
-#: ../shell/e-shell-window-actions.c:1637
+#: ../shell/e-shell-window-actions.c:1598
 msgid "_Work Online"
 msgstr "Ar_beid tilkoblet"
 
-#: ../shell/e-shell-window-actions.c:1639
+#: ../shell/e-shell-window-actions.c:1600
 msgid "Put Evolution into online mode"
 msgstr "Sett Evolution i tilkoblet modus"
 
-#: ../shell/e-shell-window-actions.c:1667
+#: ../shell/e-shell-window-actions.c:1628
 msgid "Lay_out"
 msgstr "Utf_orming"
 
-#: ../shell/e-shell-window-actions.c:1674
+#: ../shell/e-shell-window-actions.c:1635
 msgid "_New"
 msgstr "_Ny"
 
-#: ../shell/e-shell-window-actions.c:1681
+#: ../shell/e-shell-window-actions.c:1642
 msgid "_Search"
 msgstr "_Søk"
 
-#: ../shell/e-shell-window-actions.c:1688
+#: ../shell/e-shell-window-actions.c:1649
 msgid "_Switcher Appearance"
 msgstr "Ut_seende for bytter"
 
-#: ../shell/e-shell-window-actions.c:1702
+#: ../shell/e-shell-window-actions.c:1663
 msgid "_Window"
 msgstr "_Vindu"
 
-#: ../shell/e-shell-window-actions.c:1731
+#: ../shell/e-shell-window-actions.c:1692
 msgid "Show Side _Bar"
 msgstr "Vis si_delinje"
 
-#: ../shell/e-shell-window-actions.c:1733
+#: ../shell/e-shell-window-actions.c:1694
 msgid "Show the side bar"
 msgstr "Vis sidelinjen"
 
-#: ../shell/e-shell-window-actions.c:1739
+#: ../shell/e-shell-window-actions.c:1700
 msgid "Show _Buttons"
 msgstr "Vis _knapper"
 
-#: ../shell/e-shell-window-actions.c:1741
+#: ../shell/e-shell-window-actions.c:1702
 msgid "Show the switcher buttons"
 msgstr "Vis knapper for bytter"
 
-#: ../shell/e-shell-window-actions.c:1747
+#: ../shell/e-shell-window-actions.c:1708
 msgid "Show _Status Bar"
 msgstr "Vis _statuslinje"
 
-#: ../shell/e-shell-window-actions.c:1749
+#: ../shell/e-shell-window-actions.c:1710
 msgid "Show the status bar"
 msgstr "Vis statuslinjen"
 
-#: ../shell/e-shell-window-actions.c:1755
+#: ../shell/e-shell-window-actions.c:1716
 msgid "Show _Tool Bar"
 msgstr "Vis verk_tøylinjen"
 
-#: ../shell/e-shell-window-actions.c:1757
+#: ../shell/e-shell-window-actions.c:1718
 msgid "Show the tool bar"
 msgstr "Vis verktøylinjen"
 
-#: ../shell/e-shell-window-actions.c:1779
+#: ../shell/e-shell-window-actions.c:1740
 msgid "_Icons Only"
 msgstr "Kun _ikoner"
 
-#: ../shell/e-shell-window-actions.c:1781
+#: ../shell/e-shell-window-actions.c:1742
 msgid "Display window buttons with icons only"
 msgstr "Vis bare ikoner på vinduknapper"
 
-#: ../shell/e-shell-window-actions.c:1786
+#: ../shell/e-shell-window-actions.c:1747
 msgid "_Text Only"
 msgstr "Kun _tekst"
 
-#: ../shell/e-shell-window-actions.c:1788
+#: ../shell/e-shell-window-actions.c:1749
 msgid "Display window buttons with text only"
 msgstr "Vis bare tekst på vinduknapper"
 
-#: ../shell/e-shell-window-actions.c:1793
+#: ../shell/e-shell-window-actions.c:1754
 msgid "Icons _and Text"
 msgstr "Ikoner _og tekst"
 
-#: ../shell/e-shell-window-actions.c:1795
+#: ../shell/e-shell-window-actions.c:1756
 msgid "Display window buttons with icons and text"
 msgstr "Vis tekst og ikoner på vinduknapper"
 
-#: ../shell/e-shell-window-actions.c:1800
+#: ../shell/e-shell-window-actions.c:1761
 msgid "Tool_bar Style"
 msgstr "S_til for verktøylinje"
 
-#: ../shell/e-shell-window-actions.c:1802
+#: ../shell/e-shell-window-actions.c:1763
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr ""
 "Vis vinduknapper ved å bruke instillinger for verktøylinjen på skrivebordet"
 
-#: ../shell/e-shell-window-actions.c:1810
+#: ../shell/e-shell-window-actions.c:1771
 msgid "Define Views..."
 msgstr "Definer visninger..."
 
-#: ../shell/e-shell-window-actions.c:1812
+#: ../shell/e-shell-window-actions.c:1773
 msgid "Create or edit views"
 msgstr "Opprett eller rediger visninger"
 
-#: ../shell/e-shell-window-actions.c:1817
+#: ../shell/e-shell-window-actions.c:1778
 msgid "Save Custom View..."
 msgstr "Lagre egendefinert visning..."
 
-#: ../shell/e-shell-window-actions.c:1819
+#: ../shell/e-shell-window-actions.c:1780
 msgid "Save current custom view"
 msgstr "Lagre aktiv egendefinert visning"
 
-#: ../shell/e-shell-window-actions.c:1826
+#: ../shell/e-shell-window-actions.c:1787
 msgid "C_urrent View"
 msgstr "A_ktiv visning"
 
-#: ../shell/e-shell-window-actions.c:1836
+#: ../shell/e-shell-window-actions.c:1797
 msgid "Custom View"
 msgstr "Egendefinert visning"
 
-#: ../shell/e-shell-window-actions.c:1838
+#: ../shell/e-shell-window-actions.c:1799
 msgid "Current view is a customized view"
 msgstr "Aktiv visning er en egendefinert visning"
 
-#: ../shell/e-shell-window-actions.c:1848
+#: ../shell/e-shell-window-actions.c:1809
 msgid "Change the page settings for your current printer"
 msgstr "Endre sideinnstillingene for din skriver"
 
-#: ../shell/e-shell-window-actions.c:2227
+#: ../shell/e-shell-window-actions.c:2182
 #, c-format
 msgid "Switch to %s"
 msgstr "Bytt til %s"
 
-#: ../shell/e-shell-window-actions.c:2440
+#: ../shell/e-shell-window-actions.c:2395
 msgid "Execute these search parameters"
 msgstr "Kjør disse søkeparameterene"
 
@@ -19756,7 +20114,7 @@ msgid "Preparing to quit..."
 msgstr "Forbereder avslutting..."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:173
+#: ../shell/main.c:175
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19791,7 +20149,7 @@ msgstr ""
 "Vi håper at du nyter resultatene av vårt harde arbeid, og vi venter i\n"
 "spenning på at du tilbyr din hjelp!\n"
 
-#: ../shell/main.c:197
+#: ../shell/main.c:199
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19799,55 +20157,55 @@ msgstr ""
 "Takk\n"
 "Evolution utviklerene\n"
 
-#: ../shell/main.c:204
+#: ../shell/main.c:206
 msgid "Do not tell me again"
 msgstr "Ikke gi beskjed igjen"
 
-#: ../shell/main.c:316
+#: ../shell/main.c:322
 msgid "Start Evolution activating the specified component"
 msgstr "Aktiver oppgitt komponent ved oppstart av Evolution"
 
-#: ../shell/main.c:318
+#: ../shell/main.c:324
 msgid "Apply the given geometry to the main window"
 msgstr "Bruk oppgitt geometri på hovedvinduet"
 
-#: ../shell/main.c:322
+#: ../shell/main.c:328
 msgid "Start in online mode"
 msgstr "Start i tilkoblet modus"
 
-#: ../shell/main.c:324
+#: ../shell/main.c:330
 msgid "Start in \"express\" mode"
 msgstr "Start i «ekspress»-modus"
 
-#: ../shell/main.c:327
+#: ../shell/main.c:333
 msgid "Forcibly shut down Evolution"
 msgstr "Tvungen nedstenging av Evolution"
 
-#: ../shell/main.c:330
+#: ../shell/main.c:336
 msgid "Send the debugging output of all components to a file."
 msgstr "Send feilsøkingsutskrift for alle komponentene til en fil."
 
-#: ../shell/main.c:332
+#: ../shell/main.c:338
 msgid "Disable loading of any plugins."
 msgstr "Slå av lasting av tillegg."
 
-#: ../shell/main.c:334
+#: ../shell/main.c:340
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Deaktiver forhåndsvisningsområdet for e-post, kontakter og oppgaver."
 
-#: ../shell/main.c:338
+#: ../shell/main.c:344
 msgid "Import URIs or file names given as rest of arguments."
 msgstr "Importer URIer eller filnavn gitt som argumenter."
 
-#: ../shell/main.c:340
+#: ../shell/main.c:346
 msgid "Request a running Evolution process to quit"
 msgstr "Be en kjørende Evolution-prosess om å stenge ned"
 
-#: ../shell/main.c:463
+#: ../shell/main.c:469
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution personlig informasjonshåndterer og e-postklient"
 
-#: ../shell/main.c:514
+#: ../shell/main.c:531
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -21010,18 +21368,6 @@ msgstr ""
 msgid "Evolution is currently offline because the network is unavailable."
 msgstr "Evolution er frakoblet fordi nettverket ikke er tilgjengelig."
 
-#: ../widgets/misc/e-pilot-settings.c:95
-msgid "Sync with:"
-msgstr "Synkroniser med:"
-
-#: ../widgets/misc/e-pilot-settings.c:103
-msgid "Sync Private Records:"
-msgstr "Synkroniser private oppføringer:"
-
-#: ../widgets/misc/e-pilot-settings.c:112
-msgid "Sync Categories:"
-msgstr "Synkroniser kategorier:"
-
 #: ../widgets/misc/e-preferences-window.c:266
 msgid "Evolution Preferences"
 msgstr "Evolution brukervalg"