Updated Norwegian (bokmÃ¥l) translation.

2002-03-15 Kjartan Maraas <kmaraas@gnome.org> * no.po: Updated Norwegian (bokmÃ¥l) translation. svn path=/trunk/; revision=16171
author: Kjartan Maraas <kmaraas@gnome.org> 2002-03-15 21:52:21 +0800
committer: Kjartan Maraas <kmaraas@src.gnome.org> 2002-03-15 21:52:21 +0800
commit: 02d39bf7b3fa10dbd8cbf21c13b842bcf69ff64a (patch)
tree: 18f71e72a3b705baa8fbdb81f1f06d89e0a145e6 /po
parent: 7df203024eea8aecb4f5a6735423d6b006f9f3e8 (diff)
download: gsoc2013-evolution-02d39bf7b3fa10dbd8cbf21c13b842bcf69ff64a.tar
gsoc2013-evolution-02d39bf7b3fa10dbd8cbf21c13b842bcf69ff64a.tar.gz
gsoc2013-evolution-02d39bf7b3fa10dbd8cbf21c13b842bcf69ff64a.tar.bz2
gsoc2013-evolution-02d39bf7b3fa10dbd8cbf21c13b842bcf69ff64a.tar.lz
gsoc2013-evolution-02d39bf7b3fa10dbd8cbf21c13b842bcf69ff64a.tar.xz
gsoc2013-evolution-02d39bf7b3fa10dbd8cbf21c13b842bcf69ff64a.tar.zst
gsoc2013-evolution-02d39bf7b3fa10dbd8cbf21c13b842bcf69ff64a.zip
2 files changed, 1477 insertions, 1199 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index 4b3832af00..e60943d6d7 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2002-03-15  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* no.po: Updated Norwegian (bokmål) translation.
+
 2002-03-12  Tõivo Leedjärv  <toivo@linux.ee>
 
 	* et.po: Updated Estonian translation 
diff --git a/po/no.po b/po/no.po
index c8f9ff2477..a5bd3dcaf5 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.0\n"
-"POT-Creation-Date: 2002-02-28 19:19+0100\n"
-"PO-Revision-Date: 2002-02-28 19:22+0100\n"
+"POT-Creation-Date: 2002-03-15 12:45+0100\n"
+"PO-Revision-Date: 2002-03-15 14:01+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -155,7 +155,7 @@ msgstr "ISDN"
 #: addressbook/backend/ebook/e-card-simple.c:85
 #: addressbook/gui/contact-editor/e-contact-editor.c:1728
 #: addressbook/gui/contact-editor/e-contact-editor.c:1786
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:76
 msgid "Other"
 msgstr "Andre"
 
@@ -343,7 +343,7 @@ msgid "Could not initialize Bonobo"
 msgstr "Kunne ikke initiere Bonobo"
 
 #: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2364
+#: addressbook/backend/pas/pas-backend-ldap.c:2727
 msgid "Searching..."
 msgstr "Søker..."
 
@@ -356,37 +356,33 @@ msgstr "Laster..."
 msgid "Error in search expression."
 msgstr "Feil i søkeuttrykk."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:516
-msgid "Connecting to LDAP server..."
-msgstr "Kobler til LDAP-tjener..."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:526
-msgid "Unable to connect to LDAP server."
-msgstr "Kunne ikke koble til LDAP-tjener."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:542
-msgid "Waiting for connection to LDAP server..."
-msgstr "Venter på tilkobling til LDAP-tjener..."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:963
+#: addressbook/backend/pas/pas-backend-ldap.c:1120
 msgid "Adding card to LDAP server..."
 msgstr "Legger til kort på LDAP-tjener..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1064
+#: addressbook/backend/pas/pas-backend-ldap.c:1223
 msgid "Removing card from LDAP server..."
 msgstr "Fjerner kort fra LDAP-tjener..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1174
+#: addressbook/backend/pas/pas-backend-ldap.c:1459
 msgid "Modifying card from LDAP server..."
 msgstr "Endrer kort fra LDAP-tjener..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2281
+#: addressbook/backend/pas/pas-backend-ldap.c:2580
+msgid "Restarting search."
+msgstr "Starter søk på nytt."
+
+#: addressbook/backend/pas/pas-backend-ldap.c:2672
 msgid "Receiving LDAP search results..."
 msgstr "Mottar søkeresultater fra LDAP-tjener..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2287
-msgid "Restarting search."
-msgstr "Starter søk på nytt."
+#: addressbook/backend/pas/pas-backend-ldap.c:2754
+msgid "Error performing search"
+msgstr "Feil ved utføring av søk"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:2778
+msgid "Could not parse query string"
+msgstr "Kunne ikke tolke streng i spørring"
 
 #: addressbook/conduit/address-conduit.c:293
 msgid "Default Sync Address:"
@@ -431,37 +427,53 @@ msgid "A sample Bonobo control which displays an addressbook."
 msgstr "Eksempel på Bonobo-kontroll som viser en adressebok."
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+msgid "Configuration control for the Evolution Addressbook."
+msgstr "Konfigurasjonskontroll for evolutions adressebok-komponent."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr "Kontroll som viser et minikort for Evolutions adressebok."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Evolution adressebok minikort visning"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 msgid "Evolution component for handling contacts."
 msgstr "Evolution komponent for håndtering av kontakter."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Factory for the Addressbook Minicard control"
 msgstr "Factory for minikort kontroll for adressebok"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Factory for the Addressbook's address displayer"
 msgstr "Factory for adressebokens adressevisning"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Factory for the Addressbook's address popup"
 msgstr "Factory for adressebokens adressevisning"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+msgid "Factory for the configuration control for the Evolution Addressbook."
+msgstr "Factory for konfigurasjonskontroll for evolutions adressebok-komponent."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 msgid "Factory for the sample Addressbook control"
 msgstr "Factory for eksempelkontroll for adressebok"
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
+msgid "LDAP Sources"
+msgstr "LDAP-kilder"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
+msgid "This page can be used to configure access to LDAP servers"
+msgstr "Denne siden kan brukes til å konfigurere tilgang til LDAP-tjenere"
+
 #: addressbook/gui/component/addressbook-component.c:71
 #: calendar/gui/dialogs/comp-editor-util.c:310
-#: calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
-#: shell/e-shortcuts.c:1061
+#: calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:173
+#: shell/e-shortcuts.c:1042
 msgid "Contacts"
 msgstr "Kontakter"
 
@@ -477,24 +489,24 @@ msgstr "LDAP-tjener"
 msgid "LDAP server containing contact information"
 msgstr "LDAP-tjener sømme inneholder kontaktinformasjon"
 
-#: addressbook/gui/component/addressbook-component.c:558
+#: addressbook/gui/component/addressbook-component.c:560
 msgid "New Contact"
 msgstr "Ny kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:558
-#: ui/evolution-addressbook.xml.h:34
+#: addressbook/gui/component/addressbook-component.c:560
+#: ui/evolution-addressbook.xml.h:33
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:561
+#: addressbook/gui/component/addressbook-component.c:563
 msgid "New Contact List"
 msgstr "Ny kontaktliste"
 
-#: addressbook/gui/component/addressbook-component.c:561
+#: addressbook/gui/component/addressbook-component.c:563
 msgid "Contact _List"
 msgstr "Kontakt_liste"
 
-#: addressbook/gui/component/addressbook-config.c:225
+#: addressbook/gui/component/addressbook-config.c:238
 msgid "Edit Addressbook"
 msgstr "Rediger adressebok"
 
@@ -650,7 +662,7 @@ msgstr "Konton_avn:"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:126
 msgid "_Add"
 msgstr "_Legg til"
 
@@ -663,17 +675,16 @@ msgid "_Download Limit"
 msgstr "Grense for ne_dlasting"
 
 #: addressbook/gui/component/addressbook-config.glade.h:34
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:109
-#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:39
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:135
+#: ui/evolution-addressbook.xml.h:37 ui/evolution-calendar.xml.h:28
 #: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:18
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:17
 msgid "_Edit"
 msgstr "R_ediger"
 
 #: addressbook/gui/component/addressbook-config.glade.h:35
-#: mail/mail-config.glade.h:110
 msgid "_Email address:"
 msgstr "_E-post adresse:"
 
@@ -694,11 +705,11 @@ msgstr "Kunne ikke initiere gnome-vfs"
 msgid "Other Contacts"
 msgstr "Andre kontakter"
 
-#: addressbook/gui/component/addressbook.c:525
+#: addressbook/gui/component/addressbook.c:517
 msgid "Unable to open addressbook"
 msgstr "Kunne ikke åpne adresseboken"
 
-#: addressbook/gui/component/addressbook.c:534
+#: addressbook/gui/component/addressbook.c:526
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -708,7 +719,7 @@ msgstr ""
 "at du har skrevet inn en ugyldig URI, eller at LDAP-tjeneren\n"
 "er nede"
 
-#: addressbook/gui/component/addressbook.c:539
+#: addressbook/gui/component/addressbook.c:531
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -720,7 +731,7 @@ msgstr ""
 "må du kompilere programmet fra kildekoden i CVS etter å\n"
 "ha hentet OpenLDAP fra lenken under.\n"
 
-#: addressbook/gui/component/addressbook.c:547
+#: addressbook/gui/component/addressbook.c:539
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -728,43 +739,43 @@ msgstr ""
 "Kunne ikke åpne denne adresseboken. Vennligst sjekk at stien\n"
 "eksisterer og at du har rettigheter til å aksessere den."
 
-#: addressbook/gui/component/addressbook.c:655
-#: addressbook/gui/component/addressbook.c:658
+#: addressbook/gui/component/addressbook.c:647
+#: addressbook/gui/component/addressbook.c:650
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Skriv inn passord for %s (bruker %s)"
 
-#: addressbook/gui/component/addressbook.c:836
-#: calendar/gui/cal-search-bar.c:55
-msgid "Any field contains"
-msgstr "Et felt inneholder"
+#: addressbook/gui/component/addressbook.c:828
+msgid "Name begins with"
+msgstr "Navn begynner med"
 
-#: addressbook/gui/component/addressbook.c:837
-msgid "Name contains"
-msgstr "Navn inneholder"
+#: addressbook/gui/component/addressbook.c:829
+msgid "Email is"
+msgstr "E-post er"
 
-#: addressbook/gui/component/addressbook.c:838
-msgid "Email contains"
-msgstr "E-post inneholder"
-
-#: addressbook/gui/component/addressbook.c:839
+#: addressbook/gui/component/addressbook.c:830
 #: calendar/gui/cal-search-bar.c:59
 msgid "Category is"
 msgstr "Kategorien er"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:840 widgets/misc/e-filter-bar.h:97
+#: addressbook/gui/component/addressbook.c:831
+#: calendar/gui/cal-search-bar.c:55
+msgid "Any field contains"
+msgstr "Et felt inneholder"
+
+#: addressbook/gui/component/addressbook.c:832 widgets/misc/e-filter-bar.h:97
 #: widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr "Avansert..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1082
+#: addressbook/gui/component/addressbook.c:1074
 #: calendar/gui/cal-search-bar.c:412
 msgid "Any Category"
 msgstr "Enhver kategori"
 
-#: addressbook/gui/component/addressbook.c:1167
+#: addressbook/gui/component/addressbook.c:1159
 msgid "The URI that the Folder Browser will display"
 msgstr "URIen som mappeutforskeren vil vise"
 
@@ -834,7 +845,7 @@ msgid "Factory for the Addressbook's name selection interface"
 msgstr "Factory for adressebokens grensesnitt for navnevalg"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:849
+#: addressbook/gui/component/select-names/e-select-names.c:852
 #: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
 #: filter/filter-rule.c:638 shell/e-shortcuts-view.c:180
 msgid "Remove"
@@ -865,7 +876,7 @@ msgstr "(%d ikke vist)"
 msgid "Unnamed Contact"
 msgstr "Kontakt uten navn:"
 
-#: addressbook/gui/component/select-names/e-select-names.c:600
+#: addressbook/gui/component/select-names/e-select-names.c:603
 msgid ""
 "Evolution is unable to get the addressbook local storage.\n"
 "This may have been caused by the evolution-addressbook component crashing.\n"
@@ -881,7 +892,7 @@ msgstr ""
 "vennligst send en melding til Jon Trowbridge <trow@ximian.com> med en\n"
 "detaljert beskrivelse av omstendighetene rundt feilen. Takk."
 
-#: addressbook/gui/component/select-names/e-select-names.c:608
+#: addressbook/gui/component/select-names/e-select-names.c:611
 msgid ""
 "Evolution is unable to get the addressbook local storage.\n"
 "Under normal circumstances, this should never happen.\n"
@@ -893,7 +904,7 @@ msgstr ""
 "Du vil kanskje måtte avslutte og starte Evolution på nytt for\n"
 "å rette opp dette problemet."
 
-#: addressbook/gui/component/select-names/e-select-names.c:690
+#: addressbook/gui/component/select-names/e-select-names.c:693
 msgid "Select Contacts from Addressbook"
 msgstr "Velg kontakter fra adresseboken"
 
@@ -1027,9 +1038,9 @@ msgstr "Vil motta _HTML e-post"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:707 filter/filter.glade.h:8
-#: mail/folder-browser.c:1492 mail/mail-config.glade.h:107
-#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:97
-#: ui/evolution-tasks.xml.h:17 ui/evolution.xml.h:35
+#: mail/folder-browser.c:1509 mail/mail-config.glade.h:133
+#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:36
 msgid "_Delete"
 msgstr "_Slett"
 
@@ -2355,9 +2366,9 @@ msgstr "Feil under henting av bokvisning"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:145
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:313
-#: addressbook/gui/widgets/e-addressbook-view.c:910
-#: addressbook/gui/widgets/e-addressbook-view.c:1024
-#: addressbook/gui/widgets/e-addressbook-view.c:1646
+#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/gui/widgets/e-addressbook-view.c:1016
+#: addressbook/gui/widgets/e-addressbook-view.c:1638
 #: ui/evolution-addressbook.xml.h:22
 msgid "Save as VCard"
 msgstr "Lagre som VCard"
@@ -2368,63 +2379,64 @@ msgid "Open"
 msgstr "Åpne"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:314
-#: addressbook/gui/widgets/e-addressbook-view.c:1025
+#: addressbook/gui/widgets/e-addressbook-view.c:1017
 #: ui/evolution-addressbook.xml.h:13
 msgid "Forward Contact"
 msgstr "Videresend kontakt"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:315
-#: addressbook/gui/widgets/e-addressbook-view.c:1026
+#: addressbook/gui/widgets/e-addressbook-view.c:1018
 msgid "Send Message to Contact"
 msgstr "Send melding til kontakt"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:316
-#: addressbook/gui/widgets/e-addressbook-view.c:1027
+#: addressbook/gui/widgets/e-addressbook-view.c:1019
 #: ui/evolution-addressbook.xml.h:19 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:66
-#: ui/my-evolution.xml.h:2
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
+#: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Skriv ut"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:318
-#: addressbook/gui/widgets/e-addressbook-view.c:1029
+#: addressbook/gui/widgets/e-addressbook-view.c:1021
 msgid "Print Envelope"
 msgstr "Skriv ut konvolutt"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:322
-#: addressbook/gui/widgets/e-addressbook-view.c:1033
+#: addressbook/gui/widgets/e-addressbook-view.c:1025
 msgid "Copy to folder..."
 msgstr "Kopier til mappe..."
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:323
-#: addressbook/gui/widgets/e-addressbook-view.c:1034
+#: addressbook/gui/widgets/e-addressbook-view.c:1026
 msgid "Move to folder..."
 msgstr "Flytt til mappe..."
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:326
-#: addressbook/gui/widgets/e-addressbook-view.c:1037
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:7
+#: addressbook/gui/widgets/e-addressbook-view.c:1029
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Klipp ut"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:327
-#: addressbook/gui/widgets/e-addressbook-view.c:1038
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:7
-#: ui/evolution-tasks.xml.h:3
+#: addressbook/gui/widgets/e-addressbook-view.c:1030
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
+#: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopier"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:328
-#: addressbook/gui/widgets/e-addressbook-view.c:1039
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-tasks.xml.h:12
+#: addressbook/gui/widgets/e-addressbook-view.c:1031
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Lim inn"
 
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:329
-#: addressbook/gui/widgets/e-addressbook-view.c:1040 filter/libfilter-i18n.h:8
-#: mail/mail-accounts.c:295 ui/evolution-addressbook.xml.h:10
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
-#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:19
+#: addressbook/gui/widgets/e-addressbook-view.c:1032
+#: filter/libfilter-i18n.h:10 mail/mail-accounts.c:306
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Slett"
 
@@ -2441,8 +2453,8 @@ msgstr "Suksess"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
 #: camel/providers/imap/camel-imap-command.c:275
-#: camel/providers/imap/camel-imap-command.c:363 shell/e-shell.c:1941
-#: shell/e-storage.c:528 shell/evolution-shell-component.c:1057
+#: camel/providers/imap/camel-imap-command.c:363 shell/e-shell.c:1950
+#: shell/e-storage.c:515 shell/evolution-shell-component.c:1057
 msgid "Unknown error"
 msgstr "Ukjent feil"
 
@@ -2450,7 +2462,7 @@ msgstr "Ukjent feil"
 msgid "Repository offline"
 msgstr "Frakoblet lager"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:516
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
 #: shell/evolution-shell-component.c:1048
 msgid "Permission denied"
 msgstr "Tilgang nektet"
@@ -2470,7 +2482,7 @@ msgstr "Protokollen er ikke støttet"
 #: addressbook/gui/widgets/e-addressbook-util.c:42
 #: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:482 calendar/gui/print.c:2255
+#: calendar/gui/e-calendar-table.c:482 calendar/gui/print.c:2276
 #: camel/camel-service.c:610 camel/camel-service.c:646
 msgid "Cancelled"
 msgstr "Avbrutt"
@@ -2503,7 +2515,7 @@ msgstr "Feil ved fjerning av liste"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:97
 #: addressbook/gui/widgets/e-addressbook-util.c:246
-#: addressbook/gui/widgets/e-addressbook-view.c:1444
+#: addressbook/gui/widgets/e-addressbook-view.c:1436
 msgid "Error removing card"
 msgstr "Feil ved fjerning av kort"
 
@@ -2741,6 +2753,7 @@ msgid "Include:"
 msgstr "Inkluder:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
+#: calendar/gui/tasks-control.c:623
 msgid "Landscape"
 msgstr "Landskap"
 
@@ -2765,6 +2778,7 @@ msgid "Options"
 msgstr "Alternativer"
 
 #: addressbook/printing/e-contact-print.glade.h:24
+#: calendar/gui/tasks-control.c:610
 msgid "Orientation"
 msgstr "Orientering"
 
@@ -2785,7 +2799,9 @@ msgstr "Papir"
 msgid "Paper source:"
 msgstr "Papirkilde:"
 
+#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
+#: calendar/gui/tasks-control.c:616
 msgid "Portrait"
 msgstr "Portrett"
 
@@ -2847,20 +2863,20 @@ msgstr "Avtale uten navn"
 
 #: calendar/cal-util/cal-util.c:498 calendar/cal-util/cal-util.c:520
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:406 mail/message-list.c:653
+#: calendar/gui/e-calendar-table.c:406 mail/message-list.c:684
 msgid "High"
 msgstr "Høy"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/calendar-model.c:1711
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:407 mail/message-list.c:652
+#: calendar/gui/e-calendar-table.c:407 mail/message-list.c:683
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:408 mail/message-list.c:651
+#: calendar/gui/e-calendar-table.c:408 mail/message-list.c:682
 msgid "Low"
 msgstr "Lav"
 
@@ -2899,41 +2915,53 @@ msgid "A sample Bonobo control which displays an calendar."
 msgstr "Eksempel på Bonobo-kontroll som viser en kalender."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+msgid "Calendar Settings"
+msgstr "Innstillinger for kalender"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Configuration control for the Evolution Calendar."
+msgstr "Konfigurasjonskontroll for Evolution kalender."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
 msgid "Evolution calendar executive summary component."
 msgstr "Evolution komponent for kalendersammendrag."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "Evolution kalender iTip/iMip-visning"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Evolution component for handling the calendar."
 msgstr "Evolution komponent for håndtering av kalenderen."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 msgid "Factory for the Calendar Summary component."
 msgstr "Factory for kalenderens sammendragskomponent."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the Evolution Tasks control"
 msgstr "Factory for Evolution oppgavekontroll"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory for the calendar iTip view control"
 msgstr "Factory for kalenderens iTip visningskontroll"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory for the sample Calendar control"
 msgstr "Factory for eksempelkontroll for kalender"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr "Factory for å sentralisere dialoger for kalender-komponent"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:13
 msgid "Factory to create a component editor factory"
 msgstr "Factory for å opprette en factory for komponentredigering"
 
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:14
+msgid "This page can be used to configure your calendar settings"
+msgstr "Denne siden kan brukes til å konfigurere dine kalenderinnstillinger"
+
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
 msgid "Alarm notification service"
 msgstr "Alarm-tjeneste"
@@ -2997,7 +3025,7 @@ msgstr ""
 "for påminnelse i stedet."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:429 mail/mail-callbacks.c:2573
+#: calendar/gui/tasks-control.c:443 mail/mail-callbacks.c:2593
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Advarsel"
@@ -3047,40 +3075,40 @@ msgstr "Beskrivelse inneholder"
 msgid "Comment contains"
 msgstr "Kommentar inneholder"
 
-#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1117
+#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1118
 msgid "Unmatched"
 msgstr "Ingen treff"
 
-#: calendar/gui/calendar-commands.c:457
+#: calendar/gui/calendar-commands.c:404
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:460 calendar/gui/e-day-view-top-item.c:288
+#: calendar/gui/calendar-commands.c:407 calendar/gui/e-day-view-top-item.c:288
 #: calendar/gui/e-day-view.c:1403 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:462 calendar/gui/calendar-commands.c:467
-#: calendar/gui/calendar-commands.c:469
+#: calendar/gui/calendar-commands.c:409 calendar/gui/calendar-commands.c:414
+#: calendar/gui/calendar-commands.c:416
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:480 calendar/gui/calendar-commands.c:487
-#: calendar/gui/calendar-commands.c:493 calendar/gui/calendar-commands.c:495
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:434
+#: calendar/gui/calendar-commands.c:440 calendar/gui/calendar-commands.c:442
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:485
-#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1445
+#: calendar/gui/calendar-commands.c:432
+#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1468
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:834
+#: calendar/gui/calendar-commands.c:769
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
@@ -3130,20 +3158,20 @@ msgstr "Opptatt"
 
 #: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/print.c:2246
+#: calendar/gui/e-calendar-table.c:479 calendar/gui/print.c:2267
 msgid "Not Started"
 msgstr "Ikke startet"
 
 #: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:480 calendar/gui/print.c:2249
+#: calendar/gui/e-calendar-table.c:480 calendar/gui/print.c:2270
 msgid "In Progress"
 msgstr "Under arbeid"
 
 #: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:481 calendar/gui/e-meeting-model.c:326
-#: calendar/gui/e-meeting-model.c:349 calendar/gui/print.c:2252
+#: calendar/gui/e-meeting-model.c:349 calendar/gui/print.c:2273
 msgid "Completed"
 msgstr "Fullført"
 
@@ -3159,9 +3187,10 @@ msgstr ""
 
 #. An empty string is the same as 'None'.
 #: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:312
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1512
-#: mail/mail-accounts.c:148 mail/mail-accounts.c:404
-#: mail/mail-config.glade.h:56
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1035
+#: mail/mail-account-gui.c:1036 mail/mail-account-gui.c:1617
+#: mail/mail-accounts.c:151 mail/mail-accounts.c:416
+#: mail/mail-config.glade.h:74
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:202
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
@@ -3209,47 +3238,55 @@ msgstr "Ukevisning"
 msgid "Month View"
 msgstr "Månedsvisning"
 
-#: calendar/gui/component-factory.c:64 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
+#: calendar/gui/component-factory.c:67 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
 msgid "Calendar"
 msgstr "Kalender"
 
-#: calendar/gui/component-factory.c:65
+#: calendar/gui/component-factory.c:68
 msgid "Folder containing appointments and events"
 msgstr "Mappe som inneholder avtaler og hendelser"
 
-#: calendar/gui/component-factory.c:69 calendar/gui/print.c:1733
-#: my-evolution/e-summary-tasks.c:250 my-evolution/e-summary-tasks.c:267
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
-#: views/tasks/galview.xml.h:1
+#: calendar/gui/component-factory.c:72 calendar/gui/print.c:1754
+#: calendar/gui/tasks-control.c:497 my-evolution/e-summary-tasks.c:250
+#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
+#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Oppgaver"
 
-#: calendar/gui/component-factory.c:70
+#: calendar/gui/component-factory.c:73
 msgid "Folder containing to-do items"
 msgstr "Mappe som inneholder oppgaver"
 
-#: calendar/gui/component-factory.c:683
+#: calendar/gui/component-factory.c:690
 msgid "New meeting"
 msgstr "Nytt møte"
 
-#: calendar/gui/component-factory.c:683
+#: calendar/gui/component-factory.c:690
 msgid "_Meeting"
 msgstr "_Møte"
 
-#: calendar/gui/component-factory.c:687
+#: calendar/gui/component-factory.c:694
 msgid "New task"
 msgstr "Ny oppgave"
 
-#: calendar/gui/component-factory.c:687 ui/evolution-tasks.xml.h:21
+#: calendar/gui/component-factory.c:694
 msgid "_Task"
 msgstr "_Oppgave"
 
-#: calendar/gui/component-factory.c:691
+#: calendar/gui/component-factory.c:698
+msgid "New All Day Appointment"
+msgstr "Ny avtale for hele dagen"
+
+#: calendar/gui/component-factory.c:698
+msgid "All _Day Appointment"
+msgstr "Avtale for hele _dagen"
+
+#: calendar/gui/component-factory.c:702
 msgid "New appointment"
 msgstr "Ny avtale"
 
-#: calendar/gui/component-factory.c:691
+#: calendar/gui/component-factory.c:702
 msgid "_Appointment"
 msgstr "_Avtale"
 
@@ -3485,7 +3522,7 @@ msgstr "slutt på avtale"
 msgid "hour(s)"
 msgstr "time(r)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:131
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:160
 msgid "minute(s)"
 msgstr "minutt(er)"
 
@@ -3629,7 +3666,7 @@ msgid "Wednesday"
 msgstr "Onsdag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:24
 msgid "Work Week"
 msgstr "Arbeidsuke"
 
@@ -3755,23 +3792,23 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Du har ikke gjort endringer. Oppdater redigering?"
 
-#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2164
+#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2185
 msgid " to "
 msgstr " til "
 
-#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2168
+#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2189
 msgid " (Completed "
 msgstr " (Fullført "
 
-#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
+#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2191
 msgid "Completed "
 msgstr "Fullført "
 
-#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2175
+#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2196
 msgid " (Due "
 msgstr " (Ferdig "
 
-#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
+#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2198
 msgid "Due "
 msgstr "Ferdig "
 
@@ -3802,13 +3839,13 @@ msgstr "Journaloppføring - %s"
 msgid "No summary"
 msgstr "Ingen sammendrag"
 
-#: calendar/gui/dialogs/comp-editor.c:1077 mail/mail-callbacks.c:2226
-#: mail/mail-display.c:113
+#: calendar/gui/dialogs/comp-editor.c:1077 mail/mail-callbacks.c:2235
+#: mail/mail-display.c:115
 msgid "Overwrite file?"
 msgstr "Overskriv fil?"
 
-#: calendar/gui/dialogs/comp-editor.c:1081 mail/mail-callbacks.c:2233
-#: mail/mail-display.c:117
+#: calendar/gui/dialogs/comp-editor.c:1081 mail/mail-callbacks.c:2242
+#: mail/mail-display.c:119
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -3879,7 +3916,7 @@ msgstr "Deleger til:"
 msgid "Enter Delegate"
 msgstr "Skriv inn delegat"
 
-#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
+#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2224
 msgid "Appointment"
 msgstr "Avtale"
 
@@ -4032,14 +4069,14 @@ msgstr "Rolle"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:31
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:51
 #: mail/message-list.etspec.h:11
 msgid "Status"
 msgstr "Status"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:18
-#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:95
+#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:118
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Type"
@@ -4178,7 +4215,7 @@ msgid "Progress"
 msgstr "Fremdrift"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:755
+#: my-evolution/e-summary-preferences.c:763
 msgid "URL:"
 msgstr "URL:"
 
@@ -4198,7 +4235,7 @@ msgstr "Tildeling"
 
 #: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:801
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:32
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:39
 msgid "Description:"
 msgstr "Beskrivelse:"
 
@@ -4271,8 +4308,8 @@ msgid "Deleting selected objects"
 msgstr "Sletter valgte objekter"
 
 #: calendar/gui/e-calendar-table.c:960 calendar/gui/e-day-view.c:3546
-#: calendar/gui/e-week-view.c:3433 mail/folder-browser.c:1463
-#: shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:41
+#: calendar/gui/e-week-view.c:3433 mail/folder-browser.c:1480
+#: shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:40
 msgid "_Open"
 msgstr "_Åpne"
 
@@ -4283,17 +4320,17 @@ msgid "C_ut"
 msgstr "Klipp _ut"
 
 #: calendar/gui/e-calendar-table.c:966 calendar/gui/e-day-view.c:3557
-#: calendar/gui/e-week-view.c:3444 ui/evolution-addressbook.xml.h:36
-#: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
-#: ui/evolution-tasks.xml.h:16
+#: calendar/gui/e-week-view.c:3444 ui/evolution-addressbook.xml.h:35
+#: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
+#: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_Kopier"
 
 #: calendar/gui/e-calendar-table.c:968 calendar/gui/e-day-view.c:3532
 #: calendar/gui/e-day-view.c:3559 calendar/gui/e-week-view.c:3420
-#: calendar/gui/e-week-view.c:3446 ui/evolution-addressbook.xml.h:42
-#: ui/evolution-calendar.xml.h:41 ui/evolution-mail-list.xml.h:29
-#: ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-week-view.c:3446 ui/evolution-addressbook.xml.h:41
+#: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
+#: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr "_Lim inn"
 
@@ -4359,8 +4396,8 @@ msgstr "Startdato"
 #. FIXME: Inbox shortcut should point to something else for
 #. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
-#: shell/e-storage-set-view.c:1498 shell/e-summary-storage.c:79
+#: my-evolution/component-factory.c:44 shell/e-shell.c:661
+#: shell/e-shortcuts.c:1030
 msgid "Summary"
 msgstr "Sammendrag"
 
@@ -4403,7 +4440,7 @@ msgstr "%02i minutters oppdeling"
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
 #: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1389
-#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1461
+#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1484
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -4416,13 +4453,13 @@ msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:614 calendar/gui/e-week-view.c:350
-#: calendar/gui/print.c:768
+#: calendar/gui/print.c:791
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:617 calendar/gui/e-week-view.c:353
-#: calendar/gui/print.c:770
+#: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pm"
 
@@ -4435,7 +4472,7 @@ msgid "New All Day _Event"
 msgstr "Ny avtale som varer h_ele dagen"
 
 #: calendar/gui/e-day-view.c:3537 calendar/gui/e-week-view.c:3425
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "Gå _til i dag"
 
@@ -4527,15 +4564,17 @@ msgstr "Status:"
 
 #: calendar/gui/e-itip-control.c:775 calendar/gui/e-meeting-model.c:318
 #: calendar/gui/e-meeting-model.c:341 calendar/gui/e-meeting-model.c:835
+#: calendar/gui/itip-utils.c:323
 msgid "Accepted"
 msgstr "Godtatt"
 
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:779 calendar/gui/itip-utils.c:326
 msgid "Tentatively Accepted"
 msgstr "Akteptert tentativt"
 
 #: calendar/gui/e-itip-control.c:783 calendar/gui/e-meeting-model.c:320
 #: calendar/gui/e-meeting-model.c:343 calendar/gui/e-meeting-model.c:836
+#: calendar/gui/itip-utils.c:329 calendar/gui/itip-utils.c:355
 msgid "Declined"
 msgstr "Avslått"
 
@@ -4543,10 +4582,10 @@ msgstr "Avslått"
 #: calendar/gui/e-itip-control.c:1057 calendar/gui/e-meeting-model.c:254
 #: calendar/gui/e-meeting-model.c:289 calendar/gui/e-meeting-model.c:354
 #: calendar/gui/e-meeting-model.c:793 calendar/gui/e-meeting-model.c:809
-#: camel/providers/smtp/camel-smtp-transport.c:171
-#: camel/providers/smtp/camel-smtp-transport.c:226 mail/folder-browser.c:317
-#: mail/mail-display.c:817 widgets/misc/e-charset-picker.c:58
-#: widgets/misc/e-charset-picker.c:442
+#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:231 mail/folder-browser.c:317
+#: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
+#: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Ukjent"
 
@@ -4563,7 +4602,7 @@ msgstr "Oppdater"
 #: calendar/gui/e-itip-control.c:835 calendar/gui/e-itip-control.c:854
 #: calendar/gui/e-itip-control.c:867 calendar/gui/e-itip-control.c:880
 #: calendar/gui/e-itip-control.c:893 calendar/gui/e-itip-control.c:906
-#: shell/e-shell.c:1931 widgets/misc/e-cell-date-edit.c:258
+#: shell/e-shell.c:1940 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "OK"
 
@@ -4591,7 +4630,8 @@ msgstr "Oppdater status for respondent"
 msgid "Send Latest Information"
 msgstr "Send siste informasjon"
 
-#: calendar/gui/e-itip-control.c:905 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:905 calendar/gui/itip-utils.c:343
+#: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -4846,7 +4886,7 @@ msgstr "start-dato"
 msgid "Chair Persons"
 msgstr "Styremedlemmer"
 
-#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1640
+#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1650
 msgid "Required Participants"
 msgstr "Obligatoriske deltakere"
 
@@ -4919,14 +4959,14 @@ msgstr "Under arbeid"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:471
+#: calendar/gui/e-meeting-time-sel-item.c:475
 #: calendar/gui/e-meeting-time-sel.c:2088
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:475
+#: calendar/gui/e-meeting-time-sel-item.c:479
 #: calendar/gui/e-meeting-time-sel.c:2118 e-util/e-time-utils.c:186
 #: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
 msgid "%a %m/%d/%Y"
@@ -4934,7 +4974,7 @@ msgstr "%a %d.%m.%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:479 e-util/e-time-utils.c:221
+#: calendar/gui/e-meeting-time-sel-item.c:483 e-util/e-time-utils.c:221
 #: e-util/e-time-utils.c:279 widgets/misc/e-dateedit.c:1612
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
@@ -5004,7 +5044,7 @@ msgstr "Tid for møtets slutt:"
 msgid "Opening tasks at %s"
 msgstr "Åpner oppgaver på %s"
 
-#: calendar/gui/e-tasks.c:381 calendar/gui/tasks-control.c:186
+#: calendar/gui/e-tasks.c:381 calendar/gui/tasks-control.c:196
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Kunne ikke laste oppgavene i «%s»"
@@ -5093,44 +5133,47 @@ msgstr "Oktober"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/itip-utils.c:243
+#: calendar/gui/itip-utils.c:220
 msgid "At least one attendee is necessary"
 msgstr "Minst en deltaker kreves"
 
-#: calendar/gui/itip-utils.c:274
+#: calendar/gui/itip-utils.c:251
 msgid "An organizer must be set."
 msgstr "En organisator må oppgis."
 
-#: calendar/gui/itip-utils.c:313 calendar/gui/itip-utils.c:346
+#: calendar/gui/itip-utils.c:295
 msgid "Event information"
 msgstr "Hendelsesinformasjon"
 
-#: calendar/gui/itip-utils.c:315 calendar/gui/itip-utils.c:348
+#: calendar/gui/itip-utils.c:297
 msgid "Task information"
 msgstr "Oppgaveinformasjon"
 
-#: calendar/gui/itip-utils.c:317 calendar/gui/itip-utils.c:350
+#: calendar/gui/itip-utils.c:299
 msgid "Journal information"
 msgstr "Journalinformasjon"
 
-#: calendar/gui/itip-utils.c:319 calendar/gui/itip-utils.c:367
+#: calendar/gui/itip-utils.c:301
 msgid "Free/Busy information"
 msgstr "Ledig/opptatt-informasjon"
 
-#: calendar/gui/itip-utils.c:321
+#: calendar/gui/itip-utils.c:303
 msgid "Calendar information"
 msgstr "Kalenderinformasjon"
 
-#: calendar/gui/itip-utils.c:361
-#, c-format
-msgid "Free/Busy information (%s to %s)"
-msgstr "Ledig/opptatt-informasjon (%s til %s)"
+#: calendar/gui/itip-utils.c:339
+msgid "Updated"
+msgstr "Oppdatert"
 
-#: calendar/gui/itip-utils.c:373
-msgid "iCalendar information"
-msgstr "iCalendar-informasjon"
+#: calendar/gui/itip-utils.c:347
+msgid "Refresh"
+msgstr "Oppdater"
 
-#: calendar/gui/itip-utils.c:582
+#: calendar/gui/itip-utils.c:351
+msgid "Counter-proposal"
+msgstr "Motforslag"
+
+#: calendar/gui/itip-utils.c:617
 msgid "You must be an attendee of the event."
 msgstr "Du må være en deltager i hendelsen."
 
@@ -5138,239 +5181,240 @@ msgstr "Du må være en deltager i hendelsen."
 msgid "Could not create the component editor factory"
 msgstr "Kunne ikke opprette factory for komponentredigering"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "1st"
 msgstr "1"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "2nd"
 msgstr "2"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "3rd"
 msgstr "3"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "4th"
 msgstr "4"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:456
 msgid "5th"
 msgstr "5"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "6th"
 msgstr "6"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "7th"
 msgstr "7"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "8th"
 msgstr "8"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "9th"
 msgstr "9"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:457
 msgid "10th"
 msgstr "10"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "11th"
 msgstr "11"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "12th"
 msgstr "12"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "13th"
 msgstr "13"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "14th"
 msgstr "14"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:458
 msgid "15th"
 msgstr "15"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "16th"
 msgstr "16"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "17th"
 msgstr "17"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "18th"
 msgstr "18"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "19th"
 msgstr "19"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:459
 msgid "20th"
 msgstr "20"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "21st"
 msgstr "21"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "22nd"
 msgstr "22"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "23rd"
 msgstr "23"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "24th"
 msgstr "24"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:460
 msgid "25th"
 msgstr "25"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "26th"
 msgstr "26"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "27th"
 msgstr "27"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "28th"
 msgstr "28"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "29th"
 msgstr "29"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:461
 msgid "30th"
 msgstr "30"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:462
 msgid "31st"
 msgstr "31"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Su"
 msgstr "Søn"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Mo"
 msgstr "Man"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "Tu"
 msgstr "Tir"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:529
 msgid "We"
 msgstr "Ons"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Th"
 msgstr "Tor"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Fr"
 msgstr "Fre"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:530
 msgid "Sa"
 msgstr "Lør"
 
 #. Day
-#: calendar/gui/print.c:1819
+#: calendar/gui/print.c:1840
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Valgt dag (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1844 calendar/gui/print.c:1848
+#: calendar/gui/print.c:1865 calendar/gui/print.c:1869
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1845
+#: calendar/gui/print.c:1866
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1849 calendar/gui/print.c:1851
-#: calendar/gui/print.c:1852
+#: calendar/gui/print.c:1870 calendar/gui/print.c:1872
+#: calendar/gui/print.c:1873
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/print.c:1856
+#: calendar/gui/print.c:1877
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Valgt uke (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1864
+#: calendar/gui/print.c:1885
 msgid "Selected month (%b %Y)"
 msgstr "Valgt måned (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1871
+#: calendar/gui/print.c:1892
 msgid "Selected year (%Y)"
 msgstr "Valgt år (%Y)"
 
-#: calendar/gui/print.c:2205
+#: calendar/gui/print.c:2226
 msgid "Task"
 msgstr "Oppgave"
 
-#: calendar/gui/print.c:2262
+#: calendar/gui/print.c:2283
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: calendar/gui/print.c:2280
+#: calendar/gui/print.c:2301
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioritet: %s"
 
-#: calendar/gui/print.c:2294
+#: calendar/gui/print.c:2315
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Prosent fullført: %i"
 
-#: calendar/gui/print.c:2306
+#: calendar/gui/print.c:2327
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2320
+#: calendar/gui/print.c:2341
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorier: %s"
 
-#: calendar/gui/print.c:2331
+#: calendar/gui/print.c:2352
 msgid "Contacts: "
 msgstr "Kontakter: "
 
-#: calendar/gui/print.c:2386
+#: calendar/gui/print.c:2407
 msgid "Print Calendar"
 msgstr "Skriv ut kalender"
 
-#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
-#: mail/mail-callbacks.c:2882 my-evolution/e-summary.c:605
-#: ui/evolution-addressbook.xml.h:20 ui/evolution-mail-message.xml.h:67
+#: calendar/gui/print.c:2498 calendar/gui/print.c:2590
+#: calendar/gui/tasks-control.c:578 mail/mail-callbacks.c:2902
+#: my-evolution/e-summary.c:604 ui/evolution-addressbook.xml.h:20
+#: ui/evolution-mail-message.xml.h:66
 msgid "Print Preview"
 msgstr "Forhåndsvisning av utskrift"
 
-#: calendar/gui/print.c:2506
+#: calendar/gui/print.c:2527
 msgid "Print Item"
 msgstr "Skriv ut oppføring"
 
-#: calendar/gui/print.c:2587
+#: calendar/gui/print.c:2608
 msgid "Print Setup"
 msgstr "Skriveroppsett"
 
@@ -5381,11 +5425,11 @@ msgstr ""
 "Kunne ikke opprette oppgavevisning. Vennligst sjekk din ORBit og OAF "
 "konfigurasjon."
 
-#: calendar/gui/tasks-control.c:137
+#: calendar/gui/tasks-control.c:147
 msgid "The URI of the tasks folder to display"
 msgstr "URIen til oppgavemappen skal vises"
 
-#: calendar/gui/tasks-control.c:437
+#: calendar/gui/tasks-control.c:451
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -5397,11 +5441,15 @@ msgstr ""
 "\n"
 "Vil du virkelig slette disse oppgavene?"
 
-#: calendar/gui/tasks-control.c:444 mail/mail-callbacks.c:2359
-#: mail/mail-callbacks.c:2587
+#: calendar/gui/tasks-control.c:458 mail/mail-callbacks.c:2368
+#: mail/mail-callbacks.c:2607
 msgid "Do not ask me again."
 msgstr "Ikke spør meg igjen."
 
+#: calendar/gui/tasks-control.c:607
+msgid "Print Tasks"
+msgstr "Skriv ut oppgaver"
+
 #: calendar/gui/tasks-migrate.c:105
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
@@ -7349,76 +7397,76 @@ msgstr "Vennligst skriv inn din %s passphrase for %s"
 msgid "Please enter your %s passphrase"
 msgstr "Vennligst skriv inn din %s passphrase"
 
-#: camel/camel-pgp-context.c:575
+#: camel/camel-pgp-context.c:622
 msgid "Cannot sign this message: no plaintext to sign"
 msgstr "Kan ikke signere denne meldingen: ingen tekst å signere"
 
-#: camel/camel-pgp-context.c:582 camel/camel-pgp-context.c:763
+#: camel/camel-pgp-context.c:629 camel/camel-pgp-context.c:803
 msgid "Cannot sign this message: no password provided"
 msgstr "Kan ikke signere denne meldingen: ingen passord oppgitt"
 
-#: camel/camel-pgp-context.c:588 camel/camel-pgp-context.c:769
+#: camel/camel-pgp-context.c:635 camel/camel-pgp-context.c:809
 #, c-format
 msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 "Kunne ikke signere denne meldingen: kunne ikke opprette rør til GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:756
+#: camel/camel-pgp-context.c:796
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr "Kan ikke signere denne meldingen: ingen tekst for «clearsign»"
 
-#: camel/camel-pgp-context.c:955
+#: camel/camel-pgp-context.c:988
 msgid "Cannot verify this message: no plaintext to verify"
 msgstr "Kan ikke verifisere denne meldingen: ingen tekst å verifisere"
 
-#: camel/camel-pgp-context.c:961
+#: camel/camel-pgp-context.c:994
 #, c-format
 msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 "Kunne ikke verifisere denne meldingen: kunne ikke opprette rør til GPG/PGP: %"
 "s"
 
-#: camel/camel-pgp-context.c:972
+#: camel/camel-pgp-context.c:1005
 #, c-format
 msgid "Cannot verify this message: couldn't create temp file: %s"
 msgstr ""
 "Kunne ikke verifisere denne meldingen: kunne ikke opprette midlertidig fil: %"
 "s"
 
-#: camel/camel-pgp-context.c:1145
+#: camel/camel-pgp-context.c:1178
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr "Kan ikke kryptere denne meldingen: ingen tekst å kryptere"
 
-#: camel/camel-pgp-context.c:1155
+#: camel/camel-pgp-context.c:1188
 msgid "Cannot encrypt this message: no password provided"
 msgstr "Kan ikke kryptere denne meldingen: ingen passord oppgitt"
 
-#: camel/camel-pgp-context.c:1162
+#: camel/camel-pgp-context.c:1195
 #, c-format
 msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 "Kunne ikke kryptere denne meldingen: kunne ikke opprette rør til GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:1171
+#: camel/camel-pgp-context.c:1204
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr "Kan ikke kryptere denne meldingen: ingen mottakere oppgitt"
 
-#: camel/camel-pgp-context.c:1340
+#: camel/camel-pgp-context.c:1373
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr "Kan ikke dekryptere denne meldingen: ingen ciphertekst å dekryptere"
 
-#: camel/camel-pgp-context.c:1348
+#: camel/camel-pgp-context.c:1381
 msgid "Cannot decrypt this message: no password provided"
 msgstr "Kan ikke dekryptere denne meldingen: ingen passord oppgitt"
 
-#: camel/camel-pgp-context.c:1355
+#: camel/camel-pgp-context.c:1388
 #, c-format
 msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 "Kunne ikke dekryptere denne meldingen: kunne ikke opprette rør til GPG/PGP: %"
 "s"
 
-#: camel/camel-pgp-mime.c:310
+#: camel/camel-pgp-mime.c:332
 msgid "This is a digitally signed message part"
 msgstr "Dette er en digitalt signert meldingsdel"
 
@@ -7481,38 +7529,38 @@ msgstr "Kunne ikke laste %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "Kunne ikke laste %s: Ingen initieringskode i modulen."
 
-#: camel/camel-remote-store.c:203
+#: camel/camel-remote-store.c:199
 #, c-format
 msgid "%s server %s"
 msgstr "%s-tjener %s"
 
-#: camel/camel-remote-store.c:207
+#: camel/camel-remote-store.c:203
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s-tjeneste for %s på %s"
 
-#: camel/camel-remote-store.c:264
+#: camel/camel-remote-store.c:254 camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
 msgstr "Tilkobling avbrutt"
 
-#: camel/camel-remote-store.c:267
-#: camel/providers/smtp/camel-smtp-transport.c:276
+#: camel/camel-remote-store.c:257 camel/providers/pop3/camel-pop3-store.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:280
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Kunne ikke koble til %s (port %d): %s"
 
-#: camel/camel-remote-store.c:268
+#: camel/camel-remote-store.c:258
 msgid "(unknown host)"
 msgstr "(ukjent vert)"
 
-#: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:481
+#: camel/camel-remote-store.c:348 camel/camel-remote-store.c:410
+#: camel/camel-remote-store.c:471
 #: camel/providers/imap/camel-imap-command.c:228
 #: camel/providers/imap/camel-imap-command.c:409
 msgid "Operation cancelled"
 msgstr "Operasjon avbrutt"
 
-#: camel/camel-remote-store.c:484
+#: camel/camel-remote-store.c:474
 #: camel/providers/imap/camel-imap-command.c:274
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
@@ -7643,7 +7691,7 @@ msgstr "Ukjent autentiseringstilstand."
 
 #: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:149
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:61
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:79
 msgid "Password"
 msgstr "Passord"
 
@@ -7770,7 +7818,7 @@ msgstr "Kan ikke finne mappe: Ugyldig operasjon på dette lageret"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Kan ikke opprette mappe: Ugyldig operasjon på dette lageret"
 
-#: camel/camel-tcp-stream-openssl.c:519
+#: camel/camel-tcp-stream-openssl.c:614
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -7779,7 +7827,7 @@ msgstr ""
 "Utsteder: %s\n"
 "Emne: %s"
 
-#: camel/camel-tcp-stream-openssl.c:524
+#: camel/camel-tcp-stream-openssl.c:619
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -7796,7 +7844,7 @@ msgstr ""
 
 #. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
 #. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:438
+#: camel/camel-tcp-stream-ssl.c:467
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -7809,16 +7857,16 @@ msgstr ""
 "Fingeravtrykk      %s\n"
 "Signatur:          %s"
 
-#: camel/camel-tcp-stream-ssl.c:444
+#: camel/camel-tcp-stream-ssl.c:473
 msgid "GOOD"
 msgstr "GODTATT"
 
-#: camel/camel-tcp-stream-ssl.c:444
+#: camel/camel-tcp-stream-ssl.c:473
 msgid "BAD"
 msgstr "UGYLDIG"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:447
+#: camel/camel-tcp-stream-ssl.c:476
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -7954,7 +8002,7 @@ msgstr "Ser etter nye meldinger"
 msgid "Check for new messages in all folders"
 msgstr "Se etter nye meldinger i alle mapper"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:925
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1031
 msgid "Folders"
 msgstr "Mapper"
 
@@ -7994,7 +8042,7 @@ msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP-tjener %s støtter ikke etterspurt autentiseringstype %s"
 
 #: camel/providers/imap/camel-imap-store.c:528
-#: camel/providers/smtp/camel-smtp-transport.c:393
+#: camel/providers/smtp/camel-smtp-transport.c:475
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Ingen støtte for autentiseringstype %s"
@@ -8005,7 +8053,7 @@ msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sVennligst skriv inn IMAP-passord for %s@%s"
 
 #: camel/providers/imap/camel-imap-store.c:567
-#: camel/providers/smtp/camel-smtp-transport.c:434
+#: camel/providers/smtp/camel-smtp-transport.c:516
 msgid "You didn't enter a password."
 msgstr "Du skrev ikke inn et passord."
 
@@ -8628,7 +8676,7 @@ msgstr "Behold meldinger på tjeneren"
 msgid "Delete after %s day(s)"
 msgstr "Slett etter %s dag(er)"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:60
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:78
 msgid "POP"
 msgstr "POP"
 
@@ -8655,13 +8703,28 @@ msgstr ""
 "passord via APOP-protokollen. Dette vil kanskje ikke virke for alle brukere "
 "selv på tjenere som hevder å støtte det."
 
-#: camel/providers/pop3/camel-pop3-store.c:172
+#: camel/providers/pop3/camel-pop3-store.c:212
+#: camel/providers/pop3/camel-pop3-store.c:241
+#: camel/providers/pop3/camel-pop3-store.c:253
 #, c-format
-msgid "Could not connect to POP server on %s."
-msgstr "Kunne ikke koble til POP-tjener på %s."
+msgid "Failed to connect to POP server %s in secure mode: %s"
+msgstr "Kunne ikke koble til POP-tjener %s i sikker modus: %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:213
-#: camel/providers/pop3/camel-pop3-store.c:316
+msgid "SSL/TLS extension not supported."
+msgstr "SSL/TLS-utvidelse er ikke støttet."
+
+#: camel/providers/pop3/camel-pop3-store.c:254
+msgid "SSL negotiations failed"
+msgstr "SSL-forhandling feilet"
+
+#: camel/providers/pop3/camel-pop3-store.c:355
+#, c-format
+msgid "Could not connect to POP server on %s"
+msgstr "Kunne ikke koble til POP-tjener på %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:396
+#: camel/providers/pop3/camel-pop3-store.c:499
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -8669,26 +8732,26 @@ msgstr ""
 "Kunne ikke koble til POP-tjeneren.\n"
 "Ingen støtte for forespurt autentiseringsmekanisme."
 
-#: camel/providers/pop3/camel-pop3-store.c:229
+#: camel/providers/pop3/camel-pop3-store.c:412
 #, c-format
 msgid "SASL `%s' Login failed: %s"
 msgstr "SASL «%s» login feilet: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:240
+#: camel/providers/pop3/camel-pop3-store.c:423
 msgid "SASL Protocol error"
 msgstr "Feil i SASL-protokoll"
 
-#: camel/providers/pop3/camel-pop3-store.c:255
+#: camel/providers/pop3/camel-pop3-store.c:438
 #, c-format
 msgid "I/O Error: %s"
 msgstr "I/U-feil: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:276
+#: camel/providers/pop3/camel-pop3-store.c:459
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sVennligst oppgi POP-passord for %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:327
+#: camel/providers/pop3/camel-pop3-store.c:510
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -8697,13 +8760,13 @@ msgstr ""
 "Kunne ikke koble til POP-tjener.\n"
 "Feil ved oversending av passord: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:600
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Ingen slik mappe «%s»."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:103
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -8761,7 +8824,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Levering av e-post via sendmail programmet"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:75
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:94
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -8769,122 +8832,141 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "For levering av e-post via en ekstern e-posttjener med SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "Syntax error, command unrecognized"
 msgstr "Syntaksfeil, kommando ikke gjenkjent"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Syntax error in parameters or arguments"
 msgstr "Syntaksfeil i parametere eller argumenter"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "Command not implemented"
 msgstr "Kommando ikke implementert"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Command parameter not implemented"
 msgstr "Kommandoparameter ikke implementert"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "System status, or system help reply"
 msgstr "Systemstatus, eller svar på systemhjelp"
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Help message"
 msgstr "Hjelp-melding"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "Service ready"
 msgstr "Tjeneste klar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Service closing transmission channel"
 msgstr "Tjenesten lukker sendekanalen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "Service not available, closing transmission channel"
 msgstr "Tjenesten er ikke tilgjengelig, lukker sendekanalen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested mail action okay, completed"
 msgstr "Forespurt e-post handling er ok, fullført"
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "User not local; will forward to <forward-path>"
 msgstr "Ikke lokal bruker; videresender til <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Forespurt e-post handling er ikke utført: postboks ikke tilgjengelig"
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Forespurt handling ikke utført: postboks ikke tilgjengelig"
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action aborted: error in processing"
 msgstr "Forespurt handling avbrutt: feil i prosessering"
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "User not local; please try <forward-path>"
 msgstr "Ikke lokal bruker; vennligst prøv <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Forespurt handling ikke utført: utilstrekkelig lagringsplass"
 
-#: camel/providers/smtp/camel-smtp-transport.c:205
+#: camel/providers/smtp/camel-smtp-transport.c:210
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Forespurt e-post handling avbrutt: lagringsallokering oversteget"
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Forespurt handling ikke utført: postboksnavn ikke tillatt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:214
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Start e-post input; slutt med <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "Transaction failed"
 msgstr "Transaksjonen feilet"
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "A password transition is needed"
 msgstr "Passordoverføring kreves"
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:222
 msgid "Authentication mechanism is too weak"
 msgstr "Autentiseringsmekanismen er for svak"
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:224
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Kryptering kreves for forespurt autentiseringsmekanisme."
 
-#: camel/providers/smtp/camel-smtp-transport.c:221
+#: camel/providers/smtp/camel-smtp-transport.c:226
 msgid "Temporary authentication failure"
 msgstr "Midlertidig autentiseringsfeil"
 
-#: camel/providers/smtp/camel-smtp-transport.c:223
+#: camel/providers/smtp/camel-smtp-transport.c:228
 msgid "Authentication required"
 msgstr "Autentisering kreves"
 
-#: camel/providers/smtp/camel-smtp-transport.c:320
+#: camel/providers/smtp/camel-smtp-transport.c:304
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr "Feil ved Welcome-svar: %s: mulig ikke-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:383
+#: camel/providers/smtp/camel-smtp-transport.c:339
+#: camel/providers/smtp/camel-smtp-transport.c:381
+#, c-format
+msgid "Failed to connect to SMTP server %s in secure mode: %s"
+msgstr "Kunne ikke koble til SMTP-tjener %s i sikker modus: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:340
+msgid "server does not appear to support SSL"
+msgstr "tjeneren ser ikke ut til å støtte SSL"
+
+#: camel/providers/smtp/camel-smtp-transport.c:354
+#, c-format
+msgid "STARTTLS request timed out: %s"
+msgstr "Tidsavbrudd for STARTTLS-forespørsel: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:369
+msgid "STARTTLS response error"
+msgstr "Feil i STARTTLS-svar"
+
+#: camel/providers/smtp/camel-smtp-transport.c:465
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr "SMTP-tjener %s støtter ikke etterspurt autentiseringstype %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:421
+#: camel/providers/smtp/camel-smtp-transport.c:503
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sVennligst skriv inn SMTP-passord for %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:442
+#: camel/providers/smtp/camel-smtp-transport.c:524
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -8895,92 +8977,92 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:565
+#: camel/providers/smtp/camel-smtp-transport.c:649
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-tjener %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:567
+#: camel/providers/smtp/camel-smtp-transport.c:651
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP e-postlevering via %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:591
+#: camel/providers/smtp/camel-smtp-transport.c:675
 msgid "Cannot send message: sender address not defined."
 msgstr "Kan ikke sende melding: senderadresse ikke definert."
 
-#: camel/providers/smtp/camel-smtp-transport.c:598
+#: camel/providers/smtp/camel-smtp-transport.c:682
 msgid "Cannot send message: sender address not valid."
 msgstr "Kan ikke sende melding: senderadresse ikke gyldig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:603 mail/mail-ops.c:603
+#: camel/providers/smtp/camel-smtp-transport.c:687 mail/mail-ops.c:604
 msgid "Sending message"
 msgstr "Sender melding"
 
-#: camel/providers/smtp/camel-smtp-transport.c:614
+#: camel/providers/smtp/camel-smtp-transport.c:698
 msgid "Cannot send message: no recipients defined."
 msgstr "Kan ikke sende melding: ingen mottakere definert."
 
-#: camel/providers/smtp/camel-smtp-transport.c:624
+#: camel/providers/smtp/camel-smtp-transport.c:708
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Kan ikke sende melding: en eller flere ugyldige mottakere"
 
-#: camel/providers/smtp/camel-smtp-transport.c:798
+#: camel/providers/smtp/camel-smtp-transport.c:882
 msgid "SMTP Greeting"
 msgstr "SMTP-velkomst"
 
-#: camel/providers/smtp/camel-smtp-transport.c:820
+#: camel/providers/smtp/camel-smtp-transport.c:908
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Tidsavbrudd for HELO-forespørsel: %s: ikke-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:840
+#: camel/providers/smtp/camel-smtp-transport.c:928
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Feil ved HELO-svar: %s: ikke-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:884
+#: camel/providers/smtp/camel-smtp-transport.c:976
 msgid "SMTP Authentication"
 msgstr "SMTP-autentisering"
 
-#: camel/providers/smtp/camel-smtp-transport.c:890
+#: camel/providers/smtp/camel-smtp-transport.c:982
 msgid "Error creating SASL authentication object."
 msgstr "Feil under oppretting av SASL-autentiseringsobjekt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:905
-#: camel/providers/smtp/camel-smtp-transport.c:917
+#: camel/providers/smtp/camel-smtp-transport.c:999
+#: camel/providers/smtp/camel-smtp-transport.c:1011
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Tidsavbrudd for AUTH-forespørsel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:926
+#: camel/providers/smtp/camel-smtp-transport.c:1020
 msgid "AUTH request failed."
 msgstr "AUTH-forespørsel feilet."
 
-#: camel/providers/smtp/camel-smtp-transport.c:974
+#: camel/providers/smtp/camel-smtp-transport.c:1081
 msgid "Bad authentication response from server.\n"
 msgstr "Ugyldig svar på autentisering fra tjener.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1000
+#: camel/providers/smtp/camel-smtp-transport.c:1107
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Tidsavbrudd for «MAIL FROM»-forespørsel: %s: melding ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1014
+#: camel/providers/smtp/camel-smtp-transport.c:1121
 msgid "MAIL FROM response error"
 msgstr "Feil i «MAIL FROM»-svar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1039
+#: camel/providers/smtp/camel-smtp-transport.c:1146
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Tidsavbrudd for «RCPT TO»-forespørsel: %s: melding ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1055
+#: camel/providers/smtp/camel-smtp-transport.c:1162
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> feilet"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1091
+#: camel/providers/smtp/camel-smtp-transport.c:1198
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Tidsavbrudd for DATA-forespørsel: %s: melding ikke sendt."
@@ -8988,36 +9070,36 @@ msgstr "Tidsavbrudd for DATA-forespørsel: %s: melding ikke sendt."
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1212
 msgid "DATA response error"
 msgstr "Feil i DATA-svar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1145
-#: camel/providers/smtp/camel-smtp-transport.c:1163
+#: camel/providers/smtp/camel-smtp-transport.c:1252
+#: camel/providers/smtp/camel-smtp-transport.c:1270
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "Tidsavbrudd for DATA-send: meldingsterminering: %s: melding ikke sendt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1177
+#: camel/providers/smtp/camel-smtp-transport.c:1284
 msgid "DATA termination response error"
 msgstr "Feil i DATA-termineringssvar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1200
+#: camel/providers/smtp/camel-smtp-transport.c:1307
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Tidsavbrudd for RSET-forespørsel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1214
+#: camel/providers/smtp/camel-smtp-transport.c:1321
 msgid "RSET response error"
 msgstr "Feil i RSET-svar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1237
+#: camel/providers/smtp/camel-smtp-transport.c:1344
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "Tidsavbrudd for QUIT-forespørsel: %s: ikke-fatal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1251
+#: camel/providers/smtp/camel-smtp-transport.c:1358
 msgid "QUIT response error"
 msgstr "Feil i QUIT-svar"
 
@@ -9046,7 +9128,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:147
+#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:149
 msgid "attachment"
 msgstr "vedlegg"
 
@@ -9148,7 +9230,7 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Legg ved en fil"
 
-#: composer/e-msg-composer.c:710
+#: composer/e-msg-composer.c:715
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -9157,38 +9239,38 @@ msgstr ""
 "Feil under lesing av fil %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:927
+#: composer/e-msg-composer.c:955
 msgid "Save as..."
 msgstr "Lagre som..."
 
-#: composer/e-msg-composer.c:936
+#: composer/e-msg-composer.c:964
 msgid "Warning!"
 msgstr "Advarsel!"
 
-#: composer/e-msg-composer.c:940
+#: composer/e-msg-composer.c:968
 msgid "File exists, overwrite?"
 msgstr "Filen eksisterer, overskriv?"
 
-#: composer/e-msg-composer.c:962
+#: composer/e-msg-composer.c:990
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Feil under lagring av fil: %s"
 
-#: composer/e-msg-composer.c:981
+#: composer/e-msg-composer.c:1009
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Feil under lasting av fil: %s"
 
-#: composer/e-msg-composer.c:1012
+#: composer/e-msg-composer.c:1040
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Feil under tilgang til fil: %s"
 
-#: composer/e-msg-composer.c:1020
+#: composer/e-msg-composer.c:1048
 msgid "Unable to retrieve message from editor"
 msgstr "Kunne ikke hente melding fra editor"
 
-#: composer/e-msg-composer.c:1027
+#: composer/e-msg-composer.c:1055
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -9197,7 +9279,7 @@ msgstr ""
 "Kunne ikke søke i fil: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1034
+#: composer/e-msg-composer.c:1062
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -9206,7 +9288,7 @@ msgstr ""
 "Kunne ikke kutte av fil: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1043
+#: composer/e-msg-composer.c:1071
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -9215,7 +9297,7 @@ msgstr ""
 "Feil under autolagring av av melding: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1145
+#: composer/e-msg-composer.c:1173
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -9223,7 +9305,7 @@ msgstr ""
 "Ximian Evolution har funnet ikke-lagrede filer fra en tidligere sesjon.\n"
 "Vil du prøve å gjenopprette dem?"
 
-#: composer/e-msg-composer.c:1303
+#: composer/e-msg-composer.c:1331
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -9233,23 +9315,23 @@ msgstr ""
 "\n"
 "Vil du lagre endringene?"
 
-#: composer/e-msg-composer.c:1310
+#: composer/e-msg-composer.c:1338
 msgid "Warning: Modified Message"
 msgstr "Advarsel: Endret melding"
 
-#: composer/e-msg-composer.c:1333
+#: composer/e-msg-composer.c:1361
 msgid "Open file"
 msgstr "Åpne fil"
 
-#: composer/e-msg-composer.c:1482
+#: composer/e-msg-composer.c:1510
 msgid "Insert File"
 msgstr "Sett inn fil"
 
-#: composer/e-msg-composer.c:1868 composer/e-msg-composer.c:2462
+#: composer/e-msg-composer.c:2044 composer/e-msg-composer.c:2641
 msgid "Compose a message"
 msgstr "Skriv en melding"
 
-#: composer/e-msg-composer.c:2479
+#: composer/e-msg-composer.c:2658
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -9257,7 +9339,7 @@ msgstr ""
 "Kunne ikke opprette vindu for ny melding:\n"
 "Klarte ikke å aktivere kontroll for adressevelger."
 
-#: composer/e-msg-composer.c:2502 composer/e-msg-composer.c:2557
+#: composer/e-msg-composer.c:2681 composer/e-msg-composer.c:2736
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -9429,7 +9511,7 @@ msgid "%I %p"
 msgstr "%I %p"
 
 #: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
 msgid "Evolution component for the executive summary."
 msgstr "Evolution-komponent for sammendrag."
 
@@ -9703,7 +9785,7 @@ msgstr " siden"
 msgid "ago"
 msgstr "siden"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:996
+#: filter/filter-datespec.c:711 mail/message-list.c:1027
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
@@ -9733,7 +9815,7 @@ msgstr ""
 "Vennligst gå tilbake og spesifiser en gyldig mappe for levering av e-post."
 
 #: filter/filter-folder.c:239 filter/vfolder-rule.c:365
-#: mail/mail-account-gui.c:849
+#: mail/mail-account-gui.c:858
 msgid "Select Folder"
 msgstr "Velg mappe"
 
@@ -9754,7 +9836,7 @@ msgstr ""
 "Feil i regulært uttrykk «%s»:\n"
 "%s"
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:41
+#: filter/filter-part.c:518 shell/evolution-test-component.c:45
 msgid "Test"
 msgstr "Test"
 
@@ -9852,187 +9934,195 @@ msgid "Attachments"
 msgstr "Vedlegg"
 
 #: filter/libfilter-i18n.h:5
+msgid "Beep"
+msgstr "Pip"
+
+#: filter/libfilter-i18n.h:6
+msgid "contains"
+msgstr "inneholder"
+
+#: filter/libfilter-i18n.h:7
 msgid "Copy to Folder"
 msgstr "Kopier til mappe"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:8
 msgid "Date received"
 msgstr "Dato mottatt"
 
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:9
 msgid "Date sent"
 msgstr "Dato sendt"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:11
 msgid "Deleted"
 msgstr "Slettet"
 
-#: filter/libfilter-i18n.h:10
-msgid "Do Not Exist"
-msgstr "Eksisterer ikke"
-
-#: filter/libfilter-i18n.h:11
-msgid "Draft"
-msgstr "Skisse"
-
 #: filter/libfilter-i18n.h:12
-msgid "Execute Shell Command"
-msgstr "Kjør skall-kommando"
+msgid "does not contain"
+msgstr "inneholder ikke"
 
 #: filter/libfilter-i18n.h:13
-msgid "Exist"
-msgstr "Eksisterer"
+msgid "does not end with"
+msgstr "slutter ikke med"
 
 #: filter/libfilter-i18n.h:14
-msgid "Expression"
-msgstr "Uttrykk"
+msgid "does not exist"
+msgstr "eksisterer ikke"
 
 #: filter/libfilter-i18n.h:15
-msgid "Follow Up"
-msgstr "Følg opp"
+msgid "does not sound like"
+msgstr "ligner ikke"
 
 #: filter/libfilter-i18n.h:16
-msgid "Important"
-msgstr "Viktig"
+msgid "does not start with"
+msgstr "starter ikke med"
 
 #: filter/libfilter-i18n.h:17
-msgid "Mailing list"
-msgstr "E-postliste"
+msgid "Do Not Exist"
+msgstr "Eksisterer ikke"
 
 #: filter/libfilter-i18n.h:18
-msgid "Message Body"
-msgstr "Meldingskropp"
+msgid "Draft"
+msgstr "Skisse"
 
 #: filter/libfilter-i18n.h:19
-msgid "Message Header"
-msgstr "Meldingshode"
+msgid "ends with"
+msgstr "slutter med"
 
 #: filter/libfilter-i18n.h:20
-msgid "Move to Folder"
-msgstr "Flytt til mappe"
+msgid "Execute Shell Command"
+msgstr "Kjør skall-kommando"
 
 #: filter/libfilter-i18n.h:21
-msgid "Read"
-msgstr "Les"
+msgid "Exist"
+msgstr "Eksisterer"
 
 #: filter/libfilter-i18n.h:22
-msgid "Recipients"
-msgstr "Mottakere"
+msgid "exists"
+msgstr "eksisterer"
 
 #: filter/libfilter-i18n.h:23
-msgid "Regex Match"
-msgstr "Treff på vanlig uttrykk"
+msgid "Expression"
+msgstr "Uttrykk"
 
 #: filter/libfilter-i18n.h:24
-msgid "Replied to"
-msgstr "Svart til"
+msgid "Follow Up"
+msgstr "Følg opp"
 
-#: filter/libfilter-i18n.h:25 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:8
-msgid "Score"
-msgstr "Gi poeng"
+#: filter/libfilter-i18n.h:25
+msgid "Important"
+msgstr "Viktig"
 
-#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1552
-msgid "Sender"
-msgstr "Avsender"
+#: filter/libfilter-i18n.h:26
+msgid "is"
+msgstr "er"
 
 #: filter/libfilter-i18n.h:27
-msgid "Set Status"
-msgstr "Sett status"
+msgid "is after"
+msgstr "er etter"
 
 #: filter/libfilter-i18n.h:28
-msgid "Size (kB)"
-msgstr "Størrelse (kB)"
+msgid "is before"
+msgstr "er før"
 
 #: filter/libfilter-i18n.h:29
-msgid "Source Account"
-msgstr "Kildekonto"
+msgid "is Flagged"
+msgstr "er merket"
 
 #: filter/libfilter-i18n.h:30
-msgid "Specific header"
-msgstr "Spesifikk header"
+msgid "is greater than"
+msgstr "er større enn"
+
+#: filter/libfilter-i18n.h:31
+msgid "is less than"
+msgstr "er mindre enn"
 
 #: filter/libfilter-i18n.h:32
-msgid "Stop Processing"
-msgstr "Stopp behandling"
+msgid "is not"
+msgstr "er ikke"
 
-#: filter/libfilter-i18n.h:33 mail/mail-format.c:932
-#: mail/message-list.etspec.h:12
-msgid "Subject"
-msgstr "Emne"
+#: filter/libfilter-i18n.h:33
+msgid "is not Flagged"
+msgstr "er ikke merket"
 
 #: filter/libfilter-i18n.h:34
-msgid "contains"
-msgstr "inneholder"
+msgid "Mailing list"
+msgstr "E-postliste"
 
 #: filter/libfilter-i18n.h:35
-msgid "does not contain"
-msgstr "inneholder ikke"
+msgid "Message Body"
+msgstr "Meldingskropp"
 
 #: filter/libfilter-i18n.h:36
-msgid "does not end with"
-msgstr "slutter ikke med"
+msgid "Message Header"
+msgstr "Meldingshode"
 
 #: filter/libfilter-i18n.h:37
-msgid "does not exist"
-msgstr "eksisterer ikke"
+msgid "Move to Folder"
+msgstr "Flytt til mappe"
 
 #: filter/libfilter-i18n.h:38
-msgid "does not sound like"
-msgstr "ligner ikke"
+msgid "Play Sound"
+msgstr "Spill lyd"
 
 #: filter/libfilter-i18n.h:39
-msgid "does not start with"
-msgstr "starter ikke med"
+msgid "Read"
+msgstr "Les"
 
 #: filter/libfilter-i18n.h:40
-msgid "ends with"
-msgstr "slutter med"
+msgid "Recipients"
+msgstr "Mottakere"
 
 #: filter/libfilter-i18n.h:41
-msgid "exists"
-msgstr "eksisterer"
+msgid "Regex Match"
+msgstr "Treff på vanlig uttrykk"
 
 #: filter/libfilter-i18n.h:42
-msgid "is Flagged"
-msgstr "er merket"
+msgid "Replied to"
+msgstr "Svart til"
 
-#: filter/libfilter-i18n.h:43
-msgid "is after"
-msgstr "er etter"
+#: filter/libfilter-i18n.h:43 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:8
+msgid "Score"
+msgstr "Gi poeng"
 
-#: filter/libfilter-i18n.h:44
-msgid "is before"
-msgstr "er før"
+#: filter/libfilter-i18n.h:44 mail/mail-callbacks.c:1559
+msgid "Sender"
+msgstr "Avsender"
 
 #: filter/libfilter-i18n.h:45
-msgid "is greater than"
-msgstr "er større enn"
+msgid "Set Status"
+msgstr "Sett status"
 
 #: filter/libfilter-i18n.h:46
-msgid "is less than"
-msgstr "er mindre enn"
+msgid "Size (kB)"
+msgstr "Størrelse (kB)"
 
 #: filter/libfilter-i18n.h:47
-msgid "is not Flagged"
-msgstr "er ikke merket"
+msgid "sounds like"
+msgstr "lyder som"
 
 #: filter/libfilter-i18n.h:48
-msgid "is not"
-msgstr "er ikke"
+msgid "Source Account"
+msgstr "Kildekonto"
 
 #: filter/libfilter-i18n.h:49
-msgid "is"
-msgstr "er"
+msgid "Specific header"
+msgstr "Spesifikk header"
 
 #: filter/libfilter-i18n.h:50
-msgid "sounds like"
-msgstr "lyder som"
-
-#: filter/libfilter-i18n.h:51
 msgid "starts with"
 msgstr "starter med"
 
+#: filter/libfilter-i18n.h:52
+msgid "Stop Processing"
+msgstr "Stopp behandling"
+
+#: filter/libfilter-i18n.h:53 mail/mail-format.c:938
+#: mail/message-list.etspec.h:12
+msgid "Subject"
+msgstr "Emne"
+
 #: filter/rule-editor.c:179
 msgid "Rules"
 msgstr "Regler"
@@ -10189,35 +10279,26 @@ msgid "Folder containing mail"
 msgstr "Mappe som inneholder e-post"
 
 #: mail/component-factory.c:101
-msgid "Mail storage folder (internal)"
-msgstr "Mappe for meldingslager (intern)"
-
-#: mail/component-factory.c:102
 msgid "Virtual Trash"
 msgstr "Virtuell søppel"
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:101
 msgid "Virtual Trash folder"
 msgstr "Virtuelle søppelmappe"
 
-#: mail/component-factory.c:129
-#, c-format
-msgid "Cannot connect to store: %s"
-msgstr "Kunne ikke koble til lager: %s"
-
-#: mail/component-factory.c:147
+#: mail/component-factory.c:117
 msgid "This folder cannot contain messages."
 msgstr "Denne mappen kan ikke inneholde meldinger."
 
-#: mail/component-factory.c:439
+#: mail/component-factory.c:401
 msgid "Properties..."
 msgstr "Egenskaper ..."
 
-#: mail/component-factory.c:439
+#: mail/component-factory.c:401
 msgid "Change this folder's properties"
 msgstr "Endre denne mappens egenskaper"
 
-#: mail/component-factory.c:800
+#: mail/component-factory.c:762
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -10225,40 +10306,44 @@ msgstr ""
 "Noen av dine innstillinger for e-post ser ut til å være korrupt. Vennligst "
 "sjekk at alt er i orden."
 
-#: mail/component-factory.c:971
+#: mail/component-factory.c:933
 msgid "New Mail Message"
 msgstr "Ny e-post melding"
 
-#: mail/component-factory.c:971 ui/evolution-mail-global.xml.h:19
+#: mail/component-factory.c:933 ui/evolution-mail-global.xml.h:19
 msgid "_Mail Message"
 msgstr "Send _melding"
 
-#: mail/component-factory.c:998
+#: mail/component-factory.c:960
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan ikke initiere Evolutions e-postkomponent."
 
-#: mail/component-factory.c:1007
+#: mail/component-factory.c:969
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Kan ikke initiere Evolutions konfigurasjonskomponent for e-post."
 
-#: mail/component-factory.c:1013
+#: mail/component-factory.c:975
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Kan ikke initiere Evolutions mappeinfo-komponent."
 
-#: mail/component-factory.c:1229
+#: mail/component-factory.c:1175 mail/component-factory.c:1206
+msgid "Connecting..."
+msgstr "Kobler til..."
+
+#: mail/component-factory.c:1216
 msgid "Cannot register storage with shell"
 msgstr "Kan ikke registrere lagring i skallet"
 
-#: mail/folder-browser-ui.c:327
+#: mail/folder-browser-ui.c:348
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Egenskaper for «%s»"
 
-#: mail/folder-browser-ui.c:329
+#: mail/folder-browser-ui.c:350
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: mail/folder-browser.c:299 mail/mail-display.c:300 mail/mail-display.c:809
+#: mail/folder-browser.c:299 mail/mail-display.c:331 mail/mail-display.c:840
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Kunne ikke opprette midlertidig katalog: %s"
@@ -10303,140 +10388,136 @@ msgstr "%d sendt"
 msgid "%d total"
 msgstr "%d totalt"
 
-#: mail/folder-browser.c:1062
+#: mail/folder-browser.c:1079
 msgid "Create vFolder from Search"
 msgstr "Lag vFolder fra søk"
 
-#: mail/folder-browser.c:1446
+#: mail/folder-browser.c:1463
 msgid "VFolder on _Subject"
 msgstr "VFolder på e_mne"
 
-#: mail/folder-browser.c:1447
+#: mail/folder-browser.c:1464
 msgid "VFolder on Se_nder"
 msgstr "VFolder for se_nder"
 
-#: mail/folder-browser.c:1448
+#: mail/folder-browser.c:1465
 msgid "VFolder on _Recipients"
 msgstr "VFolder for mottake_re"
 
-#: mail/folder-browser.c:1449
+#: mail/folder-browser.c:1466
 msgid "VFolder on Mailing _List"
 msgstr "VFolder på e-post_liste"
 
-#: mail/folder-browser.c:1453
+#: mail/folder-browser.c:1470
 msgid "Filter on Sub_ject"
 msgstr "Filtrer på em_ne"
 
-#: mail/folder-browser.c:1454
+#: mail/folder-browser.c:1471
 msgid "Filter on Sen_der"
 msgstr "Filtrer på sen_der"
 
-#: mail/folder-browser.c:1455
+#: mail/folder-browser.c:1472
 msgid "Filter on Re_cipients"
 msgstr "Filtrer på motta_ker"
 
-#: mail/folder-browser.c:1456
+#: mail/folder-browser.c:1473 mail/folder-browser.c:1710
 msgid "Filter on _Mailing List"
 msgstr "Filtrer på e-_postliste"
 
-#: mail/folder-browser.c:1464 ui/evolution-mail-message.xml.h:98
+#: mail/folder-browser.c:1481 ui/evolution-mail-message.xml.h:96
 msgid "_Edit as New Message..."
 msgstr "R_ediger som ny melding..."
 
-#: mail/folder-browser.c:1465 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1482 ui/evolution-mail-message.xml.h:110
 msgid "_Save As..."
 msgstr "Lagre _som..."
 
-#: mail/folder-browser.c:1466
+#: mail/folder-browser.c:1483
 msgid "_Print"
 msgstr "S_kriv ut"
 
-#: mail/folder-browser.c:1470 ui/evolution-mail-message.xml.h:108
+#: mail/folder-browser.c:1487 ui/evolution-mail-message.xml.h:109
 msgid "_Reply to Sender"
 msgstr "Sva_r til sender"
 
-#: mail/folder-browser.c:1471 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1488 ui/evolution-mail-message.xml.h:73
 msgid "Reply to _List"
 msgstr "Svar til _listen"
 
-#: mail/folder-browser.c:1472 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1489 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: mail/folder-browser.c:1473
+#: mail/folder-browser.c:1490
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: mail/folder-browser.c:1477 ui/evolution-mail-message.xml.h:32
-msgid "Follow _Up..."
-msgstr "Følg _opp..."
+#: mail/folder-browser.c:1494
+msgid "Follo_w Up..."
+msgstr "Føl_g opp..."
 
-#: mail/folder-browser.c:1478
-msgid "Flag Com_pleted"
-msgstr "Merk som _fullført"
+#: mail/folder-browser.c:1495
+msgid "Fla_g Completed"
+msgstr "Mer_k som fullført"
 
-#: mail/folder-browser.c:1479
-msgid "Clear Fla_g"
-msgstr "Fjern fla_gg"
+#: mail/folder-browser.c:1496
+msgid "Cl_ear Flag"
+msgstr "Fj_ern flagg"
 
 #. separator here?
-#: mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1500 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Mer_k som lest"
 
-#: mail/folder-browser.c:1484 ui/evolution-mail-message.xml.h:44
-msgid "Mark as U_nread"
+#: mail/folder-browser.c:1501
+msgid "Mark as _Unread"
 msgstr "Merk som _ulest"
 
-#: mail/folder-browser.c:1485
+#: mail/folder-browser.c:1502
 msgid "Mark as _Important"
 msgstr "Merk som v_iktig"
 
-#: mail/folder-browser.c:1486
-msgid "Mark as Unim_portant"
-msgstr "Merk som uv_iktig"
+#: mail/folder-browser.c:1503
+msgid "_Mark as Unimportant"
+msgstr "_Merk som uviktig"
 
-#: mail/folder-browser.c:1490 ui/evolution-addressbook.xml.h:40
-msgid "_Move to Folder..."
+#: mail/folder-browser.c:1507
+msgid "Mo_ve to Folder..."
 msgstr "Fl_ytt til mappe..."
 
-#: mail/folder-browser.c:1491 ui/evolution-addressbook.xml.h:37
+#: mail/folder-browser.c:1508 ui/evolution-addressbook.xml.h:36
 msgid "_Copy to Folder..."
 msgstr "K_opier til mappe..."
 
-#: mail/folder-browser.c:1493 ui/evolution-mail-message.xml.h:111
-msgid "_Undelete"
+#: mail/folder-browser.c:1510
+msgid "U_ndelete"
 msgstr "A_ngre slett"
 
-#: mail/folder-browser.c:1497 ui/evolution-mail-message.xml.h:1
-msgid "Add Sender to Address Book"
-msgstr "Legg til sender i adressebok"
-
-#: mail/folder-browser.c:1500
-msgid "Apply Filters"
-msgstr "Påfør filtre"
+#: mail/folder-browser.c:1514
+msgid "Add Sender to Address_book"
+msgstr "Legg til sender i adresse_bok"
 
-#: mail/folder-browser.c:1502
-msgid "Create Ru_le From Message"
-msgstr "Lage rege_l fra melding"
+#: mail/folder-browser.c:1517
+msgid "Appl_y Filters"
+msgstr "_Påfør filtre"
 
-#: mail/folder-browser.c:1693
-msgid "Filter on Mailing List"
-msgstr "Filtrer etter e-postliste"
+#: mail/folder-browser.c:1519
+msgid "Crea_te Rule From Message"
+msgstr "Oppre_tt regel fra melding"
 
-#: mail/folder-browser.c:1694
-msgid "VFolder on Mailing List"
-msgstr "VFolder på e-postliste"
+#: mail/folder-browser.c:1711
+msgid "VFolder on M_ailing List"
+msgstr "VFolder på _e-postliste"
 
-#: mail/folder-browser.c:1696
+#: mail/folder-browser.c:1713
 #, c-format
-msgid "Filter on Mailing List (%s)"
-msgstr "Filtrer etter e-postliste (%s)"
+msgid "Filter on _Mailing List (%s)"
+msgstr "Filtrer _på e-postliste (%s)"
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1714
 #, c-format
-msgid "VFolder on Mailing List (%s)"
-msgstr "VFolder på e-postliste (%s)"
+msgid "VFolder on M_ailing List (%s)"
+msgstr "VFolder _på e-postliste (%s)"
 
 #: mail/folder-browser.h:26
 msgid "Default"
@@ -10518,58 +10599,67 @@ msgstr "Evolution nyhetsredigerer"
 msgid "Evolution Account Editor"
 msgstr "Kontoredigering for Evolution"
 
-#: mail/mail-account-gui.c:974
-msgid "Could not save signature file."
-msgstr "Kunne ikke lagre signaturfil."
+#: mail/mail-account-gui.c:52 mail/mail-config.glade.h:15
+msgid "Always"
+msgstr "Alltid"
+
+#: mail/mail-account-gui.c:53 mail/mail-config.glade.h:125
+msgid "Whenever Possible"
+msgstr "Når mulig"
 
-#: mail/mail-account-gui.c:1051
-msgid "Save signature"
-msgstr "Lagre signatur"
+#: mail/mail-account-gui.c:54 mail/mail-config.glade.h:71
+msgid "Never"
+msgstr "Aldri"
 
-#: mail/mail-account-gui.c:1057
+#: mail/mail-account-gui.c:1039 mail/mail-account-gui.c:1040
+#: mail/mail-account-gui.c:1279 mail/mail-account-gui.c:1284
+#: mail/mail-config.glade.h:88
+msgid "Random"
+msgstr "Tilfeldig"
+
+#: mail/mail-account-gui.c:1109 mail/mail-account-gui.c:1124
+#: mail/mail-accounts.c:904
 msgid ""
-"This signature has been changed, but hasn't been saved.\n"
-"\n"
-"Do you wish to save your changes?"
+"Please specify signature filename\n"
+"in Andvanced section of signature settings."
 msgstr ""
-"Denne signaturen er endret, men har ikke blitt lagret..\n"
-"\n"
-"Vil du lagre endringene?"
+"Vennligst oppgi filnavn for signatur\n"
+"under avanserte innstillinger for signaturer."
 
-#: mail/mail-account-gui.c:1681
+#: mail/mail-account-gui.c:1790
 msgid "You may not create two accounts with the same name."
 msgstr "Du kan ikke opprette to kontoer med samme navn."
 
-#: mail/mail-accounts.c:149
+#: mail/mail-accounts.c:152
 msgid " (default)"
 msgstr " (forvalgt)"
 
-#: mail/mail-accounts.c:194
+#: mail/mail-accounts.c:197
 msgid "Disable"
 msgstr "Deaktiver"
 
-#: mail/mail-accounts.c:196
+#: mail/mail-accounts.c:199
 msgid "Enable"
 msgstr "Aktiver"
 
-#: mail/mail-accounts.c:292
+#: mail/mail-accounts.c:303
 msgid "Are you sure you want to delete this account?"
 msgstr "Er du sikker på at du vil slette denne kontoen?"
 
-#: mail/mail-accounts.c:296
+#: mail/mail-accounts.c:307
 msgid "Don't delete"
 msgstr "Ikke slett"
 
-#: mail/mail-accounts.c:299
+#: mail/mail-accounts.c:310
 msgid "Really delete account?"
 msgstr "Vil du virkelig slette kontoen?"
 
-#: mail/mail-accounts.c:531 mail/mail-accounts.c:535
+#: mail/mail-accounts.c:543 mail/mail-accounts.c:547
 msgid "Are you sure you want to delete this news account?"
 msgstr "Er du sikker på at du vil slette denne diskusjonsgruppekontoen?"
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:823 mail/mail-config.glade.h:50
+#: mail/mail-accounts.c:1247 mail/mail-config.glade.h:64
 msgid "Mail Settings"
 msgstr "Innstillinger for e-post"
 
@@ -10597,7 +10687,7 @@ msgstr "%s e-postliste"
 msgid "Add Filter Rule"
 msgstr "Legg til filterregel"
 
-#: mail/mail-callbacks.c:96
+#: mail/mail-callbacks.c:97
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -10609,7 +10699,7 @@ msgstr ""
 "motta eller skrive meldinger.\n"
 "Vil du konfigurere den nå?"
 
-#: mail/mail-callbacks.c:145
+#: mail/mail-callbacks.c:146
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -10617,7 +10707,7 @@ msgstr ""
 "Du må konfigurere en identitet\n"
 "før du kan skrive e-post."
 
-#: mail/mail-callbacks.c:159
+#: mail/mail-callbacks.c:160
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -10625,12 +10715,12 @@ msgstr ""
 "Du må konfigurere en e-post-transport\n"
 "før du kan skrive e-post."
 
-#: mail/mail-callbacks.c:189
+#: mail/mail-callbacks.c:190
 msgid "You have not set a mail transport method"
 msgstr "Du har ikke satt en transportmetode for e-post"
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:224
+#: mail/mail-callbacks.c:225
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -10638,11 +10728,11 @@ msgstr ""
 "Du sender en melding i HMTL-format, men følgende mottakeres ønsker ikke å "
 "motta meldinger i HTML-format:\n"
 
-#: mail/mail-callbacks.c:239
+#: mail/mail-callbacks.c:240
 msgid "Send anyway?"
 msgstr "Send likevel?"
 
-#: mail/mail-callbacks.c:281
+#: mail/mail-callbacks.c:282
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -10650,7 +10740,7 @@ msgstr ""
 "Denne meldingen har ikke emne.\n"
 "Send likevel?"
 
-#: mail/mail-callbacks.c:325
+#: mail/mail-callbacks.c:326
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -10658,11 +10748,11 @@ msgstr ""
 "Siden kontaktlisten du sender til er konfigurert til å skjule listens "
 "adresser vil denne meldingen kun inneholde Bcc mottakere."
 
-#: mail/mail-callbacks.c:329
+#: mail/mail-callbacks.c:330
 msgid "This message contains only Bcc recipients."
 msgstr "Denne meldingen inneholder kun Bcc mottakere."
 
-#: mail/mail-callbacks.c:333
+#: mail/mail-callbacks.c:334
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -10672,15 +10762,15 @@ msgstr ""
 "«Apparently-To»-header.\n"
 "Send likevel?"
 
-#: mail/mail-callbacks.c:438
+#: mail/mail-callbacks.c:439
 msgid "You must specify recipients in order to send this message."
 msgstr "Du må spesifisere mottakere for å kunne sende denne meldingen."
 
-#: mail/mail-callbacks.c:527
+#: mail/mail-callbacks.c:528
 msgid "You must configure an account before you can send this email."
 msgstr "Du må konfigurere en konto før du kan sender denne meldingen."
 
-#: mail/mail-callbacks.c:646
+#: mail/mail-callbacks.c:647
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -10688,28 +10778,28 @@ msgstr ""
 "Kunne ikke åpne skisse-mappen for denne kontoen.\n"
 "Vil du bruke standard skisse-mappe?"
 
-#: mail/mail-callbacks.c:979
+#: mail/mail-callbacks.c:980
 msgid "an unknown sender"
 msgstr "en ukjent avsender"
 
-#: mail/mail-callbacks.c:983
+#: mail/mail-callbacks.c:984
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "%a, %Y-%m-%d kl. %H:%M skrev %%s:"
 
-#: mail/mail-callbacks.c:1429 mail/message-browser.c:130
+#: mail/mail-callbacks.c:1436 mail/message-browser.c:130
 msgid "Move message(s) to"
 msgstr "Flytt melding(er) til"
 
-#: mail/mail-callbacks.c:1431 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1438 mail/message-browser.c:132
 msgid "Copy message(s) to"
 msgstr "Kopier melding(er) til"
 
-#: mail/mail-callbacks.c:2077
+#: mail/mail-callbacks.c:2086
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Er du sikker på at du vil redigere alle %d meldingene?"
 
-#: mail/mail-callbacks.c:2102
+#: mail/mail-callbacks.c:2111
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -10717,7 +10807,7 @@ msgstr ""
 "Du kan kun redigere meldinger lagret\n"
 "i Skisser-katalogen."
 
-#: mail/mail-callbacks.c:2141
+#: mail/mail-callbacks.c:2150
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -10725,28 +10815,28 @@ msgstr ""
 "Du kan kun sende meldinger på nytt\n"
 "som er lagret i sendt-katalogen."
 
-#: mail/mail-callbacks.c:2155
+#: mail/mail-callbacks.c:2164
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Er du sikker på at du vil sende alle %d meldingene på nytt?"
 
-#: mail/mail-callbacks.c:2181
+#: mail/mail-callbacks.c:2190
 msgid "No Message Selected"
 msgstr "Ingen melding valgt"
 
-#: mail/mail-callbacks.c:2280
+#: mail/mail-callbacks.c:2289
 msgid "Save Message As..."
 msgstr "Lagre melding som..."
 
-#: mail/mail-callbacks.c:2282
+#: mail/mail-callbacks.c:2291
 msgid "Save Messages As..."
 msgstr "Lagre meldinger som..."
 
-#: mail/mail-callbacks.c:2344
+#: mail/mail-callbacks.c:2353
 msgid "Go to next folder with unread messages?"
 msgstr "Gå til neste mappe med uleste meldinger?"
 
-#: mail/mail-callbacks.c:2351
+#: mail/mail-callbacks.c:2360
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
@@ -10754,7 +10844,7 @@ msgstr ""
 "Ingen flere nye meldinger i denne mappen.\n"
 "Vil du gå til neste mappe?"
 
-#: mail/mail-callbacks.c:2580
+#: mail/mail-callbacks.c:2600
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -10766,7 +10856,7 @@ msgstr ""
 "\n"
 "Vil du virkelig slette disse meldingene?"
 
-#: mail/mail-callbacks.c:2690
+#: mail/mail-callbacks.c:2710
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -10775,28 +10865,28 @@ msgstr ""
 "Feil under lasting av filter-informasjon:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2702
+#: mail/mail-callbacks.c:2722
 msgid "Filters"
 msgstr "Filtre"
 
-#: mail/mail-callbacks.c:2775
+#: mail/mail-callbacks.c:2795
 #, c-format
 msgid "Page %d of %d"
 msgstr "Side %d av %d"
 
-#: mail/mail-callbacks.c:2827
+#: mail/mail-callbacks.c:2847
 msgid "Print Message"
 msgstr "Skriv ut melding"
 
-#: mail/mail-callbacks.c:2854
+#: mail/mail-callbacks.c:2874
 msgid "US-Letter"
 msgstr "US-letter"
 
-#: mail/mail-callbacks.c:2889
+#: mail/mail-callbacks.c:2909
 msgid "Printing of message failed"
 msgstr "Feil under utskrift av melding"
 
-#: mail/mail-callbacks.c:3055
+#: mail/mail-callbacks.c:3092 mail/mail-callbacks.c:3132
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Er du sikker på at du vil åpne alle %d meldingene i separate vinduer?"
@@ -10853,16 +10943,16 @@ msgstr ""
 "under. Dette navnet blir kun brukt for visning på skjermen."
 
 #. set window title
-#: mail/mail-config-druid.c:599
+#: mail/mail-config-druid.c:628
 msgid "Evolution Account Assistant"
 msgstr "Evolution kontoassistent"
 
-#: mail/mail-config.c:356
+#: mail/mail-config.c:612
 #, c-format
 msgid "Account %d"
 msgstr "Konto %d"
 
-#: mail/mail-config.c:2036
+#: mail/mail-config.c:2326
 #, c-format
 msgid ""
 "Could not get inbox for new mail store:\n"
@@ -10876,104 +10966,132 @@ msgstr ""
 #. Create the shortcut. FIXME: This only works if the
 #. * full name matches the path.
 #.
-#: mail/mail-config.c:2047
+#: mail/mail-config.c:2337
 #, c-format
 msgid "%s: Inbox"
 msgstr "%s: Innboks"
 
-#: mail/mail-config.c:2297
+#: mail/mail-config.c:2587
 msgid "Checking Service"
 msgstr "Sjekker tjeneste"
 
-#: mail/mail-config.c:2375 mail/mail-config.c:2379
+#: mail/mail-config.c:2665 mail/mail-config.c:2669
 msgid "Connecting to server..."
 msgstr "Kobler til tjener..."
 
+#: mail/mail-config.c:2866
+msgid "Unnamed"
+msgstr "Uten navn"
+
+#: mail/mail-config.c:3044
+msgid "Cannot execute signature script"
+msgstr "Kan ikke kjøre signaturskript"
+
 #: mail/mail-config.glade.h:1
+msgid "                        "
+msgstr "                        "
+
+#: mail/mail-config.glade.h:2
 msgid " _Check for supported types "
 msgstr "_Søk etter støttede typer"
 
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:3
 msgid " color"
 msgstr " farge"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
+msgid "&lt;&lt; S_imple"
+msgstr "&lt;&lt; En_kel"
+
+#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(SSL er ikke støttet i denne versjonen av Evolution)"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:6
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL er ikke støttet i denne versjonen av evolution)"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:7
+msgid "/home/rodo/cvs/evolution/mail/"
+msgstr ""
+
+#: mail/mail-config.glade.h:8
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "A_lltid krypter til meg selv ved sending av kryptert e-post"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:9
 msgid "Account"
 msgstr "Konto"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:10
 msgid "Account Information"
 msgstr "Kontoinformasjon"
 
-#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:11 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Håndtering av konti"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:12
 msgid "Accounts"
 msgstr "Kontoer"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:13
+msgid "Ad_vanced &gt;&gt;"
+msgstr "Avansert &gt;&gt;"
+
+#: mail/mail-config.glade.h:14
+msgid "Add new signature"
+msgstr "Legg til ny signatur"
+
+#: mail/mail-config.glade.h:16
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Alltid _blind karbonkopi (Bcc) til:"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:17
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "Alltid _karbonkopi (Cc) til:"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:18
 msgid "Always _encrypt to myself when sending encrypted mail"
 msgstr "Alltid krypt_er til meg selv ved sending av kryptert e-post"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:19
 msgid "Always _sign outgoing messages when using this account"
 msgstr "Alltid _signer utgående meldinger når denne kontoen brukes"
 
-#: mail/mail-config.glade.h:14 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Vedlegg"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:21
 msgid "Authentication"
 msgstr "Autentisering"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:22
 msgid "Beep when new mail arrives"
 msgstr "Pip når nye meldinger ankommer"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:23
 msgid "Checking for New Mail"
 msgstr "Ser etter nye meldinger"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:24
 msgid "Composer"
 msgstr "Skriv"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:25
 msgid "Composing Messages"
 msgstr "Skriver meldinger"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:26
 msgid "Configuration"
 msgstr "Konfigurasjon"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:27
 msgid "Confirm when Expunging a folder"
 msgstr "Bekreft ved tømming av mappe"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:28
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10989,249 +11107,316 @@ msgstr ""
 "\n"
 "Klikk «Fullfør» for å lagre dine innstillinger"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:34
 msgid "De_fault"
 msgstr "_Forvalgt"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:35
 msgid "Default Forward style is: "
 msgstr "Standard videresendingsstil er: "
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:36
 msgid "Default character encoding: "
 msgstr "Standard tegnkoding: "
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:37
 msgid "Defaults"
 msgstr "Forvalg"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:38
+msgid "Delete selected signature"
+msgstr "Slett valgt signatur"
+
+#: mail/mail-config.glade.h:40
 msgid "Digital IDs..."
 msgstr "Digitale IDer..."
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:41
 msgid "Display"
 msgstr "Vis"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:42
 msgid "Do not notify me when new mail arrives"
 msgstr "Ikke gi beskjed når nye meldinger ankommer"
 
-#: mail/mail-config.glade.h:36 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:43 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Ferdig"
 
-#: mail/mail-config.glade.h:37 shell/e-local-storage.c:173
+#: mail/mail-config.glade.h:44 shell/e-local-storage.c:174
 msgid "Drafts"
 msgstr "Skisser"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:45
+msgid "E_mail address:"
+msgstr "E-_post adresse:"
+
+#: mail/mail-config.glade.h:46
 msgid "E_nable"
 msgstr "A_ktiver"
 
-#: mail/mail-config.glade.h:39 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
-msgstr "Rediger..."
+#: mail/mail-config.glade.h:47
+msgid "Ed_it..."
+msgstr "Red_iger..."
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:48
+msgid "Edi_t..."
+msgstr "R_ediger..."
+
+#: mail/mail-config.glade.h:49
+msgid "Edit signature content in editor"
+msgstr "Rediger signaturinnhold"
+
+#: mail/mail-config.glade.h:50
 msgid "Enabled"
 msgstr "Aktivert"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:51
 msgid "Execute Command..."
 msgstr "Kjør kommando..."
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:52
+msgid "File containing signature"
+msgstr "Fil som inneholder signatur"
+
+#: mail/mail-config.glade.h:53
 msgid "Get Digital ID..."
 msgstr "Hent digital ID..."
 
-#: mail/mail-config.glade.h:43
-msgid "HTML signature file:"
-msgstr "HTML-signaturfil:"
+#: mail/mail-config.glade.h:54
+msgid "Hide advanced settings"
+msgstr "Skjul avanserte innstillinger"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:55
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:56 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "Identitet"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:57
+msgid "If selected signature will be included in random signature list"
+msgstr "Om valgt signatur skal inkluderes i listen over tilfeldige signaturer"
+
+#: mail/mail-config.glade.h:58
 msgid "In HTML mail"
 msgstr "I HTML e-post"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:59
+msgid "Include in _random signatures list"
+msgstr "Inklude_r i listen over tilfeldige signaturer"
+
+#: mail/mail-config.glade.h:60
 msgid "Inline"
 msgstr "Inline"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:61
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:62
+msgid "List of signatures"
+msgstr "Liste over signaturer"
+
+#: mail/mail-config.glade.h:63
 msgid "Mail Configuration"
 msgstr "E-post-konfigurasjon"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:65
 msgid "Mailbox location"
 msgstr "Plassering av postboks"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:66
 msgid "Make this my _default account"
 msgstr "Bruk denne som stan_dard konto"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:67
 msgid "NNTP Server:"
 msgstr "NNTP-tjener:"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:68
+msgid "N_ew..."
+msgstr "N_y..."
+
+#: mail/mail-config.glade.h:69
+msgid "Name of selected signature"
+msgstr "Navn på valgt signatur"
+
+#: mail/mail-config.glade.h:70
+msgid "Ne_w..."
+msgstr "_Ny..."
+
+#: mail/mail-config.glade.h:72
 msgid "New Mail Notification"
 msgstr "Melding om ny e-post"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:73
 msgid "News"
 msgstr "News"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:75
 msgid "Optional Information"
 msgstr "Tilleggsinformasjon"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:77
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG-nø_kkel ID:"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:80
 msgid "Pick a color"
 msgstr "Velg en farge"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:81
 msgid "Play sound file when new mail arrives"
 msgstr "Spill en lydfil når nye meldinger ankommer"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:82
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:83
 msgid "Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Spør ved sending av HTML-meldinger til kontakter som ikke ønsker dem"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:84
 msgid "Prompt when sending messages with an _empty subject"
 msgstr "Spør ved sending av meldinger uten _emne"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:85
 msgid "Prompt when sending messages with only _Bcc recipients defined"
 msgstr "Spør ved sending av meldinger med kun _Bcc-mottakere definert"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:86
 msgid "Qmail maildir "
 msgstr "Qmail maildir"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:87
 msgid "Quoted"
 msgstr "Sitert"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:89
 msgid "Re_member this password"
 msgstr "H_usk dette passordet"
 
-#: mail/mail-config.glade.h:71 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:90 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Innkommende e-post"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:91
 msgid "Receiving Mail"
 msgstr "Innkommende e-post"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:92
 msgid "Receiving Options"
 msgstr "Alternativer innkommende"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:93
 msgid "Required Information"
 msgstr "Nødvendig informasjon"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:95
+msgid "Same as text"
+msgstr "Samme som tekst"
+
+#: mail/mail-config.glade.h:96
+msgid "Script which is run before signature loading from specified filename"
+msgstr "Skript som kjøres før lasting av signatur fra spesifisert filnavn"
+
+#: mail/mail-config.glade.h:97
 msgid "Secure MIME (S/MIME)"
 msgstr "Sikker MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:98
 msgid "Security"
 msgstr "Sikkerhet"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:99
 msgid "Select Filter Log file..."
 msgstr "Velg en loggfil for filter..."
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:100
 msgid "Select PGP binary"
 msgstr "Velg PGP-binærfil"
 
-#: mail/mail-config.glade.h:80 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:101 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Utgående e-post"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:102
 msgid "Sending Mail"
 msgstr "Utgående e-post"
 
-#: mail/mail-config.glade.h:83 mail/message-list.etspec.h:9
-#: shell/e-local-storage.c:176
+#: mail/mail-config.glade.h:104 mail/message-list.etspec.h:9
+#: shell/e-local-storage.c:177
 msgid "Sent"
 msgstr "Sendt"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:105
 msgid "Sent _messages folder:"
 msgstr "Mappe for sendte _meldinger:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:106
 msgid "Sent and Draft Messages"
 msgstr "Sendte meldinger og skisser"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:107
 msgid "Ser_ver requires authentication"
 msgstr "Tjener kre_ver autentisering"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:108
 msgid "Server Configuration"
 msgstr "Tjenerkonfigurasjon"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:109
 msgid "Server _Type: "
 msgstr "Tjener_type: "
 
-#: mail/mail-config.glade.h:89
-msgid "Signature file:"
-msgstr "Signaturfil:"
+#: mail/mail-config.glade.h:110
+msgid "Show advanced settings"
+msgstr "Vis avanserte innstillinger"
+
+#: mail/mail-config.glade.h:111
+msgid "Signatures"
+msgstr "Signaturer"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:112
 msgid "Source"
 msgstr "Kilde"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:113
 msgid "Source Information"
 msgstr "Kildeinformasjon"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:114
 msgid "Sources"
 msgstr "Kilder"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:115
 msgid "Specify filename:"
 msgstr "Spesifiser filnavn:"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:116
 msgid "Standard Unix mbox"
 msgstr "Standard Unix mbox"
 
-#: mail/mail-config.glade.h:96
-msgid "Use s_ecure connection (SSL)"
-msgstr "Bruk sikk_er forbindelse (SSL)"
+#: mail/mail-config.glade.h:117
+msgid "Text _Signature:"
+msgstr "Tekst_signatur:"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:119
+msgid ""
+"Type the name by which you would like to refer to this account.\n"
+"For example: \"Work\" or \"Personal\""
+msgstr ""
+"Skriv navnet du vil referere til denne kontoen.\n"
+"For eksempel «Arbeid» eller «Personlig»"
+
+#: mail/mail-config.glade.h:121
+msgid "Use s_ecure connection (SSL):"
+msgstr "Bruk sikk_er forbindelse (SSL):"
+
+#: mail/mail-config.glade.h:122
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -11241,126 +11426,146 @@ msgstr ""
 "\n"
 "Klikk «Neste» for å begynne. "
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:127
 msgid "_Always load images off the net"
 msgstr "_Alltid last bilder fra nettet"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:128
 msgid "_Always sign outgoing messages when using this account"
 msgstr "_Alltid signer utgående meldinger når denne kontoen brukes"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:129
 msgid "_Authentication Type: "
 msgstr "_Autentiseringstype: "
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:130
 msgid "_Authentication type: "
 msgstr "_Autentiseringstype: "
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:131
 msgid "_Automatically check for new mail"
 msgstr "Sjekk etter meldinger _automatisk"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:132
 msgid "_Certificate ID:"
 msgstr "_Sertifikat-ID:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:134
 msgid "_Drafts folder:"
 msgstr "Mappe _for skisser:"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:136
+msgid "_Edit..."
+msgstr "R_ediger..."
+
+#: mail/mail-config.glade.h:137
 msgid "_Empty trash folders on exit"
 msgstr "Tøm søpp_elkurven ved slutt"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:138
+msgid "_Filename"
+msgstr "_Filnavn:"
+
+#: mail/mail-config.glade.h:139
 msgid "_Full name:"
 msgstr "_Fullt navn:"
 
-#: mail/mail-config.glade.h:113
-msgid "_HTML signature:"
+#: mail/mail-config.glade.h:140
+msgid "_HTML Signature:"
 msgstr "_HTML-signatur:"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:141
 msgid "_Highlight citations with"
 msgstr "M_erk sitering med"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:142
 msgid "_Host:"
 msgstr "_Vert:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:143
 msgid "_Load images if sender is in addressbook"
 msgstr "_Last bilder hvis avsender er i adresseboken"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:144
 msgid "_Log filter actions to:"
 msgstr "_Logg filterhandlinger til:"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:145
 msgid "_Mark messages as Read after"
 msgstr "_Merk meldinger som Lest etter"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:146
+msgid "_Name"
+msgstr "_Navn"
+
+#: mail/mail-config.glade.h:147
 msgid "_Name:"
 msgstr "_Navn:"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:148
 msgid "_Never load images off the net"
 msgstr "Aldri last bilder fra _nettet"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:149
 msgid "_Organization:"
 msgstr "_Organisasjon:"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:150
 msgid "_PGP binary path:"
 msgstr "Sti til _PGP-binærfil:"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:151
 msgid "_Path:"
 msgstr "S_ti:"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:152
 msgid "_Remember this password"
 msgstr "Husk dette passo_rdet"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:153
+msgid "_Script"
+msgstr "_Skript"
+
+#: mail/mail-config.glade.h:154
 msgid "_Send mail in HTML format by default."
 msgstr "_Send meldinger i HTML-format som standard."
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:155
 msgid "_Server type: "
 msgstr "_Tjenertype: "
 
-#: mail/mail-config.glade.h:127
-msgid "_Signature file:"
-msgstr "_Signaturfil:"
+#: mail/mail-config.glade.h:156
+msgid "_Signatures"
+msgstr "_Signaturer"
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:157
 msgid "_Username:"
 msgstr "Br_ukernavn:"
 
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:158
 msgid "_every"
 msgstr "hv_er(t)"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:159
 msgid "description"
 msgstr "beskrivelse"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:161
 msgid "newswindow1"
 msgstr "nyhetsvindu1"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:162
 msgid "placeholder"
 msgstr "plassholder"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:163
 msgid "seconds."
 msgstr "sekunder"
 
+#: mail/mail-config.glade.h:164
+msgid "use _HTML for this signature"
+msgstr "bruk_HTML for denne signaturen"
+
 #: mail/mail-crypto.c:59
 msgid "Could not create a PGP signature context."
 msgstr "Kunne ikke opprette PGP signaturkontekst."
@@ -11397,142 +11602,146 @@ msgstr "Kunne ikke opprette S/MIME «envelope»-kontekst."
 msgid "Could not create a S/MIME decode context."
 msgstr "Kunne ikke opprette S/MIME dekodingskontekst."
 
-#: mail/mail-display.c:245
+#: mail/mail-display.c:276
 msgid "Save Attachment"
 msgstr "Lagre vedlegg"
 
-#: mail/mail-display.c:310
+#: mail/mail-display.c:341
 #, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Kunne ikke opprette midlertidig fil «%s»: %s"
 
-#: mail/mail-display.c:356
+#: mail/mail-display.c:387
 msgid "Save to Disk..."
 msgstr "Lagre til disk..."
 
-#: mail/mail-display.c:358
+#: mail/mail-display.c:389
 msgid "View Inline"
 msgstr "Vis «inline»"
 
-#: mail/mail-display.c:360
+#: mail/mail-display.c:391
 #, c-format
 msgid "Open in %s..."
 msgstr "Åpne i %s..."
 
-#: mail/mail-display.c:421
+#: mail/mail-display.c:452
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Vis «inline» (via %s)"
 
-#: mail/mail-display.c:425
+#: mail/mail-display.c:456
 msgid "Hide"
 msgstr "Skjul"
 
-#: mail/mail-display.c:446
+#: mail/mail-display.c:477
 msgid "External Viewer"
 msgstr "Ekstern visning"
 
-#: mail/mail-display.c:1224
+#: mail/mail-display.c:1262
 msgid "Loading message content"
 msgstr "Laster meldingsinnhold"
 
-#: mail/mail-display.c:1717
+#: mail/mail-display.c:1754
 msgid "Open Link in Browser"
 msgstr "Åpne lenke i nettleser"
 
-#: mail/mail-display.c:1719
+#: mail/mail-display.c:1756
 msgid "Copy Link Location"
 msgstr "Kopier lokasjon for lenke"
 
-#: mail/mail-display.c:1722
+#: mail/mail-display.c:1759
 msgid "Save Link as (FIXME)"
 msgstr "Lagre lenke som"
 
-#: mail/mail-display.c:1725
+#: mail/mail-display.c:1762
 msgid "Save Image as..."
 msgstr "Lagre bilde som..."
 
-#: mail/mail-format.c:646
+#: mail/mail-format.c:652
 #, c-format
 msgid "%s attachment"
 msgstr "%s-vedlegg"
 
-#: mail/mail-format.c:692
+#: mail/mail-format.c:698
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Kunne ikke lese MIME-melding. Viser ren meldingstekst."
 
-#: mail/mail-format.c:775
+#: mail/mail-format.c:781
 msgid "Date"
 msgstr "Dato"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:873
 msgid "Bad Address"
 msgstr "Ugyldig e-post-adresse:"
 
-#: mail/mail-format.c:910 mail/message-list.etspec.h:6
+#: mail/mail-format.c:916 mail/message-list.etspec.h:6
 msgid "From"
 msgstr "Fra"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:920
 msgid "Reply-To"
 msgstr "Svar-til"
 
-#: mail/mail-format.c:919 mail/message-list.etspec.h:13
+#: mail/mail-format.c:925 mail/message-list.etspec.h:13
 msgid "To"
 msgstr "Til"
 
-#: mail/mail-format.c:924
+#: mail/mail-format.c:930
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:929
+#: mail/mail-format.c:935
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:1784
+#: mail/mail-format.c:1712
+msgid "View messages..."
+msgstr "Vis meldinger..."
+
+#: mail/mail-format.c:1806
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "Denne meldingen er digitalt signert. Klikk låsikonet for mer informasjon."
 
-#: mail/mail-format.c:1807
+#: mail/mail-format.c:1829
 msgid "Evolution does not recognize this type of signed message."
 msgstr "Kan ikke kjenne igjen denne typen signert melding."
 
-#: mail/mail-format.c:1815
+#: mail/mail-format.c:1837
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Denne meldingen er digitalt signert og er funnet autentisk."
 
-#: mail/mail-format.c:1823
+#: mail/mail-format.c:1845
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr "Denne meldingen er digitalt signert, men kan ikke finnes autentisk."
 
-#: mail/mail-format.c:2066
+#: mail/mail-format.c:2088
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Peker til FTP-tjener (%s)"
 
-#: mail/mail-format.c:2080
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Peker til lokal fil (%s) gyldig på nettsted «%s»"
 
-#: mail/mail-format.c:2085
+#: mail/mail-format.c:2107
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Peker til lokal fil (%s)"
 
-#: mail/mail-format.c:2114
+#: mail/mail-format.c:2136
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Peker til eksterne data (%s)"
 
-#: mail/mail-format.c:2122
+#: mail/mail-format.c:2144
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Peker til ukjente eksterne data («%s»-type)"
 
-#: mail/mail-format.c:2127
+#: mail/mail-format.c:2149
 msgid "Malformed external-body part."
 msgstr "Feilutformet del for ekstern kropp."
 
@@ -11609,117 +11818,117 @@ msgstr ""
 msgid "Working"
 msgstr "Arbeider"
 
-#: mail/mail-ops.c:87
+#: mail/mail-ops.c:88
 msgid "Filtering Folder"
 msgstr "Filtrerer mappe"
 
-#: mail/mail-ops.c:258
+#: mail/mail-ops.c:259
 msgid "Fetching Mail"
 msgstr "Henter e-post"
 
-#: mail/mail-ops.c:534 mail/mail-ops.c:563
+#: mail/mail-ops.c:535 mail/mail-ops.c:564
 msgid "However, the message was successfully sent."
 msgstr "Likevel, fullførte sending av meldingen."
 
-#: mail/mail-ops.c:599
+#: mail/mail-ops.c:600
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Sender «%s»"
 
-#: mail/mail-ops.c:719
+#: mail/mail-ops.c:720
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sender melding %d av %d"
 
-#: mail/mail-ops.c:738
+#: mail/mail-ops.c:739
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Feilet på melding %d av %d"
 
-#: mail/mail-ops.c:740 mail/mail-send-recv.c:545
+#: mail/mail-ops.c:741 mail/mail-send-recv.c:545
 msgid "Complete."
 msgstr "Fullført."
 
-#: mail/mail-ops.c:833
+#: mail/mail-ops.c:834
 msgid "Saving message to folder"
 msgstr "Lagrer melding til mappe"
 
-#: mail/mail-ops.c:913
+#: mail/mail-ops.c:914
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flytter melding(er) til %s"
 
-#: mail/mail-ops.c:913
+#: mail/mail-ops.c:914
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopierer meldinger til %s"
 
-#: mail/mail-ops.c:940
+#: mail/mail-ops.c:941
 msgid "Moving"
 msgstr "Flytter"
 
-#: mail/mail-ops.c:943
+#: mail/mail-ops.c:944
 msgid "Copying"
 msgstr "Kopierer"
 
-#: mail/mail-ops.c:1053
+#: mail/mail-ops.c:1054
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanner mapper i «%s»"
 
 #. Fill in the new fields
-#: mail/mail-ops.c:1103 shell/e-local-storage.c:178
+#: mail/mail-ops.c:1104 shell/e-local-storage.c:179
 msgid "Trash"
 msgstr "Søppel"
 
-#: mail/mail-ops.c:1236
+#: mail/mail-ops.c:1237
 msgid "Forwarded messages"
 msgstr "Videresendte meldinger"
 
-#: mail/mail-ops.c:1279
+#: mail/mail-ops.c:1280
 #, c-format
 msgid "Opening folder %s"
 msgstr "Åpner mappe %s"
 
-#: mail/mail-ops.c:1351
+#: mail/mail-ops.c:1352
 #, c-format
 msgid "Opening store %s"
 msgstr "Åpner lager %s"
 
-#: mail/mail-ops.c:1420
+#: mail/mail-ops.c:1421
 #, c-format
 msgid "Removing folder %s"
 msgstr "Fjerner mappe %s"
 
-#: mail/mail-ops.c:1514
+#: mail/mail-ops.c:1515
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Lagrer mappe «%s»"
 
-#: mail/mail-ops.c:1565
+#: mail/mail-ops.c:1566
 msgid "Refreshing folder"
 msgstr "Oppdaterer mappe"
 
-#: mail/mail-ops.c:1601
+#: mail/mail-ops.c:1602
 msgid "Expunging folder"
 msgstr "Tømmer mappe"
 
-#: mail/mail-ops.c:1650
+#: mail/mail-ops.c:1651
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Henter melding %s"
 
-#: mail/mail-ops.c:1717
+#: mail/mail-ops.c:1718
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Henter %d melding(er)"
 
-#: mail/mail-ops.c:1803
+#: mail/mail-ops.c:1804
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Lagrer %d melding(er)"
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1916
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -11728,7 +11937,7 @@ msgstr ""
 "Kunne ikke opprette utdatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1943
+#: mail/mail-ops.c:1944
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -11737,11 +11946,11 @@ msgstr ""
 "Feil under lagring av av meldinger til: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2017
+#: mail/mail-ops.c:2018
 msgid "Saving attachment"
 msgstr "Lagrer vedlegg"
 
-#: mail/mail-ops.c:2033
+#: mail/mail-ops.c:2034
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -11750,22 +11959,22 @@ msgstr ""
 "Kunne ikke opprette utdatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2064
+#: mail/mail-ops.c:2065
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kan ikke skrive data: %s"
 
-#: mail/mail-ops.c:2133
+#: mail/mail-ops.c:2134
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Kobler fra %s"
 
-#: mail/mail-ops.c:2134
+#: mail/mail-ops.c:2135
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Kobler til %s på nytt"
 
-#: mail/mail-ops.c:2233
+#: mail/mail-ops.c:2234
 #, c-format
 msgid "Executing shell command: %s"
 msgstr "Kjører skall-kommando: %s"
@@ -11932,63 +12141,63 @@ msgstr "(Uten emne)"
 msgid "%s - Message"
 msgstr "%s - Melding"
 
-#: mail/message-list.c:641
+#: mail/message-list.c:672
 msgid "Unseen"
 msgstr "Ulest"
 
-#: mail/message-list.c:642
+#: mail/message-list.c:673
 msgid "Seen"
 msgstr "Lest"
 
-#: mail/message-list.c:643
+#: mail/message-list.c:674
 msgid "Answered"
 msgstr "Besvart"
 
-#: mail/message-list.c:644
+#: mail/message-list.c:675
 msgid "Multiple Unseen Messages"
 msgstr "Flere uleste meldinger"
 
-#: mail/message-list.c:645
+#: mail/message-list.c:676
 msgid "Multiple Messages"
 msgstr "Flere meldinger"
 
-#: mail/message-list.c:649
+#: mail/message-list.c:680
 msgid "Lowest"
 msgstr "Lavest"
 
-#: mail/message-list.c:650
+#: mail/message-list.c:681
 msgid "Lower"
 msgstr "Lavere"
 
-#: mail/message-list.c:654
+#: mail/message-list.c:685
 msgid "Higher"
 msgstr "Høyere"
 
-#: mail/message-list.c:655
+#: mail/message-list.c:686
 msgid "Highest"
 msgstr "Høyest"
 
-#: mail/message-list.c:960
+#: mail/message-list.c:991
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:967
+#: mail/message-list.c:998
 msgid "Today %l:%M %p"
 msgstr "I dag %l:%M %p"
 
-#: mail/message-list.c:976
+#: mail/message-list.c:1007
 msgid "Yesterday %l:%M %p"
 msgstr "I går %l:%M %p"
 
-#: mail/message-list.c:988
+#: mail/message-list.c:1019
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:998
+#: mail/message-list.c:1029
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2365
+#: mail/message-list.c:2396
 msgid "Generating message list"
 msgstr "Genererer meldingsliste"
 
@@ -12081,6 +12290,23 @@ msgstr "_Abonner"
 msgid "_Unsubscribe"
 msgstr "_Fjern abonnement"
 
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+msgid "Configuration control for the Evolution Summary."
+msgstr "Konfigurasjonskontroll for Evolution sammendrag."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:3
+msgid "Factory for Evolution Summary's configuration control."
+msgstr "Factory for konfigurasjonskontroll for Evolution sammendrag."
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:4
+msgid "Summary Preferences"
+msgstr "Brukervalg for sammendrag"
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:5
+msgid ""
+"This page can be used to control the appearance of the Evolution Summary"
+msgstr "Denne siden kan brukes til å kontrollere utseende av Evolution sammendrag"
+
 #: my-evolution/Locations.h:1
 msgid "Aarhus"
 msgstr "Århus"
@@ -21911,35 +22137,31 @@ msgstr "E-post sammendrag"
 #. stations and their codes in Evolution sources.
 #. (evolution/my-evolution/Locations)
 #. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:82
+#: my-evolution/e-summary-preferences.c:89
 #: my-evolution/e-summary-weather.c:603
 msgid "KBOS"
 msgstr "KBOS"
 
-#: my-evolution/e-summary-preferences.c:453
+#: my-evolution/e-summary-preferences.c:461
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Ord for dagen"
 
-#: my-evolution/e-summary-preferences.c:474
+#: my-evolution/e-summary-preferences.c:482
 msgid "Quotes of the Day"
 msgstr "Dagens sitat"
 
-#: my-evolution/e-summary-preferences.c:735
+#: my-evolution/e-summary-preferences.c:743
 msgid "Add a news feed"
 msgstr "Legg til news-tjener"
 
-#: my-evolution/e-summary-preferences.c:743
+#: my-evolution/e-summary-preferences.c:751
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Skriv inn URL for nyhetsstedet du vil legge til"
 
-#: my-evolution/e-summary-preferences.c:747
+#: my-evolution/e-summary-preferences.c:755
 msgid "Name:"
 msgstr "Navn:"
 
-#: my-evolution/e-summary-preferences.c:1225
-msgid "Summary Settings"
-msgstr "Innstillinger for sammendrag"
-
 #: my-evolution/e-summary-rdf.c:300
 msgid "Error downloading RDF"
 msgstr "Feil under nedlasting av RDF"
@@ -21976,11 +22198,11 @@ msgstr "%A, %B %e %Y"
 msgid "Please wait..."
 msgstr "Vennligst vent..."
 
-#: my-evolution/e-summary.c:566 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:565 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Skriv ut sammendrag"
 
-#: my-evolution/e-summary.c:612
+#: my-evolution/e-summary.c:611
 msgid "Printing of Summary failed"
 msgstr "Feil under utskrift av sammendrag"
 
@@ -23262,23 +23484,24 @@ msgstr "Factory for notat-kontroll"
 msgid "The Evolution shell."
 msgstr "Evolution skallet."
 
-#: shell/e-activity-handler.c:160
+#: shell/e-activity-handler.c:162
 msgid "Show Details"
 msgstr "Vis detaljer"
 
-#: shell/e-activity-handler.c:162
+#: shell/e-activity-handler.c:164
 msgid "Cancel Operation"
 msgstr "Avlys operasjon"
 
-#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
+#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
+#: shell/e-shortcuts.c:1033
 msgid "Inbox"
 msgstr "Innboks"
 
-#: shell/e-local-storage.c:175
+#: shell/e-local-storage.c:176
 msgid "Outbox"
 msgstr "Utboks"
 
-#: shell/e-local-storage.c:636
+#: shell/e-local-storage.c:1022
 msgid "Local Folders"
 msgstr "Lokale mapper"
 
@@ -23392,49 +23615,51 @@ msgstr ""
 "Evolution-katalogen. Vennligst flytt den for å \n"
 "tillate installasjon av Evolution's brukerfiler."
 
-#: shell/e-shell-about-box.c:40
-msgid "Evolution "
-msgstr "Evolution "
-
-#: shell/e-shell-about-box.c:41
-msgid "Copyright 1999, 2000, 2001, 2002 Ximian, Inc."
-msgstr "Copyright 1999, 2000, 2001, 2002 Ximian, Inc."
-
 #: shell/e-shell-about-box.c:43
 msgid "Brought to you by"
 msgstr "Etter mange timers slit av"
 
-#: shell/e-shell-folder-commands.c:176
+#: shell/e-shell-folder-commands.c:140
+#, c-format
+msgid "Cannot copy folder: %s"
+msgstr "Kan ikke kopiere mappe: %s"
+
+#: shell/e-shell-folder-commands.c:143
+#, c-format
+msgid "Cannot move folder: %s"
+msgstr "Kunne ikke flytte mappe: %s"
+
+#: shell/e-shell-folder-commands.c:190
 msgid "Cannot move a folder over itself."
 msgstr "Kan ikke flytte en mappe over seg selv."
 
-#: shell/e-shell-folder-commands.c:178
+#: shell/e-shell-folder-commands.c:192
 msgid "Cannot copy a folder over itself."
 msgstr "Kan ikke kopiere en mappe oppå seg selv."
 
-#: shell/e-shell-folder-commands.c:192
+#: shell/e-shell-folder-commands.c:206
 msgid "Cannot move a folder into one of its descendants."
 msgstr "Kan ikke flytte en mappe til en av sine egne undermapper."
 
-#: shell/e-shell-folder-commands.c:307
+#: shell/e-shell-folder-commands.c:321
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "Spesifiser en mappe som mappen «%s» skal kopieres til:"
 
-#: shell/e-shell-folder-commands.c:312
+#: shell/e-shell-folder-commands.c:326
 msgid "Copy folder"
 msgstr "Kopier mappe"
 
-#: shell/e-shell-folder-commands.c:354
+#: shell/e-shell-folder-commands.c:368
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "Spesifiser en mappe å flytte mappen «%s» til:"
 
-#: shell/e-shell-folder-commands.c:359
+#: shell/e-shell-folder-commands.c:373
 msgid "Move folder"
 msgstr "Flytt mappe"
 
-#: shell/e-shell-folder-commands.c:385
+#: shell/e-shell-folder-commands.c:399
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -23443,18 +23668,18 @@ msgstr ""
 "Kunne ikke slette mappe:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:401
+#: shell/e-shell-folder-commands.c:415
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Slett «%s»"
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:411
+#: shell/e-shell-folder-commands.c:425
 #, c-format
 msgid "Are you sure you want to remove the \"%s\" folder?"
 msgstr "Er du sikker på at du vil fjerne mappen «%s»?"
 
-#: shell/e-shell-folder-commands.c:488
+#: shell/e-shell-folder-commands.c:502
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -23463,16 +23688,16 @@ msgstr ""
 "Kunne ikke endre navn på mappe:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:537
+#: shell/e-shell-folder-commands.c:552
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Endre navn på mappe «%s» til:"
 
-#: shell/e-shell-folder-commands.c:544
+#: shell/e-shell-folder-commands.c:559
 msgid "Rename folder"
 msgstr "Endre navn på mappe"
 
-#: shell/e-shell-folder-commands.c:554
+#: shell/e-shell-folder-commands.c:569
 #: shell/e-shell-folder-creation-dialog.c:168
 #, c-format
 msgid "The specified folder name is not valid: %s"
@@ -23487,7 +23712,7 @@ msgstr ""
 "Kan ikke opprette spesifisert katalog:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:304
+#: shell/e-shell-folder-creation-dialog.c:291
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Lag ny mappe"
 
@@ -23676,8 +23901,8 @@ msgstr ""
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Kunne ikke starte assistent-grensesnittet for Evolution\n"
 
-#: shell/e-shell-user-creatable-items-handler.c:503
-#: shell/e-shell-user-creatable-items-handler.c:548
+#: shell/e-shell-user-creatable-items-handler.c:506
+#: shell/e-shell-user-creatable-items-handler.c:551
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Ny"
@@ -23698,93 +23923,93 @@ msgstr "Mappenavn kan ikke inneholde skråstreker."
 msgid "'.' and '..' are reserved folder names."
 msgstr "«.» og «..» er reserverte mappenavn."
 
-#: shell/e-shell-view-menu.c:165
+#: shell/e-shell-view-menu.c:170
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy ble ikke funnet i din $PATH."
 
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-view-menu.c:178
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy kunne ikke kjøres."
 
-#: shell/e-shell-view-menu.c:215
+#: shell/e-shell-view-menu.c:220
 msgid "About Ximian Evolution"
 msgstr "Om Ximian Evolution"
 
-#: shell/e-shell-view-menu.c:427
+#: shell/e-shell-view-menu.c:432
 msgid "Go to folder..."
 msgstr "Gå til mappe..."
 
-#: shell/e-shell-view-menu.c:428
+#: shell/e-shell-view-menu.c:433
 msgid "Select the folder that you want to open"
 msgstr "Velg mappen du ønsker å åpne"
 
-#: shell/e-shell-view-menu.c:548
+#: shell/e-shell-view-menu.c:553
 msgid "Create a new shortcut"
 msgstr "Opprett en ny snarvei"
 
-#: shell/e-shell-view-menu.c:549
+#: shell/e-shell-view-menu.c:554
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Velg mappen du ønsker snarveien skal peke til:"
 
-#: shell/e-shell-view-menu.c:580
+#: shell/e-shell-view-menu.c:602
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 "GNOME pilot verktøyene ser ikke ut til å være installert på dette systemet."
 
-#: shell/e-shell-view-menu.c:588
+#: shell/e-shell-view-menu.c:610
 #, c-format
 msgid "Error executing %s."
 msgstr "Feil under kjøring av %s."
 
-#: shell/e-shell-view-menu.c:691
+#: shell/e-shell-view-menu.c:715
 msgid "_Work Online"
 msgstr "Ar_beid tilkoblet"
 
-#: shell/e-shell-view-menu.c:704 ui/evolution.xml.h:51
+#: shell/e-shell-view-menu.c:728 ui/evolution.xml.h:52
 msgid "_Work Offline"
 msgstr "Ar_beid frakoblet"
 
-#: shell/e-shell-view-menu.c:717 ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:741 ui/evolution.xml.h:30
 msgid "Work Offline"
 msgstr "Arbeid frakoblet"
 
-#: shell/e-shell-view.c:220
+#: shell/e-shell-view.c:224
 msgid "(No folder displayed)"
 msgstr "(Ingen mappe vist)"
 
-#: shell/e-shell-view.c:1703
+#: shell/e-shell-view.c:1802
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1705
+#: shell/e-shell-view.c:1804
 msgid "(None)"
 msgstr "(Ingen)"
 
-#: shell/e-shell-view.c:1752
+#: shell/e-shell-view.c:1851
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution er koblet til. Klikk på denne knappen for å arbeide "
 "frakoblet."
 
-#: shell/e-shell-view.c:1759
+#: shell/e-shell-view.c:1858
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution er i ferd med å koble fra."
 
-#: shell/e-shell-view.c:1765
+#: shell/e-shell-view.c:1864
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution er frakoblet. Klikk på denne knappen for å arbeide "
 "tilkoblet."
 
-#: shell/e-shell.c:651
+#: shell/e-shell.c:652
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan ikke sette opp lokal lagring -- %s"
 
-#: shell/e-shell.c:1706
+#: shell/e-shell.c:1715
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -23795,19 +24020,19 @@ msgstr ""
 "har avsluttet uventet. Du vil måtte avslutte Evolution og starte på\n"
 "nytt for å få tilgang til disse dataene igjen."
 
-#: shell/e-shell.c:1933
+#: shell/e-shell.c:1942
 msgid "Invalid arguments"
 msgstr "Ugyldige argumenter"
 
-#: shell/e-shell.c:1935
+#: shell/e-shell.c:1944
 msgid "Cannot register on OAF"
 msgstr "Kan ikke registrere i OAF"
 
-#: shell/e-shell.c:1937
+#: shell/e-shell.c:1946
 msgid "Configuration Database not found"
 msgstr "Konfigurasjonsdatabase ikke funnet"
 
-#: shell/e-shell.c:1939 shell/e-storage.c:500
+#: shell/e-shell.c:1948 shell/e-storage.c:487
 msgid "Generic error"
 msgstr "Vanlig feil"
 
@@ -23924,15 +24149,15 @@ msgstr "_Fjern"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Fjern denne snarveien fra snarveilinjen"
 
-#: shell/e-shortcuts.c:640
+#: shell/e-shortcuts.c:621
 msgid "Error saving shortcuts."
 msgstr "Feil under lagring av snarveier."
 
-#: shell/e-shortcuts.c:1043
+#: shell/e-shortcuts.c:1024
 msgid "Shortcuts"
 msgstr "Snarveier"
 
-#: shell/e-storage-set-view.c:658
+#: shell/e-storage-set-view.c:649
 #, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -23941,59 +24166,55 @@ msgstr ""
 "Kan ikke overføre mappe:\n"
 "%s"
 
-#: shell/e-storage.c:181 shell/e-storage.c:187
-msgid "(No name)"
-msgstr "(Uten navn)"
-
-#: shell/e-storage.c:498
+#: shell/e-storage.c:485
 msgid "No error"
 msgstr "Ingen feil"
 
-#: shell/e-storage.c:502
+#: shell/e-storage.c:489
 msgid "A folder with the same name already exists"
 msgstr "En mappe med samme navn eksisterer allerede"
 
-#: shell/e-storage.c:504
+#: shell/e-storage.c:491
 msgid "The specified folder type is not valid"
 msgstr "Spesifisert mappetype er ikke gyldig"
 
-#: shell/e-storage.c:506
+#: shell/e-storage.c:493
 msgid "I/O error"
 msgstr "I/U-feil"
 
-#: shell/e-storage.c:508
+#: shell/e-storage.c:495
 msgid "Not enough space to create the folder"
 msgstr "Ikke nok plass til å opprette mappen"
 
-#: shell/e-storage.c:510
+#: shell/e-storage.c:497
 msgid "The folder is not empty"
 msgstr "Mappen er ikke tom"
 
-#: shell/e-storage.c:512
+#: shell/e-storage.c:499
 msgid "The specified folder was not found"
 msgstr "Spesifisert mappe ble ikke funnet"
 
-#: shell/e-storage.c:514
+#: shell/e-storage.c:501
 msgid "Function not implemented in this storage"
 msgstr "Funksjonen er ikke implementert i dette lageret"
 
-#: shell/e-storage.c:518
+#: shell/e-storage.c:505
 msgid "Operation not supported"
 msgstr "Operasjonen er ikke støttet"
 
-#: shell/e-storage.c:520
+#: shell/e-storage.c:507
 msgid "The specified type is not supported in this storage"
 msgstr "Spesifisert type er ikke støttet for dette lageret"
 
-#: shell/e-storage.c:522
+#: shell/e-storage.c:509
 msgid "The specified folder cannot be modified or removed"
 msgstr "Spesifisert mappe kan ikke endres eller fjernes"
 
-#: shell/e-storage.c:524
+#: shell/e-storage.c:511
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Kan ikke gjøre en mappe til barn av en av sine etterkommere"
 
-#: shell/e-storage.c:526
+#: shell/e-storage.c:513
 msgid "Cannot create a folder with that name"
 msgstr "Kunne ikke opprette en mappe med det navnet"
 
@@ -24104,7 +24325,7 @@ msgstr "Ingen plass igjen"
 msgid "Old owner has died"
 msgstr "Gammel eier er død"
 
-#: shell/evolution-test-component.c:41
+#: shell/evolution-test-component.c:45
 msgid "Test type"
 msgstr "Testtype"
 
@@ -24301,7 +24522,7 @@ msgstr "Ingen filnavn spesifisert."
 msgid "Copy Contact(s) to Another Folder..."
 msgstr "Kopier kontakt(er) til en annen mappe..."
 
-#: ui/evolution-addressbook.xml.h:4 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:4 ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "Kopier utvalget"
 
@@ -24317,7 +24538,7 @@ msgstr "Opprett en ny kontakt"
 msgid "Create new contact list"
 msgstr "Opprett en ny kontaktliste"
 
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:12
+#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Klipp ut utvalget"
 
@@ -24337,7 +24558,7 @@ msgstr "Flytt kontakt(er) til en annen mappe..."
 msgid "Move to Folder..."
 msgstr "Flytt til mappe..."
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:23
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:14
 msgid "Paste the clipboard"
 msgstr "Lim inn fra utklippstavlen"
 
@@ -24385,177 +24606,126 @@ msgstr "Stopp innlesing"
 msgid "View the current contact"
 msgstr "Vis aktiv kontakt"
 
-#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:34
+#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
 #: ui/evolution-mail-global.xml.h:17 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:92 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-task-editor.xml.h:9 ui/evolution-tasks.xml.h:15
+#: ui/evolution-mail-message.xml.h:91 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-task-editor.xml.h:9 ui/evolution-tasks.xml.h:14
 msgid "_Actions"
 msgstr "H_andlinger"
 
-#: ui/evolution-addressbook.xml.h:33
-msgid "_Addressbook Sources..."
-msgstr "_Adressebok-kilder..."
-
-#: ui/evolution-addressbook.xml.h:35
+#: ui/evolution-addressbook.xml.h:34
 msgid "_Contact List"
 msgstr "_Kontaktliste"
 
-#: ui/evolution-addressbook.xml.h:39 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:38 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr "_Videresend kontakt..."
 
-#: ui/evolution-addressbook.xml.h:43 ui/evolution-calendar.xml.h:42
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:106
-#: ui/my-evolution.xml.h:7
+#: ui/evolution-addressbook.xml.h:39
+msgid "_Move to Folder..."
+msgstr "Fl_ytt til mappe..."
+
+#: ui/evolution-addressbook.xml.h:42 ui/evolution-calendar.xml.h:30
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
+#: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "S_kriv ut..."
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:43
 msgid "_Save as VCard"
 msgstr "Lagre _som VCard"
 
-#: ui/evolution-addressbook.xml.h:45
+#: ui/evolution-addressbook.xml.h:44
 msgid "_Search for Contacts"
 msgstr "_Søk etter kontakter"
 
-#: ui/evolution-addressbook.xml.h:46
+#: ui/evolution-addressbook.xml.h:45
 msgid "_Select All"
 msgstr "_Velg alle"
 
-#: ui/evolution-addressbook.xml.h:47
+#: ui/evolution-addressbook.xml.h:46
 msgid "_Send Message to Contact..."
 msgstr "_Send melding til kontakt..."
 
-#: ui/evolution-calendar.xml.h:2
-msgid "Configure the calendar's settings"
-msgstr "Konfigurer innstillinger for kalender"
-
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a New All Day _Event"
-msgstr "Opprett en ny hendelse for h_ele dagen"
-
-#: ui/evolution-calendar.xml.h:5 ui/evolution-tasks.xml.h:5
-msgid "Create a New _Task"
-msgstr "Oppre_tt en ny oppgave"
-
-#: ui/evolution-calendar.xml.h:6
-msgid "Create a _New Appointment"
-msgstr "Opprett en _ny avtale"
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a _New Meeting"
-msgstr "Skriv _ny melding"
-
-#: ui/evolution-calendar.xml.h:8
-msgid "Create a new appointment"
-msgstr "Opprett en ny avtale"
-
-#: ui/evolution-calendar.xml.h:9
-msgid "Create a new meeting request"
-msgstr "Dette er en møteforespørsel"
-
-#: ui/evolution-calendar.xml.h:10 ui/evolution-tasks.xml.h:6
-msgid "Create a new task"
-msgstr "Opprett en ny oppgave"
-
-#: ui/evolution-calendar.xml.h:11
-msgid "Create an event for the whole day"
-msgstr "Opprett en hendelse for hele dagen"
-
-#: ui/evolution-calendar.xml.h:13
 msgid "Day"
 msgstr "Dag"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:5
 msgid "Delete the appointment"
 msgstr "Slett avtalen"
 
-#: ui/evolution-calendar.xml.h:15 ui/evolution-mail-message.xml.h:39
+#: ui/evolution-calendar.xml.h:6
 msgid "Go To"
 msgstr "Gå til"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:7
 msgid "Go back"
 msgstr "Gå tilbake"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:8
 msgid "Go forward"
 msgstr "Gå fremover"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:9
 msgid "Go to _Date"
 msgstr "Gå til _dato"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:11
 msgid "Go to a specific date"
 msgstr "Gå til en spesifikk dato"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to today"
 msgstr "Gå til i dag"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:13
 msgid "Month"
 msgstr "Måned"
 
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:15
 msgid "Previews the calendar to be printed"
 msgstr "Forhåndsviser av kalenderen som skal skrives ut"
 
-#: ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
+#: ui/evolution-calendar.xml.h:16 ui/evolution-comp-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:12
 msgid "Print Pre_view"
 msgstr "Forhåndsvisning av utskrift"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:17
 msgid "Print this calendar"
 msgstr "Skriv ut denne kalenderen"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:18
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Publiser ledig/opptatt informasjon for denne kalenderen"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:19
 msgid "Show one day"
 msgstr "Vis en dag"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:20
 msgid "Show one month"
 msgstr "Vis en måned"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:21
 msgid "Show one week"
 msgstr "Vis en uke"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:22
 msgid "Show the working week"
 msgstr "Vis arbeidsuken"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:23
 msgid "Week"
 msgstr "Uke"
 
-#: ui/evolution-calendar.xml.h:35
-msgid "_Appointment..."
-msgstr "_Avtale..."
-
-#: ui/evolution-calendar.xml.h:36
-msgid "_Calendar Settings..."
-msgstr "Innstillinger for _kalender..."
-
-#: ui/evolution-calendar.xml.h:40
-msgid "_Meeting..."
-msgstr "_Møte..."
-
-#: ui/evolution-calendar.xml.h:43
+#: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "_Publiser ledig/opptatt-informasjon"
 
-#: ui/evolution-calendar.xml.h:44
-msgid "_Task..."
-msgstr "_Oppgave..."
-
 #: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
@@ -24590,13 +24760,13 @@ msgid "Print..."
 msgstr "Skriv ut..."
 
 #: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:240
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:240
 msgid "Save"
 msgstr "Lagre"
 
 #: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
 #: ui/evolution-contact-list-editor.xml.h:6
-#: ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-signature-editor.xml.h:6
 msgid "Save and Close"
 msgstr "Lagre og lukk"
 
@@ -24612,8 +24782,8 @@ msgstr "Lagre denne oppføringen til disk"
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:36
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:37
 msgid "_File"
 msgstr "_Fil"
 
@@ -24638,7 +24808,7 @@ msgstr "Send _melding til kontakt..."
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
 #: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:11
+#: ui/evolution-signature-editor.xml.h:14
 msgid "_Save"
 msgstr "_Lagre"
 
@@ -24867,11 +25037,11 @@ msgstr "Skjul valgte meldinger midlertidig"
 msgid "Threaded Message list"
 msgstr "Meldingsliste med tråder"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:19
+#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:18
 msgid "_Expunge"
 msgstr "_Tøm"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:38
 msgid "_Folder"
 msgstr "M_appe"
 
@@ -24887,205 +25057,221 @@ msgstr "Egenska_per..."
 msgid "_Threaded Message List"
 msgstr "Meldingsliste med _tråder"
 
+#: ui/evolution-mail-message.xml.h:1
+msgid "A_dd Sender to Addressbook"
+msgstr "Le_gg til sender i adressebok"
+
 #: ui/evolution-mail-message.xml.h:2
-msgid "Add Sender to Address _Book"
-msgstr "Legg til sender i adresse_bok"
+msgid "A_pply Filters"
+msgstr "_Påfør filtre"
 
 #: ui/evolution-mail-message.xml.h:3
+msgid "Add Sender to Addressbook"
+msgstr "Legg til sender i adressebok"
+
+#: ui/evolution-mail-message.xml.h:4
 msgid "Apply filter rules to the selected messages"
 msgstr "Aktiver filterregler på de valgte meldingene"
 
-#: ui/evolution-mail-message.xml.h:4
+#: ui/evolution-mail-message.xml.h:5
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "Skriv et svar til alle mottakere av den valgte meldingen"
 
-#: ui/evolution-mail-message.xml.h:5
+#: ui/evolution-mail-message.xml.h:6
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Skriv et svar til e-postlisten for den valgte meldingen"
 
-#: ui/evolution-mail-message.xml.h:6
+#: ui/evolution-mail-message.xml.h:7
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Skriv et svar til avsender av den valgte meldingen"
 
-#: ui/evolution-mail-message.xml.h:8
+#: ui/evolution-mail-message.xml.h:9
 msgid "Copy selected messages to another folder"
 msgstr "Kopier valgte meldinger til en annen mappe"
 
-#: ui/evolution-mail-message.xml.h:9
+#: ui/evolution-mail-message.xml.h:10
 msgid "Create _Virtual Folder From Message"
 msgstr "Lage _virtuell mappe fra melding"
 
-#: ui/evolution-mail-message.xml.h:10
+#: ui/evolution-mail-message.xml.h:11
 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:11
+#: ui/evolution-mail-message.xml.h:12
 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:12
+#: ui/evolution-mail-message.xml.h:13
 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:13
+#: ui/evolution-mail-message.xml.h:14
 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:14
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a virtual folder for these recipients"
 msgstr "Lag en virtuell mappe for disse mottakerene"
 
-#: ui/evolution-mail-message.xml.h:15
+#: ui/evolution-mail-message.xml.h:16
 msgid "Create a virtual folder for this mailing list"
 msgstr "Lag en virtuell mappe for denne e-postlisten"
 
-#: ui/evolution-mail-message.xml.h:16
+#: ui/evolution-mail-message.xml.h:17
 msgid "Create a virtual folder for this sender"
 msgstr "Lag en virtuell mappe for denne avsenderen"
 
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:18
 msgid "Create a virtual folder for this subject"
 msgstr "Lag en virtuell mappe for dette emnet"
 
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:19
 msgid "Decrease the text size"
 msgstr "Mindre skrift"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the next important message"
 msgstr "Vis neste viktige melding"
 
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the next message"
 msgstr "Vis neste melding"
 
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:23
 msgid "Display the next unread message"
 msgstr "Vis neste uleste melding"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:24
 msgid "Display the next unread thread"
 msgstr "Vis neste uleste tråd"
 
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:25
 msgid "Display the previous important message"
 msgstr "Vis forrige viktige melding"
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:26
 msgid "Display the previous message"
 msgstr "Vis forrige melding"
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:27
 msgid "Display the previous unread message"
 msgstr "Vis forrige uleste melding"
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:28
+msgid "F_orward"
+msgstr "_Videresend"
+
+#: ui/evolution-mail-message.xml.h:29
 msgid "Filter on Mailing _List..."
 msgstr "Filtrer på e-post_liste..."
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:30
 msgid "Filter on Se_nder..."
 msgstr "Filtrer på se_nder..."
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:31
 msgid "Filter on _Recipients..."
 msgstr "Filtrer på mottake_re..."
 
-#: ui/evolution-mail-message.xml.h:30
+#: ui/evolution-mail-message.xml.h:32
 msgid "Filter on _Subject..."
 msgstr "Filtrer på e_mne..."
 
-#: ui/evolution-mail-message.xml.h:31
+#: ui/evolution-mail-message.xml.h:33
 msgid "Flag selected message(s) for follow-up"
 msgstr "Merk valgt(e) melding(er) for oppfølging"
 
-#: ui/evolution-mail-message.xml.h:33
+#: ui/evolution-mail-message.xml.h:34
+msgid "Follow _Up..."
+msgstr "Følg _opp..."
+
+#: ui/evolution-mail-message.xml.h:35
 msgid "Force images in HTML mail to be loaded"
 msgstr "Tvungen lasting av bilder i HTML e-post"
 
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr "Videresend"
 
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:37
 msgid "Forward the selected message in the body of a new message"
 msgstr "Videresend den valgte meldingen i kroppen av en ny melding"
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:38
 msgid "Forward the selected message quoted like a reply"
 msgstr "Videresend den valgte meldingen sitert som et svar"
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:39
 msgid "Forward the selected message to someone"
 msgstr "Videresend den valgte meldingen til noen"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:40
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Videresend den valgte meldingen til noen som et vedlegg"
 
-#: ui/evolution-mail-message.xml.h:40
+#: ui/evolution-mail-message.xml.h:41
 msgid "Increase the text size"
 msgstr "Større tekst"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:42
 msgid "Load _Images"
 msgstr "Last b_ilder"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark as I_mportant"
 msgstr "Merk som _viktig"
 
 #: ui/evolution-mail-message.xml.h:45
+msgid "Mark as U_nread"
+msgstr "Merk som _ulest"
+
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark as Unimp_ortant"
 msgstr "Merk som uv_iktig"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
 msgid "Mark the selected message(s) as having been read"
 msgstr "Merk valgt(e) melding(er) som lest"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark the selected message(s) as important"
 msgstr "Merk valgt(e) melding(er) som viktige"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Merk valgt(e) melding(er) som ulest"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Merk valgt(e) melding(er) som uviktige"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected messages for deletion"
 msgstr "Merk valgte meldinger for sletting"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:52
 msgid "Move"
 msgstr "Flytt"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:53
 msgid "Move selected message(s) to another folder"
 msgstr "Flytt valgt(e) melding(er) til en annen mappe"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:54
 msgid "Next"
 msgstr "Neste"
 
-#: ui/evolution-mail-message.xml.h:54
-msgid "Next Important Message"
-msgstr "Neste viktige melding"
-
 #: ui/evolution-mail-message.xml.h:55
-msgid "Next Message"
-msgstr "Neste melding"
+msgid "Next _Important Message"
+msgstr "Neste v_iktige melding"
 
 #: ui/evolution-mail-message.xml.h:56
-msgid "Next Thread"
-msgstr "Velg tråd"
+msgid "Next _Thread"
+msgstr "Neste _tråd"
 
 #: ui/evolution-mail-message.xml.h:57
-msgid "Next Unread Message"
-msgstr "Neste uleste melding"
+msgid "Next _Unread Message"
+msgstr "Neste _uleste melding"
 
 #: ui/evolution-mail-message.xml.h:58
 msgid "Open the selected message in a new window"
@@ -25100,149 +25286,149 @@ msgid "Original Si_ze"
 msgstr "Opprinnelig st_ørrelse"
 
 #: ui/evolution-mail-message.xml.h:61
-msgid "Preview the message to be printed"
-msgstr "Forhåndsvis meldingen som skal skrives ut"
+msgid "P_revious Unread Message"
+msgstr "Fo_rrige uleste melding"
 
 #: ui/evolution-mail-message.xml.h:62
-msgid "Previous"
-msgstr "Forrige"
+msgid "Pr_evious Important Message"
+msgstr "Forrig_e viktige melding"
 
 #: ui/evolution-mail-message.xml.h:63
-msgid "Previous Important Message"
-msgstr "Forrige viktige melding"
+msgid "Preview the message to be printed"
+msgstr "Forhåndsvis meldingen som skal skrives ut"
 
 #: ui/evolution-mail-message.xml.h:64
-msgid "Previous Message"
-msgstr "Forrige melding"
-
-#: ui/evolution-mail-message.xml.h:65
-msgid "Previous Unread Message"
-msgstr "Forrige uleste melding"
+msgid "Previous"
+msgstr "Forrige"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:67
 msgid "Print this message"
 msgstr "Skriv ut denne meldingen"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:68
 msgid "Re_direct"
 msgstr "Om_diriger"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:69
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Omdiriger (bounce) den valgte meldingen til noen"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:70
 msgid "Reply"
 msgstr "Svar"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:71
 msgid "Reply to All"
 msgstr "Svar til alle"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:74
 msgid "Reset the text to its original size"
 msgstr "Ta teksten tilbake til sin opprinnelige størrelse"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:75
 msgid "S_earch Message..."
 msgstr "Søk i m_elding..."
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:76
 msgid "S_maller"
 msgstr "_Mindre"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:77
 msgid "Save the message as a text file"
 msgstr "Lagre meldingen som en tekstfil"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:78
 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:80
+#: ui/evolution-mail-message.xml.h:79
 msgid "Setup the page settings for your current printer"
 msgstr "Rediger sideinnstillinger for aktiv skriver"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:80
 msgid "Show Email _Source"
 msgstr "Vis e-post-kilde"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:81
 msgid "Show Full _Headers"
 msgstr "Vis fulle _headere"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show message in the normal style"
 msgstr "Vis melding i normal stil"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show message with all email headers"
 msgstr "Vis melding med fulle e-post headere"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:84
 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:86
+#: ui/evolution-mail-message.xml.h:85
 msgid "Text Si_ze"
 msgstr "Tekstst_ørrelse"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:86
 msgid "Un-delete the selected messages"
 msgstr "Angre slett av den valgte meldingen"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:87
 msgid "VFolder on Mailing _List..."
 msgstr "VFolder på e-post_liste..."
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:88
 msgid "VFolder on Se_nder..."
 msgstr "VFolder for se_nder..."
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on _Recipients..."
 msgstr "VFolder for mottake_re..."
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on _Subject..."
 msgstr "VFolder på e_mne..."
 
-#: ui/evolution-mail-message.xml.h:93
-msgid "_Apply Filters"
-msgstr "_Påfør filtre"
-
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:92
 msgid "_Attached"
 msgstr "Vedl_agt"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Copy to Folder"
 msgstr "_Kopier til mappe"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:94
 msgid "_Create Filter From Message"
 msgstr "La_g filter fra melding"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:97
 msgid "_Forward Message"
 msgstr "_Videresend melding"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:98
+msgid "_Go To"
+msgstr "_Gå til"
+
+#: ui/evolution-mail-message.xml.h:99
 msgid "_Inline"
 msgstr "_Inline"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Larger"
 msgstr "_Større"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Message Display"
 msgstr "_Meldingsvisning"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Move to Folder"
 msgstr "_Flytt til mappe"
 
+#: ui/evolution-mail-message.xml.h:103
+msgid "_Next Message"
+msgstr "_Neste melding"
+
 #: ui/evolution-mail-message.xml.h:104
 msgid "_Normal Display"
 msgstr "_Normal visning"
@@ -25251,28 +25437,35 @@ msgstr "_Normal visning"
 msgid "_Open Message"
 msgstr "_Åpne melding"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:106
+msgid "_Previous Message"
+msgstr "_Forrige melding"
+
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Quoted"
 msgstr "_Sitert"
 
-#: ui/evolution-mail-message.xml.h:110 ui/evolution.xml.h:49
-#: ui/my-evolution.xml.h:9
+#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:50
 msgid "_Tools"
 msgstr "_Verktøy"
 
+#: ui/evolution-mail-message.xml.h:112
+msgid "_Undelete"
+msgstr "A_ngre slett"
+
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Lukk dette vinduet"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:9
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
 #: ui/evolution.xml.h:33
 msgid "_Close"
 msgstr "L_ukk"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:50
+#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:51
 msgid "_View"
 msgstr "_Vis"
 
@@ -25296,11 +25489,11 @@ msgstr "Krypter denne meldingen med PGP"
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "Krypter denne meldingen med ditt S/MIME krypteringssertifikat"
 
-#: ui/evolution-message-composer.xml.h:8
+#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:3
 msgid "For_mat"
 msgstr "For_mat"
 
-#: ui/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:9 ui/evolution-signature-editor.xml.h:4
 msgid "H_TML"
 msgstr "H_TML"
 
@@ -25349,7 +25542,7 @@ msgid "Save in folder..."
 msgstr "Lagre i mappe..."
 
 #: ui/evolution-message-composer.xml.h:24
-#: ui/evolution-signature-editor.xml.h:5
+#: ui/evolution-signature-editor.xml.h:7
 msgid "Save the current file"
 msgstr "Lagre aktiv fil"
 
@@ -25374,6 +25567,7 @@ msgid "Send _later"
 msgstr "Send se_nere"
 
 #: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-signature-editor.xml.h:8
 msgid "Send the mail in HTML format"
 msgstr "Send meldingen i HTML-format"
 
@@ -25442,7 +25636,7 @@ msgid "_From Field"
 msgstr "_Fra-felt"
 
 #: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:13
 msgid "_Insert"
 msgstr "Sett _inn"
 
@@ -25458,7 +25652,7 @@ msgstr "Svar-til felt"
 msgid "_Security"
 msgstr "_Sikkerhet"
 
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:41
 msgid "_Help"
 msgstr "_Hjelp"
 
@@ -25514,37 +25708,37 @@ msgstr "Hent siste informasjon om oppgaven"
 msgid "Re_fresh Task"
 msgstr "O_ppdater oppgave"
 
-#: ui/evolution-tasks.xml.h:2
-msgid "Configure the task view's settings"
-msgstr "Konfigurer innstillinger for oppgavevisning"
-
-#: ui/evolution-tasks.xml.h:4
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "Kopier valgt oppgave"
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:5
 msgid "Cut selected task"
 msgstr "Klipp ut valgt oppgave"
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:6
 msgid "Delete completed tasks"
 msgstr "Slett fullførte oppgaver"
 
-#: ui/evolution-tasks.xml.h:10
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete selected tasks"
 msgstr "Slett valgte oppgaver"
 
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:8
 msgid "Mar_k as Complete"
 msgstr "Mer_k som fullført"
 
-#: ui/evolution-tasks.xml.h:13
+#: ui/evolution-tasks.xml.h:10
 msgid "Paste task from the clipboard"
 msgstr "Lim inn oppgave fra utklippstavlen"
 
-#: ui/evolution-tasks.xml.h:14
-msgid "Tasks Settings..."
-msgstr "Innstillinger for oppgaver..."
+#: ui/evolution-tasks.xml.h:11
+msgid "Previews the list of tasks to be printed"
+msgstr "Forhåndsviser listen over oppgaver som skal skrives ut"
+
+#: ui/evolution-tasks.xml.h:13
+msgid "Print the list of tasks"
+msgstr "Skriv ut denne listen over oppgaver"
 
 #: ui/evolution.xml.h:1
 msgid "About Ximian Evolution..."
@@ -25655,69 +25849,65 @@ msgid "_About Ximian Evolution..."
 msgstr "_Om Ximian Evolution..."
 
 #: ui/evolution.xml.h:34
+msgid "_Configure..."
+msgstr "_Konfigurer..."
+
+#: ui/evolution.xml.h:35
 msgid "_Copy..."
 msgstr "_Kopier..."
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:39
 msgid "_Folder Bar"
 msgstr "_Mappelinje"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:40
 msgid "_Go to Folder..."
 msgstr "_Gå til mappe..."
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:42
 msgid "_Import..."
 msgstr "_Importer..."
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:43
 msgid "_Move..."
 msgstr "_Flytt..."
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:44
 msgid "_New"
 msgstr "_Ny"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:45
 msgid "_New Folder"
 msgstr "_Ny mappe"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:46
 msgid "_Pilot Settings..."
 msgstr "Innstillinger for _pilot..."
 
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:47
 msgid "_Rename..."
 msgstr "_Gi nytt navn..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:48
 msgid "_Shortcut"
 msgstr "_Snarvei"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:49
 msgid "_Shortcut Bar"
 msgstr "_Snarveilinje"
 
-#: ui/my-evolution.xml.h:1
-msgid "Change the settings for the summary"
-msgstr "Endre innstillingene for sammendrag"
-
-#: ui/my-evolution.xml.h:4
+#: ui/my-evolution.xml.h:3
 msgid "Print summary"
 msgstr "Skriv ut sammendrag"
 
-#: ui/my-evolution.xml.h:5
+#: ui/my-evolution.xml.h:4
 msgid "Reload"
 msgstr "Oppdater"
 
-#: ui/my-evolution.xml.h:6
+#: ui/my-evolution.xml.h:5
 msgid "Reload the view"
 msgstr "Oppdater visningen"
 
-#: ui/my-evolution.xml.h:8
-msgid "_Summary Settings..."
-msgstr "Innstillinger for _sammendrag..."
-
 #: views/addressbook/galview.xml.h:1
 msgid "Address Cards"
 msgstr "Adressekort"
@@ -25891,20 +26081,20 @@ msgstr "Ukrainsk"
 msgid "Visual"
 msgstr "Synlig"
 
-#: widgets/misc/e-charset-picker.c:162
+#: widgets/misc/e-charset-picker.c:164
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Ukjent tegnsett: %s"
 
-#: widgets/misc/e-charset-picker.c:204
+#: widgets/misc/e-charset-picker.c:206
 msgid "Enter the character set to use"
 msgstr "Skriv inn tegnsett som skal brukes"
 
-#: widgets/misc/e-charset-picker.c:279
+#: widgets/misc/e-charset-picker.c:281
 msgid "Other..."
 msgstr "Andre..."
 
-#: widgets/misc/e-charset-picker.c:398
+#: widgets/misc/e-charset-picker.c:400
 msgid "Character Encoding"
 msgstr "Tegnkoding"
 
@@ -25928,6 +26118,10 @@ msgstr "Legg til i lagrede søk"
 msgid "Clear"
 msgstr "Tøm"
 
+#: widgets/misc/e-filter-bar.h:96 widgets/misc/e-filter-bar.h:103
+msgid "Edit..."
+msgstr "Rediger..."
+
 #: widgets/misc/e-filter-bar.h:102
 msgid "Show All"
 msgstr "Vis alle"
@@ -25979,6 +26173,120 @@ msgstr "init_corba(): kunne ikke initiere GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 
+#~ msgid "Connecting to LDAP server..."
+#~ msgstr "Kobler til LDAP-tjener..."
+
+#~ msgid "Unable to connect to LDAP server."
+#~ msgstr "Kunne ikke koble til LDAP-tjener."
+
+#~ msgid "Waiting for connection to LDAP server..."
+#~ msgstr "Venter på tilkobling til LDAP-tjener..."
+
+#~ msgid "Name contains"
+#~ msgstr "Navn inneholder"
+
+#~ msgid "Email contains"
+#~ msgstr "E-post inneholder"
+
+#~ msgid "Free/Busy information (%s to %s)"
+#~ msgstr "Ledig/opptatt-informasjon (%s til %s)"
+
+#~ msgid "iCalendar information"
+#~ msgstr "iCalendar-informasjon"
+
+#~ msgid "Mail storage folder (internal)"
+#~ msgstr "Mappe for meldingslager (intern)"
+
+#~ msgid "Cannot connect to store: %s"
+#~ msgstr "Kunne ikke koble til lager: %s"
+
+#~ msgid "Filter on Mailing List"
+#~ msgstr "Filtrer etter e-postliste"
+
+#~ msgid "Could not save signature file."
+#~ msgstr "Kunne ikke lagre signaturfil."
+
+#~ msgid ""
+#~ "This signature has been changed, but hasn't been saved.\n"
+#~ "\n"
+#~ "Do you wish to save your changes?"
+#~ msgstr ""
+#~ "Denne signaturen er endret, men har ikke blitt lagret..\n"
+#~ "\n"
+#~ "Vil du lagre endringene?"
+
+#~ msgid "HTML signature file:"
+#~ msgstr "HTML-signaturfil:"
+
+#~ msgid "Signature file:"
+#~ msgstr "Signaturfil:"
+
+#~ msgid "Summary Settings"
+#~ msgstr "Innstillinger for sammendrag"
+
+#~ msgid "Evolution "
+#~ msgstr "Evolution "
+
+#~ msgid "Copyright 1999, 2000, 2001, 2002 Ximian, Inc."
+#~ msgstr "Copyright 1999, 2000, 2001, 2002 Ximian, Inc."
+
+#~ msgid "(No name)"
+#~ msgstr "(Uten navn)"
+
+#~ msgid "_Addressbook Sources..."
+#~ msgstr "_Adressebok-kilder..."
+
+#~ msgid "Configure the calendar's settings"
+#~ msgstr "Konfigurer innstillinger for kalender"
+
+#~ msgid "Create a New All Day _Event"
+#~ msgstr "Opprett en ny hendelse for h_ele dagen"
+
+#~ msgid "Create a New _Task"
+#~ msgstr "Oppre_tt en ny oppgave"
+
+#~ msgid "Create a _New Appointment"
+#~ msgstr "Opprett en _ny avtale"
+
+#~ msgid "Create a _New Meeting"
+#~ msgstr "Skriv _ny melding"
+
+#~ msgid "Create a new appointment"
+#~ msgstr "Opprett en ny avtale"
+
+#~ msgid "Create a new meeting request"
+#~ msgstr "Dette er en møteforespørsel"
+
+#~ msgid "Create a new task"
+#~ msgstr "Opprett en ny oppgave"
+
+#~ msgid "Create an event for the whole day"
+#~ msgstr "Opprett en hendelse for hele dagen"
+
+#~ msgid "_Appointment..."
+#~ msgstr "_Avtale..."
+
+#~ msgid "_Meeting..."
+#~ msgstr "_Møte..."
+
+#~ msgid "_Task..."
+#~ msgstr "_Oppgave..."
+
+#~ msgid "_Apply Filters"
+#~ msgstr "_Påfør filtre"
+
+#~ msgid "Configure the task view's settings"
+#~ msgstr "Konfigurer innstillinger for oppgavevisning"
+
+#~ msgid "Tasks Settings..."
+#~ msgstr "Innstillinger for oppgaver..."
+
+#~ msgid "Change the settings for the summary"
+#~ msgstr "Endre innstillingene for sammendrag"
+
+#~ msgid "_Summary Settings..."
+#~ msgstr "Innstillinger for _sammendrag..."
+
 #~ msgid "New List"
 #~ msgstr "Ny liste"
 
@@ -26323,13 +26631,6 @@ msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 #~ msgid "Could not connect to server: %s"
 #~ msgstr "Kunne ikke koble til tjener: %s"
 
-#~ msgid ""
-#~ "Unable to connect to POP server.\n"
-#~ "Error sending username: %s"
-#~ msgstr ""
-#~ "Kunne ikke koble til POP-tjener.\n"
-#~ "Feil under oversending av brukernavn: %s"
-
 #~ msgid "(Unknown)"
 #~ msgstr "(Ukjent)"
 
@@ -26898,9 +27199,6 @@ msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 #~ msgid "Save task as something else"
 #~ msgstr "Lagre oppgave som noe annet"
 
-#~ msgid "_Print Task..."
-#~ msgstr "Skriv ut o_ppgave..."
-
 #~ msgid "Send contact to other"
 #~ msgstr "Send kontakt til andre"
 
@@ -26976,9 +27274,6 @@ msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 #~ msgid "_Print Calendar..."
 #~ msgstr "Skriv _ut kalender"
 
-#~ msgid "This is an event that can be added to your calendar."
-#~ msgstr "Dette er en hendelse som kan legges til i din kalender."
-
 #~ msgid "This is one or more additions to a current meeting."
 #~ msgstr "Dette er et eller flere tillegg til et aktivt møte."
 
@@ -27186,9 +27481,6 @@ msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 #~ msgid "Save calendar"
 #~ msgstr "Lagre kalender"
 
-#~ msgid "Edit this task"
-#~ msgstr "Rediger denne oppgaven"
-
 #~ msgid "Delete all Occurrences"
 #~ msgstr "Slett alle oppføringer"
 
@@ -28463,9 +28755,6 @@ msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 #~ msgid "Apply any new filters to the mail in this box"
 #~ msgstr "Bruk alle nye filtre på meldinger i denne mappen"
 
-#~ msgid "Configure Folder..."
-#~ msgstr "Konfigurer mappe..."
-
 #~ msgid "Copy message to a new folder"
 #~ msgstr "Kopier meldingen til en ny mappe"
 
@@ -28638,9 +28927,6 @@ msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 #~ msgid "Unspecified"
 #~ msgstr "Uspesifisert"
 
-#~ msgid "Check settings"
-#~ msgstr "Sjekk innstillinger"
-
 #~ msgid "Evolution Mail Configuration"
 #~ msgstr "Evolution e-post-konfigurasjon"
 
@@ -28746,9 +29032,6 @@ msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 #~ msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
 #~ msgstr "© 1998-2000 the Free Software Foundation og Helix Code"
 
-#~ msgid "Configuration utility for the evolution addressbook conduit.\n"
-#~ msgstr "Konfigurasjonsverktøy for evolutions adressebok-komponent.\n"
-
 #~ msgid "gnome-unknown.xpm"
 #~ msgstr "gnome-unknown.xpm"
 
@@ -28781,9 +29064,6 @@ msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 #~ msgid "Evolution Calendar Conduit"
 #~ msgstr "Evolution kalender-komponent"
 
-#~ msgid "Configuration utility for the evolution calendar conduit.\n"
-#~ msgstr "Konfigurasjonsverktøy for evolutions kalender-komponent.\n"
-
 #~ msgid "Configure the GnomeCal conduit"
 #~ msgstr "Konfigurer GnomeCal-komponent"
 
@@ -28799,9 +29079,6 @@ msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 #~ msgid "Evolution ToDo Conduit"
 #~ msgstr "Evolution oppgaveliste-komponent"
 
-#~ msgid "Configuration utility for the evolution todo conduit.\n"
-#~ msgstr "Konfigurasjonsverktøy for evolutions oppgavelistekomponent.\n"
-
 #~ msgid "matches regex"
 #~ msgstr "er lik regex"
 
@@ -29367,9 +29644,6 @@ msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 #~ msgid "To Do List"
 #~ msgstr "Oppgaveliste"
 
-#~ msgid "Preferences"
-#~ msgstr "Brukervalg"
-
 #~ msgid "Beep on display alarms"
 #~ msgstr "Pip ved visning av alarmer"
author	Kjartan Maraas <kmaraas@gnome.org>	2002-03-15 21:52:21 +0800
committer	Kjartan Maraas <kmaraas@src.gnome.org>	2002-03-15 21:52:21 +0800
commit	02d39bf7b3fa10dbd8cbf21c13b842bcf69ff64a (patch)
tree	18f71e72a3b705baa8fbdb81f1f06d89e0a145e6 /po
parent	7df203024eea8aecb4f5a6735423d6b006f9f3e8 (diff)
download	gsoc2013-evolution-02d39bf7b3fa10dbd8cbf21c13b842bcf69ff64a.tar gsoc2013-evolution-02d39bf7b3fa10dbd8cbf21c13b842bcf69ff64a.tar.gz gsoc2013-evolution-02d39bf7b3fa10dbd8cbf21c13b842bcf69ff64a.tar.bz2 gsoc2013-evolution-02d39bf7b3fa10dbd8cbf21c13b842bcf69ff64a.tar.lz gsoc2013-evolution-02d39bf7b3fa10dbd8cbf21c13b842bcf69ff64a.tar.xz gsoc2013-evolution-02d39bf7b3fa10dbd8cbf21c13b842bcf69ff64a.tar.zst gsoc2013-evolution-02d39bf7b3fa10dbd8cbf21c13b842bcf69ff64a.zip