Updated Norwegian bokmål translation

1 files changed, 247 insertions, 283 deletions

diff --git a/po/nb.po b/po/nb.po
index d44ac86987..a573e06f10 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution 3.9.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-28 09:39+0200\n"
-"PO-Revision-Date: 2013-05-28 09:41+0200\n"
+"POT-Creation-Date: 2013-06-03 09:23+0200\n"
+"PO-Revision-Date: 2013-06-03 09:25+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"
@@ -469,7 +469,7 @@ msgstr "Arbeid"
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:192
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:82
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:368
-#: ../calendar/gui/e-cal-model.c:3940
+#: ../calendar/gui/e-cal-model.c:3965
 msgid "Other"
 msgstr "Andre"
 
@@ -1226,7 +1226,7 @@ msgstr "Videosamtale"
 #: ../e-util/e-send-options.c:546
 #: ../modules/calendar/e-cal-shell-view-actions.c:216
 #: ../modules/calendar/e-cal-shell-view-actions.c:245
-#: ../modules/calendar/e-cal-shell-view.c:528
+#: ../modules/calendar/e-cal-shell-view.c:551
 #: ../plugins/publish-calendar/publish-calendar.ui.h:21
 msgid "Calendar"
 msgstr "Kalender"
@@ -1534,7 +1534,7 @@ msgstr "Lukk _alle"
 msgid "_Snooze"
 msgstr "_Utsett"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:4 ../e-util/e-alert-dialog.c:162
+#: ../calendar/alarm-notify/alarm-notify.ui.h:4 ../e-util/e-alert-dialog.c:165
 msgid "_Dismiss"
 msgstr "_Lukk"
 
@@ -3433,7 +3433,7 @@ msgstr "Avbrutt"
 #. * Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/dialogs/task-details-page.ui.h:17
 #: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-cal-model.c:3994
+#: ../calendar/gui/e-cal-model.c:4019
 #: ../calendar/gui/e-meeting-list-view.c:695
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../calendar/gui/tasktypes.xml.h:8 ../mail/em-filter-i18n.h:75
@@ -3616,7 +3616,7 @@ msgid "Gnome Calendar"
 msgstr "GNOME kalender"
 
 #: ../calendar/gui/ea-gnome-calendar.c:204
-#: ../modules/calendar/e-cal-shell-view-private.c:1112
+#: ../modules/calendar/e-cal-shell-view-private.c:1104
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -3629,16 +3629,16 @@ msgstr "%A %d %b %Y"
 #: ../calendar/gui/ea-gnome-calendar.c:208 ../calendar/gui/e-day-view.c:2427
 #: ../calendar/gui/e-day-view-top-item.c:859
 #: ../calendar/gui/e-week-view-main-item.c:219
-#: ../modules/calendar/e-cal-shell-view-private.c:1116
+#: ../modules/calendar/e-cal-shell-view-private.c:1108
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #: ../calendar/gui/ea-gnome-calendar.c:211
 #: ../calendar/gui/ea-gnome-calendar.c:217
 #: ../calendar/gui/ea-gnome-calendar.c:220
-#: ../modules/calendar/e-cal-shell-view-private.c:1119
-#: ../modules/calendar/e-cal-shell-view-private.c:1125
-#: ../modules/calendar/e-cal-shell-view-private.c:1128
+#: ../modules/calendar/e-cal-shell-view-private.c:1111
+#: ../modules/calendar/e-cal-shell-view-private.c:1117
+#: ../modules/calendar/e-cal-shell-view-private.c:1120
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -3646,10 +3646,10 @@ msgstr "%a %d %b %Y"
 #: ../calendar/gui/ea-gnome-calendar.c:247
 #: ../calendar/gui/ea-gnome-calendar.c:254
 #: ../calendar/gui/ea-gnome-calendar.c:257
-#: ../modules/calendar/e-cal-shell-view-private.c:1145
-#: ../modules/calendar/e-cal-shell-view-private.c:1156
-#: ../modules/calendar/e-cal-shell-view-private.c:1163
-#: ../modules/calendar/e-cal-shell-view-private.c:1166
+#: ../modules/calendar/e-cal-shell-view-private.c:1137
+#: ../modules/calendar/e-cal-shell-view-private.c:1148
+#: ../modules/calendar/e-cal-shell-view-private.c:1155
+#: ../modules/calendar/e-cal-shell-view-private.c:1158
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -3661,7 +3661,7 @@ msgstr "%d %b %Y"
 #: ../calendar/gui/ea-gnome-calendar.c:244 ../calendar/gui/e-day-view.c:2443
 #: ../calendar/gui/e-day-view-top-item.c:863
 #: ../calendar/gui/e-week-view-main-item.c:233
-#: ../modules/calendar/e-cal-shell-view-private.c:1152
+#: ../modules/calendar/e-cal-shell-view-private.c:1144
 msgid "%d %b"
 msgstr "%d %b"
 
@@ -3955,35 +3955,35 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nei"
 
-#: ../calendar/gui/e-cal-model.c:3935
+#: ../calendar/gui/e-cal-model.c:3960
 #: ../calendar/gui/e-meeting-list-view.c:221
 #: ../calendar/gui/e-meeting-store.c:197 ../calendar/gui/e-meeting-store.c:220
 #: ../modules/itip-formatter/itip-view.c:5974
 msgid "Accepted"
 msgstr "Godtatt"
 
-#: ../calendar/gui/e-cal-model.c:3936
+#: ../calendar/gui/e-cal-model.c:3961
 #: ../calendar/gui/e-meeting-list-view.c:222
 #: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
 #: ../modules/itip-formatter/itip-view.c:5980
 msgid "Declined"
 msgstr "Avslått"
 
-#: ../calendar/gui/e-cal-model.c:3937
+#: ../calendar/gui/e-cal-model.c:3962
 #: ../calendar/gui/e-meeting-list-view.c:223
 #: ../calendar/gui/e-meeting-store.c:201 ../calendar/gui/e-meeting-store.c:224
 #: ../calendar/gui/e-meeting-time-sel.c:526
 msgid "Tentative"
 msgstr "Tentativ"
 
-#: ../calendar/gui/e-cal-model.c:3938
+#: ../calendar/gui/e-cal-model.c:3963
 #: ../calendar/gui/e-meeting-list-view.c:224
 #: ../calendar/gui/e-meeting-store.c:203 ../calendar/gui/e-meeting-store.c:226
 #: ../modules/itip-formatter/itip-view.c:5983
 msgid "Delegated"
 msgstr "Delegert"
 
-#: ../calendar/gui/e-cal-model.c:3939
+#: ../calendar/gui/e-cal-model.c:3964
 msgid "Needs action"
 msgstr "Krever handling"
 
@@ -4190,7 +4190,7 @@ msgstr "Feilårsak: %s"
 
 #: ../calendar/gui/e-meeting-store.c:1925
 #: ../plugins/publish-calendar/publish-calendar.c:341
-#: ../smime/gui/component.c:55
+#: ../smime/gui/component.c:64
 msgid "Enter password"
 msgstr "Oppgi passord"
 
@@ -4391,7 +4391,7 @@ msgstr "Velg tidssone"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:2347
+#: ../calendar/gui/gnome-cal.c:2373
 msgid "Purging"
 msgstr "Tømmer"
 
@@ -6643,15 +6643,15 @@ msgstr "Slå av/på visning av Svar-til feltet"
 msgid "Save Draft"
 msgstr "Lagre utkast"
 
-#: ../composer/e-composer-header-table.c:41
+#: ../composer/e-composer-header-table.c:39
 msgid "Enter the recipients of the message"
 msgstr "Skriv inn mottakerene for meldingen"
 
-#: ../composer/e-composer-header-table.c:43
+#: ../composer/e-composer-header-table.c:41
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Skriv inn adressene som skal motta en kopi av meldingen"
 
-#: ../composer/e-composer-header-table.c:46
+#: ../composer/e-composer-header-table.c:44
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -6659,35 +6659,35 @@ msgstr ""
 "Skriv inn adressene som skal motta en kopi av meldingen uten å vises i "
 "mottakerlisten for meldingen."
 
-#: ../composer/e-composer-header-table.c:802
+#: ../composer/e-composer-header-table.c:772
 msgid "Fr_om:"
 msgstr "Fr_a:"
 
-#: ../composer/e-composer-header-table.c:809
+#: ../composer/e-composer-header-table.c:779
 msgid "_Reply-To:"
 msgstr "Sva_r-til:"
 
-#: ../composer/e-composer-header-table.c:814
+#: ../composer/e-composer-header-table.c:784
 msgid "_To:"
 msgstr "_Til:"
 
-#: ../composer/e-composer-header-table.c:820
+#: ../composer/e-composer-header-table.c:790
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:826
+#: ../composer/e-composer-header-table.c:796
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-composer-header-table.c:831
+#: ../composer/e-composer-header-table.c:801
 msgid "_Post To:"
 msgstr "_Post til:"
 
-#: ../composer/e-composer-header-table.c:835
+#: ../composer/e-composer-header-table.c:805
 msgid "S_ubject:"
 msgstr "Em_ne:"
 
-#: ../composer/e-composer-header-table.c:843
+#: ../composer/e-composer-header-table.c:813
 #: ../mail/e-mail-config-identity-page.c:488
 msgid "Si_gnature:"
 msgstr "Si_gnatur:"
@@ -6700,7 +6700,7 @@ msgstr "Klikk her for å få opp adresseboken"
 msgid "Click here to select folders to post to"
 msgstr "Klikk her for å velge mapper å poste til"
 
-#: ../composer/e-msg-composer.c:871
+#: ../composer/e-msg-composer.c:869
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
@@ -6708,7 +6708,7 @@ msgstr ""
 "Kan ikke signere utgående melding: Ingen sertifikat for signering satt for "
 "denne kontoen"
 
-#: ../composer/e-msg-composer.c:880
+#: ../composer/e-msg-composer.c:878
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -6717,17 +6717,17 @@ msgstr ""
 "Kan ikke kryptere utgående melding: Sertifikat for kryptering ikke satt for "
 "denne kontoen"
 
-#: ../composer/e-msg-composer.c:1561 ../composer/e-msg-composer.c:1964
+#: ../composer/e-msg-composer.c:1557 ../composer/e-msg-composer.c:1958
 msgid "Compose Message"
 msgstr "Skriv melding"
 
-#: ../composer/e-msg-composer.c:4221
+#: ../composer/e-msg-composer.c:4213
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr ""
 "Redigering inneholder en meldingskropp som ikke er tekst, og som ikke kan "
 "redigeres."
 
-#: ../composer/e-msg-composer.c:4896
+#: ../composer/e-msg-composer.c:4886
 msgid "Untitled Message"
 msgstr "Melding uten navn"
 
@@ -6896,7 +6896,7 @@ msgstr "Evolution varslingstjeneste"
 msgid "Calendar event notifications"
 msgstr "Varsling om kalenderhendelser"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:928
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:993
 #: ../modules/mailto-handler/evolution-mailto-handler.c:212
 #: ../shell/e-shell-window-private.c:243
 msgid "Evolution"
@@ -9162,7 +9162,7 @@ msgstr "Bruk SpamAssassin tjener og klient"
 msgid "Use spamc and spamd programs, if available."
 msgstr "Bruk programmene spamc og spamd hvis tilgjengelig."
 
-#: ../em-format/e-mail-formatter-attachment.c:410
+#: ../em-format/e-mail-formatter-attachment.c:397
 #: ../e-util/e-attachment-bar.c:101 ../e-util/e-attachment-bar.c:106
 #: ../e-util/e-attachment-paned.c:176 ../e-util/e-attachment-paned.c:181
 #: ../mail/message-list.etspec.h:4
@@ -9171,7 +9171,7 @@ msgid_plural "Attachments"
 msgstr[0] "Vedlegg"
 msgstr[1] "Vedlegg"
 
-#: ../em-format/e-mail-formatter-attachment.c:411
+#: ../em-format/e-mail-formatter-attachment.c:398
 msgid "Display as attachment"
 msgstr "Vis som vedlegg"
 
@@ -9226,7 +9226,7 @@ msgstr "Ansikt"
 msgid "(no subject)"
 msgstr "(uten emne)"
 
-#: ../em-format/e-mail-formatter-headers.c:354
+#: ../em-format/e-mail-formatter-headers.c:323
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "Denne meldingen ble sendt av %s på vegne av %s"
@@ -10357,7 +10357,7 @@ msgstr "Ukrainsk"
 msgid "Visual"
 msgstr "Synlig"
 
-#: ../e-util/e-client-cache.c:1067
+#: ../e-util/e-client-cache.c:1162
 #, c-format
 msgid "Cannot create a client object from extension name '%s'"
 msgstr "Kan ikke lage et klientobjekt fra utvidelsesnavn «%s»"
@@ -10486,19 +10486,19 @@ msgstr "Bruk forvalg for locale"
 msgid "Format:"
 msgstr "Format:"
 
-#: ../e-util/e-file-utils.c:150
+#: ../e-util/e-file-utils.c:121
 msgid "(Unknown Filename)"
 msgstr "(Ukjent filnavn)"
 
 #. Translators: The string value is the basename of a file.
-#: ../e-util/e-file-utils.c:154
+#: ../e-util/e-file-utils.c:125
 #, c-format
 msgid "Writing \"%s\""
 msgstr "Skriver «%s»"
 
 #. Translators: The first string value is the basename of a
 #. * remote file, the second string value is the hostname.
-#: ../e-util/e-file-utils.c:159
+#: ../e-util/e-file-utils.c:130
 #, c-format
 msgid "Writing \"%s\" to %s"
 msgstr "Skriver «%s» til %s"
@@ -11614,13 +11614,13 @@ msgstr "Ugyldig URI for mappe «%s»"
 msgid "No mail transport service available"
 msgstr "Tjeneste for transport av e-post er ikke tilgjengelig"
 
-#: ../libemail-engine/e-mail-session-utils.c:643
+#: ../libemail-engine/e-mail-session-utils.c:638
 #: ../libemail-engine/mail-ops.c:703
 #, 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:690
+#: ../libemail-engine/e-mail-session-utils.c:685
 #: ../libemail-engine/mail-ops.c:747
 #, c-format
 msgid ""
@@ -11630,13 +11630,13 @@ msgstr ""
 "Kunne ikke legge til i %s: %s\n"
 "Legger til i lokal «Sendt»-mappe i stedet."
 
-#: ../libemail-engine/e-mail-session-utils.c:716
+#: ../libemail-engine/e-mail-session-utils.c:711
 #: ../libemail-engine/mail-ops.c:771
 #, 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:914
+#: ../libemail-engine/e-mail-session-utils.c:909
 #: ../libemail-engine/mail-ops.c:902 ../libemail-engine/mail-ops.c:1004
 msgid "Sending message"
 msgstr "Sender melding"
@@ -11670,8 +11670,8 @@ msgstr "Sendt"
 #: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-tree-model.c:760
 #: ../modules/mail/e-mail-shell-view-private.c:1102
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-#: ../plugins/templates/templates.c:1078 ../plugins/templates/templates.c:1377
-#: ../plugins/templates/templates.c:1387
+#: ../plugins/templates/templates.c:1079 ../plugins/templates/templates.c:1378
+#: ../plugins/templates/templates.c:1388
 msgid "Templates"
 msgstr "Maler"
 
@@ -11892,7 +11892,7 @@ msgstr "Kontonavn"
 
 #: ../mail/e-mail-account-tree-view.c:136
 #: ../mail/e-mail-config-security-page.c:333
-#: ../mail/e-mail-config-security-page.c:472 ../mail/e-mail-reader.c:3735
+#: ../mail/e-mail-config-security-page.c:472 ../mail/e-mail-reader.c:3610
 #: ../mail/mail-config.ui.h:49
 msgid "Default"
 msgstr "Forvalgt"
@@ -12364,10 +12364,6 @@ msgstr ""
 msgid "Color"
 msgstr "Farge"
 
-#: ../mail/e-mail-notebook-view.c:269
-msgid "Please select a folder"
-msgstr "Vennligst velg en mappe"
-
 #: ../mail/e-mail-printer.c:149
 #, c-format
 msgid "Page %d of %d"
@@ -12391,638 +12387,601 @@ msgstr "Verdi for meldingshode"
 msgid "Headers"
 msgstr "Meldingshoder"
 
-#: ../mail/e-mail-reader.c:370
+#: ../mail/e-mail-reader.c:375
 msgid "Save Image"
 msgstr "Lagre bilde"
 
-#: ../mail/e-mail-reader.c:457 ../mail/em-filter-i18n.h:12
+#: ../mail/e-mail-reader.c:463 ../mail/em-filter-i18n.h:12
 msgid "Copy to Folder"
 msgstr "Kopier til mappe"
 
-#: ../mail/e-mail-reader.c:457 ../mail/em-folder-utils.c:489
+#: ../mail/e-mail-reader.c:463 ../mail/em-folder-utils.c:489
 msgid "C_opy"
 msgstr "K_opier"
 
-#: ../mail/e-mail-reader.c:991 ../mail/em-filter-i18n.h:54
+#: ../mail/e-mail-reader.c:938 ../mail/em-filter-i18n.h:54
 msgid "Move to Folder"
 msgstr "Flytt til mappe"
 
-#: ../mail/e-mail-reader.c:991 ../mail/em-folder-utils.c:489
+#: ../mail/e-mail-reader.c:938 ../mail/em-folder-utils.c:489
 msgid "_Move"
 msgstr "_Flytt"
 
-#: ../mail/e-mail-reader.c:1339 ../mail/e-mail-reader.c:1539
-#: ../mail/e-mail-reader.c:1579
+#: ../mail/e-mail-reader.c:1260 ../mail/e-mail-reader.c:1469
+#: ../mail/e-mail-reader.c:1509
 msgid "_Do not ask me again."
 msgstr "_Ikke spør meg igjen."
 
-#: ../mail/e-mail-reader.c:1585
+#: ../mail/e-mail-reader.c:1515
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Alltid ignorer Reply-To: for e-postlister."
 
-#: ../mail/e-mail-reader.c:1780
+#: ../mail/e-mail-reader.c:1716
 msgid "Failed to retrieve message:"
 msgstr "Klarte ikke å hente melding:"
 
-#: ../mail/e-mail-reader.c:1826 ../mail/e-mail-reader.c:2942
+#: ../mail/e-mail-reader.c:1756 ../mail/e-mail-reader.c:2851
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "Henter melding «%s»"
 
-#: ../mail/e-mail-reader.c:2003
+#: ../mail/e-mail-reader.c:1935
 msgid "A_dd Sender to Address Book"
 msgstr "L_egg til avsender i adressebok"
 
-#: ../mail/e-mail-reader.c:2005
+#: ../mail/e-mail-reader.c:1937
 msgid "Add sender to address book"
 msgstr "Legg til avsender i adressebok"
 
-#: ../mail/e-mail-reader.c:2010
+#: ../mail/e-mail-reader.c:1942
 msgid "Check for _Junk"
 msgstr "Sjekk etter _uønsket e-post"
 
-#: ../mail/e-mail-reader.c:2012
+#: ../mail/e-mail-reader.c:1944
 msgid "Filter the selected messages for junk status"
 msgstr "Filtrer valgte meldinger etter uønsket e-poststatus"
 
-#: ../mail/e-mail-reader.c:2017
+#: ../mail/e-mail-reader.c:1949
 msgid "_Copy to Folder..."
 msgstr "K_opier til mappe …"
 
-#: ../mail/e-mail-reader.c:2019
+#: ../mail/e-mail-reader.c:1951
 msgid "Copy selected messages to another folder"
 msgstr "Kopier valgte meldinger til en annen mappe"
 
-#: ../mail/e-mail-reader.c:2024
+#: ../mail/e-mail-reader.c:1956
 msgid "_Delete Message"
 msgstr "_Slett melding"
 
-#: ../mail/e-mail-reader.c:2026
+#: ../mail/e-mail-reader.c:1958
 msgid "Mark the selected messages for deletion"
 msgstr "Merk valgte meldinger for sletting"
 
-#: ../mail/e-mail-reader.c:2031
+#: ../mail/e-mail-reader.c:1963
 msgid "Create a Filter Rule for Mailing _List..."
 msgstr "Lag filterregel for e-post_liste …"
 
-#: ../mail/e-mail-reader.c:2033
+#: ../mail/e-mail-reader.c:1965
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Lag en regel for å filtrere meldinger til denne meldingslisten"
 
-#: ../mail/e-mail-reader.c:2038
+#: ../mail/e-mail-reader.c:1970
 msgid "Create a Filter Rule for _Recipients..."
 msgstr "Lag en filterregel for mottake_re …"
 
-#: ../mail/e-mail-reader.c:2040
+#: ../mail/e-mail-reader.c:1972
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Lag en regel for å filtrere meldinger til disse mottakerene"
 
-#: ../mail/e-mail-reader.c:2045
+#: ../mail/e-mail-reader.c:1977
 msgid "Create a Filter Rule for Se_nder..."
 msgstr "Lag en filterregel for avse_nder …"
 
-#: ../mail/e-mail-reader.c:2047
+#: ../mail/e-mail-reader.c:1979
 msgid "Create a rule to filter messages from this sender"
 msgstr "Lag en regel for å filtrere meldinger fra denne avsenderen"
 
-#: ../mail/e-mail-reader.c:2052
+#: ../mail/e-mail-reader.c:1984
 msgid "Create a Filter Rule for _Subject..."
 msgstr "Lag en filterregel for e_mne …"
 
-#: ../mail/e-mail-reader.c:2054
+#: ../mail/e-mail-reader.c:1986
 msgid "Create a rule to filter messages with this subject"
 msgstr "Lag en regel for filtrering av meldinger med dette emnet"
 
-#: ../mail/e-mail-reader.c:2059
+#: ../mail/e-mail-reader.c:1991
 msgid "A_pply Filters"
 msgstr "_Påfør filtre"
 
-#: ../mail/e-mail-reader.c:2061
+#: ../mail/e-mail-reader.c:1993
 msgid "Apply filter rules to the selected messages"
 msgstr "Aktiver filterregler på de valgte meldingene"
 
-#: ../mail/e-mail-reader.c:2066
+#: ../mail/e-mail-reader.c:1998
 msgid "_Find in Message..."
 msgstr "_Finn i melding …"
 
-#: ../mail/e-mail-reader.c:2068
+#: ../mail/e-mail-reader.c:2000
 msgid "Search for text in the body of the displayed message"
 msgstr "Søk etter tekst i kroppen av vist melding"
 
-#: ../mail/e-mail-reader.c:2073
+#: ../mail/e-mail-reader.c:2005
 msgid "_Clear Flag"
 msgstr "F_jern flagg"
 
-#: ../mail/e-mail-reader.c:2075
+#: ../mail/e-mail-reader.c:2007
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Fjern flagg for oppfølging fra valgte meldinger"
 
-#: ../mail/e-mail-reader.c:2080
+#: ../mail/e-mail-reader.c:2012
 msgid "_Flag Completed"
 msgstr "Merk som _fullført"
 
-#: ../mail/e-mail-reader.c:2082
+#: ../mail/e-mail-reader.c:2014
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "Sett flagg for oppfølging til fullført på valgte meldinger"
 
-#: ../mail/e-mail-reader.c:2087
+#: ../mail/e-mail-reader.c:2019
 msgid "Follow _Up..."
 msgstr "Følg _opp …"
 
-#: ../mail/e-mail-reader.c:2089
+#: ../mail/e-mail-reader.c:2021
 msgid "Flag the selected messages for follow-up"
 msgstr "Merk valgte meldinger for oppfølging"
 
-#: ../mail/e-mail-reader.c:2094
+#: ../mail/e-mail-reader.c:2026
 msgid "_Attached"
 msgstr "L_agt ved"
 
-#: ../mail/e-mail-reader.c:2096 ../mail/e-mail-reader.c:2103
+#: ../mail/e-mail-reader.c:2028 ../mail/e-mail-reader.c:2035
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Videresend den valgte meldingen til noen som et vedlegg"
 
-#: ../mail/e-mail-reader.c:2101
+#: ../mail/e-mail-reader.c:2033
 msgid "Forward As _Attached"
 msgstr "Videresend s_om vedlegg"
 
-#: ../mail/e-mail-reader.c:2108
+#: ../mail/e-mail-reader.c:2040
 msgid "_Inline"
 msgstr "_I meldingen"
 
-#: ../mail/e-mail-reader.c:2110 ../mail/e-mail-reader.c:2117
+#: ../mail/e-mail-reader.c:2042 ../mail/e-mail-reader.c:2049
 msgid "Forward the selected message in the body of a new message"
 msgstr "Videresend den valgte meldingen i kroppen av en ny melding"
 
-#: ../mail/e-mail-reader.c:2115
+#: ../mail/e-mail-reader.c:2047
 msgid "Forward As _Inline"
 msgstr "V_ideresend som vedlegg"
 
-#: ../mail/e-mail-reader.c:2122
+#: ../mail/e-mail-reader.c:2054
 msgid "_Quoted"
 msgstr "_Sitert"
 
-#: ../mail/e-mail-reader.c:2124 ../mail/e-mail-reader.c:2131
+#: ../mail/e-mail-reader.c:2056 ../mail/e-mail-reader.c:2063
 msgid "Forward the selected message quoted like a reply"
 msgstr "Videresend den valgte meldingen sitert som et svar"
 
-#: ../mail/e-mail-reader.c:2129
+#: ../mail/e-mail-reader.c:2061
 msgid "Forward As _Quoted"
 msgstr "Videresend s_om sitat"
 
-#: ../mail/e-mail-reader.c:2136
+#: ../mail/e-mail-reader.c:2068
 msgid "_Load Images"
 msgstr "_Last bilder"
 
-#: ../mail/e-mail-reader.c:2138
+#: ../mail/e-mail-reader.c:2070
 msgid "Force images in HTML mail to be loaded"
 msgstr "Tvungen lasting av bilder i HTML e-post"
 
-#: ../mail/e-mail-reader.c:2143
+#: ../mail/e-mail-reader.c:2075
 msgid "_Important"
 msgstr "V_iktig"
 
-#: ../mail/e-mail-reader.c:2145
+#: ../mail/e-mail-reader.c:2077
 msgid "Mark the selected messages as important"
 msgstr "Merk valgte meldinger som viktige"
 
-#: ../mail/e-mail-reader.c:2150
+#: ../mail/e-mail-reader.c:2082
 msgid "_Junk"
 msgstr "_Uønsket e-post"
 
-#: ../mail/e-mail-reader.c:2152
+#: ../mail/e-mail-reader.c:2084
 msgid "Mark the selected messages as junk"
 msgstr "Merk valgte meldinger som uønsket e-post"
 
-#: ../mail/e-mail-reader.c:2157
+#: ../mail/e-mail-reader.c:2089
 msgid "_Not Junk"
 msgstr "_Ikke uønsket e-post"
 
-#: ../mail/e-mail-reader.c:2159
+#: ../mail/e-mail-reader.c:2091
 msgid "Mark the selected messages as not being junk"
 msgstr "Merk valgte meldinger som ønsket e-post"
 
-#: ../mail/e-mail-reader.c:2164
+#: ../mail/e-mail-reader.c:2096
 msgid "_Read"
 msgstr "_Les"
 
-#: ../mail/e-mail-reader.c:2166
+#: ../mail/e-mail-reader.c:2098
 msgid "Mark the selected messages as having been read"
 msgstr "Merk valgte meldinger som lest"
 
-#: ../mail/e-mail-reader.c:2171
+#: ../mail/e-mail-reader.c:2103
 msgid "Uni_mportant"
 msgstr "_Ikke viktig"
 
-#: ../mail/e-mail-reader.c:2173
+#: ../mail/e-mail-reader.c:2105
 msgid "Mark the selected messages as unimportant"
 msgstr "Merk valgte meldinger som uviktige"
 
-#: ../mail/e-mail-reader.c:2178
+#: ../mail/e-mail-reader.c:2110
 msgid "_Unread"
 msgstr "_Ulest"
 
-#: ../mail/e-mail-reader.c:2180
+#: ../mail/e-mail-reader.c:2112
 msgid "Mark the selected messages as not having been read"
 msgstr "Merk valgte meldinger som ulest"
 
-#: ../mail/e-mail-reader.c:2185
+#: ../mail/e-mail-reader.c:2117
 msgid "_Edit as New Message..."
 msgstr "R_ediger som ny melding …"
 
-#: ../mail/e-mail-reader.c:2187
+#: ../mail/e-mail-reader.c:2119
 msgid "Open the selected messages in the composer for editing"
 msgstr "Åpne valgte meldinger i redigeringskomponenten"
 
-#: ../mail/e-mail-reader.c:2192
+#: ../mail/e-mail-reader.c:2124
 msgid "Compose _New Message"
 msgstr "Skriv _ny melding"
 
-#: ../mail/e-mail-reader.c:2194
+#: ../mail/e-mail-reader.c:2126
 msgid "Open a window for composing a mail message"
 msgstr "Åpne et vindu for å skrive en e-post melding"
 
-#: ../mail/e-mail-reader.c:2199
+#: ../mail/e-mail-reader.c:2131
 msgid "_Open in New Window"
 msgstr "_Åpne i _nytt vindu"
 
-#: ../mail/e-mail-reader.c:2201
+#: ../mail/e-mail-reader.c:2133
 msgid "Open the selected messages in a new window"
 msgstr "Åpne valgte meldinger i et nytt vindu"
 
-#: ../mail/e-mail-reader.c:2206
+#: ../mail/e-mail-reader.c:2138
 msgid "_Move to Folder..."
 msgstr "Fl_ytt til mappe …"
 
-#: ../mail/e-mail-reader.c:2208
+#: ../mail/e-mail-reader.c:2140
 msgid "Move selected messages to another folder"
 msgstr "Flytt valgte meldinger til en annen mappe"
 
-#: ../mail/e-mail-reader.c:2213
-msgid "_Switch to Folder"
-msgstr "_Bytt til mappe"
-
-#: ../mail/e-mail-reader.c:2215
-msgid "Display the parent folder"
-msgstr "Vis opphavsmappe"
-
-#: ../mail/e-mail-reader.c:2220
-msgid "Switch to _next tab"
-msgstr "Bytt til _neste fane"
-
-#: ../mail/e-mail-reader.c:2222
-msgid "Switch to the next tab"
-msgstr "Bytt til neste fane"
-
-#: ../mail/e-mail-reader.c:2227
-msgid "Switch to _previous tab"
-msgstr "Bytt til _forrige fane"
-
-#: ../mail/e-mail-reader.c:2229
-msgid "Switch to the previous tab"
-msgstr "Bytt til forrige fane"
-
-#: ../mail/e-mail-reader.c:2234
-msgid "Cl_ose current tab"
-msgstr "L_ukk aktiv fane"
-
-#: ../mail/e-mail-reader.c:2236
-msgid "Close current tab"
-msgstr "Lukk aktiv fane"
-
-#: ../mail/e-mail-reader.c:2241
+#: ../mail/e-mail-reader.c:2145
 msgid "_Next Message"
 msgstr "_Neste melding"
 
-#: ../mail/e-mail-reader.c:2243
+#: ../mail/e-mail-reader.c:2147
 msgid "Display the next message"
 msgstr "Vis neste melding"
 
-#: ../mail/e-mail-reader.c:2248
+#: ../mail/e-mail-reader.c:2152
 msgid "Next _Important Message"
 msgstr "Neste v_iktige melding"
 
-#: ../mail/e-mail-reader.c:2250
+#: ../mail/e-mail-reader.c:2154
 msgid "Display the next important message"
 msgstr "Vis neste viktige melding"
 
-#: ../mail/e-mail-reader.c:2255
+#: ../mail/e-mail-reader.c:2159
 msgid "Next _Thread"
 msgstr "Neste _tråd"
 
-#: ../mail/e-mail-reader.c:2257
+#: ../mail/e-mail-reader.c:2161
 msgid "Display the next thread"
 msgstr "Vis neste tråd"
 
-#: ../mail/e-mail-reader.c:2262
+#: ../mail/e-mail-reader.c:2166
 msgid "Next _Unread Message"
 msgstr "Neste _uleste melding"
 
-#: ../mail/e-mail-reader.c:2264
+#: ../mail/e-mail-reader.c:2168
 msgid "Display the next unread message"
 msgstr "Vis neste uleste melding"
 
-#: ../mail/e-mail-reader.c:2269
+#: ../mail/e-mail-reader.c:2173
 msgid "_Previous Message"
 msgstr "_Forrige melding"
 
-#: ../mail/e-mail-reader.c:2271
+#: ../mail/e-mail-reader.c:2175
 msgid "Display the previous message"
 msgstr "Vis forrige melding"
 
-#: ../mail/e-mail-reader.c:2276
+#: ../mail/e-mail-reader.c:2180
 msgid "Pr_evious Important Message"
 msgstr "Forrig_e viktige melding"
 
-#: ../mail/e-mail-reader.c:2278
+#: ../mail/e-mail-reader.c:2182
 msgid "Display the previous important message"
 msgstr "Vis forrige viktige melding"
 
-#: ../mail/e-mail-reader.c:2283
+#: ../mail/e-mail-reader.c:2187
 msgid "Previous T_hread"
 msgstr "Forrige trå_d"
 
-#: ../mail/e-mail-reader.c:2285
+#: ../mail/e-mail-reader.c:2189
 msgid "Display the previous thread"
 msgstr "Vis forrige tråd"
 
-#: ../mail/e-mail-reader.c:2290
+#: ../mail/e-mail-reader.c:2194
 msgid "P_revious Unread Message"
 msgstr "Fo_rrige uleste melding"
 
-#: ../mail/e-mail-reader.c:2292
+#: ../mail/e-mail-reader.c:2196
 msgid "Display the previous unread message"
 msgstr "Vis forrige uleste melding"
 
-#: ../mail/e-mail-reader.c:2299
+#: ../mail/e-mail-reader.c:2203
 msgid "Print this message"
 msgstr "Skriv ut denne meldingen"
 
-#: ../mail/e-mail-reader.c:2306
+#: ../mail/e-mail-reader.c:2210
 msgid "Preview the message to be printed"
 msgstr "Forhåndsvis meldingen som skal skrives ut"
 
-#: ../mail/e-mail-reader.c:2311
+#: ../mail/e-mail-reader.c:2215
 msgid "Re_direct"
 msgstr "Om_diriger"
 
-#: ../mail/e-mail-reader.c:2313
+#: ../mail/e-mail-reader.c:2217
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Omdiriger (bounce) den valgte meldingen til noen"
 
-#: ../mail/e-mail-reader.c:2318
+#: ../mail/e-mail-reader.c:2222
 msgid "Remo_ve Attachments"
 msgstr "Fjern _vedlegg"
 
-#: ../mail/e-mail-reader.c:2320
+#: ../mail/e-mail-reader.c:2224
 msgid "Remove attachments"
 msgstr "Fjern vedlegg"
 
-#: ../mail/e-mail-reader.c:2325
+#: ../mail/e-mail-reader.c:2229
 msgid "Remove Du_plicate Messages"
 msgstr "Fjern du_plikatmeldinger"
 
-#: ../mail/e-mail-reader.c:2327
+#: ../mail/e-mail-reader.c:2231
 msgid "Checks selected messages for duplicates"
 msgstr "Sjekk valgte meldinger for duplikater"
 
-#: ../mail/e-mail-reader.c:2332 ../mail/mail.error.xml.h:27
+#: ../mail/e-mail-reader.c:2236 ../mail/mail.error.xml.h:27
 #: ../modules/calendar/e-cal-shell-view-actions.c:1568
-#: ../modules/mail/e-mail-attachment-handler.c:213
+#: ../modules/mail/e-mail-attachment-handler.c:214
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: ../mail/e-mail-reader.c:2334
+#: ../mail/e-mail-reader.c:2238
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "Skriv et svar til alle mottakere av den valgte meldingen"
 
-#: ../mail/e-mail-reader.c:2339 ../mail/mail.error.xml.h:25
+#: ../mail/e-mail-reader.c:2243 ../mail/mail.error.xml.h:25
 msgid "Reply to _List"
 msgstr "Svar til _listen"
 
-#: ../mail/e-mail-reader.c:2341
+#: ../mail/e-mail-reader.c:2245
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Skriv et svar til e-postlisten for den valgte meldingen"
 
-#: ../mail/e-mail-reader.c:2346
-#: ../modules/mail/e-mail-attachment-handler.c:220
+#: ../mail/e-mail-reader.c:2250
+#: ../modules/mail/e-mail-attachment-handler.c:221
 msgid "_Reply to Sender"
 msgstr "Sva_r til avsender"
 
-#: ../mail/e-mail-reader.c:2348
+#: ../mail/e-mail-reader.c:2252
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Skriv et svar til avsender av den valgte meldingen"
 
-#: ../mail/e-mail-reader.c:2353
+#: ../mail/e-mail-reader.c:2257
 msgid "_Save as mbox..."
 msgstr "Lagre _som mbox …"
 
-#: ../mail/e-mail-reader.c:2355
+#: ../mail/e-mail-reader.c:2259
 msgid "Save selected messages as an mbox file"
 msgstr "Lagre valgte meldinger som en mbox-fil"
 
-#: ../mail/e-mail-reader.c:2360
+#: ../mail/e-mail-reader.c:2264
 msgid "_Message Source"
 msgstr "_Meldingskilde"
 
-#: ../mail/e-mail-reader.c:2362
+#: ../mail/e-mail-reader.c:2266
 msgid "Show the raw email source of the message"
 msgstr "Vis e-post meldingen i sin råe form"
 
-#: ../mail/e-mail-reader.c:2374
+#: ../mail/e-mail-reader.c:2278
 msgid "_Undelete Message"
 msgstr "_Angre sletting av melding"
 
-#: ../mail/e-mail-reader.c:2376
+#: ../mail/e-mail-reader.c:2280
 msgid "Undelete the selected messages"
 msgstr "Angre sletting av valgte meldinger"
 
-#: ../mail/e-mail-reader.c:2381
+#: ../mail/e-mail-reader.c:2285
 msgid "_Normal Size"
 msgstr "_Normal størrelse"
 
-#: ../mail/e-mail-reader.c:2383
+#: ../mail/e-mail-reader.c:2287
 msgid "Reset the text to its original size"
 msgstr "Ta teksten tilbake til sin opprinnelige størrelse"
 
-#: ../mail/e-mail-reader.c:2388
+#: ../mail/e-mail-reader.c:2292
 msgid "_Zoom In"
 msgstr "_Zoom inn"
 
-#: ../mail/e-mail-reader.c:2390
+#: ../mail/e-mail-reader.c:2294
 msgid "Increase the text size"
 msgstr "Større tekst"
 
-#: ../mail/e-mail-reader.c:2395
+#: ../mail/e-mail-reader.c:2299
 msgid "Zoom _Out"
 msgstr "Zoom _ut"
 
-#: ../mail/e-mail-reader.c:2397
+#: ../mail/e-mail-reader.c:2301
 msgid "Decrease the text size"
 msgstr "Mindre skrift"
 
-#: ../mail/e-mail-reader.c:2404
+#: ../mail/e-mail-reader.c:2308
 msgid "Cre_ate"
 msgstr "L_ag"
 
-#: ../mail/e-mail-reader.c:2411
+#: ../mail/e-mail-reader.c:2315
 msgid "Ch_aracter Encoding"
 msgstr "Tegn_koding"
 
-#: ../mail/e-mail-reader.c:2418
+#: ../mail/e-mail-reader.c:2322
 msgid "F_orward As"
 msgstr "Videresend s_om"
 
-#: ../mail/e-mail-reader.c:2425
+#: ../mail/e-mail-reader.c:2329
 msgid "_Group Reply"
 msgstr "_Gruppesvar"
 
-#: ../mail/e-mail-reader.c:2432
+#: ../mail/e-mail-reader.c:2336
 msgid "_Go To"
 msgstr "_Gå til"
 
-#: ../mail/e-mail-reader.c:2439
+#: ../mail/e-mail-reader.c:2343
 msgid "Mar_k As"
 msgstr "Mer_k som"
 
-#: ../mail/e-mail-reader.c:2446
+#: ../mail/e-mail-reader.c:2350
 msgid "_Message"
 msgstr "_Melding"
 
-#: ../mail/e-mail-reader.c:2453
+#: ../mail/e-mail-reader.c:2357
 msgid "_Zoom"
 msgstr "_Zoom"
 
-#: ../mail/e-mail-reader.c:2463
+#: ../mail/e-mail-reader.c:2367
 msgid "Create a Search Folder from Mailing _List..."
 msgstr "Lag en søkemappe fra e-post_liste …"
 
-#: ../mail/e-mail-reader.c:2465
+#: ../mail/e-mail-reader.c:2369
 msgid "Create a search folder for this mailing list"
 msgstr "Lag en søkemappe for denne e-postlisten"
 
-#: ../mail/e-mail-reader.c:2470
+#: ../mail/e-mail-reader.c:2374
 msgid "Create a Search Folder from Recipien_ts..."
 msgstr "Lag en søkemappe fra mo_ttakere …"
 
-#: ../mail/e-mail-reader.c:2472
+#: ../mail/e-mail-reader.c:2376
 msgid "Create a search folder for these recipients"
 msgstr "Lag en søkemappe for disse mottakerene"
 
-#: ../mail/e-mail-reader.c:2477
+#: ../mail/e-mail-reader.c:2381
 msgid "Create a Search Folder from Sen_der..."
 msgstr "Lag en søkemappe fra avsen_der …"
 
-#: ../mail/e-mail-reader.c:2479
+#: ../mail/e-mail-reader.c:2383
 msgid "Create a search folder for this sender"
 msgstr "Lag en søkemappe for denne avsenderen"
 
-#: ../mail/e-mail-reader.c:2484
+#: ../mail/e-mail-reader.c:2388
 msgid "Create a Search Folder from S_ubject..."
 msgstr "Lag en søkemappe fra _emne …"
 
-#: ../mail/e-mail-reader.c:2486
+#: ../mail/e-mail-reader.c:2390
 msgid "Create a search folder for this subject"
 msgstr "Lag en søkemappe for dette emnet"
 
-#: ../mail/e-mail-reader.c:2509
+#: ../mail/e-mail-reader.c:2413
 msgid "Mark for Follo_w Up..."
 msgstr "Merk for oppføl_ging …"
 
-#: ../mail/e-mail-reader.c:2517
+#: ../mail/e-mail-reader.c:2421
 msgid "Mark as _Important"
 msgstr "Merk som v_iktig"
 
-#: ../mail/e-mail-reader.c:2521
+#: ../mail/e-mail-reader.c:2425
 msgid "Mark as _Junk"
 msgstr "Merk som _uønsket e-post"
 
-#: ../mail/e-mail-reader.c:2525
+#: ../mail/e-mail-reader.c:2429
 msgid "Mark as _Not Junk"
 msgstr "Merk som _gyldig melding"
 
-#: ../mail/e-mail-reader.c:2529
+#: ../mail/e-mail-reader.c:2433
 msgid "Mar_k as Read"
 msgstr "Mer_k som lest"
 
-#: ../mail/e-mail-reader.c:2533
+#: ../mail/e-mail-reader.c:2437
 msgid "Mark as Uni_mportant"
 msgstr "_Merk som uviktig"
 
-#: ../mail/e-mail-reader.c:2537
+#: ../mail/e-mail-reader.c:2441
 msgid "Mark as _Unread"
 msgstr "Merk som _ulest"
 
-#: ../mail/e-mail-reader.c:2581
+#: ../mail/e-mail-reader.c:2485
 msgid "_Caret Mode"
 msgstr "Markør_modus"
 
-#: ../mail/e-mail-reader.c:2583
+#: ../mail/e-mail-reader.c:2487
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Vis en blinkende markør i kroppen av meldinger som vises"
 
-#: ../mail/e-mail-reader.c:2589
+#: ../mail/e-mail-reader.c:2493
 msgid "All Message _Headers"
 msgstr "Alle meldings_hoder"
 
-#: ../mail/e-mail-reader.c:2591
+#: ../mail/e-mail-reader.c:2495
 msgid "Show messages with all email headers"
 msgstr "Vis meldinger med alle meldingshoder"
 
-#: ../mail/e-mail-reader.c:2948
+#: ../mail/e-mail-reader.c:2857
 msgid "Retrieving message"
 msgstr "Henter melding"
 
-#: ../mail/e-mail-reader.c:3928
-#: ../modules/mail/e-mail-attachment-handler.c:206
+#: ../mail/e-mail-reader.c:3775
+#: ../modules/mail/e-mail-attachment-handler.c:207
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: ../mail/e-mail-reader.c:3929
+#: ../mail/e-mail-reader.c:3776
 msgid "Forward the selected message to someone"
 msgstr "Videresend den valgte meldingen til noen"
 
-#: ../mail/e-mail-reader.c:3948
+#: ../mail/e-mail-reader.c:3795
 msgid "Group Reply"
 msgstr "Gruppesvar"
 
-#: ../mail/e-mail-reader.c:3949
+#: ../mail/e-mail-reader.c:3796
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "Svar til e-postlisten eller til alle mottakere"
 
-#: ../mail/e-mail-reader.c:4015 ../mail/em-filter-i18n.h:15
+#: ../mail/e-mail-reader.c:3862 ../mail/em-filter-i18n.h:15
 msgid "Delete"
 msgstr "Slett"
 
-#: ../mail/e-mail-reader.c:4048
+#: ../mail/e-mail-reader.c:3874
 #: ../modules/calendar/e-cal-shell-view-actions.c:1393
 msgid "Next"
 msgstr "Neste"
 
-#: ../mail/e-mail-reader.c:4052
+#: ../mail/e-mail-reader.c:3878
 #: ../modules/calendar/e-cal-shell-view-actions.c:1386
 msgid "Previous"
 msgstr "Forrige"
 
-#: ../mail/e-mail-reader.c:4061 ../mail/mail-dialogs.ui.h:15
+#: ../mail/e-mail-reader.c:3887 ../mail/mail-dialogs.ui.h:15
 msgid "Reply"
 msgstr "Svar"
 
-#: ../mail/e-mail-reader.c:4779
-#, c-format
-msgid "Folder '%s'"
-msgstr "Mappe «%s»"
-
-#: ../mail/e-mail-reader-utils.c:144
+#: ../mail/e-mail-reader-utils.c:151
 msgid "Do not warn me again"
 msgstr "Ikke varsle meg igjen"
 
-#: ../mail/e-mail-reader-utils.c:959
+#: ../mail/e-mail-reader-utils.c:966
 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:1197
+#: ../mail/e-mail-reader-utils.c:1204
 #, c-format
 msgid ""
 "Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -13037,7 +12996,7 @@ msgstr[1] ""
 "Mappen «%s» inneholder %u duplikatmeldinger. Er du sikker på at du vil "
 "slette dem?"
 
-#: ../mail/e-mail-reader-utils.c:1705
+#: ../mail/e-mail-reader-utils.c:2033
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Lagre melding"
@@ -13048,13 +13007,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:1726
+#: ../mail/e-mail-reader-utils.c:2054
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Melding"
 msgstr[1] "Meldinger"
 
-#: ../mail/e-mail-reader-utils.c:2204
+#: ../mail/e-mail-reader-utils.c:2532
 msgid "Parsing message"
 msgstr "Leser melding"
 
@@ -13071,7 +13030,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:1282
+#: ../mail/em-composer-utils.c:1341
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -13079,23 +13038,23 @@ msgstr ""
 "${AbbrevWeekdayName}, ${Day}.${Month}.${Year} kl. ${24Hour}.${Minute} "
 "${TimeZone}, skrev ${Sender}:"
 
-#: ../mail/em-composer-utils.c:1288
+#: ../mail/em-composer-utils.c:1347
 msgid "-------- Forwarded Message --------"
 msgstr "---------Videresendt melding-------"
 
-#: ../mail/em-composer-utils.c:1293
+#: ../mail/em-composer-utils.c:1352
 msgid "-----Original Message-----"
 msgstr "-----Opprinnelig melding-----"
 
-#: ../mail/em-composer-utils.c:2692
+#: ../mail/em-composer-utils.c:2497
 msgid "an unknown sender"
 msgstr "en ukjent avsender"
 
-#: ../mail/em-composer-utils.c:3113
+#: ../mail/em-composer-utils.c:2918
 msgid "Posting destination"
 msgstr "Destinasjon for post"
 
-#: ../mail/em-composer-utils.c:3114
+#: ../mail/em-composer-utils.c:2919
 msgid "Choose folders to post the message to."
 msgstr "Velg mapper meldingen skal postes til."
 
@@ -13432,12 +13391,12 @@ msgstr "Flytter mappe %s"
 msgid "Copying folder %s"
 msgstr "Kopierer mappe %s"
 
-#: ../mail/em-folder-tree.c:2140 ../mail/message-list.c:2282
+#: ../mail/em-folder-tree.c:2140 ../mail/message-list.c:2275
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Flytter meldinger til mappe %s"
 
-#: ../mail/em-folder-tree.c:2144 ../mail/message-list.c:2284
+#: ../mail/em-folder-tree.c:2144 ../mail/message-list.c:2277
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopierer meldinger til mappe %s"
@@ -15076,25 +15035,25 @@ msgstr "%d %b %H.%M"
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../mail/message-list.c:2750
+#: ../mail/message-list.c:2743
 msgid "Select all visible messages"
 msgstr "Velg alle synlige meldinger"
 
-#: ../mail/message-list.c:2888 ../mail/message-list.etspec.h:17
+#: ../mail/message-list.c:2881 ../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:4135
+#: ../mail/message-list.c:4128
 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:4697 ../mail/message-list.c:5101
+#: ../mail/message-list.c:4690 ../mail/message-list.c:5094
 msgid "Generating message list"
 msgstr "Genererer meldingsliste"
 
-#: ../mail/message-list.c:4931
+#: ../mail/message-list.c:4924
 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 "
@@ -15106,7 +15065,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:4936
+#: ../mail/message-list.c:4929
 msgid "There are no messages in this folder."
 msgstr "Det er ingen meldinger i denne mappen."
 
@@ -16641,29 +16600,29 @@ msgstr "_Åpne nettside"
 msgid "Print the selected memo"
 msgstr "Skriv ut valgt notat"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1479
+#: ../modules/calendar/e-cal-shell-view-private.c:1473
 msgid "Searching next matching event"
 msgstr "Søker etter neste hendelsen som passer"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1480
+#: ../modules/calendar/e-cal-shell-view-private.c:1474
 msgid "Searching previous matching event"
 msgstr "Søker etter forrige hendelse som passer"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1501
+#: ../modules/calendar/e-cal-shell-view-private.c:1495
 #, c-format
 msgid "Cannot find matching event in the next %d year"
 msgid_plural "Cannot find matching event in the next %d years"
 msgstr[0] "Kan ikke finne treff på hendelse neste %d år"
 msgstr[1] "Kan ikke finne treff på hendelse de neste %d år"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1505
+#: ../modules/calendar/e-cal-shell-view-private.c:1499
 #, c-format
 msgid "Cannot find matching event in the previous %d year"
 msgid_plural "Cannot find matching event in the previous %d years"
 msgstr[0] "Kan ikke finne treff på hendelse forrige %d år"
 msgstr[1] "Kan ikke finne treff på hendelse forrige %d år"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1530
+#: ../modules/calendar/e-cal-shell-view-private.c:1524
 msgid "Cannot search with no active calendar"
 msgstr "Kan ikke søke uten en aktiv kalender"
 
@@ -16841,15 +16800,15 @@ msgstr "Slett notater"
 msgid "Delete Memo"
 msgstr "Slett notat"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:462
+#: ../modules/calendar/e-memo-shell-view-private.c:460
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d notat"
 msgstr[1] "%d notater"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:466
-#: ../modules/calendar/e-task-shell-view-private.c:670
+#: ../modules/calendar/e-memo-shell-view-private.c:464
+#: ../modules/calendar/e-task-shell-view-private.c:668
 #, c-format
 msgid "%d selected"
 msgstr "%d valgt"
@@ -17017,11 +16976,11 @@ msgstr "Slett oppgaver"
 msgid "Delete Task"
 msgstr "Slett oppgave"
 
-#: ../modules/calendar/e-task-shell-view-private.c:555
+#: ../modules/calendar/e-task-shell-view-private.c:553
 msgid "Expunging"
 msgstr "Tømmer"
 
-#: ../modules/calendar/e-task-shell-view-private.c:666
+#: ../modules/calendar/e-task-shell-view-private.c:664
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -17884,7 +17843,7 @@ msgstr "Yahoo!-funksjoner"
 msgid "Add Yahoo! Ca_lendar and Tasks to this account"
 msgstr "Legg til kalender og oppgaver fra Yahoo i denne kontoen"
 
-#: ../modules/mail/e-mail-attachment-handler.c:421
+#: ../modules/mail/e-mail-attachment-handler.c:425
 #, c-format
 msgid "%d attached message"
 msgid_plural "%d attached messages"
@@ -19872,15 +19831,15 @@ msgstr ""
 "$ORIG[subject], $ORIG[from], $ORIG[to] eller $ORIG[body], der disse vil bli "
 "erstattet av verdier fra en e-post du svarer på."
 
-#: ../plugins/templates/templates.c:1144
+#: ../plugins/templates/templates.c:1145
 msgid "No Title"
 msgstr "Ingen tittel"
 
-#: ../plugins/templates/templates.c:1253
+#: ../plugins/templates/templates.c:1254
 msgid "Save as _Template"
 msgstr "Lagre som _mal"
 
-#: ../plugins/templates/templates.c:1255
+#: ../plugins/templates/templates.c:1256
 msgid "Save as Template"
 msgstr "Lagre som mal"
 
@@ -19892,11 +19851,11 @@ msgstr "Forbereder frakoblet bruk …"
 msgid "Preparing to go online..."
 msgstr "Forbereder tilkoblet bruk …"
 
-#: ../shell/e-shell.c:405
+#: ../shell/e-shell.c:412
 msgid "Preparing to quit"
 msgstr "Forbereder å avslutte"
 
-#: ../shell/e-shell.c:411
+#: ../shell/e-shell.c:418
 msgid "Preparing to quit..."
 msgstr "Forbereder å avslutte …"
 
@@ -19936,7 +19895,7 @@ msgstr "vCard (.vcf)"
 msgid "All Files (*)"
 msgstr "Alle filer (*)"
 
-#: ../shell/e-shell-view.c:296
+#: ../shell/e-shell-view.c:293
 msgid "Saving user interface state"
 msgstr "Lagrer tilstand for brukergrensesnitt"
 
@@ -20578,17 +20537,22 @@ msgstr ""
 "sertifikatet stoler du heller ikke på at dette sertifikatet er autentisk med "
 "mindre annet indikeres her"
 
-#: ../smime/gui/component.c:51
+#: ../smime/gui/component.c:56
+#, c-format
+msgid "Enter the password for '%s', token '%s'"
+msgstr "Oppgi passord for «%s», tegn «%s»"
+
+#: ../smime/gui/component.c:58
 #, c-format
 msgid "Enter the password for '%s'"
 msgstr "Oppgi passord for «%s»"
 
 #. we're setting the password initially
-#: ../smime/gui/component.c:77
+#: ../smime/gui/component.c:86
 msgid "Enter new password for certificate database"
 msgstr "Oppgi passordet for «%s»"
 
-#: ../smime/gui/component.c:80
+#: ../smime/gui/component.c:89
 msgid "Enter new password"
 msgstr "Oppgi nytt passord"