Updated Norwegian bokmål translation. Same

2005-08-09  Kjartan Maraas  <kmaraas@gnome.org>

	* nb.po: Updated Norwegian bokmål translation.
	* no.po: Same

svn path=/trunk/; revision=30053

1 files changed, 247 insertions, 245 deletions

diff --git a/po/nb.po b/po/nb.po
index 2b389f475b..ad6f89b574 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution 2.3.6.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-06 05:00+0200\n"
-"PO-Revision-Date: 2005-08-04 15:09+0200\n"
+"POT-Creation-Date: 2005-08-09 13:27+0200\n"
+"PO-Revision-Date: 2005-08-09 13:38+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"
@@ -565,7 +565,7 @@ msgid "Manage your S/MIME certificates here"
 msgstr "Håndter dine S/MIME-sertifikater her"
 
 #. create the local source group
-#. On This Computer is always first and vFolders is always last
+#. On This Computer is always first and Search Folders is always last
 #: ../addressbook/gui/component/addressbook-component.c:137
 #: ../addressbook/gui/component/addressbook-migrate.c:502
 #: ../calendar/gui/calendar-component.c:208 ../calendar/gui/migration.c:462
@@ -669,7 +669,7 @@ msgstr "Autentisering"
 
 #: ../addressbook/gui/component/addressbook-config.c:912
 #: ../addressbook/gui/component/ldap-config.glade.h:18
-#: ../mail/mail-dialogs.glade.h:8 ../smime/gui/smime-ui.glade.h:20
+#: ../mail/mail-dialogs.glade.h:7 ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Detaljer"
 
@@ -843,7 +843,7 @@ msgstr "Om forhåndsvisningsområdet skal vises."
 #: ../calendar/gui/dialogs/new-task-list.glade.h:1
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: ../composer/e-msg-composer-attachment.glade.h:1
-#: ../mail/mail-dialogs.glade.h:2 ../mail/message-tags.glade.h:1
+#: ../mail/message-tags.glade.h:1
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 #: ../plugins/groupwise-features/properties.glade.h:1
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
@@ -904,7 +904,7 @@ msgid "Add Address Book"
 msgstr "Legg til adressebok"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:15
-#: ../mail/em-account-editor.c:302 ../mail/em-account-editor.c:757
+#: ../mail/em-account-editor.c:302 ../mail/em-account-editor.c:759
 msgid "Always"
 msgstr "Alltid"
 
@@ -939,7 +939,7 @@ msgid "Lo_gin:"
 msgstr "Lo_gin"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:300 ../mail/em-account-editor.c:756
+#: ../mail/em-account-editor.c:300 ../mail/em-account-editor.c:758
 msgid "Never"
 msgstr "Aldri"
 
@@ -1118,7 +1118,7 @@ msgstr "kort"
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:14
-#: ../filter/filter.glade.h:16 ../mail/em-account-editor.c:1949
+#: ../filter/filter.glade.h:16 ../mail/em-account-editor.c:1951
 #: ../plugins/calendar-http/calendar-http.c:263
 #: ../plugins/calendar-weather/calendar-weather.c:563
 msgid "minutes"
@@ -4199,7 +4199,7 @@ msgid "_Save"
 msgstr "_Lagre"
 
 #: ../calendar/calendar.error.xml.h:65
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:121
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:123
 msgid "_Send"
 msgstr "_Send"
 
@@ -4624,7 +4624,7 @@ msgstr "Vis tid for avtalers slutt i ukes- og månedsvisning"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
 msgid "Show display alarms in notification tray"
-msgstr ""
+msgstr "Vis alarmer i varslingsområdet på panelet"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
 msgid "Show week numbers in date navigator"
@@ -4659,7 +4659,7 @@ msgstr "Oppdeling av tid"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
 msgid "Time the last alarm ran, in time_t."
-msgstr ""
+msgstr "Tid for forrige alarm, som time_t."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
 msgid "Timezone"
@@ -5985,12 +5985,12 @@ msgstr "<b>Fra:</b> "
 #: ../calendar/gui/e-cal-model-tasks.c:653
 #: ../calendar/gui/e-itip-control.c:1104 ../composer/e-msg-composer.c:2121
 #: ../filter/filter-rule.c:881 ../mail/em-account-editor.c:683
-#: ../mail/em-account-editor.c:1346 ../mail/em-account-prefs.c:464
+#: ../mail/em-account-editor.c:1348 ../mail/em-account-prefs.c:464
 #: ../mail/em-folder-view.c:1064 ../mail/em-junk-hook.c:78
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:7
-#: ../plugins/itip-formatter/itip-formatter.c:1607
+#: ../plugins/itip-formatter/itip-formatter.c:1613
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:190
 #: ../widgets/misc/e-cell-date-edit.c:248 ../widgets/misc/e-dateedit.c:465
 #: ../widgets/misc/e-dateedit.c:1504 ../widgets/misc/e-dateedit.c:1673
@@ -6563,7 +6563,7 @@ msgstr "Startdato"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:5
 #: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../mail/mail-dialogs.glade.h:17 ../plugins/save-calendar/csv-format.c:386
+#: ../mail/mail-dialogs.glade.h:16 ../plugins/save-calendar/csv-format.c:386
 msgid "Summary"
 msgstr "Sammendrag"
 
@@ -6611,7 +6611,7 @@ msgstr "Nei"
 #: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
 #: ../calendar/gui/e-meeting-store.c:224 ../mail/em-utils.c:1244
 #: ../plugins/itip-formatter/itip-formatter.c:238
-#: ../plugins/itip-formatter/itip-formatter.c:1632
+#: ../plugins/itip-formatter/itip-formatter.c:1638
 #: ../plugins/plugin-manager/plugin-manager.c:72
 #: ../widgets/misc/e-attachment-bar.c:643
 #: ../widgets/misc/e-charset-picker.c:62
@@ -7023,12 +7023,12 @@ msgstr ""
 #: ../calendar/gui/e-meeting-list-view.c:204
 #: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
 #: ../calendar/gui/itip-utils.c:548
-#: ../plugins/itip-formatter/itip-formatter.c:1620
+#: ../plugins/itip-formatter/itip-formatter.c:1626
 msgid "Accepted"
 msgstr "Godtatt"
 
 #: ../calendar/gui/e-itip-control.c:1141 ../calendar/gui/itip-utils.c:551
-#: ../plugins/itip-formatter/itip-formatter.c:1623
+#: ../plugins/itip-formatter/itip-formatter.c:1629
 msgid "Tentatively Accepted"
 msgstr "Akseptert tentativt"
 
@@ -7036,7 +7036,7 @@ msgstr "Akseptert tentativt"
 #: ../calendar/gui/e-meeting-list-view.c:205
 #: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
 #: ../calendar/gui/itip-utils.c:554 ../calendar/gui/itip-utils.c:583
-#: ../plugins/itip-formatter/itip-formatter.c:1626
+#: ../plugins/itip-formatter/itip-formatter.c:1632
 msgid "Declined"
 msgstr "Avslått"
 
@@ -7423,7 +7423,7 @@ msgstr "Tentativ"
 #: ../calendar/gui/e-meeting-list-view.c:207
 #: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
 #: ../calendar/gui/itip-utils.c:557
-#: ../plugins/itip-formatter/itip-formatter.c:1629
+#: ../plugins/itip-formatter/itip-formatter.c:1635
 msgid "Delegated"
 msgstr "Delegert"
 
@@ -9644,15 +9644,15 @@ msgstr "Stillehavet/Wallis"
 msgid "Pacific/Yap"
 msgstr "Stillahavet/Yap"
 
-#: ../composer/e-msg-composer-hdrs.c:559
+#: ../composer/e-msg-composer-hdrs.c:560
 msgid "Posting destination"
 msgstr "Destinasjon for post"
 
-#: ../composer/e-msg-composer-hdrs.c:560
+#: ../composer/e-msg-composer-hdrs.c:561
 msgid "Choose folders to post the message to."
 msgstr "Velg mapper meldingen skal postes til."
 
-#: ../composer/e-msg-composer-hdrs.c:594
+#: ../composer/e-msg-composer-hdrs.c:595
 msgid "Click here for the address book"
 msgstr "Klikk her for å få opp adresseboken"
 
@@ -9663,45 +9663,45 @@ msgstr "Klikk her for å få opp adresseboken"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: ../composer/e-msg-composer-hdrs.c:624
+#: ../composer/e-msg-composer-hdrs.c:625
 msgid "_Reply-To:"
 msgstr "Sva_r-til:"
 
 #.
 #. * From
 #.
-#: ../composer/e-msg-composer-hdrs.c:631
+#: ../composer/e-msg-composer-hdrs.c:632
 msgid "Fr_om:"
 msgstr "Fr_a:"
 
 #.
 #. * Subject
 #.
-#: ../composer/e-msg-composer-hdrs.c:638
+#: ../composer/e-msg-composer-hdrs.c:639
 msgid "S_ubject:"
 msgstr "Em_ne:"
 
-#: ../composer/e-msg-composer-hdrs.c:648
+#: ../composer/e-msg-composer-hdrs.c:649
 msgid "_To:"
 msgstr "_Til:"
 
-#: ../composer/e-msg-composer-hdrs.c:649
+#: ../composer/e-msg-composer-hdrs.c:650
 msgid "Enter the recipients of the message"
 msgstr "Skriv inn mottakerene for meldingen"
 
-#: ../composer/e-msg-composer-hdrs.c:652
+#: ../composer/e-msg-composer-hdrs.c:653
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-msg-composer-hdrs.c:653
+#: ../composer/e-msg-composer-hdrs.c:654
 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-msg-composer-hdrs.c:656
+#: ../composer/e-msg-composer-hdrs.c:657
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-msg-composer-hdrs.c:657
+#: ../composer/e-msg-composer-hdrs.c:658
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9712,15 +9712,15 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: ../composer/e-msg-composer-hdrs.c:664
+#: ../composer/e-msg-composer-hdrs.c:665
 msgid "_Post To:"
 msgstr "_Post til:"
 
-#: ../composer/e-msg-composer-hdrs.c:669
+#: ../composer/e-msg-composer-hdrs.c:670
 msgid "Click here to select folders to post to"
 msgstr "Klikk her for å velge mapper å poste til"
 
-#: ../composer/e-msg-composer-hdrs.c:675
+#: ../composer/e-msg-composer-hdrs.c:676
 msgid "Post To:"
 msgstr "Post til:"
 
@@ -9766,7 +9766,7 @@ msgid "Open File"
 msgstr "Åpne fil"
 
 #: ../composer/e-msg-composer.c:2005 ../mail/em-account-editor.c:588
-#: ../mail/em-account-editor.c:633 ../mail/em-account-editor.c:698
+#: ../mail/em-account-editor.c:633 ../mail/em-account-editor.c:700
 msgid "Autogenerated"
 msgstr "Generert automatisk"
 
@@ -10107,7 +10107,7 @@ msgstr "Vil du overskrive den?"
 msgid "File exists &quot;{0}&quot;."
 msgstr "Filen &quot;{0}&quot; eksisterer."
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:120
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:122
 msgid "_Overwrite"
 msgstr "_Overskriv"
 
@@ -10557,50 +10557,50 @@ msgstr ""
 msgid "Select Folder"
 msgstr "Velg mappe"
 
-#: ../mail/em-account-editor.c:758
+#: ../mail/em-account-editor.c:760
 msgid "Ask for each message"
 msgstr "Spør for hver melding"
 
-#: ../mail/em-account-editor.c:1722 ../mail/mail-config.glade.h:90
+#: ../mail/em-account-editor.c:1724 ../mail/mail-config.glade.h:90
 msgid "Identity"
 msgstr "Identitet"
 
-#: ../mail/em-account-editor.c:1758 ../mail/mail-config.glade.h:117
+#: ../mail/em-account-editor.c:1760 ../mail/mail-config.glade.h:117
 msgid "Receiving Email"
 msgstr "Innkommende e-post"
 
-#: ../mail/em-account-editor.c:1941
+#: ../mail/em-account-editor.c:1943
 msgid "Automatically check for _new mail every"
 msgstr "Se etter _nye meldinger automatisk"
 
-#: ../mail/em-account-editor.c:2109 ../mail/mail-config.glade.h:128
+#: ../mail/em-account-editor.c:2111 ../mail/mail-config.glade.h:128
 msgid "Sending Email"
 msgstr "Utgående e-post"
 
-#: ../mail/em-account-editor.c:2160 ../mail/mail-config.glade.h:68
+#: ../mail/em-account-editor.c:2162 ../mail/mail-config.glade.h:68
 msgid "Defaults"
 msgstr "Forvalg"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2219 ../mail/mail-config.glade.h:122
+#: ../mail/em-account-editor.c:2221 ../mail/mail-config.glade.h:122
 #: ../plugins/exchange-operations/exchange-account-setup.c:317
 msgid "Security"
 msgstr "Sikkerhet"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2256 ../mail/em-account-editor.c:2330
+#: ../mail/em-account-editor.c:2258 ../mail/em-account-editor.c:2332
 msgid "Receiving Options"
 msgstr "Alternativer for mottak"
 
-#: ../mail/em-account-editor.c:2257 ../mail/em-account-editor.c:2331
+#: ../mail/em-account-editor.c:2259 ../mail/em-account-editor.c:2333
 msgid "Checking for New Mail"
 msgstr "Ser etter nye meldinger"
 
-#: ../mail/em-account-editor.c:2655 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2657 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Kontoredigering"
 
-#: ../mail/em-account-editor.c:2655 ../mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:2657 ../mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr "Evolution kontoassistent"
 
@@ -10638,7 +10638,7 @@ msgstr "Legg til signaturskript"
 msgid "Signature(s)"
 msgstr "Signatur(er)"
 
-#: ../mail/em-composer-utils.c:853
+#: ../mail/em-composer-utils.c:853 ../mail/em-format-quote.c:389
 msgid "-------- Forwarded Message --------"
 msgstr "---------Videresendt melding-------"
 
@@ -10923,8 +10923,8 @@ msgid "<b>Then</b>"
 msgstr "<b>Så</b> "
 
 #: ../mail/em-folder-browser.c:134
-msgid "Create _vFolder From Search..."
-msgstr "Lag _virtuell mappe fra søk..."
+msgid "C_reate Search Folder From Search..."
+msgstr "Opp_rett søkemappe fra søk..."
 
 #. TODO: can this be done in a loop?
 #: ../mail/em-folder-properties.c:144
@@ -10958,8 +10958,8 @@ msgstr "Mappe_navn:"
 
 #: ../mail/em-folder-tree-model.c:201 ../mail/em-folder-tree-model.c:203
 #: ../mail/mail-vfolder.c:937 ../mail/mail-vfolder.c:1007
-msgid "vFolders"
-msgstr "Virtuelle mapper"
+msgid "Search Folders"
+msgstr "Søkemapper"
 
 #. UNMATCHED is always last
 #: ../mail/em-folder-tree-model.c:207 ../mail/em-folder-tree-model.c:209
@@ -11023,7 +11023,7 @@ msgstr "_Kopier til mappe"
 msgid "_Move to Folder"
 msgstr "_Flytt til mappe"
 
-#: ../mail/em-folder-tree.c:1751 ../mail/mail-ops.c:1056
+#: ../mail/em-folder-tree.c:1751 ../mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanner mapper i «%s»"
@@ -11173,20 +11173,20 @@ msgid "Crea_te Rule From Message"
 msgstr "Oppre_tt regel fra melding"
 
 #: ../mail/em-folder-view.c:1074
-msgid "vFolder on _Subject"
-msgstr "Virtuell mappe på e_mne"
+msgid "Search Folder from _Subject"
+msgstr "Søkemappe på e_mne"
 
 #: ../mail/em-folder-view.c:1075
-msgid "vFolder on Se_nder"
-msgstr "Virtuell mappe på se_nder"
+msgid "Search Folder from Se_nder"
+msgstr "Søkemappe på se_nder"
 
 #: ../mail/em-folder-view.c:1076
-msgid "vFolder on _Recipients"
-msgstr "Virtuell mappe på mottake_re"
+msgid "Search Folder from _Recipients"
+msgstr "Søkemappe på mottake_re"
 
 #: ../mail/em-folder-view.c:1077
-msgid "vFolder on Mailing _List"
-msgstr "Virtuell mappe på e-post_liste"
+msgid "Search Folder from Mailing _List"
+msgstr "Søkemappe på e-post_liste"
 
 #: ../mail/em-folder-view.c:1081
 msgid "Filter on Sub_ject"
@@ -11224,8 +11224,8 @@ msgid "_Copy Link Location"
 msgstr "_Kopier lokasjon for lenke"
 
 #: ../mail/em-folder-view.c:2419
-msgid "Create _vFolder"
-msgstr "Opprett _virtuell mappe"
+msgid "Create _Search Folder"
+msgstr "Opprett _søkemappe"
 
 #: ../mail/em-folder-view.c:2420
 msgid "_From this Address"
@@ -11527,27 +11527,27 @@ msgstr "Nyhetsgrupper"
 msgid "%s attachment"
 msgstr "%s-vedlegg"
 
-#: ../mail/em-format.c:1140 ../mail/em-format.c:1273
+#: ../mail/em-format.c:1140 ../mail/em-format.c:1279
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Kunne ikke lese S/MIME-melding: Ukjent feil"
 
-#: ../mail/em-format.c:1263
+#: ../mail/em-format.c:1269
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Krypteringstype for multipart/encrypted som ikke er støttet"
 
-#: ../mail/em-format.c:1411
+#: ../mail/em-format.c:1417
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Kunne ikke lese MIME-melding. Viser ren meldingstekst."
 
-#: ../mail/em-format.c:1430
+#: ../mail/em-format.c:1436
 msgid "Unsupported signature format"
 msgstr "Ustøttet signaturformat"
 
-#: ../mail/em-format.c:1438
+#: ../mail/em-format.c:1444
 msgid "Error verifying signature"
 msgstr "Feil under verifisering av signatur"
 
-#: ../mail/em-format.c:1438
+#: ../mail/em-format.c:1444
 msgid "Unknown error verifying signature"
 msgstr "Ukjent feil under verifisering av signatur"
 
@@ -11718,12 +11718,12 @@ msgid "Messages from %s"
 msgstr "Meldinger fra %s"
 
 #: ../mail/em-vfolder-editor.c:104
-msgid "v_Folders"
-msgstr "_Virtuelle mapper"
+msgid "Search _Folders"
+msgstr "Søke_mapper"
 
 #: ../mail/em-vfolder-rule.c:574
-msgid "vFolder source"
-msgstr "Kilde for virtuell mappe"
+msgid "Search Folder source"
+msgstr "Kilde for søke_mappe"
 
 #: ../mail/evolution-mail.schemas.in.in.h:1
 msgid "Automatic link recognition"
@@ -11819,7 +11819,7 @@ msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.in.h:24
 msgid "Enable/disable caret mode"
-msgstr ""
+msgstr "Aktiver/deaktiver markørmodus"
 
 #: ../mail/evolution-mail.schemas.in.in.h:25
 msgid "Height of the message-list pane"
@@ -12509,7 +12509,7 @@ msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr "<span weight=\"bold\">Alternativer for filtre</span>"
 
 #: ../mail/mail-config.glade.h:18
-#: ../plugins/itip-formatter/itip-formatter.c:1916
+#: ../plugins/itip-formatter/itip-formatter.c:1922
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">Generelt</span>"
 
@@ -13067,60 +13067,60 @@ msgstr "farge"
 msgid "description"
 msgstr "beskrivelse"
 
-#: ../mail/mail-dialogs.glade.h:3
-msgid "<b>vFolder Sources</b>"
-msgstr "<b>Kilder for virtuelle mapper</b>"
+#: ../mail/mail-dialogs.glade.h:2
+msgid "<b>Search Folder Sources</b>"
+msgstr "<b>Kilder for søkemapper</b>"
 
-#: ../mail/mail-dialogs.glade.h:4
+#: ../mail/mail-dialogs.glade.h:3
 msgid "<span weight=\"bold\">Digital Signature</span>"
 msgstr "<span weight=\"bold\">Digital signatur</span>"
 
-#: ../mail/mail-dialogs.glade.h:5
+#: ../mail/mail-dialogs.glade.h:4
 msgid "<span weight=\"bold\">Encryption</span>"
 msgstr "<span weight=\"bold\">Kryptering</span>"
 
-#: ../mail/mail-dialogs.glade.h:6
+#: ../mail/mail-dialogs.glade.h:5
 msgid "Case _Sensitive"
 msgstr "_Skill mellom store/små bokstaver"
 
-#: ../mail/mail-dialogs.glade.h:7 ../mail/message-tags.glade.h:2
+#: ../mail/mail-dialogs.glade.h:6 ../mail/message-tags.glade.h:2
 msgid "Co_mpleted"
 msgstr "Fu_llført"
 
-#: ../mail/mail-dialogs.glade.h:9
+#: ../mail/mail-dialogs.glade.h:8
 msgid "F_ind:"
 msgstr "F_inn:"
 
-#: ../mail/mail-dialogs.glade.h:10
+#: ../mail/mail-dialogs.glade.h:9
 msgid "Find in Message"
 msgstr "Finn i melding"
 
-#: ../mail/mail-dialogs.glade.h:11 ../mail/message-tag-followup.c:295
+#: ../mail/mail-dialogs.glade.h:10 ../mail/message-tag-followup.c:295
 #: ../mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "Merk for oppfølging"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:11
 msgid "Folder Subscriptions"
 msgstr "Abonnement på mapper"
 
-#: ../mail/mail-dialogs.glade.h:13
+#: ../mail/mail-dialogs.glade.h:12
 msgid "License Agreement"
 msgstr "Lisensavtale"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:13
 msgid "None Selected"
 msgstr "Ingen valgt"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:14
 msgid "S_erver:"
 msgstr "Tj_ener:"
 
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:15
 msgid "Security Information"
 msgstr "Sikkerhetsinformasjon"
 
-#: ../mail/mail-dialogs.glade.h:18 ../mail/message-tags.glade.h:4
+#: ../mail/mail-dialogs.glade.h:17 ../mail/message-tags.glade.h:4
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -13128,44 +13128,44 @@ msgstr ""
 "Meldingene du har valgt for oppfølging er listet under.\n"
 "Vennligst velg en handling for oppfølging fra menyen «Flagg»."
 
-#: ../mail/mail-dialogs.glade.h:20
+#: ../mail/mail-dialogs.glade.h:19
 msgid "_Accept License"
 msgstr "Godt_a lisensen"
 
-#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:6
+#: ../mail/mail-dialogs.glade.h:20 ../mail/message-tags.glade.h:6
 msgid "_Due By:"
 msgstr "_Ferdig til:"
 
-#: ../mail/mail-dialogs.glade.h:22 ../mail/message-tags.glade.h:7
+#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:7
 msgid "_Flag:"
 msgstr "_Flagg:"
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:22
 msgid "_Subscribe"
 msgstr "_Abonner"
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Tick this to accept the license agreement"
 msgstr "_Kryss av her for å godta lisensen"
 
-#: ../mail/mail-dialogs.glade.h:25
+#: ../mail/mail-dialogs.glade.h:24
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
 msgid "_Unsubscribe"
 msgstr "_Fjern abonnement"
 
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:25
 msgid "specific folders only"
 msgstr "kun spesifikke mapper"
 
-#: ../mail/mail-dialogs.glade.h:27
+#: ../mail/mail-dialogs.glade.h:26
 msgid "with all active remote folders"
 msgstr "med alle aktive eksterne mapper"
 
-#: ../mail/mail-dialogs.glade.h:28
+#: ../mail/mail-dialogs.glade.h:27
 msgid "with all local and active remote folders"
 msgstr "med alle lokale og aktive eksterne mapper"
 
-#: ../mail/mail-dialogs.glade.h:29
+#: ../mail/mail-dialogs.glade.h:28
 msgid "with all local folders"
 msgstr "med alle lokale mapper"
 
@@ -13188,7 +13188,7 @@ msgstr "Henter e-post"
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Feil under påføring av utgående filtre: %s"
 
-#: ../mail/mail-ops.c:574 ../mail/mail-ops.c:603
+#: ../mail/mail-ops.c:575 ../mail/mail-ops.c:604
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13197,114 +13197,114 @@ msgstr ""
 "Kunne ikke legge til i %s: %s\n"
 "Legger til i lokal «Sendt»-mappe i stedet."
 
-#: ../mail/mail-ops.c:620
+#: ../mail/mail-ops.c:621
 #, 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:732
+#: ../mail/mail-ops.c:733
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sender melding %d av %d"
 
-#: ../mail/mail-ops.c:757
+#: ../mail/mail-ops.c:758
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Feil under sending av %d av %d meldinger"
 
-#: ../mail/mail-ops.c:759 ../mail/mail-send-recv.c:613
+#: ../mail/mail-ops.c:760 ../mail/mail-send-recv.c:613
 msgid "Cancelled."
 msgstr "Avbrutt."
 
-#: ../mail/mail-ops.c:761
+#: ../mail/mail-ops.c:762
 msgid "Complete."
 msgstr "Fullført."
 
-#: ../mail/mail-ops.c:858
+#: ../mail/mail-ops.c:859
 msgid "Saving message to folder"
 msgstr "Lagrer melding til mappe"
 
-#: ../mail/mail-ops.c:943
+#: ../mail/mail-ops.c:944
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flytter melding(er) til %s"
 
-#: ../mail/mail-ops.c:943
+#: ../mail/mail-ops.c:944
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopierer meldinger til %s"
 
-#: ../mail/mail-ops.c:1166
+#: ../mail/mail-ops.c:1167
 msgid "Forwarded messages"
 msgstr "Videresendte meldinger"
 
-#: ../mail/mail-ops.c:1209
+#: ../mail/mail-ops.c:1210
 #, c-format
 msgid "Opening folder %s"
 msgstr "Åpner mappe %s"
 
-#: ../mail/mail-ops.c:1281
+#: ../mail/mail-ops.c:1282
 #, c-format
 msgid "Opening store %s"
 msgstr "Åpner lager %s"
 
-#: ../mail/mail-ops.c:1359
+#: ../mail/mail-ops.c:1360
 #, c-format
 msgid "Removing folder %s"
 msgstr "Fjerner mappe %s"
 
-#: ../mail/mail-ops.c:1453
+#: ../mail/mail-ops.c:1454
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Lagrer mappe «%s»"
 
-#: ../mail/mail-ops.c:1518
+#: ../mail/mail-ops.c:1519
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Tømmer og lagrer konto «%s»"
 
-#: ../mail/mail-ops.c:1519
+#: ../mail/mail-ops.c:1520
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Lagrer konto «%s»"
 
-#: ../mail/mail-ops.c:1574
+#: ../mail/mail-ops.c:1575
 msgid "Refreshing folder"
 msgstr "Oppdaterer mappe"
 
-#: ../mail/mail-ops.c:1610 ../mail/mail-ops.c:1661
+#: ../mail/mail-ops.c:1611 ../mail/mail-ops.c:1662
 msgid "Expunging folder"
 msgstr "Tømmer mappe"
 
-#: ../mail/mail-ops.c:1658
+#: ../mail/mail-ops.c:1659
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Tømmer søppel i «%s»"
 
-#: ../mail/mail-ops.c:1659
+#: ../mail/mail-ops.c:1660
 msgid "Local Folders"
 msgstr "Lokale mapper"
 
-#: ../mail/mail-ops.c:1742
+#: ../mail/mail-ops.c:1743
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Henter melding %s"
 
-#: ../mail/mail-ops.c:1852
+#: ../mail/mail-ops.c:1853
 #, 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:1938
+#: ../mail/mail-ops.c:1939
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Lagrer %d melding"
 msgstr[1] "Lagrer %d melding(er)"
 
-#: ../mail/mail-ops.c:1988
+#: ../mail/mail-ops.c:1989
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13313,7 +13313,7 @@ msgstr ""
 "Kunne ikke opprette utdatafil: %s\n"
 " %s"
 
-#: ../mail/mail-ops.c:2016
+#: ../mail/mail-ops.c:2017
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13322,11 +13322,11 @@ msgstr ""
 "Feil under lagring av av meldinger til: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2087
+#: ../mail/mail-ops.c:2088
 msgid "Saving attachment"
 msgstr "Lagrer vedlegg"
 
-#: ../mail/mail-ops.c:2099
+#: ../mail/mail-ops.c:2100
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13335,22 +13335,22 @@ msgstr ""
 "Kunne ikke opprette utdatafil: %s\n"
 " %s"
 
-#: ../mail/mail-ops.c:2109
+#: ../mail/mail-ops.c:2110
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kan ikke skrive data: %s"
 
-#: ../mail/mail-ops.c:2259
+#: ../mail/mail-ops.c:2260
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Kobler fra %s"
 
-#: ../mail/mail-ops.c:2259
+#: ../mail/mail-ops.c:2260
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Kobler til %s på nytt"
 
-#: ../mail/mail-ops.c:2375
+#: ../mail/mail-ops.c:2376
 msgid "Checking Service"
 msgstr "Sjekker tjeneste"
 
@@ -13445,26 +13445,26 @@ msgstr "Ugyldig mappe: «%s»"
 
 #: ../mail/mail-vfolder.c:91
 #, c-format
-msgid "Setting up vFolder: %s"
-msgstr "Setter opp virtuell mappe: %s"
+msgid "Setting up Search Folder: %s"
+msgstr "Setter opp søkemappe: %s"
 
 #: ../mail/mail-vfolder.c:240
 #, c-format
-msgid "Updating vFolders for '%s:%s'"
-msgstr "Oppdaterer virtuelle mapper for «%s:%s»"
+msgid "Updating Search Folders for '%s:%s'"
+msgstr "Oppdaterer søkemapper for «%s:%s»"
 
 #: ../mail/mail-vfolder.c:247
 #, c-format
-msgid "Updating vFolders for '%s'"
-msgstr "Oppdaterer virtuelle mapper for «%s»"
+msgid "Updating Search Folders for '%s'"
+msgstr "Oppdaterer søkemapper for «%s»"
 
 #: ../mail/mail-vfolder.c:1046
-msgid "Edit vFolder"
-msgstr "Rediger virtuell mappe"
+msgid "Edit Search Folder"
+msgstr "Rediger søkemappe"
 
 #: ../mail/mail-vfolder.c:1130
-msgid "New vFolder"
-msgstr "Ny virtuell mappe"
+msgid "New Search Folder"
+msgstr "Ny søkemappe"
 
 #: ../mail/mail.error.xml.h:1
 msgid ""
@@ -13551,8 +13551,8 @@ msgid "Because &quot;{2}&quot;."
 msgstr "Fordi &quot;{2}&quot;."
 
 #: ../mail/mail.error.xml.h:19
-msgid "Cannot add vFolder &quot;{0}&quot;."
-msgstr "Kan ikke legge til virtuell mappe &quot;{0}&quot;."
+msgid "Cannot add Search Folder &quot;{0}&quot;."
+msgstr "Kan ikke legge til søkemappe &quot;{0}&quot;."
 
 #: ../mail/mail.error.xml.h:20
 msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
@@ -13579,9 +13579,8 @@ msgid "Cannot delete system folder &quot;{0}&quot;."
 msgstr "Kan ikke slette systemmappe &quot;{0}&quot;."
 
 #: ../mail/mail.error.xml.h:26
-msgid "Cannot edit vFolder &quot;{0}&quot; as it does not exist."
-msgstr ""
-"Kan ikke redigere virtuell mappe &quot;{0}&quot; da den ikke eksisterer."
+msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
+msgstr "Kan ikke redigere søkemappe &quot;{0}&quot; da den ikke eksisterer."
 
 #: ../mail/mail.error.xml.h:27
 msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
@@ -13820,10 +13819,14 @@ msgstr ""
 "Vil du virkelig slette mappen &quot;{0}&quot; og alle dens undermapper?"
 
 #: ../mail/mail.error.xml.h:79
+msgid "Search Folders automatically updated."
+msgstr "Søkemapper oppdatert automatisk."
+
+#: ../mail/mail.error.xml.h:80
 msgid "Send Receipt"
 msgstr "Send kvittering"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:81
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
 "cannot be renamed, moved, or deleted."
@@ -13831,7 +13834,7 @@ msgstr ""
 "Systemmapper kreves for at Evolution skal fungere korrekt og du kan ikke "
 "endre navn på, flytte eller slette disse."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:82
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -13847,35 +13850,35 @@ msgstr ""
 "meldingen likevel. For å unngå dette bør du legge inn minst en mottaker i "
 "Til: eller Cc:."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:85
 msgid ""
-"The following filter rule(s):\n"
+"The following Search Folder(s):\n"
 "{0}\n"
 "Used the now removed folder:\n"
 "    &quot;{1}&quot;\n"
 "And have been updated."
 msgstr ""
-"Følgende filterregler:\n"
+"Følgende søkemapper:\n"
 "{0}\n"
 "brukte fjernet mappe:\n"
 "    &quot;{1}&quot;\n"
 "og er nå oppdatert."
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:90
 msgid ""
-"The following vFolder(s):\n"
+"The following filter rule(s):\n"
 "{0}\n"
 "Used the now removed folder:\n"
 "    &quot;{1}&quot;\n"
 "And have been updated."
 msgstr ""
-"Følgende virtuelle mapper:\n"
+"Følgende filterregler:\n"
 "{0}\n"
 "brukte fjernet mappe:\n"
 "    &quot;{1}&quot;\n"
 "og er nå oppdatert."
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:95
 msgid ""
 "The message was sent via the &quot;sendmail&quot; external application.  "
 "Sendmail reports the following error: status 67: mail not sent.\n"
@@ -13886,24 +13889,22 @@ msgstr ""
 "Sendmail rapporterer den følgende feilmeldingen: status 67: mail not sent.\n"
 "Meldingen er lagret i Utboks. Sjekk meldingen for feil og send igjen."
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:97
 msgid "The script file must exist and be executable."
 msgstr "Skriptfilen må eksistere og være kjørbar."
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:98
 msgid ""
-"This folder may have been added implicitly, go to the vFolder editor to add "
-"it explicitly, if required."
-msgstr ""
-"Denne mappen er lagt til implisitt. Gå til redigering av virtuelle mapper og "
-"legg den inn eksplisitt hvis det er nødvendig."
+"This folder may have been added implicitly,\n"
+"go to the Search Folder editor to add it explicitly, if required."
+msgstr "Denne mappen er lagt til implisitt. Gå til redigering av søkemapper og legg den inn eksplisitt hvis det er nødvendig."
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:100
 msgid ""
 "This message cannot be sent because you have not specified any Recipients"
 msgstr "Denne meldingen kan ikke sendes da du ikke har oppgitt noen mottakere"
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:101
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -13911,15 +13912,15 @@ msgstr ""
 "Tjener støtter ikke denne typen autentisering. Det kan hende den ikke "
 "støtter autentisering i det hele tatt."
 
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:102
 msgid "This signature has been changed, but has not been saved."
 msgstr "Denne signaturen er endret, men er ikke lagret."
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:103
 msgid "Unable to connect to the GroupWise server."
 msgstr "Kunne ikke koble til GroupWise-tjener."
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:104
 msgid ""
 "Unable to open the drafts folder for this account.  Use the system drafts "
 "folder instead?"
@@ -13927,39 +13928,39 @@ msgstr ""
 "Kunne ikke åpne skisse-mappen for denne kontoen. Vil du bruke standard "
 "skisse-mappe?"
 
-#: ../mail/mail.error.xml.h:103
+#: ../mail/mail.error.xml.h:105
 msgid "Unable to read license file."
 msgstr "Kan ikke lese lisensfilen."
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:106
 msgid "Use _Default"
 msgstr "Bruk _forvalg"
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:107
 msgid "Use default drafts folder?"
 msgstr "Bruk forvalgt mappe for skisser?"
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:108
 msgid "You have not filled in all of the required information."
 msgstr "Du har ikke fylt ut all nødvendig informasjon."
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:109
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Du har usendte meldinger. Vil du avslutte likevel?"
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:110
 msgid "You may not create two accounts with the same name."
 msgstr "Du kan ikke opprette to kontoer med samme navn."
 
-#: ../mail/mail.error.xml.h:109
-msgid "You must name this vFolder."
-msgstr "Du må gi navn til denne virtuelle mappen."
+#: ../mail/mail.error.xml.h:111
+msgid "You must name this Search Folder."
+msgstr "Du må gi navn til denne søkemappen."
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:112
 msgid "You must specify a folder."
 msgstr "Du må oppgi en mappe."
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:113
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -13969,38 +13970,34 @@ msgstr ""
 "Enten ved å velge mappene individuelt og/eller å velge alle lokale mapper, "
 "alle eksterne mapper eller begge deler."
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:115
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 msgstr "Din pålogging på tjener &quot;{0}&quot; som &quot;{0}&quot; feilet."
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:116
 msgid "Your message with the subject &quot;{0}&quot; was not delivered."
 msgstr "Din melding med emne &quot;{0}&quot; ble ikke levert."
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:117
 msgid "_Append"
 msgstr "_Legg til"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:118
 msgid "_Discard changes"
 msgstr "_Forkast endringene"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:119
 msgid "_Empty Trash"
 msgstr "Tøm søpp_elkurven"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:120
 msgid "_Expunge"
 msgstr "T_øm"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:121
 msgid "_Open Messages"
 msgstr "_Åpne meldinger"
 
-#: ../mail/mail.error.xml.h:122
-msgid "vFolders automatically updated."
-msgstr "Virtuelle mapper oppdatert automatisk."
-
 #: ../mail/message-list.c:996
 msgid "Unseen"
 msgstr "Ulest"
@@ -14642,6 +14639,14 @@ msgstr "_Oppgaver:"
 msgid "Permissions..."
 msgstr "Rettigheter..."
 
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:136
+msgid "Folder Name"
+msgstr "Mappenavn"
+
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:140
+msgid "Folder Size"
+msgstr "Mappestørrelse"
+
 #: ../plugins/exchange-operations/exchange-folder-tree.glade.h:1
 msgid "Exchange Folder Tree"
 msgstr "Tre for Exchange-mappe"
@@ -15246,7 +15251,7 @@ msgstr "Proxy-innlogging"
 
 #: ../plugins/groupwise-features/proxy-login.c:221
 #: ../plugins/groupwise-features/proxy-login.c:263
-#: ../plugins/groupwise-features/proxy.c:470
+#: ../plugins/groupwise-features/proxy.c:474
 #: ../plugins/groupwise-features/send-options.c:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
@@ -15256,7 +15261,7 @@ msgstr "%sSkriv inn passord for %s (bruker %s)"
 msgid "_Proxy Login..."
 msgstr "_Brukernavn for proxy..."
 
-#: ../plugins/groupwise-features/proxy.c:664
+#: ../plugins/groupwise-features/proxy.c:668
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "Proxyfanen vil kun være tilgjengelig når kontoen er aktivert."
 
@@ -15375,26 +15380,26 @@ msgstr ""
 "Du må lagre filen og importere kalenderen for å prosessere alle disse "
 "oppføringene"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1907
+#: ../plugins/itip-formatter/itip-formatter.c:1913
 msgid "Meetings and Tasks"
 msgstr "Møter og oppgaver"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:1930
+#: ../plugins/itip-formatter/itip-formatter.c:1936
 msgid "_Delete message after acting"
 msgstr "_Slett melding etter utført handling"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1940
+#: ../plugins/itip-formatter/itip-formatter.c:1946
 msgid "<span weight=\"bold\">Conflict Search</span>"
 msgstr "<span weight=\"bold\">Søk etter konflikter</span>"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:1953
+#: ../plugins/itip-formatter/itip-formatter.c:1959
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Velg kalendere som skal gjennomsøkes for å finne møtekonflikter"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1970
+#: ../plugins/itip-formatter/itip-formatter.c:1976
 msgid "Conflict Search Table"
 msgstr "Tabell for søk etter konflikter"
 
@@ -17731,12 +17736,12 @@ msgid "Create a new folder for storing mail"
 msgstr "Lag en ny mappe for lagring av meldinger"
 
 #: ../ui/evolution-mail-global.xml.h:5
-msgid "Create or edit rules for filtering new mail"
-msgstr "Opprett eller rediger regler for filtrering av ny e-post"
+msgid "Create or edit Search Folder definitions"
+msgstr "Opprett eller rediger definisjoner av søkemapper"
 
 #: ../ui/evolution-mail-global.xml.h:6
-msgid "Create or edit vFolder definitions"
-msgstr "Opprett eller rediger definisjoner av virtuelle mapper"
+msgid "Create or edit rules for filtering new mail"
+msgstr "Opprett eller rediger regler for filtrering av ny e-post"
 
 #: ../ui/evolution-mail-global.xml.h:7
 msgid "Empty _Trash"
@@ -17950,36 +17955,36 @@ msgid "Create R_ule"
 msgstr "Opprett _regel"
 
 #: ../ui/evolution-mail-message.xml.h:15
-msgid "Create a rule to filter messages from this sender"
-msgstr "Lag en regel for å filtrere meldinger fra denne avsenderen"
+msgid "Create a Search Folder for these recipients"
+msgstr "Lag en søkemappe for disse mottakerene"
 
 #: ../ui/evolution-mail-message.xml.h:16
-msgid "Create a rule to filter messages to these recipients"
-msgstr "Lag en regel for å filtrere meldinger til disse mottakerene"
+msgid "Create a Search Folder for this mailing list"
+msgstr "Lag en søkemappe for denne e-postlisten"
 
 #: ../ui/evolution-mail-message.xml.h:17
-msgid "Create a rule to filter messages to this mailing list"
-msgstr "Lag en regel for å filtrere meldinger til denne meldingslisten"
+msgid "Create a Search Folder for this sender"
+msgstr "Lag en søkemappe for denne avsenderen"
 
 #: ../ui/evolution-mail-message.xml.h:18
-msgid "Create a rule to filter messages with this subject"
-msgstr "Lag en regel for filtrering av meldinger med dette emnet"
+msgid "Create a Search Folder for this subject"
+msgstr "Lag en søkemappe for dette emnet"
 
 #: ../ui/evolution-mail-message.xml.h:19
-msgid "Create a vFolder for these recipients"
-msgstr "Lag en virtuell mappe for disse mottakerene"
+msgid "Create a rule to filter messages from this sender"
+msgstr "Lag en regel for å filtrere meldinger fra denne avsenderen"
 
 #: ../ui/evolution-mail-message.xml.h:20
-msgid "Create a vFolder for this mailing list"
-msgstr "Lag en virtuell mappe for denne e-postlisten"
+msgid "Create a rule to filter messages to these recipients"
+msgstr "Lag en regel for å filtrere meldinger til disse mottakerene"
 
 #: ../ui/evolution-mail-message.xml.h:21
-msgid "Create a vFolder for this sender"
-msgstr "Lag en virtuell mappe for denne avsenderen"
+msgid "Create a rule to filter messages to this mailing list"
+msgstr "Lag en regel for å filtrere meldinger til denne meldingslisten"
 
 #: ../ui/evolution-mail-message.xml.h:22
-msgid "Create a vFolder for this subject"
-msgstr "Lag en virtuell mappe for dette emnet"
+msgid "Create a rule to filter messages with this subject"
+msgstr "Lag en regel for filtrering av meldinger med dette emnet"
 
 #: ../ui/evolution-mail-message.xml.h:24
 msgid "Decrease the text size"
@@ -18178,61 +18183,61 @@ msgid "Save the message as a text file"
 msgstr "Lagre meldingen som en tekstfil"
 
 #: ../ui/evolution-mail-message.xml.h:84
+msgid "Search Folder from Mailing _List..."
+msgstr "Søkemappe på e-post_liste..."
+
+#: ../ui/evolution-mail-message.xml.h:85
+msgid "Search Folder from Recipients..."
+msgstr "Søkemappe for mottakere..."
+
+#: ../ui/evolution-mail-message.xml.h:86
+msgid "Search Folder from S_ubject..."
+msgstr "Søkemappe for _emne..."
+
+#: ../ui/evolution-mail-message.xml.h:87
+msgid "Search Folder from Sen_der..."
+msgstr "Søkemappe for avsen_der..."
+
+#: ../ui/evolution-mail-message.xml.h:88
 msgid "Search for text in the body of the displayed message"
 msgstr "Søk etter tekst i kroppen av vist melding"
 
-#: ../ui/evolution-mail-message.xml.h:85
+#: ../ui/evolution-mail-message.xml.h:89
 msgid "Select _All Text"
 msgstr "Marker _all tekst"
 
-#: ../ui/evolution-mail-message.xml.h:86
+#: ../ui/evolution-mail-message.xml.h:90
 msgid "Select all the text in a message"
 msgstr "Marker all tekst i meldingen"
 
-#: ../ui/evolution-mail-message.xml.h:87
+#: ../ui/evolution-mail-message.xml.h:91
 msgid "Set up the page settings for your current printer"
 msgstr "Sett opp sideinnstillinger for din skriver"
 
-#: ../ui/evolution-mail-message.xml.h:88
+#: ../ui/evolution-mail-message.xml.h:92
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Vis en blinkende markør i kroppen av meldinger som vises"
 
-#: ../ui/evolution-mail-message.xml.h:89
+#: ../ui/evolution-mail-message.xml.h:93
 msgid "Show message in the normal style"
 msgstr "Vis melding i normal stil"
 
-#: ../ui/evolution-mail-message.xml.h:90
+#: ../ui/evolution-mail-message.xml.h:94
 msgid "Show message with all email headers"
 msgstr "Vis melding med fulle e-post headere"
 
-#: ../ui/evolution-mail-message.xml.h:91
+#: ../ui/evolution-mail-message.xml.h:95
 msgid "Show the raw email source of the message"
 msgstr "Vis e-post meldingen i sin råe form"
 
-#: ../ui/evolution-mail-message.xml.h:92
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "Un-delete the selected messages"
 msgstr "Angre sletting av valgte meldinger"
 
-#: ../ui/evolution-mail-message.xml.h:93
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "Uni_mportant"
 msgstr "_Ikke viktig"
 
-#: ../ui/evolution-mail-message.xml.h:94
-msgid "VFolder on Mailing _List..."
-msgstr "Virtuell mappe på e-post_liste..."
-
-#: ../ui/evolution-mail-message.xml.h:95
-msgid "VFolder on Recipients..."
-msgstr "Virtuell mappe for mottakere..."
-
-#: ../ui/evolution-mail-message.xml.h:96
-msgid "VFolder on S_ubject..."
-msgstr "Virtuell mappe for _emne..."
-
-#: ../ui/evolution-mail-message.xml.h:97
-msgid "VFolder on Sen_der..."
-msgstr "Virtuell mappe for avsen_der..."
-
 #: ../ui/evolution-mail-message.xml.h:98
 msgid "Zoom _Out"
 msgstr "Zoom _ut"
@@ -20011,6 +20016,3 @@ msgstr "IM-kontekst"
 #: ../widgets/text/e-text.c:3683 ../widgets/text/e-text.c:3684
 msgid "Handle Popup"
 msgstr "Håndter sprettopp"
-
-#~ msgid "SaveDraft"
-#~ msgstr "Lagre utkast"