Updated Norwegian translation.

2004-05-12 Kjartan Maraas <kmaraas@gnome.org> * no.po: Updated Norwegian translation. svn path=/trunk/; revision=25882
author: Kjartan Maraas <kmaraas@gnome.org> 2004-05-12 23:53:12 +0800
committer: Kjartan Maraas <kmaraas@src.gnome.org> 2004-05-12 23:53:12 +0800
commit: 0645ef8e562b36f965a2312af3c50a2add878917 (patch)
tree: 182500204d314ecebf5bd0db81dc3ba11a1ed3f3
parent: 7668792e0c401a5eddccdfc9f8974262add7d27a (diff)
download: gsoc2013-evolution-0645ef8e562b36f965a2312af3c50a2add878917.tar
gsoc2013-evolution-0645ef8e562b36f965a2312af3c50a2add878917.tar.gz
gsoc2013-evolution-0645ef8e562b36f965a2312af3c50a2add878917.tar.bz2
gsoc2013-evolution-0645ef8e562b36f965a2312af3c50a2add878917.tar.lz
gsoc2013-evolution-0645ef8e562b36f965a2312af3c50a2add878917.tar.xz
gsoc2013-evolution-0645ef8e562b36f965a2312af3c50a2add878917.tar.zst
gsoc2013-evolution-0645ef8e562b36f965a2312af3c50a2add878917.zip
2 files changed, 1634 insertions, 1412 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index d9decb2cf9..097c523779 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2004-05-12  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* no.po: Updated Norwegian translation.
+
 2004-05-12  Marco Ciampa  <ciampix@libero.it>
 
 	* it.po: Italian translation updated.
diff --git a/po/no.po b/po/no.po
index a10e48e5b0..1d9de81693 100644
--- a/po/no.po
+++ b/po/no.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-02 22:22+0200\n"
-"PO-Revision-Date: 2004-05-02 22:29+0200\n"
+"POT-Creation-Date: 2004-05-12 13:30+0200\n"
+"PO-Revision-Date: 2004-05-12 15:05+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <i18n-nb@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
@@ -114,41 +114,45 @@ msgstr "_Kontaktgruppe"
 msgid "Create a new contacts group"
 msgstr "Opprett en ny kontaktgruppe"
 
-#: addressbook/gui/component/addressbook-config.c:463
+#: addressbook/gui/component/addressbook-component.c:182
+msgid "Failed upgrading Addressbook settings or folders."
+msgstr "Feil under oppgradering av innstillinger eller mapper for adressebok."
+
+#: addressbook/gui/component/addressbook-config.c:483
 msgid "Failed to connect to LDAP server"
 msgstr "Kunne ikke koble til LDAP-tjener"
 
-#: addressbook/gui/component/addressbook-config.c:487
+#: addressbook/gui/component/addressbook-config.c:507
 msgid "Failed to authenticate with LDAP server"
 msgstr "Kunne ikke autentisere mot LDAP-tjener"
 
-#: addressbook/gui/component/addressbook-config.c:515
+#: addressbook/gui/component/addressbook-config.c:535
 msgid "Could not perform query on Root DSE"
 msgstr "Kunne ikke utføre spørring på Root DSE"
 
-#: addressbook/gui/component/addressbook-config.c:820
+#: addressbook/gui/component/addressbook-config.c:840
 msgid "The server responded with no supported search bases"
 msgstr "Tjeneren svarte ikke med noen støttede basis for søk"
 
-#: addressbook/gui/component/addressbook-config.c:1220
+#: addressbook/gui/component/addressbook-config.c:1242
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Denne tjeneren støtter ikke LDAPv3 schema-informasjon"
 
-#: addressbook/gui/component/addressbook-config.c:1241
+#: addressbook/gui/component/addressbook-config.c:1263
 msgid "Error retrieving schema information"
 msgstr "Feil under henting av schema-informasjon"
 
-#: addressbook/gui/component/addressbook-config.c:1249
+#: addressbook/gui/component/addressbook-config.c:1271
 msgid "Server did not respond with valid schema information"
 msgstr "Tjener svarte ikke med gyldig schema-informasjon"
 
 #: addressbook/gui/component/addressbook-migrate.c:68
-#: calendar/gui/migration.c:137 mail/em-migrate.c:1070
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
 msgid "Migrating..."
 msgstr "Migrerer..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1111
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Migrerer «%s»:"
@@ -157,8 +161,8 @@ msgstr "Migrerer «%s»:"
 #. On This Computer is always first and VFolders is always last
 #: addressbook/gui/component/addressbook-migrate.c:438
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
-#: mail/mail-component.c:242
+#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
+#: mail/mail-component.c:243
 msgid "On This Computer"
 msgstr "På denne datamaskinen"
 
@@ -167,9 +171,9 @@ msgstr "På denne datamaskinen"
 #. Create the default Person task list
 #. orange
 #: addressbook/gui/component/addressbook-migrate.c:446
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:924 mail/mail-config.c:67
+#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
 #: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "Personlig"
@@ -200,53 +204,47 @@ msgstr ""
 "Vennligst vent mens Evolution migrerer dine mapper..."
 
 #: addressbook/gui/component/addressbook-migrate.c:1090
-#, fuzzy
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Lokasjon og hierarki for kontaktmappene i Evolution er endret siden "
-"Evolution 1.x.\n"
+"Format for kontaktlister er endret.\n"
 "\n"
 "Vennligst vent mens Evolution migrerer dine mapper..."
 
 #: addressbook/gui/component/addressbook-migrate.c:1099
-#, fuzzy
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Lokasjon og hierarki for kontaktmappene i Evolution er endret siden "
-"Evolution 1.x.\n"
+"Måten Evolution lagrer noen telefonnumre er endret.\n"
 "\n"
 "Vennligst vent mens Evolution migrerer dine mapper..."
 
 #: addressbook/gui/component/addressbook-migrate.c:1109
-#, fuzzy
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
-"Lokasjon og hierarki for kontaktmappene i Evolution er endret siden "
-"Evolution 1.x.\n"
+"Endringslogg og tilordningsfiler for Palm-synkronisering er endret.\n"
 "\n"
 "Vennligst vent mens Evolution migrerer dine mapper..."
 
-#: addressbook/gui/component/addressbook-view.c:687
+#: addressbook/gui/component/addressbook-view.c:674
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr "Adressebok «%s» vil bli fjernet. Er du sikker på at du vil fortsette?"
 
-#: addressbook/gui/component/addressbook-view.c:774
+#: addressbook/gui/component/addressbook-view.c:761
 msgid "New Address Book"
 msgstr "Ny adressebok"
 
-#: addressbook/gui/component/addressbook-view.c:775
+#: addressbook/gui/component/addressbook-view.c:762
 #: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:427 calendar/gui/tasks-component.c:361
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:365
 #: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
 #: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:3
@@ -255,25 +253,17 @@ msgstr "Ny adressebok"
 msgid "Delete"
 msgstr "Slett"
 
-#: addressbook/gui/component/addressbook-view.c:776
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
+#: addressbook/gui/component/addressbook-view.c:763
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
 msgid "Properties..."
 msgstr "Egenskaper ..."
 
-#: addressbook/gui/component/addressbook-view.c:1001
-msgid "UID of the contacts source that the view will display"
-msgstr "UID for kontaktkilden som visningen skal vise"
-
-#: addressbook/gui/component/addressbook-view.c:1006
-msgid "The URI that the address book will display"
-msgstr "URIen som adresseboken skal vise"
-
 #. Fix me *
 #. can not get name, should be a bug of e-book.Anyway, should set a default name.
 #.
 #. name = e_book_get_name (book);
 #. Create the contacts group
-#: addressbook/gui/component/addressbook-view.c:1031
+#: addressbook/gui/component/addressbook-view.c:1002
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
 #: addressbook/tools/evolution-addressbook-export-list-folders.c:51
 #: calendar/gui/migration.c:373
@@ -286,17 +276,17 @@ msgstr "EFolderList xml for listen med fullføringsURIer"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
 msgid "Position of the vertical pane in main view"
-msgstr ""
+msgstr "Plassering av vertikalt felt i hovedvisningen"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
 msgid ""
 "The number of characters that must be typed before evolution will attempt to "
 "autocomplete"
-msgstr ""
+msgstr "Antall tegn som må skrives før Evolution forsøker automatisk fullføring"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
 msgid "URI for the folder last used in the select names dialog"
-msgstr ""
+msgstr "URI for sist brukt mappe i dialogen for å velge navn"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
 msgid "Autocompletion"
@@ -331,19 +321,15 @@ msgid "Evolution Addressbook component"
 msgstr "Evolution adressebok-komponent"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook folder viewer"
-msgstr "Evolution adressebok mappevisning"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
 msgid "Evolution S/Mime Certificate Management Control"
 msgstr "Kontroll for S/MIME sertifikathåndtering for Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
 msgid "Evolution folder settings configuration control"
 msgstr "Konfigurasjonskontroll for mappeinnstillinger i Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Manage your S/MIME certificates here"
 msgstr "Håndter dine S/MIME-sertifikater her"
 
 #: addressbook/gui/component/ldap-config.glade.h:1
@@ -432,7 +418,7 @@ msgstr "Legg til kontaktgruppe"
 msgid "Address Book Properties"
 msgstr "Egenskaper for adressebok"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:68
+#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr "Alltid"
@@ -447,100 +433,90 @@ msgid "Basic"
 msgstr "Grunnleggende"
 
 #: addressbook/gui/component/ldap-config.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-msgid "C_olor:"
-msgstr "F_arge:"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Connecting"
 msgstr "Tilkobling"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 #: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Detaljer"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Distinguished _name:"
 msgstr "Distinguished _name:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Distinguished name"
 msgstr "Distinguished name"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 msgid "Download limit:"
 msgstr "Grense for nedlasting:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Email address"
 msgstr "E-postadresse"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:27
 msgid "Email address:"
 msgstr "E-postadresse:"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:28
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr "Evolution vil bruke DN til å autentisere deg mot tjeneren"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 "Evolution vil bruke denne e-post adressen til å autentisere deg mot tjeneren"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid "Find Possible Search Bases"
 msgstr "Finn mulige søkebaser"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:31
 #: calendar/gui/dialogs/calendar-setup.glade.h:6
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Generelt"
 
-#: addressbook/gui/component/ldap-config.glade.h:33 mail/mail-account-gui.c:70
+#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr "Aldri"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "En"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Only locations within starting point"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:36
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
-msgid "Pick a color"
-msgstr "Velg en farge"
+msgstr "Kun lokasjoner innenfor startpunktet"
 
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "S_earch scope: "
 msgstr "Sø_keområde: "
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid "Search base only"
 msgstr "Kun søkebase"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid "Search base:"
 msgstr "Søkebase:"
 
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid "Search scope:"
 msgstr "Søkeområde:"
 
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid "Searching"
 msgstr "Søker"
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -550,7 +526,7 @@ msgstr ""
 "tjener hvis\n"
 "denne støtter SSL eller TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -567,7 +543,7 @@ msgstr ""
 "vil ikke Evolution behøve å bruke SSL/TLS fordi tilkoblingen allerede er "
 "sikker."
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -580,19 +556,19 @@ msgstr ""
 "betyr at din tilkobling vil være usikker, og at du vil være sårbar for "
 "sikkerhetshull. "
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Starting point and locations within it"
-msgstr ""
+msgstr "Startpunkt og lokasjoner innenfor dette"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr "Under"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Supported Search Bases"
 msgstr "Støttede søkebaser"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -603,7 +579,7 @@ msgstr ""
 "starte.\n"
 "Hvis du lar denne stå tom vil søk starte ved roten av katalogtreet."
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -617,25 +593,24 @@ msgstr ""
 "Et søkeområde som «sub» vil ta med alle oppføringer under din søkebase.\n"
 "Et søkeområde som «one» vil kun ta med oppføringer ett nivå under basen.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:60
+#: addressbook/gui/component/ldap-config.glade.h:58
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 "Dette er fullt navn på din LDAP-tjener. For eksempel «ldap.mittfirma.no»."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
-#, fuzzy
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
 "too large will slow down your address book."
 msgstr ""
-"Dette er maksimalt antall oppføringer som skal lastes ned. Hvis du setter "
-"dette tallet \n"
-"for høyt vil adresseboken bli treg."
+"Dette er maksimalt antall oppføringer som skal lastes ned. Hvis du setter \n"
+"dette \n"
+"tallet for høyt vil adresseboken bli treg."
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: addressbook/gui/component/ldap-config.glade.h:61
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -644,7 +619,7 @@ msgstr ""
 "Dette er metoden Evolution bruker for å autentisere deg. Merk at hvis du "
 "setter denne til «e-post-adresse» krever anonym tilgang til din LDAP-tjener."
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -653,7 +628,7 @@ msgstr ""
 "Dette er navnet på denne tjeneren som vises i mappelisten i Evolution. \n"
 "Det brukes kun for visning på skjermen."
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:64
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -664,105 +639,105 @@ msgstr ""
 "liste med standardporter er gitt. Spør din systemadministrator hvilken\n"
 "port du skal bruke."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:67
 msgid "This option controls how long a search will be run."
 msgstr "Dette alternativet kontrollerer hvor lenge et søk vil kjøre."
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid "Timeout:"
 msgstr "Tidsavbrudd:"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "U_se SSL/TLS:"
 msgstr "B_ruk SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Using distinguished name (DN)"
 msgstr "Bruker distinguished name (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Using email address"
 msgstr "Bruker e-post adresse"
 
-#: addressbook/gui/component/ldap-config.glade.h:74 mail/mail-account-gui.c:69
+#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr "Når mulig"
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid "_Add Contacts Group"
 msgstr "_Legg til kontaktgruppe"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:74
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
 msgid "_Display name:"
 msgstr "_Vis navn:"
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid "_Download limit:"
 msgstr "Grense for ne_dlasting:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:76
 msgid "_Email address:"
 msgstr "_E-postadresse:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "_Log in method:"
 msgstr "Metode for på_logging:"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr "_Navn:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "_Port number:"
 msgstr "_Portnummer:"
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid "_Port:"
 msgstr "_Port:"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid "_Search base:"
 msgstr "_Søkebase:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "_Server name:"
 msgstr "_Tjenernavn:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "_Server:"
 msgstr "Tj_ener:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "_Timeout (minutes):"
 msgstr "_Tidsavbrudd (minutter):"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Use secure connection:"
 msgstr "Br_uk sikker forbindelse:"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "cards"
 msgstr "kort"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "connecting-tab"
 msgstr "connecting-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "general-tab"
 msgstr "general-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: calendar/gui/dialogs/alarm-options.glade.h:14
 #: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
 #: mail/mail-config.glade.h:182
 msgid "minutes"
 msgstr "minutter"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "searching-tab"
 msgstr "searching-tab"
 
@@ -876,175 +851,171 @@ msgid "<b>Work</b>"
 msgstr "<b>Arbeid</b> "
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
+#: addressbook/gui/contact-editor/e-contact-editor.c:183
 #: addressbook/gui/widgets/eab-contact-display.c:302
 #: addressbook/gui/widgets/eab-contact-display.c:321
 msgid "AIM"
 msgstr "AIM"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-msgid "Address 2:"
-msgstr "Adresse 2:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "Address:"
 msgstr "Adresse:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "Anniversary:"
 msgstr "Bryllupsdag:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Assistant:"
 msgstr "Assistent:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Birthday:"
 msgstr "Fødselsdag:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-msgid "Blog:"
-msgstr "Weblogg:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: calendar/gui/dialogs/event-page.glade.h:5
 msgid "Calendar:"
 msgstr "Kalender:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "City:"
 msgstr "By:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "Company:"
 msgstr "Firma:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: addressbook/gui/contact-editor/e-contact-editor.c:260
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/e-contact-editor.c:270
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
 msgid "Contact"
 msgstr "Kontakt"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
-#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1523
 msgid "Contact Editor"
 msgstr "Kontaktredigering"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "Country:"
 msgstr "Land:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "Department:"
 msgstr "Avdeling:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "Free/Busy:"
 msgstr "Ledig/opptatt:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "Full _Name..."
 msgstr "Fullt _navn..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
 msgid "Home"
 msgstr "Hjemme"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+msgid "Home Page:"
+msgstr "Hjemmeside:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "Job title:"
 msgstr "Jobbtittel:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 #: calendar/gui/e-itip-control.c:936
 msgid "Location:"
 msgstr "Plassering:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "Mailing Address"
 msgstr "Postadresse"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "Manager:"
 msgstr "Leder:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "Ni_ckname:"
 msgstr "_Kallenavn:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "Notes:"
 msgstr "Notater:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
 msgid "Other"
 msgstr "Andre"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "Personal Information"
 msgstr "Personlig informasjon"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "Profession:"
 msgstr "Yrke:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "State/Province:"
 msgstr "Stat/provins:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
 msgid "Wants to receive HTML mail"
 msgstr "Ønsker å motta HTML-formatert e-post"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:42
+#: addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "Webcam:"
 msgstr "Nettkamera:"
 
 #. red
-#: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:193
+#: addressbook/gui/contact-editor/contact-editor.glade.h:42
+#: addressbook/gui/contact-editor/e-contact-editor.c:200
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
-#: filter/filter-label.c:122 mail/em-migrate.c:923 mail/mail-config.c:66
+#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
 #: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "Arbeid"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: addressbook/gui/contact-editor/contact-editor.glade.h:43
 msgid "Zip/Postal Code:"
 msgstr "Zip/postnummer:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: addressbook/gui/contact-editor/contact-editor.glade.h:44
 msgid "_Categories"
 msgstr "_Kategorier"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: addressbook/gui/contact-editor/contact-editor.glade.h:45
 msgid "_File under:"
 msgstr "_Lagre under:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-editor/contact-editor.glade.h:46
 msgid "_Where:"
 msgstr "_Hvor:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: addressbook/gui/contact-editor/contact-editor.glade.h:47
 msgid "item7"
 msgstr "oppføring7"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
+#: addressbook/gui/contact-editor/contact-editor.glade.h:48
 msgid "item8"
 msgstr "oppføring8"
 
@@ -1071,7 +1042,7 @@ msgid "Address"
 msgstr "Adresse"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:281
+#: addressbook/gui/contact-editor/e-contact-editor.c:291
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
@@ -2052,65 +2023,65 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
 #: addressbook/gui/widgets/eab-contact-display.c:305
 #: addressbook/gui/widgets/eab-contact-display.c:324
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/widgets/eab-contact-display.c:307
 #: addressbook/gui/widgets/eab-contact-display.c:326
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
 #: addressbook/gui/widgets/eab-contact-display.c:306
 #: addressbook/gui/widgets/eab-contact-display.c:325
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
 #: addressbook/gui/widgets/eab-contact-display.c:304
 #: addressbook/gui/widgets/eab-contact-display.c:323
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:256
 msgid "Source Book"
 msgstr "Kildebok"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:253
+#: addressbook/gui/contact-editor/e-contact-editor.c:263
 msgid "Target Book"
 msgstr "Målbok"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:267
+#: addressbook/gui/contact-editor/e-contact-editor.c:277
 msgid "Is New Contact"
 msgstr "Er ny kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:274
+#: addressbook/gui/contact-editor/e-contact-editor.c:284
 msgid "Writable Fields"
 msgstr "Skrivbare felter"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:288
+#: addressbook/gui/contact-editor/e-contact-editor.c:298
 msgid "Changed"
 msgstr "Endret"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
 msgid "Category editor not available."
 msgstr "Kategori editor ikke tilgjengelig."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
 msgid "This contact belongs to these categories:"
 msgstr "Denne kontakten hører til disse kategoriene:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2495
+#: addressbook/gui/contact-editor/e-contact-editor.c:2592
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Kunne ikke finne widget for felt: «%s»"
@@ -2457,7 +2428,7 @@ msgstr "Suksess"
 #. E_BOOK_ERROR_BUSY
 #: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Backend busy"
-msgstr ""
+msgstr "Motor opptatt"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
 #: addressbook/gui/widgets/eab-gui-util.c:52
@@ -2471,9 +2442,8 @@ msgstr "Adresseboken eksisterer ikke"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
 #: addressbook/gui/widgets/eab-gui-util.c:54
-#, fuzzy
 msgid "No Self Contact defined"
-msgstr "Ny kontaktliste"
+msgstr "Egen kontaktinformasjon er ikke definert"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
@@ -2502,7 +2472,7 @@ msgstr "Protokollen er ikke støttet"
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:233
 #: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
-#: calendar/gui/e-cal-model-tasks.c:627 calendar/gui/print.c:2349
+#: calendar/gui/e-cal-model-tasks.c:655 calendar/gui/print.c:2349
 #: camel/camel-service.c:728 camel/camel-service.c:766
 #: camel/camel-service.c:850 camel/camel-service.c:890
 #: camel/providers/pop3/camel-pop3-store.c:451
@@ -2620,7 +2590,7 @@ msgid "Error adding list"
 msgstr "Feil under innlegging av liste"
 
 #: addressbook/gui/widgets/eab-gui-util.c:228
-#: addressbook/gui/widgets/eab-gui-util.c:650
+#: addressbook/gui/widgets/eab-gui-util.c:651
 msgid "Error adding contact"
 msgstr "Feil under innlegging av kontakt"
 
@@ -2637,7 +2607,7 @@ msgid "Error removing list"
 msgstr "Feil under fjerning av liste"
 
 #: addressbook/gui/widgets/eab-gui-util.c:251
-#: addressbook/gui/widgets/eab-gui-util.c:608
+#: addressbook/gui/widgets/eab-gui-util.c:609
 msgid "Error removing contact"
 msgstr "Feil under fjerning av kontakt"
 
@@ -2673,35 +2643,35 @@ msgstr "Feil under lagring av %s: %s"
 msgid "card.vcf"
 msgstr "kort.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:569
+#: addressbook/gui/widgets/eab-gui-util.c:570
 msgid "list"
 msgstr "liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:704
+#: addressbook/gui/widgets/eab-gui-util.c:705
 msgid "Move contact to"
 msgstr "Flytt kontakt til"
 
-#: addressbook/gui/widgets/eab-gui-util.c:706
+#: addressbook/gui/widgets/eab-gui-util.c:707
 msgid "Copy contact to"
 msgstr "Kopier kontakt til"
 
-#: addressbook/gui/widgets/eab-gui-util.c:709
+#: addressbook/gui/widgets/eab-gui-util.c:710
 msgid "Move contacts to"
 msgstr "Flytt kontakter til"
 
-#: addressbook/gui/widgets/eab-gui-util.c:711
+#: addressbook/gui/widgets/eab-gui-util.c:712
 msgid "Copy contacts to"
 msgstr "Kopier kontakter til"
 
-#: addressbook/gui/widgets/eab-gui-util.c:714
+#: addressbook/gui/widgets/eab-gui-util.c:715
 msgid "Select target addressbook."
 msgstr "Velg mål-adressebok"
 
-#: addressbook/gui/widgets/eab-gui-util.c:887
+#: addressbook/gui/widgets/eab-gui-util.c:888
 msgid "Multiple VCards"
 msgstr "Flere VCard"
 
-#: addressbook/gui/widgets/eab-gui-util.c:890
+#: addressbook/gui/widgets/eab-gui-util.c:891
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard for %s"
@@ -2844,7 +2814,7 @@ msgstr "Adressebok"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:850
 #: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2066
+#: addressbook/gui/widgets/e-addressbook-view.c:2076
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Lagre som VCard"
@@ -2911,7 +2881,7 @@ msgid "Cut"
 msgstr "Klipp ut"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:425 calendar/gui/tasks-component.c:359
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
@@ -2940,7 +2910,7 @@ msgstr ""
 "igjen"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1657
+#: addressbook/gui/widgets/e-addressbook-view.c:1667
 #: calendar/gui/cal-search-bar.c:365
 msgid "Any Category"
 msgstr "Enhver kategori"
@@ -3619,7 +3589,7 @@ msgstr "ugyldig tid"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
 msgid "Allocate less space to weekend appointments"
-msgstr ""
+msgstr "Tildel mindre plass til avtaler i helgen"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
 msgid "Calendars to run alarms for"
@@ -3741,7 +3711,9 @@ msgstr "Om tider skal vises i 24-timers format i stedet for å bruke AM/PM"
 msgid "Whether to show week numbers in date navigator"
 msgstr "Om ukenummer skal vises i minikalenderen"
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1706
+#: calendar/gui/calendar-commands.c:116 calendar/gui/calendar-component.c:552
+#: calendar/gui/dialogs/select-source-dialog.c:88
+#: calendar/gui/gnome-cal.c:1703
 #: camel/providers/groupwise/camel-gw-listener.c:304
 #: camel/providers/groupwise/camel-gw-listener.c:327
 msgid "Calendar"
@@ -3766,7 +3738,7 @@ msgstr "Slett hendelser eldre enn"
 msgid "days"
 msgstr "dager"
 
-#: calendar/gui/calendar-commands.c:431
+#: calendar/gui/calendar-commands.c:431 calendar/gui/calendar-component.c:504
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
@@ -3776,104 +3748,111 @@ msgstr "%A %d %B %Y"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: calendar/gui/calendar-commands.c:434 calendar/gui/e-day-view.c:1589
-#: calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/calendar-commands.c:434 calendar/gui/calendar-component.c:507
+#: calendar/gui/e-day-view.c:1589 calendar/gui/e-day-view-top-item.c:694
 #: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #: calendar/gui/calendar-commands.c:436 calendar/gui/calendar-commands.c:441
-#: calendar/gui/calendar-commands.c:443
+#: calendar/gui/calendar-commands.c:443 calendar/gui/calendar-component.c:509
+#: calendar/gui/calendar-component.c:514 calendar/gui/calendar-component.c:516
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
 #: calendar/gui/calendar-commands.c:460 calendar/gui/calendar-commands.c:466
 #: calendar/gui/calendar-commands.c:472 calendar/gui/calendar-commands.c:474
+#: calendar/gui/calendar-component.c:528 calendar/gui/calendar-component.c:535
+#: calendar/gui/calendar-component.c:541 calendar/gui/calendar-component.c:543
 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:464
+#: calendar/gui/calendar-commands.c:464 calendar/gui/calendar-component.c:533
 #: calendar/gui/e-week-view-main-item.c:337 calendar/gui/print.c:1498
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:367
+#: calendar/gui/calendar-component.c:370
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr "Kalender «%s» vil bli fjernet. Er du sikker på at du vil fortsette?"
 
-#: calendar/gui/calendar-component.c:423
+#: calendar/gui/calendar-component.c:426
 msgid "New Calendar"
 msgstr "Ny kalender"
 
-#: calendar/gui/calendar-component.c:800
+#: calendar/gui/calendar-component.c:623
+msgid "Failed upgrading calendars."
+msgstr "Feil under oppgradering av kalendere."
+
+#: calendar/gui/calendar-component.c:917
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Kan ikke åpne kalender «%s» for oppretting av hendelser og møter"
 
-#: calendar/gui/calendar-component.c:812
+#: calendar/gui/calendar-component.c:929
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Ingen kalender er tilgjengelig for oppretting av hendelser og møter"
 
-#: calendar/gui/calendar-component.c:846
+#: calendar/gui/calendar-component.c:963
 msgid ""
 "Selected calendar is read-only, events cannot be created. Please select a "
 "read-write calendar."
-msgstr ""
+msgstr "Valgt kalender er skrivebeskyttet. Hendelser kan ikke opprettes. Vennligst velg en kalender du kan skrive til."
 
-#: calendar/gui/calendar-component.c:954
+#: calendar/gui/calendar-component.c:1071
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
 msgid "Calendars"
 msgstr "Kalendere"
 
-#: calendar/gui/calendar-component.c:1110
+#: calendar/gui/calendar-component.c:1234
 msgid "New appointment"
 msgstr "Ny avtale"
 
-#: calendar/gui/calendar-component.c:1111
+#: calendar/gui/calendar-component.c:1235
 msgid "_Appointment"
 msgstr "A_vtale"
 
-#: calendar/gui/calendar-component.c:1112
+#: calendar/gui/calendar-component.c:1236
 msgid "Create a new appointment"
 msgstr "Opprett en ny avtale"
 
-#: calendar/gui/calendar-component.c:1118
+#: calendar/gui/calendar-component.c:1242
 msgid "New meeting"
 msgstr "Nytt møte"
 
-#: calendar/gui/calendar-component.c:1119
+#: calendar/gui/calendar-component.c:1243
 msgid "M_eeting"
 msgstr "Møt_e"
 
-#: calendar/gui/calendar-component.c:1120
+#: calendar/gui/calendar-component.c:1244
 msgid "Create a new meeting request"
 msgstr "Opprett en ny møteforespørsel"
 
-#: calendar/gui/calendar-component.c:1126
+#: calendar/gui/calendar-component.c:1250
 msgid "New all day appointment"
 msgstr "Ny avtale for hele dagen"
 
-#: calendar/gui/calendar-component.c:1127
+#: calendar/gui/calendar-component.c:1251
 msgid "All _Day Appointment"
 msgstr "Avtale for hele _dagen"
 
-#: calendar/gui/calendar-component.c:1128
+#: calendar/gui/calendar-component.c:1252
 msgid "Create a new all-day appointment"
 msgstr "Opprett en ny avtale for hele dagen"
 
-#: calendar/gui/calendar-component.c:1134
+#: calendar/gui/calendar-component.c:1258
 msgid "New calendar"
 msgstr "Ny kalender"
 
-#: calendar/gui/calendar-component.c:1135
+#: calendar/gui/calendar-component.c:1259
 msgid "C_alendar"
 msgstr "K_alender"
 
-#: calendar/gui/calendar-component.c:1136
+#: calendar/gui/calendar-component.c:1260
 msgid "Create a new calendar"
 msgstr "Opprett en ny kalender"
 
@@ -3940,19 +3919,6 @@ msgstr "Tilgang nektet ved åpning av kalender"
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/control-factory.c:142
-#, c-format
-msgid "Could not open the folder in '%s'"
-msgstr "Kunne ikke åpne mappen i «%s»"
-
-#: calendar/gui/control-factory.c:194
-msgid "The URI that the calendar will display"
-msgstr "URIen som kalenderen skal vise"
-
-#: calendar/gui/control-factory.c:201
-msgid "The type of view to show"
-msgstr "Type visning som skal brukes"
-
 #: calendar/gui/dialogs/alarm-options.c:466
 msgid "Audio Alarm Options"
 msgstr "Alternativer for lyd-alarmer"
@@ -4098,26 +4064,26 @@ msgstr "minutt(er)"
 msgid "start of appointment"
 msgstr "start på avtale"
 
-#: calendar/gui/dialogs/calendar-setup.c:166
+#: calendar/gui/dialogs/calendar-setup.c:170
 msgid "You must specify a location to get the calendar from."
 msgstr "Du må oppgi en lokasjon å hente kalenderen fra."
 
-#: calendar/gui/dialogs/calendar-setup.c:174
+#: calendar/gui/dialogs/calendar-setup.c:178
 #, c-format
 msgid "The source location '%s' is not well-formed."
 msgstr "Kildelokasjon «%s» er ikke riktig utformet."
 
-#: calendar/gui/dialogs/calendar-setup.c:189
+#: calendar/gui/dialogs/calendar-setup.c:193
 #, c-format
 msgid "The source location '%s' is not a webcal source."
 msgstr "Kildelokasjon «%s» er ikke en webcal-kilde."
 
-#: calendar/gui/dialogs/calendar-setup.c:234
+#: calendar/gui/dialogs/calendar-setup.c:265
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr "Kilde med navn «%s» eksisterer allerede i valgt gruppe"
 
-#: calendar/gui/dialogs/calendar-setup.c:247
+#: calendar/gui/dialogs/calendar-setup.c:278
 #, c-format
 msgid ""
 "The group '%s' is remote. You must specify a location to get the calendar "
@@ -4133,10 +4099,18 @@ msgstr "Legg til kalender"
 msgid "Add Tasks Group"
 msgstr "Legg til oppgavegruppe"
 
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+msgid "C_olor:"
+msgstr "F_arge:"
+
 #: calendar/gui/dialogs/calendar-setup.glade.h:5
 msgid "Calendar Properties"
 msgstr "Kalenderegenskaper"
 
+#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
+msgid "Pick a color"
+msgstr "Velg en farge"
+
 #: calendar/gui/dialogs/calendar-setup.glade.h:8
 msgid "Remote"
 msgstr "Ekstern"
@@ -4179,8 +4153,8 @@ msgstr "uker"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
-#: calendar/gui/dialogs/cal-prefs-dialog.c:567 mail/em-account-prefs.c:463
-#: mail/em-composer-prefs.c:663 mail/em-composer-prefs.c:891
+#: calendar/gui/dialogs/cal-prefs-dialog.c:567 mail/em-account-prefs.c:466
+#: mail/em-composer-prefs.c:677 mail/em-composer-prefs.c:905
 msgid "Enabled"
 msgstr "Aktivert"
 
@@ -4194,19 +4168,19 @@ msgstr "Ikke fjern"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.c:778
 #: calendar/gui/dialogs/cal-prefs-dialog.c:811
-#: calendar/gui/dialogs/cal-prefs-dialog.c:844 mail/em-account-prefs.c:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:369
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: calendar/gui/dialogs/cal-prefs-dialog.c:844 mail/em-account-prefs.c:288
+#: mail/em-account-prefs.c:329 mail/em-account-prefs.c:372
+#: mail/em-composer-prefs.c:596 mail/em-composer-prefs.c:654
+#: mail/em-composer-prefs.c:684
 msgid "Disable"
 msgstr "Deaktiver"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.c:778
 #: calendar/gui/dialogs/cal-prefs-dialog.c:811
-#: calendar/gui/dialogs/cal-prefs-dialog.c:846 mail/em-account-prefs.c:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:371
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: calendar/gui/dialogs/cal-prefs-dialog.c:846 mail/em-account-prefs.c:288
+#: mail/em-account-prefs.c:329 mail/em-account-prefs.c:374
+#: mail/em-composer-prefs.c:596 mail/em-composer-prefs.c:654
+#: mail/em-composer-prefs.c:684
 msgid "Enable"
 msgstr "Aktiver"
 
@@ -4558,7 +4532,7 @@ msgstr "Ingen sammendrag"
 
 #: calendar/gui/dialogs/comp-editor.c:1376
 #: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1037
-#: composer/e-msg-composer.c:1183
+#: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Lagre som..."
 
@@ -4842,9 +4816,9 @@ msgstr "_Start-tid:"
 #. is not permitted.
 #: calendar/gui/dialogs/meeting-page.c:311
 #: calendar/gui/dialogs/meeting-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:619 composer/e-msg-composer.c:2102
-#: mail/em-account-prefs.c:424 mail/em-folder-view.c:804
-#: mail/mail-account-gui.c:1540 mail/mail-account-gui.c:2033
+#: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
+#: mail/em-account-prefs.c:427 mail/em-folder-view.c:927
+#: mail/mail-account-gui.c:1559 mail/mail-account-gui.c:2038
 #: mail/mail-config.glade.h:100
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
@@ -4872,7 +4846,7 @@ msgstr "_Deleger til..."
 #: calendar/gui/dialogs/meeting-page.c:655
 #: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
 #: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
-#: mail/em-folder-tree.c:2609 mail/em-folder-view.c:795
+#: mail/em-folder-tree.c:2619 mail/em-folder-view.c:918
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
@@ -5144,24 +5118,17 @@ msgstr "_Forkast endringer"
 msgid "Save Event"
 msgstr "Lagre hendelse"
 
-#. create the dialog
-#: calendar/gui/dialogs/select-source-dialog.c:63
+#: calendar/gui/dialogs/select-source-dialog.c:65
 msgid "Select source"
 msgstr "Velg kilde"
 
-#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
-#: calendar/gui/dialogs/select-source-dialog.c:69
-#, c-format
-msgid "Select destination %s"
-msgstr "Velg mål %s"
-
-#: calendar/gui/dialogs/select-source-dialog.c:71
-msgid "calendar"
-msgstr "kalender"
+#: calendar/gui/dialogs/select-source-dialog.c:86
+msgid "_Destination"
+msgstr "_Mål"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
-msgid "task list"
-msgstr "oppgaveliste"
+#: calendar/gui/dialogs/select-source-dialog.c:88
+msgid "Task List"
+msgstr "Oppgaveliste"
 
 #: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
@@ -5191,42 +5158,42 @@ msgstr "% _fullført"
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-cal-component-preview.c:230
 #: calendar/gui/e-calendar-table.c:449 calendar/gui/e-cal-model-tasks.c:350
-#: calendar/gui/e-cal-model-tasks.c:625 calendar/gui/e-meeting-store.c:187
+#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-meeting-store.c:187
 #: calendar/gui/e-meeting-store.c:210 calendar/gui/print.c:2346
 msgid "Completed"
 msgstr "Fullført"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 #: calendar/gui/e-cal-component-preview.c:249
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:923
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:928
 msgid "High"
 msgstr "Høy"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:227
 #: calendar/gui/e-calendar-table.c:448 calendar/gui/e-cal-model-tasks.c:348
-#: calendar/gui/e-cal-model-tasks.c:623 calendar/gui/e-cal-model-tasks.c:698
+#: calendar/gui/e-cal-model-tasks.c:651 calendar/gui/e-cal-model-tasks.c:726
 #: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr "Under arbeid"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:253
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:921
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:926
 msgid "Low"
 msgstr "Lav"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:251
-#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:875
-#: mail/message-list.c:922
+#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
+#: mail/message-list.c:927
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-component-preview.c:237
 #: calendar/gui/e-calendar-table.c:447 calendar/gui/e-cal-model-tasks.c:346
-#: calendar/gui/e-cal-model-tasks.c:621 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-model-tasks.c:649 calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "Ikke startet"
 
@@ -5420,7 +5387,7 @@ msgstr "%s ved %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s for en ukjent utløsertype"
 
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2214
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2331
 #, c-format
 msgid "Click to open %s"
 msgstr "Klikk for å åpne %s"
@@ -5452,17 +5419,17 @@ msgstr "Prioritet:"
 msgid "Web Page:"
 msgstr "Nettside:"
 
-#: calendar/gui/e-calendar-table.c:352 calendar/gui/e-cal-list-view.c:255
+#: calendar/gui/e-calendar-table.c:352 calendar/gui/e-cal-list-view.c:257
 #: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
 msgid "Public"
 msgstr "Offentlig"
 
-#: calendar/gui/e-calendar-table.c:353 calendar/gui/e-cal-list-view.c:256
+#: calendar/gui/e-calendar-table.c:353 calendar/gui/e-cal-list-view.c:258
 #: calendar/gui/e-cal-model.c:330
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/e-calendar-table.c:354 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-calendar-table.c:354 calendar/gui/e-cal-list-view.c:259
 #: calendar/gui/e-cal-model.c:332
 msgid "Confidential"
 msgstr "Konfidensiell"
@@ -5530,7 +5497,7 @@ msgstr "Oppdaterer objekter"
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
 #: calendar/gui/e-calendar-view.c:1292 calendar/gui/e-calendar-view.c:1372
-#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:37
+#: mail/em-folder-view.c:893 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Åpne"
 
@@ -5540,7 +5507,7 @@ msgstr "_Åpne nettside"
 
 #: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
 #: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1378
-#: mail/em-folder-view.c:772 mail/em-popup.c:692 mail/em-popup.c:807
+#: mail/em-folder-view.c:895 mail/em-popup.c:692 mail/em-popup.c:808
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "Lagre _som..."
@@ -5563,7 +5530,7 @@ msgstr "Kli_pp ut"
 
 #: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
 #: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1340
-#: mail/em-folder-tree.c:2602 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-tree.c:2612 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
 msgid "_Copy"
@@ -5721,29 +5688,29 @@ msgstr "Startdato"
 #: camel/providers/imap4/camel-imap4-engine.c:1561
 #: camel/providers/imap4/camel-imap4-engine.c:1591
 #: camel/providers/imap4/camel-imap4-engine.c:1631
-#: camel/providers/imap4/camel-imap4-store.c:1034
+#: camel/providers/imap4/camel-imap4-store.c:1039
 #: camel/providers/imap4/camel-imap4-utils.c:292
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2120
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1046
 #: shell/e-component-registry.c:170 widgets/misc/e-charset-picker.c:62
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: calendar/gui/e-cal-model.c:877
+#: calendar/gui/e-cal-model.c:911
 msgid "Recurring"
 msgstr "Gjeninntreffer"
 
-#: calendar/gui/e-cal-model.c:879
+#: calendar/gui/e-cal-model.c:913
 msgid "Assigned"
 msgstr "Tildelt"
 
-#: calendar/gui/e-cal-model.c:881 calendar/gui/e-cal-model-tasks.c:981
+#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
 #: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/e-cal-model.c:881 calendar/gui/e-cal-model-tasks.c:981
+#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
 #: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "Nei"
@@ -5764,7 +5731,7 @@ msgstr "Ø"
 msgid "W"
 msgstr "V"
 
-#: calendar/gui/e-cal-model-tasks.c:573
+#: calendar/gui/e-cal-model-tasks.c:601
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -5979,7 +5946,7 @@ msgstr "Oppdater"
 #: calendar/gui/e-itip-control.c:1024 calendar/gui/e-itip-control.c:1055
 #: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1091
 #: calendar/gui/e-itip-control.c:1104 calendar/gui/e-itip-control.c:1117
-#: shell/e-shell.c:1079 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
@@ -6192,60 +6159,56 @@ msgstr "Vedlegget inneholder ikke et gyldig kalender-vedlegg"
 msgid "The attachment has no viewable calendar items"
 msgstr "Vedlegget inneholder ingen visbare kalender-vedlegg"
 
-#: calendar/gui/e-itip-control.c:1766
-msgid "Calendar file could not be updated!\n"
-msgstr "Kalenderfilen kunne ikke oppdateres!\n"
-
-#: calendar/gui/e-itip-control.c:1768
+#: calendar/gui/e-itip-control.c:1769
 msgid "Update complete\n"
 msgstr "Oppdatering fullført\n"
 
-#: calendar/gui/e-itip-control.c:1798 calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Deltakerstatus kan ikke oppdateres fordi oppføringen ikke eksisterer lenger"
 
-#: calendar/gui/e-itip-control.c:1814 calendar/gui/e-itip-control.c:1852
+#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objektet er ugyldig og kan ikke oppdateres\n"
 
-#: calendar/gui/e-itip-control.c:1824
+#: calendar/gui/e-itip-control.c:1825
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Dette svaret er ikke fra en aktiv deltaker. Legg til som deltaker?"
 
-#: calendar/gui/e-itip-control.c:1836
+#: calendar/gui/e-itip-control.c:1837
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Deltakerstatus kunne ikke oppdateres pga ugyldig status!\n"
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1856
 msgid "There was an error on the CORBA system\n"
 msgstr "Det oppsto en feil i CORBA-systemet\n"
 
-#: calendar/gui/e-itip-control.c:1858
+#: calendar/gui/e-itip-control.c:1859
 msgid "Object could not be found\n"
 msgstr "Objektet kunne ikke finnes\n"
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1862
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Du har ikke rettigheter til å oppdatere kalenderen\n"
 
-#: calendar/gui/e-itip-control.c:1864
+#: calendar/gui/e-itip-control.c:1865
 msgid "Attendee status updated\n"
 msgstr "Deltakerstatus oppdatert\n"
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1868
 msgid "Attendee status could not be updated!\n"
 msgstr "Deltakerstatus kunne ikke oppdateres!\n"
 
-#: calendar/gui/e-itip-control.c:1898
+#: calendar/gui/e-itip-control.c:1899
 msgid "Removal Complete"
 msgstr "Fjerning fullført"
 
-#: calendar/gui/e-itip-control.c:1921 calendar/gui/e-itip-control.c:1969
+#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
 msgid "Item sent!\n"
 msgstr "Oppføring sendt!\n"
 
-#: calendar/gui/e-itip-control.c:1923 calendar/gui/e-itip-control.c:1973
+#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
 msgid "The item could not be sent!\n"
 msgstr "Oppføringen kunne ikke sendes!\n"
 
@@ -6457,7 +6420,7 @@ msgstr "%d.%m.%Y"
 msgid "Enter the password for %s"
 msgstr "Oppgi passord for %s"
 
-#: calendar/gui/e-tasks.c:616 calendar/gui/gnome-cal.c:2021
+#: calendar/gui/e-tasks.c:585 calendar/gui/gnome-cal.c:2018
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6466,19 +6429,19 @@ msgstr ""
 "Feil på «%s»:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:644 calendar/gui/gnome-cal.c:2060
+#: calendar/gui/e-tasks.c:613 calendar/gui/gnome-cal.c:2057
 #, c-format
 msgid "The task backend for '%s' has crashed."
 msgstr "Oppgavemotor for «%s» har krasjet."
 
 #. FIXME Loading should be async
 #. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:718
+#: calendar/gui/e-tasks.c:687
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Åpner oppgaver på %s"
 
-#: calendar/gui/e-tasks.c:741
+#: calendar/gui/e-tasks.c:710
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6487,51 +6450,52 @@ msgstr ""
 "Feil under åpning av «%s»:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:762
+#: calendar/gui/e-tasks.c:731
 msgid "Loading tasks"
 msgstr "Laster oppgaver"
 
-#: calendar/gui/e-tasks.c:866
+#: calendar/gui/e-tasks.c:835
 msgid "Completing tasks..."
 msgstr "Fullfører oppgaver..."
 
-#: calendar/gui/e-tasks.c:889
+#: calendar/gui/e-tasks.c:858
 msgid "Deleting selected objects..."
 msgstr "Sletter valgte objekter..."
 
-#: calendar/gui/e-tasks.c:916
+#: calendar/gui/e-tasks.c:885
 msgid "Expunging"
 msgstr "Tømmer"
 
-#: calendar/gui/e-tasks.c:992
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:591
-#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:79
+#: calendar/gui/e-tasks.c:961
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:402
+#: calendar/gui/tasks-component.c:648 calendar/gui/tasks-control.c:405
+#: calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:705
 msgid "Tasks"
 msgstr "Oppgaver"
 
-#: calendar/gui/gnome-cal.c:1879
+#: calendar/gui/gnome-cal.c:1876
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Laster avtaler på %s"
 
-#: calendar/gui/gnome-cal.c:1898
+#: calendar/gui/gnome-cal.c:1895
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Laster oppgaver på %s"
 
-#: calendar/gui/gnome-cal.c:1921
+#: calendar/gui/gnome-cal.c:1918
 #, c-format
 msgid "Opening %s"
 msgstr "Åpner %s"
 
-#: calendar/gui/gnome-cal.c:2051
+#: calendar/gui/gnome-cal.c:2048
 #, c-format
 msgid "The calendar backend for '%s' has crashed."
 msgstr "Kalendermotoren for «%s» har krasjet."
 
-#: calendar/gui/gnome-cal.c:2895
+#: calendar/gui/gnome-cal.c:2894
 msgid "Purging"
 msgstr "Sletter"
 
@@ -6556,22 +6520,14 @@ msgid "Evolution Calendar scheduling message viewer"
 msgstr "Visning for møteplanlegging i Evolution kalender"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Evolution kalendervisning"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
 msgid "Evolution Calendar/Task editor"
 msgstr "Redigering av kalender/oppgaver for Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Evolution oppgavevisning"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
 msgid "Evolution's Calendar component"
 msgstr "Evolution kalenderkomponent"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
 msgid "Evolution's Tasks component"
 msgstr "Oppgavekomponent for Evolution"
 
@@ -6718,6 +6674,23 @@ msgstr "Fødselsdager og jubileum"
 msgid "On The Web"
 msgstr "På nettet"
 
+#. FIXME: set proper domain/code
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+msgid "Unable to migrate old settings from evolution/config.xmldb"
+msgstr "Kan ikke migrere gamle innstillinger fra evolution/config.xmldb"
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:737
+#, c-format
+msgid "Unable to migrate calendar `%s'"
+msgstr "Kan ikke migrere kalender «%s»"
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:869
+#, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr "Kan ikke migrere oppgaver «%s»"
+
 #: calendar/gui/print.c:489
 msgid "1st"
 msgstr "1"
@@ -6949,65 +6922,74 @@ msgstr "Skriv ut oppføring"
 msgid "Print Setup"
 msgstr "Skriveroppsett"
 
-#: calendar/gui/tasks-component.c:299
+#: calendar/gui/tasks-component.c:303
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 "Oppgaveliste «%s» vil bli fjernet. Er du sikker på at du vil fortsette?"
 
-#: calendar/gui/tasks-component.c:357
+#: calendar/gui/tasks-component.c:361
 msgid "New Task List"
 msgstr "Ny oppgaveliste"
 
-#: calendar/gui/tasks-component.c:469
+#: calendar/gui/tasks-component.c:398
+#, c-format
+msgid "%d task"
+msgid_plural "%d tasks"
+msgstr[0] "%d oppgave"
+msgstr[1] "%d oppgaver"
+
+#: calendar/gui/tasks-component.c:400 mail/mail-component.c:496
+#, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] ", %d valgt"
+msgstr[1] ", %d valgt"
+
+#: calendar/gui/tasks-component.c:447
+msgid "Failed upgrading tasks."
+msgstr "Feil under oppgradering av oppgaver."
+
+#: calendar/gui/tasks-component.c:526
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "Kan ikke åpne oppgaveliste «%s» for oppretting av hendelser og møter"
 
-#: calendar/gui/tasks-component.c:481
+#: calendar/gui/tasks-component.c:538
 msgid "There is no calendar available for creating tasks"
 msgstr "Ingen kalender tilgjengelig for opppretting av oppgaver"
 
-#: calendar/gui/tasks-component.c:519
+#: calendar/gui/tasks-component.c:576
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
-msgstr ""
+msgstr "Valgt oppgaveliste er skrivebeskyttet. Hendelser kan ikke opprettes. Vennligst velg en oppgaveliste du kan skrive til."
 
-#: calendar/gui/tasks-component.c:732
+#: calendar/gui/tasks-component.c:804
 msgid "New task"
 msgstr "Ny oppgave"
 
-#: calendar/gui/tasks-component.c:733
+#: calendar/gui/tasks-component.c:805
 msgid "_Task"
 msgstr "_Oppgave"
 
-#: calendar/gui/tasks-component.c:734
+#: calendar/gui/tasks-component.c:806
 msgid "Create a new task"
 msgstr "Opprett en ny oppgave"
 
-#: calendar/gui/tasks-component.c:740
+#: calendar/gui/tasks-component.c:812
 msgid "New tasks group"
 msgstr "Ny oppgavegruppe"
 
-#: calendar/gui/tasks-component.c:741
+#: calendar/gui/tasks-component.c:813
 msgid "_Tasks Group"
 msgstr "_Oppgavegruppe"
 
-#: calendar/gui/tasks-component.c:742
+#: calendar/gui/tasks-component.c:814
 msgid "Create a new tasks group"
 msgstr "Opprett en ny oppgavegruppe"
 
-#: calendar/gui/tasks-control.c:152
-msgid "The URI of the tasks folder to display"
-msgstr "URIen til oppgavemappen skal vises"
-
-#: calendar/gui/tasks-control.c:211
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "Kunne ikke laste oppgavene i «%s»"
-
-#: calendar/gui/tasks-control.c:478
+#: calendar/gui/tasks-control.c:367
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -7019,11 +7001,11 @@ msgstr ""
 "\n"
 "Vil du virkelig slette disse oppgavene?"
 
-#: calendar/gui/tasks-control.c:481
+#: calendar/gui/tasks-control.c:370
 msgid "Do not ask me again."
 msgstr "Ikke spør meg igjen."
 
-#: calendar/gui/tasks-control.c:539
+#: calendar/gui/tasks-control.c:428
 msgid "Print Tasks"
 msgstr "Skriv ut oppgaver"
 
@@ -8789,7 +8771,7 @@ msgstr "Kopierer meldinger"
 
 #: camel/camel-folder.c:1666
 msgid "Learning junk and/or non junk message(s)"
-msgstr ""
+msgstr "Lærer om søppel og/eller gyldige meldinger"
 
 #: camel/camel-folder.c:1695
 msgid "Filtering new message(s)"
@@ -8852,7 +8834,7 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:781 camel/camel-gpg-context.c:1267
 #: camel/camel-gpg-context.c:1425 camel/camel-gpg-context.c:1517
-#: camel/camel-gpg-context.c:1624 mail/mail-ops.c:695
+#: camel/camel-gpg-context.c:1624 mail/mail-ops.c:706
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Avbrutt."
@@ -9222,7 +9204,7 @@ msgstr ""
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1196
+#: camel/providers/imap/camel-imap-store.c:1207
 msgid "Bad authentication response from server."
 msgstr "Ugyldig svar på autentisering fra tjener."
 
@@ -9379,62 +9361,57 @@ msgid "Cannot find certificate for '%s'"
 msgstr "Kan ikke finne sertifikat for «%s»"
 
 #: camel/camel-smime-context.c:267
-#, fuzzy
 msgid "Cannot create CMS message"
-msgstr "Kan ikke åpne melding"
+msgstr "Kan ikke opprette CMS-melding"
 
 #: camel/camel-smime-context.c:272
 msgid "Cannot create CMS signedData"
-msgstr ""
+msgstr "Kan ikke opprette signedData for CMS"
 
 #: camel/camel-smime-context.c:278
-#, fuzzy
 msgid "Cannot attach CMS signedData"
-msgstr "Kan ikke legge ved fil: %s: %s"
+msgstr "Kan ikke legge ved signedData for CMS"
 
 #: camel/camel-smime-context.c:285
-#, fuzzy
 msgid "Cannot attach CMS data"
-msgstr "Kan ikke legge ved fil: %s: %s"
+msgstr "Kan ikke legge ved CMS-data"
 
 #: camel/camel-smime-context.c:291
 msgid "Cannot create CMS SignerInfo"
-msgstr ""
+msgstr "Kan ikke opprette SignerInfo for CMS"
 
 #: camel/camel-smime-context.c:297
 msgid "Cannot find cert chain"
-msgstr ""
+msgstr "Kan ikke finne sertifikatkjede"
 
 #: camel/camel-smime-context.c:303
 msgid "Cannot add CMS SigningTime"
-msgstr ""
+msgstr "Kan ikke legge til SigningTime for CMS"
 
 #: camel/camel-smime-context.c:325 camel/camel-smime-context.c:337
-#, fuzzy, c-format
+#, c-format
 msgid "Encryption cert for '%s' does not exist"
-msgstr "Mappen «%s» eksisterer ikke."
+msgstr "Krypteringssertifikat for «%s» eksisterer ikke"
 
 #: camel/camel-smime-context.c:344
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
-msgstr ""
+msgstr "Kan ikke legge til SMIMEEncKeyPrefs-attributt"
 
 #: camel/camel-smime-context.c:349
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr ""
 
 #: camel/camel-smime-context.c:354
-#, fuzzy
-msgid "Cannot add add encryption certificate"
-msgstr "Sertifikat for kry_ptering:"
+msgid "Cannot add encryption certificate"
+msgstr "Kan ikke legge til sertifikat for kryptering"
 
 #: camel/camel-smime-context.c:360
 msgid "Cannot add CMS SignerInfo"
-msgstr ""
+msgstr "Kan ikke legge til SignerInfo for CMS"
 
 #: camel/camel-smime-context.c:430
-#, fuzzy
 msgid "Cannot create encoder context"
-msgstr "Kan ikke opprette mappelås på: %s: %s"
+msgstr "Kan ikke opprette kontekst for koding"
 
 #: camel/camel-smime-context.c:436
 #, fuzzy
@@ -9442,9 +9419,8 @@ msgid "Failed to add data to CMS encoder"
 msgstr "Kunne ikke legge til i lokal Sendt-mappe: %s"
 
 #: camel/camel-smime-context.c:441 camel/camel-smime-context.c:890
-#, fuzzy
 msgid "Failed to encode data"
-msgstr "Kunne ikke autentisere.\n"
+msgstr "Kunne ikke kode data"
 
 #: camel/camel-smime-context.c:514
 msgid "Unverified"
@@ -9452,7 +9428,7 @@ msgstr "Uverifisert"
 
 #: camel/camel-smime-context.c:516
 msgid "Good signature"
-msgstr "God signatur"
+msgstr "Gyldig signatur"
 
 #: camel/camel-smime-context.c:518
 msgid "Bad signature"
@@ -9506,9 +9482,8 @@ msgid "Cannot set message digests"
 msgstr "Kan ikke hente melding %s: %s"
 
 #: camel/camel-smime-context.c:614
-#, fuzzy
 msgid "Certificate import failed"
-msgstr "Feil med sertifikatsignatur"
+msgstr "Import av sertifikat feilet"
 
 #: camel/camel-smime-context.c:624
 msgid "Certficate only message, cannot verify certificates"
@@ -9529,14 +9504,13 @@ msgid "Signer: %s <%s>: %s\n"
 msgstr "Signeringspart: %s <%s>: %s\n"
 
 #: camel/camel-smime-context.c:748
-#, fuzzy
 msgid "Decoder failed"
-msgstr "IMAP-kommando feilet: %s"
+msgstr "Dekoder feilet"
 
 #: camel/camel-smime-context.c:800
-#, fuzzy, c-format
+#, c-format
 msgid "Can't find certificate for `%s'"
-msgstr "Kan ikke opprette mappe: %s: %s"
+msgstr "Kan ikke finne sertifikat for «%s»"
 
 #: camel/camel-smime-context.c:807
 msgid "Can't find common bulk encryption algorithm"
@@ -9548,9 +9522,8 @@ msgid "Can't allocate slot for encryption bulk key"
 msgstr ""
 
 #: camel/camel-smime-context.c:827
-#, fuzzy
 msgid "Can't create CMS Message"
-msgstr "Oppre_tt regel fra melding"
+msgstr "Kan ikke opprette CMS-melding"
 
 #: camel/camel-smime-context.c:833
 msgid "Can't create CMS EnvelopedData"
@@ -9573,9 +9546,8 @@ msgid "Can't add CMS RecipientInfo"
 msgstr ""
 
 #: camel/camel-smime-context.c:873
-#, fuzzy
 msgid "Can't create encoder context"
-msgstr "Kan ikke opprette mappelås på: %s: %s"
+msgstr "Kan ikke opprette kontekst for koding"
 
 #: camel/camel-smime-context.c:884
 #, fuzzy
@@ -9585,20 +9557,19 @@ msgstr "Kunne ikke sende brukernavn til tjener"
 #: camel/camel-smime-context.c:970
 #, c-format
 msgid "Decoder failed, error %d"
-msgstr ""
+msgstr "Dekoder feilet, feil %d"
 
 #: camel/camel-smime-context.c:977
 msgid "S/MIME Decrypt: No encrypted content found"
-msgstr ""
+msgstr "S/MIME dekryptering: Fant ikke kryptert innhold"
 
 #: camel/camel-smime-context.c:1004
-#, fuzzy
 msgid "import keys: unimplemented"
-msgstr "Kommando ikke implementert"
+msgstr "importering av nøkler: ikke implementert"
 
 #: camel/camel-smime-context.c:1012
 msgid "export keys: unimplemented"
-msgstr ""
+msgstr "eksportering av nøkler: ikke implementert"
 
 #: camel/camel-store.c:214
 msgid "Cannot get folder: Invalid operation on this store"
@@ -9746,7 +9717,7 @@ msgstr "Bruk av nøkkel støtter ikke sertifikatsignering"
 msgid "Error in application verification"
 msgstr "Feil i applikasjonsverifikasjon"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9759,11 +9730,11 @@ msgstr ""
 "Fingeravtrykk      %s\n"
 "Signatur:          %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "GOOD"
 msgstr "GODTATT"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "BAD"
 msgstr "UGYLDIG"
 
@@ -9787,7 +9758,7 @@ msgstr ""
 "Vil du akseptere likevel?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:835
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9802,7 +9773,7 @@ msgstr ""
 "\n"
 "Vil du akseptere?"
 
-#: camel/camel-tcp-stream-ssl.c:885
+#: camel/camel-tcp-stream-ssl.c:879
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9811,7 +9782,7 @@ msgstr ""
 "Sertifikatproblem: %s\n"
 "Utsteder: %s"
 
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/camel-tcp-stream-ssl.c:931
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9820,7 +9791,7 @@ msgstr ""
 "Ugyldig sertifikatdomene: %s\n"
 "Utsteder: %s"
 
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/camel-tcp-stream-ssl.c:949
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9829,7 +9800,7 @@ msgstr ""
 "Sertifikatet har gått ut: %s\n"
 "Utsteder: %s"
 
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/camel-tcp-stream-ssl.c:966
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9843,17 +9814,17 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Kunne ikke tolke URL «%s»"
 
-#: camel/camel-vee-folder.c:614
+#: camel/camel-vee-folder.c:633
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr "Feil ved lagring av «%s»: %s"
 
-#: camel/camel-vee-folder.c:654
+#: camel/camel-vee-folder.c:673
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Ingen slik melding %s i %s"
 
-#: camel/camel-vee-folder.c:820 camel/camel-vee-folder.c:826
+#: camel/camel-vee-folder.c:839 camel/camel-vee-folder.c:845
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Kan ikke kopiere eller flytte meldinger inn i en virtuell mappe"
 
@@ -9906,7 +9877,7 @@ msgstr "Adressebok og kalender"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:69
 msgid "Post Office Agent SOAP Port:"
-msgstr ""
+msgstr "SOAP-port for postkontoragent:"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:80
 msgid "Novell GroupWise"
@@ -9939,37 +9910,37 @@ msgid "Checklist"
 msgstr "Sjekkliste"
 
 #: camel/providers/imap4/camel-imap4-command.c:629
-#, fuzzy, c-format
+#, c-format
 msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "Uventet svar fra IMAP-tjener: %s"
+msgstr "Uventet svar fra IMAP4-tjener %s: %s"
 
 #: camel/providers/imap4/camel-imap4-engine.c:415
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot select folder `%s': Invalid mailbox name"
-msgstr "Kan ikke slette mappe: %s: Ugyldig operasjon"
+msgstr "Kan ikke velge mappe «%s»: Ugyldig navn på postboks"
 
 #: camel/providers/imap4/camel-imap4-engine.c:421
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot select folder `%s': Bad command"
-msgstr "Finner ikke mappe: %s: %s"
+msgstr "Kan ikke velge mappe «%s»: Ugyldig kommando"
 
 #: camel/providers/imap4/camel-imap4-engine.c:1144
 #: camel/providers/imap4/camel-imap4-engine.c:1533
 #: camel/providers/imap4/camel-imap4-engine.c:1560
 #: camel/providers/imap4/camel-imap4-engine.c:1590
 #: camel/providers/imap4/camel-imap4-engine.c:1630
-#, fuzzy, c-format
+#, c-format
 msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "Tjener koblet fra uventet: %s"
+msgstr "IMAP4-tjener %s koblet fra uventet: %s"
 
 #: camel/providers/imap4/camel-imap4-engine.c:1145
 msgid "Got BYE response"
-msgstr ""
+msgstr "Mottok svaret BYE"
 
 #: camel/providers/imap4/camel-imap4-folder.c:335
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot sync flags to folder `%s': Unknown"
-msgstr "Finner ikke mappe: %s: %s"
+msgstr "Kan ikke synkronisere flagg til mappe «%s»: Ukjent"
 
 #: camel/providers/imap4/camel-imap4-folder.c:341
 #, fuzzy, c-format
@@ -9994,11 +9965,9 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap4/camel-imap4-folder.c:621
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot get message %s from folder `%s': Bad command"
-msgstr ""
-"Kan ikke hente melding: %s fra mappe %s\n"
-"  %s"
+msgstr "Kan ikke hente melding: %s fra mappe «%s»: Ugyldig kommando"
 
 #: camel/providers/imap4/camel-imap4-folder.c:746
 #, fuzzy, c-format
@@ -10060,9 +10029,8 @@ msgid "Namespace"
 msgstr "Navneområde"
 
 #: camel/providers/imap4/camel-imap4-provider.c:53
-#, fuzzy
 msgid "IMAPv4rev1"
-msgstr "IMAPv4"
+msgstr "IMAPv4rev1"
 
 #: camel/providers/imap4/camel-imap4-provider.c:55
 #, fuzzy
@@ -10091,8 +10059,8 @@ msgstr "IMAP-tjeneste for %s på %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:208
 #: camel/providers/imap4/camel-imap4-store.c:225
-#: camel/providers/imap/camel-imap-store.c:545
-#: camel/providers/imap/camel-imap-store.c:565
+#: camel/providers/imap/camel-imap-store.c:546
+#: camel/providers/imap/camel-imap-store.c:566
 #: camel/providers/imapp/camel-imapp-store.c:231
 #: camel/providers/nntp/camel-nntp-store.c:140
 #: camel/providers/pop3/camel-pop3-store.c:175
@@ -10103,15 +10071,15 @@ msgid "Could not connect to %s (port %d): %s"
 msgstr "Kunne ikke koble til %s (port %d): %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:210
-#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:548
 #: camel/providers/pop3/camel-pop3-store.c:177
 #: camel/providers/smtp/camel-smtp-transport.c:271
 msgid "SSL unavailable"
 msgstr "SSL er ikke tilgjengelig"
 
 #: camel/providers/imap4/camel-imap4-store.c:222
-#: camel/providers/imap/camel-imap-store.c:562
-#: camel/providers/imap/camel-imap-store.c:799
+#: camel/providers/imap/camel-imap-store.c:563
+#: camel/providers/imap/camel-imap-store.c:810
 #: camel/providers/imapp/camel-imapp-store.c:228
 #: camel/providers/nntp/camel-nntp-store.c:137
 #: camel/providers/nntp/camel-nntp-store.c:155
@@ -10127,8 +10095,8 @@ msgid ""
 msgstr "Kunne ikke koble til IMAP-tjener %s i sikker modus: %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:633
-#: camel/providers/imap/camel-imap-store.c:664
+#: camel/providers/imap/camel-imap-store.c:644
+#: camel/providers/imap/camel-imap-store.c:675
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Kunne ikke koble til IMAP-tjener %s i sikker modus: %s"
@@ -10137,7 +10105,7 @@ msgstr "Kunne ikke koble til IMAP-tjener %s i sikker modus: %s"
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1089
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1109
 msgid "Unknown error"
 msgstr "Ukjent feil"
 
@@ -10150,9 +10118,9 @@ msgstr ""
 "autentiseringsmekanisme."
 
 #: camel/providers/imap4/camel-imap4-store.c:418
-#, fuzzy, c-format
+#, c-format
 msgid "%sPlease enter the IMAP password for %s on host %s"
-msgstr "%sVennligst skriv inn SMTP-passord for %s på vert %s"
+msgstr "%sVennligst skriv inn IMAP-passord for %s på vert %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:492
 #, fuzzy, c-format
@@ -10171,56 +10139,55 @@ msgid ""
 msgstr "Mappenavn «%s» er ugyldig fordi det inneholder tegnet «%c»"
 
 #: camel/providers/imap4/camel-imap4-store.c:826
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot create folder `%s': Invalid mailbox name"
-msgstr "Kan ikke endre navn på mappe: %s: Ugyldig operasjon"
+msgstr "Kan ikke opprette mappe «%s»: Ugyldig navn på postboks"
 
 #: camel/providers/imap4/camel-imap4-store.c:831
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot create folder `%s': Bad command"
-msgstr "Kan ikke opprette mappe «%s»: %s"
+msgstr "Kan ikke opprette mappe «%s»: Ugyldig kommando"
 
 #: camel/providers/imap4/camel-imap4-store.c:859
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot delete folder `%s': Special folder"
-msgstr "Kan ikke slette mappe: %s: Ingen slik mappe"
+msgstr "Kan ikke slette mappe «%s»: Spesiell mappe"
 
 #: camel/providers/imap4/camel-imap4-store.c:891
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgstr "Kan ikke slette mappe: %s: Ugyldig operasjon"
+msgstr "Kan ikke slette mappe «%s»: Ugyldig navn på postboks"
 
 #: camel/providers/imap4/camel-imap4-store.c:896
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot delete folder `%s': Bad command"
-msgstr "Kan ikke slette mappe: %s: Ugyldig operasjon"
+msgstr "Kan ikke slette mappe «%s»: Ugyldig kommando"
 
-#: camel/providers/imap4/camel-imap4-store.c:1032
+#: camel/providers/imap4/camel-imap4-store.c:1037
 #, c-format
 msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:1034
-#, fuzzy
+#: camel/providers/imap4/camel-imap4-store.c:1039
 msgid "Bad command"
-msgstr "Kommando:"
+msgstr "Ugyldig kommando"
 
-#: camel/providers/imap4/camel-imap4-store.c:1095
+#: camel/providers/imap4/camel-imap4-store.c:1100
 #, fuzzy, c-format
 msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
 msgstr "Kan ikke slette mappe: %s: Ugyldig operasjon"
 
-#: camel/providers/imap4/camel-imap4-store.c:1100
+#: camel/providers/imap4/camel-imap4-store.c:1105
 #, fuzzy, c-format
 msgid "Cannot subscribe to folder `%s': Bad command"
 msgstr "Kan ikke opprette mappe «%s»: %s"
 
-#: camel/providers/imap4/camel-imap4-store.c:1144
+#: camel/providers/imap4/camel-imap4-store.c:1149
 #, fuzzy, c-format
 msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
 msgstr "Kan ikke endre navn på mappe: %s: Ugyldig operasjon"
 
-#: camel/providers/imap4/camel-imap4-store.c:1149
+#: camel/providers/imap4/camel-imap4-store.c:1154
 #, fuzzy, c-format
 msgid "Cannot unsubscribe from folder `%s': Bad command"
 msgstr "Kan ikke opprette mappe «%s»: %s"
@@ -10232,22 +10199,22 @@ msgstr "Uventet svar fra IMAP-tjener: %s"
 
 #: camel/providers/imap4/camel-imap4-utils.c:108
 msgid "No data"
-msgstr ""
+msgstr "Ingen data"
 
 #: camel/providers/imap4/camel-imap4-utils.c:291
-#, fuzzy, c-format
+#, c-format
 msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "Tjener koblet fra uventet: %s"
+msgstr "IMAP-tjener %s koblet fra uventet: %s"
 
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3118
+#: camel/providers/imap/camel-imap-store.c:3129
 msgid "Operation cancelled"
 msgstr "Operasjon avbrutt"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3121
+#: camel/providers/imap/camel-imap-store.c:3132
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Tjener koblet fra uventet: %s"
@@ -10305,12 +10272,12 @@ msgstr "Mappen ble ødelagt og laget på nytt på tjeneren."
 msgid "Scanning for changed messages"
 msgstr "Søker etter endrede meldinger"
 
-#: camel/providers/imap/camel-imap-folder.c:1963
+#: camel/providers/imap/camel-imap-folder.c:1961
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Kan ikke hente melding: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: camel/providers/imap/camel-imap-folder.c:1998
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -10326,25 +10293,25 @@ msgstr ""
 "Kan ikke hente melding: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: camel/providers/imap/camel-imap-folder.c:1998
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "Ingen slik melding"
 
-#: camel/providers/imap/camel-imap-folder.c:2044
-#: camel/providers/imap/camel-imap-folder.c:2646
+#: camel/providers/imap/camel-imap-folder.c:2040
+#: camel/providers/imap/camel-imap-folder.c:2642
 #: camel/providers/nntp/camel-nntp-folder.c:233
 msgid "This message is not currently available"
 msgstr "Denne meldingen er ikke tilgjengelig"
 
-#: camel/providers/imap/camel-imap-folder.c:2310
-#: camel/providers/imap/camel-imap-folder.c:2380
+#: camel/providers/imap/camel-imap-folder.c:2306
+#: camel/providers/imap/camel-imap-folder.c:2376
 msgid "Fetching summary information for new messages"
 msgstr "Henter sammendragsinformasjon for nye meldinger"
 
-#: camel/providers/imap/camel-imap-folder.c:2684
+#: camel/providers/imap/camel-imap-folder.c:2680
 msgid "Could not find message body in FETCH response."
 msgstr "Kunne ikke finne meldingskropp i FETCH-svar."
 
@@ -10402,43 +10369,43 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "For lesing og lagring av e-post på IMAP-tjenere."
 
-#: camel/providers/imap/camel-imap-store.c:634
+#: camel/providers/imap/camel-imap-store.c:645
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS-utvidelse er ikke støttet."
 
-#: camel/providers/imap/camel-imap-store.c:665
+#: camel/providers/imap/camel-imap-store.c:676
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "SSL-forhandling feilet"
 
-#: camel/providers/imap/camel-imap-store.c:802
+#: camel/providers/imap/camel-imap-store.c:813
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Kunne ikke koble til med kommando «%s»: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1226
+#: camel/providers/imap/camel-imap-store.c:1237
 #, c-format
 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:1236
+#: camel/providers/imap/camel-imap-store.c:1247
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Ingen støtte for autentiseringstype %s"
 
-#: camel/providers/imap/camel-imap-store.c:1259
+#: camel/providers/imap/camel-imap-store.c:1270
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 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:1273
+#: camel/providers/imap/camel-imap-store.c:1284
 msgid "You didn't enter a password."
 msgstr "Du skrev ikke inn et passord."
 
-#: camel/providers/imap/camel-imap-store.c:1302
+#: camel/providers/imap/camel-imap-store.c:1313
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10449,33 +10416,33 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1789
-#: camel/providers/imap/camel-imap-store.c:1979
+#: camel/providers/imap/camel-imap-store.c:1800
+#: camel/providers/imap/camel-imap-store.c:1990
 #, c-format
 msgid "No such folder %s"
 msgstr "Mappen %s eksisterer ikke"
 
-#: camel/providers/imap/camel-imap-store.c:1807
-#: camel/providers/imap/camel-imap-store.c:2185
-#, fuzzy, c-format
+#: camel/providers/imap/camel-imap-store.c:1818
+#: camel/providers/imap/camel-imap-store.c:2196
+#, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr "Mappenavn «%s» er ugyldig fordi det inneholder tegnet «%c»"
 
-#: camel/providers/imap/camel-imap-store.c:1865
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:1876
+#: camel/providers/imap/camel-imap-store.c:2257
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Opphavsmappen tillates ikke å ha undermapper"
 
-#: camel/providers/imap/camel-imap-store.c:1920
+#: camel/providers/imap/camel-imap-store.c:1931
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot create folder `%s': folder exists."
-msgstr "Kan ikke opprette mappe: %s: %s"
+msgstr "Kan ikke opprette mappe «%s»: mappen eksisterer."
 
-#: camel/providers/imap/camel-imap-store.c:2196
+#: camel/providers/imap/camel-imap-store.c:2207
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Ukjent opphavsmappe: %s"
@@ -10665,16 +10632,16 @@ msgstr "Ugyldig meldingsinnhold"
 #: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:204
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot get folder `%s': %s"
-msgstr "Finner ikke mappe: %s: %s"
+msgstr "Finner ikke mappe «%s»: %s"
 
 #: camel/providers/local/camel-maildir-store.c:111
 #: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:211
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot get folder `%s': folder does not exist."
-msgstr "Mappen «%s» eksisterer ikke."
+msgstr "Finner ikke mappe «%s»: mappen eksisterer ikke."
 
 #: camel/providers/local/camel-maildir-store.c:119
 #: camel/providers/local/camel-mbox-store.c:184
@@ -11213,7 +11180,6 @@ msgid "Could not get group: %s"
 msgstr "Kunne ikke hente gruppe: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:333
-#, fuzzy
 msgid "Could not get messages: unspecified error"
 msgstr "Kunne ikke hente meldinger: uspesifisert feil"
 
@@ -11267,8 +11233,8 @@ msgstr "Ingen melding med uid %s"
 msgid "Retrieving POP message %d"
 msgstr "Henter POP-melding %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1215
-#: composer/e-msg-composer.c:1236
+#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1225
+#: composer/e-msg-composer.c:1246
 msgid "Unknown reason"
 msgstr "Ukjent årsak"
 
@@ -11434,9 +11400,8 @@ msgid "SMTP"
 msgstr "SMTP"
 
 #: camel/providers/smtp/camel-smtp-provider.c:39
-#, fuzzy
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
-msgstr "For levering av e-post via en ekstern e-posttjener med SMTP.\n"
+msgstr "For levering av e-post via en ekstern e-posttjener med SMTP."
 
 #: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Syntax error, command unrecognized"
@@ -11671,18 +11636,17 @@ msgstr "RCPT TO <%s> feilet"
 #: camel/providers/smtp/camel-smtp-transport.c:1252
 #: camel/providers/smtp/camel-smtp-transport.c:1310
 #: camel/providers/smtp/camel-smtp-transport.c:1329
-#, fuzzy, c-format
+#, c-format
 msgid "DATA command failed: %s: mail not sent"
-msgstr "Tidsavbrudd for DATA-forespørsel: %s: melding ikke sendt."
+msgstr "DATA-kommando feilet: %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:1269
 #: camel/providers/smtp/camel-smtp-transport.c:1345
-#, fuzzy
 msgid "DATA command failed"
-msgstr "IMAP-kommando feilet: %s"
+msgstr "DATA-kommando feilet"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1368
 #, c-format
@@ -11717,7 +11681,7 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:1478
+#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:404
 msgid "attachment"
 msgstr "vedlegg"
 
@@ -11761,67 +11725,63 @@ msgstr "MIME-type:"
 msgid "Suggest automatic display of attachment"
 msgstr "Foreslå automatisk visning av vedlegg"
 
-#: composer/e-msg-composer.c:695
+#: composer/e-msg-composer.c:704
+#, fuzzy
 msgid ""
-"Cannot sign outgoing message: No signing certificate set for from account"
-msgstr ""
-"Kan ikke signere utgående melding: ingen sertifikat for signering satt for "
-"avsenderkonto"
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr "Kan ikke signere utgående melding: Ingen sertifikat for signering satt for denne kontoen"
 
-#: composer/e-msg-composer.c:701
+#: composer/e-msg-composer.c:711
 msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for from "
+"Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
-msgstr ""
-"Kan ikke kryptere utgående melding: Sertifikat for kryptering ikke satt for "
-"avsenderkonto"
+msgstr "Kan ikke kryptere utgående melding: Sertifikat for kryptering ikke satt for denne kontoen"
 
-#: composer/e-msg-composer.c:1273
-#, fuzzy
+#: composer/e-msg-composer.c:1283
 msgid "Could not open file"
-msgstr "Kan ikke åpne fil"
+msgstr "Kunne ikke åpne fil"
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1291
 msgid "Unable to retrieve message from editor"
 msgstr "Kunne ikke hente melding fra editor"
 
-#: composer/e-msg-composer.c:1551
+#: composer/e-msg-composer.c:1561
 msgid "Untitled Message"
 msgstr "Melding uten navn"
 
-#: composer/e-msg-composer.c:1581
+#: composer/e-msg-composer.c:1591
 msgid "Open file"
 msgstr "Åpne fil"
 
-#: composer/e-msg-composer.c:1988 mail/mail-account-gui.c:1461
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
 msgid "Autogenerated"
 msgstr "Generert automatisk"
 
-#: composer/e-msg-composer.c:2087
+#: composer/e-msg-composer.c:2097
 msgid "Signature:"
 msgstr "Signatur:"
 
-#: composer/e-msg-composer.c:2288
+#: composer/e-msg-composer.c:2298
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
 msgstr[0] ""
 msgstr[1] ""
 
-#: composer/e-msg-composer.c:2317
+#: composer/e-msg-composer.c:2327
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr "Skjul _vedleggsfeltet (slipp vedlegg her)"
 
-#: composer/e-msg-composer.c:2320 composer/e-msg-composer.c:3224
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3234
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr "Vis _vedleggsfeltet (slipp vedlegg her)"
 
-#: composer/e-msg-composer.c:2337 composer/e-msg-composer.c:3103
-#: composer/e-msg-composer.c:3104
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3113
+#: composer/e-msg-composer.c:3114
 msgid "Compose a message"
 msgstr "Skriv en melding"
 
-#: composer/e-msg-composer.c:3137
+#: composer/e-msg-composer.c:3147
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -11829,7 +11789,7 @@ msgstr ""
 "Kunne ikke opprette vindu for ny melding:\n"
 "Klarte ikke å aktivere kontroll for adressevelger."
 
-#: composer/e-msg-composer.c:3165
+#: composer/e-msg-composer.c:3175
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -11841,7 +11801,7 @@ msgstr ""
 "Vennligst sjekk at du har installert korrekt\n"
 "versjon av gtkhtml og libgtkhtml.\n"
 
-#: composer/e-msg-composer.c:3269
+#: composer/e-msg-composer.c:3279
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -11849,7 +11809,7 @@ msgstr ""
 "Kunne ikke opprette skrivevindu:\n"
 "Klarte ikke å aktivere HTML-redigeringskomponenten."
 
-#: composer/e-msg-composer.c:4274
+#: composer/e-msg-composer.c:4284
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -11937,113 +11897,128 @@ msgstr "Klikk her for å velge mapper å poste til"
 msgid "Attach file(s)"
 msgstr "Legg ved fil(er)"
 
-#: composer/mail-composer-errors.xml.in.h:1
+#. mail-composer:no-attach primary
+#: composer/mail-composer-errors.xml.h:2
+#, fuzzy
+msgid "You cannot attach the file `${0}' to this message."
+msgstr "Legg en fil ved meldingen"
+
+#. mail-composer:no-attach secondary
+#: composer/mail-composer-errors.xml.h:4
 msgid "${1}"
 msgstr "${1}"
 
-#: composer/mail-composer-errors.xml.in.h:2
-msgid "All accounts have been removed."
-msgstr "Alle kontoer er fjernet."
+#. mail-composer:attach-notfile primary
+#: composer/mail-composer-errors.xml.h:6
+msgid "The file `${0}' is not a regular file and cannot be sent in a message."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:3
-#, fuzzy
-msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
-msgstr "Er du sikker på at du vil slette denne avtalen uten tittel?"
+#. mail-composer:attach-directory primary
+#: composer/mail-composer-errors.xml.h:8
+msgid "Directories can not be attached to Messages."
+msgstr "Kataloger kan ikke legges ved meldinger."
 
-#: composer/mail-composer-errors.xml.in.h:4
-msgid "Because \"${0}\", you may need to select different mail options."
+#. mail-composer:attach-directory secondary
+#: composer/mail-composer-errors.xml.h:10
+msgid ""
+"To attach the contents of this directory, either attach the files in this "
+"directory individually, or create an archive of the directory and attach it."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:5
-msgid "Because \"${1}\"."
-msgstr ""
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:12
+msgid "Unfinished messages found"
+msgstr "Uferdige meldinger funnet"
 
-#: composer/mail-composer-errors.xml.in.h:6
+#. mail-composer:recover-autosave primary
+#: composer/mail-composer-errors.xml.h:14
+msgid "Do you want to recover unfinished messages?"
+msgstr "Vil du gjenopprette uferdige meldinger?"
+
+#. mail-composer:recover-autosave secondary
+#: composer/mail-composer-errors.xml.h:16
 msgid ""
-"Closing this composer window will discard the message permanently, unless "
-"you choose to save the message in your Drafts folder. This will allow you to "
-"continue the message at a later date."
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:7
-#, fuzzy
-msgid "Could not create message."
-msgstr "Kunne ikke opprette rør: %s"
+#: composer/mail-composer-errors.xml.h:17
+msgid "Don't Recover"
+msgstr "Ikke gjenopprett"
 
-#: composer/mail-composer-errors.xml.in.h:8
-#, fuzzy
-msgid "Could not read signature file \"{0}\"."
-msgstr "Kunne ikke lagre signaturfil: %s"
+#: composer/mail-composer-errors.xml.h:18
+msgid "Recover"
+msgstr "Gjenopprett"
 
-#: composer/mail-composer-errors.xml.in.h:9
+#. mail-composer:no-autosave primary
+#: composer/mail-composer-errors.xml.h:20
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Kunne ikke lagre signaturfil: %s"
 
-#: composer/mail-composer-errors.xml.in.h:10
-msgid "Directories can not be attached to Messages."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:11
-#, fuzzy
-msgid "Discard Changes"
-msgstr "_Forkast endringer"
-
-#: composer/mail-composer-errors.xml.in.h:12
+#. mail-composer:no-autosave secondary
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
-msgid "Do you want to recover unfinished messages?"
-msgstr "Vil du lagre endringene?"
+msgid "Error saving to autosave because \"{1}\"."
+msgstr "Feil under lagring av snarveier."
 
-#: composer/mail-composer-errors.xml.in.h:13
-#, fuzzy
-msgid "Don't Recover"
-msgstr "Ikke fjern"
+#. mail-composer:exit-unsaved title
+#: composer/mail-composer-errors.xml.h:24
+msgid "Warning: Modified Message"
+msgstr "Advarsel: Endret melding"
 
-#: composer/mail-composer-errors.xml.in.h:14
+#. mail-composer:exit-unsaved primary
+#: composer/mail-composer-errors.xml.h:26
 #, fuzzy
-msgid "Error saving to autosave because \"{1}\"."
-msgstr "Feil under lagring av snarveier."
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
+msgstr "Er du sikker på at du vil slette denne avtalen uten tittel?"
 
-#: composer/mail-composer-errors.xml.in.h:15
+#. mail-composer:exit-unsaved secondary
+#: composer/mail-composer-errors.xml.h:28
 msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
+"Closing this composer window will discard the message permanently, unless "
+"you choose to save the message in your Drafts folder. This will allow you to "
+"continue the message at a later date."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:16
-msgid "Recover"
-msgstr "Gjenopprett"
+#: composer/mail-composer-errors.xml.h:29
+msgid "Discard Changes"
+msgstr "Forkast endringer"
 
-#: composer/mail-composer-errors.xml.in.h:17
+#: composer/mail-composer-errors.xml.h:30
 msgid "Save Message"
 msgstr "Lagre melding"
 
-#: composer/mail-composer-errors.xml.in.h:18
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
-msgstr ""
+#. mail-composer:no-build-message primary
+#: composer/mail-composer-errors.xml.h:32
+msgid "Could not create message."
+msgstr "Kunne ikke opprette melding."
 
-#: composer/mail-composer-errors.xml.in.h:19
-msgid ""
-"To attach the contents of this directory, either attach the files in this "
-"directory individually, or create an archive of the directory and attach it."
+#. mail-composer:no-build-message secondary
+#: composer/mail-composer-errors.xml.h:34
+msgid "Because \"${0}\", you may need to select different mail options."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:20
-msgid "Unfinished messages found"
-msgstr "Uferdige meldinger funnet"
+#. mail-composer:no-sig-file primary
+#: composer/mail-composer-errors.xml.h:36
+#, fuzzy
+msgid "Could not read signature file \"{0}\"."
+msgstr "Kunne ikke lagre signaturfil: %s"
 
-#: composer/mail-composer-errors.xml.in.h:21
-msgid "Warning: Modified Message"
-msgstr "Advarsel: Endret melding"
+#. mail-composer:no-sig-file secondary
+#: composer/mail-composer-errors.xml.h:38
+msgid "Because \"${1}\"."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:22
-#, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
-msgstr "Legg en fil ved meldingen"
+#. mail-composer:all-accounts-deleted primary
+#: composer/mail-composer-errors.xml.h:40
+msgid "All accounts have been removed."
+msgstr "Alle kontoer er fjernet."
 
-#: composer/mail-composer-errors.xml.in.h:23
+#. mail-composer:all-accounts-deleted secondary
+#: composer/mail-composer-errors.xml.h:42
 msgid "You need to configure an account before you can compose mail."
 msgstr "Du må konfigurere en konto før du kan skrive meldinger."
 
@@ -12176,7 +12151,8 @@ msgstr ""
 "En fil med samme navn eksisterer allerede.\n"
 "Overskriv den?"
 
-#: e-util/e-dialog-utils.c:251 widgets/misc/e-system-errors.xml.in.h:7
+#. system:ask-save-file-exists-overwrite title
+#: e-util/e-dialog-utils.c:251 widgets/misc/e-system-errors.xml.h:2
 msgid "Overwrite file?"
 msgstr "Overskriv fil?"
 
@@ -12364,76 +12340,93 @@ msgstr "Velg en tid å sammenligne mot"
 msgid "_Filter Rules"
 msgstr "_Filterregler"
 
-#: filter/filter-errors.xml.in.h:1
-#, fuzzy
-msgid "Bad regular expression \"{0}\"."
-msgstr ""
-"Feil i regulært uttrykk «%s»:\n"
-"%s"
-
-#: filter/filter-errors.xml.in.h:2
-msgid "Could not compile regular expression \"{1}\"."
-msgstr ""
-
-#: filter/filter-errors.xml.in.h:3
-#, fuzzy
-msgid "File \"{0}\" does not exist or is not a regular file."
-msgstr "Fil «%s» eksisterer ikke eller er ikke en vanlig fil."
-
-#: filter/filter-errors.xml.in.h:4
+#. filter:no-date primary
+#: filter/filter-errors.xml.h:2
 msgid "Missing date."
 msgstr "Mangler dato."
 
-#: filter/filter-errors.xml.in.h:5
+#. filter:no-date secondary
+#: filter/filter-errors.xml.h:4
+msgid "You must choose a date."
+msgstr "Du må velge en dato."
+
+#. filter:no-file primary
+#: filter/filter-errors.xml.h:6
 msgid "Missing file name."
 msgstr "Mangler filnavn."
 
-#: filter/filter-errors.xml.in.h:6
+#. filter:no-file secondary
+#. filter:bad-file secondary
+#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
+msgid "You must specify a file name."
+msgstr "Du må oppgi et filnavn."
+
+#. filter:bad-file primary
+#: filter/filter-errors.xml.h:10
+#, fuzzy
+msgid "File \"{0}\" does not exist or is not a regular file."
+msgstr "Fil «%s» eksisterer ikke eller er ikke en vanlig fil."
+
+#. filter:no-folder primary
+#: filter/filter-errors.xml.h:14
 msgid "Missing folder."
 msgstr "Mangler mappe."
 
-#: filter/filter-errors.xml.in.h:7
-msgid "Missing name."
-msgstr "Mangler navn."
+#. filter:no-folder secondary
+#: filter/filter-errors.xml.h:16
+msgid "You must specify a folder."
+msgstr "Du må oppgi en mappe."
 
-#: filter/filter-errors.xml.in.h:8
-msgid "Name \"{0}\" already used."
+#. filter:bad-regexp primary
+#: filter/filter-errors.xml.h:18
+#, fuzzy
+msgid "Bad regular expression \"{0}\"."
 msgstr ""
+"Feil i regulært uttrykk «%s»:\n"
+"%s"
 
-#: filter/filter-errors.xml.in.h:9
-msgid "No sources selected."
-msgstr "Ingen kilder valgt."
-
-#: filter/filter-errors.xml.in.h:10
-msgid "Please choose another name."
-msgstr "Vennligst velg et annet navn."
+#. filter:bad-regexp secondary
+#: filter/filter-errors.xml.h:20
+msgid "Could not compile regular expression \"{1}\"."
+msgstr ""
 
-#: filter/filter-errors.xml.in.h:11
-msgid "You must choose a date."
-msgstr "Du må velge en dato."
+#. filter:no-name primary
+#. filter:no-name-vfolder primary
+#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+msgid "Missing name."
+msgstr "Mangler navn."
 
-#: filter/filter-errors.xml.in.h:12
+#. filter:no-name secondary
+#: filter/filter-errors.xml.h:24
 msgid "You must name this filter."
 msgstr "Du må gi navn til dette filteret."
 
-#: filter/filter-errors.xml.in.h:13
-#, fuzzy
+#. filter:no-name-vfolder secondary
+#: filter/filter-errors.xml.h:28
 msgid "You must name this vFolder."
-msgstr "Du må gi navn til denne vfolderen."
+msgstr "Du må gi navn til denne virtuelle mappen."
 
-#: filter/filter-errors.xml.in.h:14
-msgid "You must specify a file name."
-msgstr "Du må oppgi et filnavn."
+#. filter:bad-name-notunique primary
+#: filter/filter-errors.xml.h:30
+msgid "Name \"{0}\" already used."
+msgstr ""
 
-#: filter/filter-errors.xml.in.h:15
-msgid "You must specify a folder."
-msgstr "Du må oppgi en mappe."
+#. filter:bad-name-notunique secondary
+#: filter/filter-errors.xml.h:32
+msgid "Please choose another name."
+msgstr "Vennligst velg et annet navn."
 
-#: filter/filter-errors.xml.in.h:16
+#. filter:vfolder-no-source primary
+#: filter/filter-errors.xml.h:34
+msgid "No sources selected."
+msgstr "Ingen kilder valgt."
+
+#. filter:vfolder-no-source secondary
+#: filter/filter-errors.xml.h:36
 msgid ""
-"You must specify at least one folder as a source. Either by selecting the "
-"folders individually, and/or by selecting all local folders, all remote "
-"folders, or both."
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting\n"
+"all local folders, all remote folders, or both."
 msgstr ""
 
 #: filter/filter-file.c:288
@@ -12446,7 +12439,7 @@ msgid "<b>Then</b>"
 msgstr "<b>Så</b> "
 
 #: filter/filter-folder.c:237 filter/vfolder-rule.c:492
-#: mail/mail-account-gui.c:1327
+#: mail/mail-account-gui.c:1335
 msgid "Select Folder"
 msgstr "Velg mappe"
 
@@ -12538,19 +12531,19 @@ msgstr "med alle lokale mapper"
 msgid "years"
 msgstr "år"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:922
-#: mail/mail-config.c:65 mail/mail-config.glade.h:90
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:916
+#: mail/mail-config.c:76 mail/mail-config.glade.h:90
 msgid "Important"
 msgstr "Viktig"
 
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:925 mail/mail-config.c:68
+#: filter/filter-label.c:124 mail/em-migrate.c:919 mail/mail-config.c:79
 #: mail/mail-config.glade.h:145
 msgid "To Do"
 msgstr "Oppgaver"
 
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:926 mail/mail-config.c:69
+#: filter/filter-label.c:125 mail/em-migrate.c:920 mail/mail-config.c:80
 #: mail/mail-config.glade.h:94
 msgid "Later"
 msgstr "Senere"
@@ -12716,7 +12709,7 @@ msgstr "er ikke merket"
 msgid "Junk Test"
 msgstr "Søppeltest"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:803
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:926
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Etikett"
@@ -12753,7 +12746,7 @@ msgstr "Send til program"
 msgid "Play Sound"
 msgstr "Spill lyd"
 
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:68
+#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
 msgid "Read"
 msgstr "Les"
 
@@ -12822,9 +12815,9 @@ msgstr "starter med"
 msgid "Stop Processing"
 msgstr "Stopp behandling"
 
-#: filter/libfilter-i18n.h:64 mail/em-format.c:747 mail/em-format-html.c:1542
-#: mail/em-format-quote.c:301 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:318
+#: filter/libfilter-i18n.h:64 mail/em-format.c:747 mail/em-format-html.c:1533
+#: mail/em-format-quote.c:301 mail/em-mailer-prefs.c:89
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
 #: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr "Emne"
@@ -12890,46 +12883,53 @@ msgid "VFolder source"
 msgstr "VFolder-kilde"
 
 #. translators: default account indicator
-#: mail/em-account-prefs.c:415
+#: mail/em-account-prefs.c:418
 msgid "[Default]"
 msgstr "[Forvalg]"
 
-#: mail/em-account-prefs.c:469
+#: mail/em-account-prefs.c:472
 msgid "Account name"
 msgstr "Kontonavn"
 
-#: mail/em-account-prefs.c:471
+#: mail/em-account-prefs.c:474
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: mail/em-composer-prefs.c:292 mail/em-composer-prefs.c:411
-#: mail/mail-config.c:1038
+#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
+#: mail/mail-config.c:1061
 msgid "Unnamed"
 msgstr "Uten navn"
 
-#: mail/em-composer-prefs.c:895
+#: mail/em-composer-prefs.c:909
 msgid "Language(s)"
 msgstr "Språk"
 
-#: mail/em-composer-prefs.c:941
+#: mail/em-composer-prefs.c:955
 msgid "Add signature script"
 msgstr "Legg til signaturskript"
 
-#: mail/em-composer-prefs.c:961
+#: mail/em-composer-prefs.c:975
 msgid "Signature(s)"
 msgstr "Signatur(er)"
 
-#: mail/em-folder-browser.c:139
+#: mail/em-composer-utils.c:883
+msgid "-------- Forwarded Message --------"
+msgstr "---------Videresendt melding-------"
+
+#: mail/em-composer-utils.c:1494
+msgid "an unknown sender"
+msgstr "en ukjent avsender"
+
+#. translators: attribution string used when quoting messages,
+#. it must contain a single single %%+05d followed by a single '%%s'
+#: mail/em-composer-utils.c:1504
+msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+msgstr "%a, %d.%m.%Y kl. %H.%M %%+05d, skrev %%s:"
+
+#: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "Lag _virtuell mappe fra søk..."
 
-#: mail/em-folder-browser.c:829 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:539
-#: mail/mail-component.c:582
-msgid "Mail"
-msgstr "E-post"
-
 #: mail/em-folder-properties.c:120
 msgid "Folder properties"
 msgstr "Egenskaper for mappe"
@@ -12960,8 +12960,8 @@ msgstr "<klikk her for å velge en mappe>"
 msgid "Create New Folder"
 msgstr "Opprett ny mappe"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2334
-#: mail/mail-component.c:731
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2344
+#: mail/mail-component.c:696
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Spesifiser hvor mappen skal opprettes:"
@@ -12971,285 +12971,284 @@ msgstr "Spesifiser hvor mappen skal opprettes:"
 msgid "Folder _name:"
 msgstr "Mappe_navn:"
 
-#: mail/em-folder-tree.c:934
+#: mail/em-folder-tree.c:937
 #, c-format
 msgid "Moving folder %s"
 msgstr "Flytter mappe %s"
 
-#: mail/em-folder-tree.c:936
+#: mail/em-folder-tree.c:939
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopierer mappe %s"
 
-#: mail/em-folder-tree.c:943
+#: mail/em-folder-tree.c:946
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Flytter meldinger til mappe %s"
 
-#: mail/em-folder-tree.c:945
+#: mail/em-folder-tree.c:948
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopierer meldinger til mappe %s"
 
-#: mail/em-folder-tree.c:961
+#: mail/em-folder-tree.c:964
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Kan ikke slippe melding(er) toppnivå for lageret"
 
-#: mail/em-folder-tree.c:2108 mail/em-folder-tree.c:2121
-#: mail/em-folder-view.c:672 mail/em-folder-view.c:686
+#: mail/em-folder-tree.c:2118 mail/em-folder-tree.c:2131
+#: mail/em-folder-view.c:797 mail/em-folder-view.c:811
 #: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Velg mappe"
 
-#: mail/em-folder-tree.c:2148
+#: mail/em-folder-tree.c:2158
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Oppretter mappe «%s»"
 
-#: mail/em-folder-tree.c:2334 mail/mail-component.c:731
+#: mail/em-folder-tree.c:2344 mail/mail-component.c:696
 msgid "Create folder"
 msgstr "Opprett mappe"
 
-#: mail/em-folder-tree.c:2526
+#: mail/em-folder-tree.c:2536
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Endre navn på mappe «%s» til:"
 
-#: mail/em-folder-tree.c:2528
+#: mail/em-folder-tree.c:2538
 msgid "Rename Folder"
 msgstr "Endre navn på mappe"
 
-#: mail/em-folder-tree.c:2597 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2607 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
 msgid "_View"
 msgstr "_Vis"
 
-#: mail/em-folder-tree.c:2598
+#: mail/em-folder-tree.c:2608
 msgid "Open in _New Window"
 msgstr "Åpne i _nytt vindu"
 
-#: mail/em-folder-tree.c:2603
+#: mail/em-folder-tree.c:2613
 msgid "_Move"
 msgstr "_Flytt"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2607
+#: mail/em-folder-tree.c:2617
 msgid "_New Folder..."
 msgstr "_Ny mappe..."
 
-#: mail/em-folder-tree.c:2610
+#: mail/em-folder-tree.c:2620
 msgid "_Rename"
 msgstr "End_re navn"
 
-#: mail/em-folder-tree.c:2613 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2623 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "Egenska_per..."
 
-#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:852
+#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
+#: mail/mail-vfolder.c:851
 msgid "VFolders"
 msgstr "VFoldere"
 
 #. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
 msgid "UNMATCHED"
 msgstr "UTEN TREFF"
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:208 mail/em-folder-tree-model.c:210
+#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
 msgid "Inbox"
 msgstr "Innboks"
 
-#: mail/em-folder-tree-model.c:465 mail/em-folder-tree-model.c:774
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
 msgid "Loading..."
 msgstr "Laster..."
 
+#: mail/em-folder-view.c:413 mail/GNOME_Evolution_Mail.server.in.in.h:11
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:504
+#: mail/mail-component.c:547
+msgid "Mail"
+msgstr "E-post"
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:771 mail/em-popup.c:691
+#: mail/em-folder-view.c:894 mail/em-popup.c:691
 msgid "_Edit as New Message..."
 msgstr "R_ediger som ny melding..."
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:896
 msgid "_Print"
 msgstr "S_kriv ut"
 
-#: mail/em-folder-view.c:776 ui/evolution-mail-message.xml.h:126
+#: mail/em-folder-view.c:899 ui/evolution-mail-message.xml.h:126
 msgid "_Reply to Sender"
 msgstr "Sva_r til avsender"
 
-#: mail/em-folder-view.c:777 mail/em-popup.c:811
+#: mail/em-folder-view.c:900 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Svar til _listen"
 
-#: mail/em-folder-view.c:778 mail/em-popup.c:812
+#: mail/em-folder-view.c:901 mail/em-popup.c:813
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: mail/em-folder-view.c:779 mail/em-popup.c:814
+#: mail/em-folder-view.c:902 mail/em-popup.c:815
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: mail/em-folder-view.c:782
+#: mail/em-folder-view.c:905
 msgid "Follo_w Up..."
 msgstr "Føl_g opp..."
 
-#: mail/em-folder-view.c:783
+#: mail/em-folder-view.c:906
 msgid "Fla_g Completed"
 msgstr "Mer_k som fullført"
 
-#: mail/em-folder-view.c:784
+#: mail/em-folder-view.c:907
 msgid "Cl_ear Flag"
 msgstr "Fj_ern flagg"
 
-#: mail/em-folder-view.c:787 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:910 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "Mer_k som lest"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:911
 msgid "Mark as _Unread"
 msgstr "Merk som _ulest"
 
-#: mail/em-folder-view.c:789
+#: mail/em-folder-view.c:912
 msgid "Mark as _Important"
 msgstr "Merk som v_iktig"
 
-#: mail/em-folder-view.c:790
+#: mail/em-folder-view.c:913
 msgid "_Mark as Unimportant"
 msgstr "_Merk som uviktig"
 
-#: mail/em-folder-view.c:791 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:914 ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr "Merk som _søppel"
 
-#: mail/em-folder-view.c:792 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr "Merk som _ikke søppel"
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:919
 msgid "U_ndelete"
 msgstr "A_ngre slett"
 
-#: mail/em-folder-view.c:799
+#: mail/em-folder-view.c:922
 msgid "Mo_ve to Folder..."
 msgstr "Fl_ytt til mappe..."
 
-#: mail/em-folder-view.c:800 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:923 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "K_opier til mappe..."
 
-#: mail/em-folder-view.c:808
+#: mail/em-folder-view.c:931
 msgid "Add Sender to Address_book"
 msgstr "Legg til avsender i adresse_bok"
 
-#: mail/em-folder-view.c:811
+#: mail/em-folder-view.c:934
 msgid "Appl_y Filters"
 msgstr "_Påfør filtre"
 
-#: mail/em-folder-view.c:812
+#: mail/em-folder-view.c:935
 msgid "F_ilter Junk"
 msgstr "F_iltrer søppel"
 
-#: mail/em-folder-view.c:815
+#: mail/em-folder-view.c:938
 msgid "Crea_te Rule From Message"
 msgstr "Oppre_tt regel fra melding"
 
-#: mail/em-folder-view.c:816
+#: mail/em-folder-view.c:939
 msgid "VFolder on _Subject"
 msgstr "VFolder på e_mne"
 
-#: mail/em-folder-view.c:817
+#: mail/em-folder-view.c:940
 msgid "VFolder on Se_nder"
 msgstr "VFolder for se_nder"
 
-#: mail/em-folder-view.c:818
+#: mail/em-folder-view.c:941
 msgid "VFolder on _Recipients"
 msgstr "VFolder for mottake_re"
 
-#: mail/em-folder-view.c:819
+#: mail/em-folder-view.c:942
 msgid "VFolder on Mailing _List"
 msgstr "VFolder på e-post_liste"
 
-#: mail/em-folder-view.c:821
-msgid "VFolder on Thread"
-msgstr "VFolder for tråd"
-
-#: mail/em-folder-view.c:825
+#: mail/em-folder-view.c:946
 msgid "Filter on Sub_ject"
 msgstr "Filtrer på em_ne"
 
-#: mail/em-folder-view.c:826
+#: mail/em-folder-view.c:947
 msgid "Filter on Sen_der"
 msgstr "Filtrer på sen_der"
 
-#: mail/em-folder-view.c:827
+#: mail/em-folder-view.c:948
 msgid "Filter on Re_cipients"
 msgstr "Filtrer på motta_ker"
 
-#: mail/em-folder-view.c:828
+#: mail/em-folder-view.c:949
 msgid "Filter on _Mailing List"
 msgstr "Filtrer på e-_postliste"
 
-#: mail/em-folder-view.c:830
-msgid "Filter on Thread"
-msgstr "Filtrer på tråd"
-
 #. default charset used in mail view
-#: mail/em-folder-view.c:1613 mail/em-folder-view.c:1651
+#: mail/em-folder-view.c:1717 mail/em-folder-view.c:1757
 #: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "Forvalgt"
 
-#: mail/em-folder-view.c:1687
+#: mail/em-folder-view.c:1807
 msgid "Print Message"
 msgstr "Skriv ut melding"
 
-#: mail/em-folder-view.c:1950
+#: mail/em-folder-view.c:2072
 msgid "_Copy Link Location"
 msgstr "_Kopier lokasjon for lenke"
 
-#: mail/em-folder-view.c:2209
+#: mail/em-folder-view.c:2326
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klikk for å sende melding til %s"
 
-#: mail/em-format.c:742 mail/em-format-html.c:1436 mail/em-format-quote.c:191
-#: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:314
+#: mail/em-format.c:742 mail/em-format-html.c:1427 mail/em-format-quote.c:191
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
 msgid "From"
 msgstr "Fra"
 
-#: mail/em-format.c:743 mail/em-format-html.c:1436 mail/em-format-quote.c:191
-#: mail/em-mailer-prefs.c:68
+#: mail/em-format.c:743 mail/em-format-html.c:1427 mail/em-format-quote.c:191
+#: mail/em-mailer-prefs.c:85
 msgid "Reply-To"
 msgstr "Svar-til"
 
-#: mail/em-format.c:744 mail/em-format-html.c:1436 mail/em-format-quote.c:191
-#: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
+#: mail/em-format.c:744 mail/em-format-html.c:1427 mail/em-format-quote.c:191
+#: mail/em-mailer-prefs.c:86 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Til"
 
-#: mail/em-format.c:745 mail/em-format-html.c:1436 mail/em-format-quote.c:191
-#: mail/em-mailer-prefs.c:70
+#: mail/em-format.c:745 mail/em-format-html.c:1427 mail/em-format-quote.c:191
+#: mail/em-mailer-prefs.c:87
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/em-format.c:746 mail/em-format-html.c:1436 mail/em-format-quote.c:191
-#: mail/em-mailer-prefs.c:71
+#: mail/em-format.c:746 mail/em-format-html.c:1427 mail/em-format-quote.c:191
+#: mail/em-mailer-prefs.c:88
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/em-format.c:748 mail/em-format-html.c:1586 mail/em-format-quote.c:315
-#: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
+#: mail/em-format.c:748 mail/em-format-html.c:1577 mail/em-format-quote.c:315
+#: mail/em-mailer-prefs.c:90 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Dato"
 
-#: mail/em-format.c:749 mail/em-format-html.c:1607 mail/em-mailer-prefs.c:74
+#: mail/em-format.c:749 mail/em-format-html.c:1598 mail/em-mailer-prefs.c:91
 msgid "Newsgroups"
-msgstr ""
+msgstr "Nyhetsgrupper"
 
 #: mail/em-format.c:986
 #, c-format
@@ -13280,89 +13279,89 @@ msgstr "Feil under verifisering av signatur"
 msgid "Unknown error verifying signature"
 msgstr "Ukjent feil under verifisering av signatur"
 
-#: mail/em-format-html.c:462 mail/em-format-html.c:464
+#: mail/em-format-html.c:453 mail/em-format-html.c:455
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Henter «%s»"
 
-#: mail/em-format-html.c:569 mail/em-format-html-display.c:646
+#: mail/em-format-html.c:560 mail/em-format-html-display.c:646
 msgid "Unsigned"
 msgstr "Usignert"
 
-#: mail/em-format-html.c:570 mail/em-format-html-display.c:647
+#: mail/em-format-html.c:561 mail/em-format-html-display.c:647
 msgid "Valid signature"
 msgstr "Gyldig signatur"
 
-#: mail/em-format-html.c:571 mail/em-format-html-display.c:648
+#: mail/em-format-html.c:562 mail/em-format-html-display.c:648
 msgid "Invalid signature"
 msgstr "Ugyldig signatur"
 
-#: mail/em-format-html.c:572 mail/em-format-html-display.c:649
+#: mail/em-format-html.c:563 mail/em-format-html-display.c:649
 msgid "Valid signature, cannot verify sender"
 msgstr "Gyldig signatur. Kan ikke verifisere avsender"
 
-#: mail/em-format-html.c:578 mail/em-format-html-display.c:655
+#: mail/em-format-html.c:569 mail/em-format-html-display.c:655
 msgid "Unencrypted"
 msgstr "Ukryptert"
 
-#: mail/em-format-html.c:579 mail/em-format-html-display.c:656
+#: mail/em-format-html.c:570 mail/em-format-html-display.c:656
 msgid "Encrypted, weak"
 msgstr "Kryptert, svak"
 
-#: mail/em-format-html.c:580 mail/em-format-html-display.c:657
+#: mail/em-format-html.c:571 mail/em-format-html-display.c:657
 msgid "Encrypted"
 msgstr "Kryptert"
 
-#: mail/em-format-html.c:581 mail/em-format-html-display.c:658
+#: mail/em-format-html.c:572 mail/em-format-html-display.c:658
 msgid "Encrypted, strong"
 msgstr "Kryptert, sterk"
 
-#: mail/em-format-html.c:843
+#: mail/em-format-html.c:834
 msgid "Malformed external-body part."
 msgstr "Feilutformet del for ekstern kropp."
 
-#: mail/em-format-html.c:873
+#: mail/em-format-html.c:864
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Peker til FTP-tjener (%s)"
 
-#: mail/em-format-html.c:884
+#: mail/em-format-html.c:875
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Peker til lokal fil (%s) gyldig på nettsted «%s»"
 
-#: mail/em-format-html.c:886
+#: mail/em-format-html.c:877
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Peker til lokal fil (%s)"
 
-#: mail/em-format-html.c:907
+#: mail/em-format-html.c:898
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Peker til eksterne data (%s)"
 
-#: mail/em-format-html.c:918
+#: mail/em-format-html.c:909
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Peker til ukjente eksterne data («%s»-type)"
 
-#: mail/em-format-html.c:1160
+#: mail/em-format-html.c:1151
 msgid "Formatting message"
 msgstr "Formatterer melding"
 
 #. pseudo-header
-#: mail/em-format-html.c:1546 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:918
+#: mail/em-format-html.c:1537 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:932
 msgid "Mailer"
 msgstr "E-postprogram"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1573
+#: mail/em-format-html.c:1564
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1576
+#: mail/em-format-html.c:1567
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
@@ -13373,13 +13372,10 @@ msgid "Matches: %d"
 msgstr "Treff: %d"
 
 #: mail/em-format-html-display.c:646
-#, fuzzy
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
-msgstr ""
-"Denne meldingen er ikke signert. Du har ingen garanti for at avsender av "
-"meldingen er autentisk."
+msgstr "Denne meldingen er ikke signert. Du har ingen garanti for at meldingen er autentisk."
 
 #: mail/em-format-html-display.c:647
 #, fuzzy
@@ -13407,7 +13403,6 @@ msgstr ""
 "kan ikke verifiseres."
 
 #: mail/em-format-html-display.c:655
-#, fuzzy
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "The Internet."
@@ -13479,23 +13474,23 @@ msgstr "Side %d av %d"
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (integrert)"
 
-#: mail/em-mailer-prefs.c:85
+#: mail/em-mailer-prefs.c:102
 msgid "Every time"
 msgstr "Hver gang"
 
-#: mail/em-mailer-prefs.c:86
+#: mail/em-mailer-prefs.c:103
 msgid "Once per day"
 msgstr "En gang om dagen"
 
-#: mail/em-mailer-prefs.c:87
+#: mail/em-mailer-prefs.c:104
 msgid "Once per week"
 msgstr "En gang i uken"
 
-#: mail/em-mailer-prefs.c:88
+#: mail/em-mailer-prefs.c:105
 msgid "Once per month"
 msgstr "En gang i måneden"
 
-#: mail/em-migrate.c:1078
+#: mail/em-migrate.c:1072
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13507,25 +13502,53 @@ msgstr ""
 "\n"
 "Vennligst vent mens Evolution migrere dine mapper..."
 
-#: mail/em-migrate.c:1933 mail/em-migrate.c:1948
+#: mail/em-migrate.c:1506
 #, c-format
-msgid "Failed to migrate pop3 uid caches: %s"
-msgstr "Feil under migrering av uid-buffer for pop3: %s"
+msgid "Unable to create new folder `%s': %s"
+msgstr "Kan ikke opprette ny mappe «%s»: %s"
 
-#: mail/em-migrate.c:2036 mail/em-migrate.c:2137
+#: mail/em-migrate.c:1532
 #, c-format
-msgid "Failed to migrate folder expand state: %s"
-msgstr "Feil under migrering av utvidelsestilstand for mappe: %s"
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr "Kan ikke kopiere mappe «%s» til «%s»: %s"
 
-#: mail/em-migrate.c:2338 mail/em-migrate.c:2512
-#, c-format
-msgid "Failed to create directory `%s': %s"
+#: mail/em-migrate.c:1715
+#, fuzzy, c-format
+msgid "Unable to scan for existing mailboxes at `%s': %s"
+msgstr "Kunne ikke lagre gruppelistefil for %s: %s"
+
+#: mail/em-migrate.c:1919
+#, fuzzy, c-format
+msgid "Unable to open old POP keep-on-server data `%s': %s"
+msgstr "Kunne ikke autentisere mot POP-tjener %s: %s"
+
+#: mail/em-migrate.c:1933
+#, fuzzy, c-format
+msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Klarte ikke å opprette katalog «%s»: %s"
 
-#: mail/em-migrate.c:2350
+#: mail/em-migrate.c:1962
 #, c-format
-msgid "Failed to open store for `%s': %s"
-msgstr "Klarte ikke å åpne lager for «%s»: %s"
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr ""
+
+#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#, fuzzy, c-format
+msgid "Failed to create local mail storage `%s': %s"
+msgstr "Klarte ikke å opprette katalog «%s»: %s"
+
+#: mail/em-migrate.c:2480
+#, fuzzy, c-format
+msgid "Unable to create local mail folders at `%s': %s"
+msgstr ""
+"Kunne ikke opprette utdatafil: %s\n"
+" %s"
+
+#: mail/em-migrate.c:2498
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
 
 #: mail/em-popup.c:701
 msgid "Save As..."
@@ -13536,89 +13559,75 @@ msgstr "Lagre som..."
 msgid "untitled_image.%s"
 msgstr "bilde_uten_navn.%s"
 
-#: mail/em-popup.c:808
+#: mail/em-popup.c:809
 msgid "Set as _Background"
 msgstr "Sett som _bakgrunn"
 
-#: mail/em-popup.c:810
+#: mail/em-popup.c:811
 msgid "_Reply to sender"
 msgstr "Sva_r til avsender"
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:860
 msgid "_Open Link in Browser"
 msgstr "_Åpne lenke i nettleser"
 
-#: mail/em-popup.c:859
+#: mail/em-popup.c:861
 msgid "Se_nd message to..."
 msgstr "Se_nd melding til..."
 
-#: mail/em-popup.c:860
+#: mail/em-popup.c:862
 msgid "_Add to Addressbook"
 msgstr "Legg til i _adressebok"
 
-#: mail/em-popup.c:966
+#: mail/em-popup.c:968
 #, c-format
 msgid "Open in %s..."
 msgstr "Åpne i %s..."
 
-#: mail/em-subscribe-editor.c:604
+#: mail/em-subscribe-editor.c:606
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr ""
 "Dette lageret støtter ikke abonnering, eller så er dette ikke aktivert."
 
-#: mail/em-subscribe-editor.c:633
+#: mail/em-subscribe-editor.c:635
 msgid "Subscribed"
 msgstr "Abonnert"
 
-#: mail/em-subscribe-editor.c:637 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Mappe"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:850
+#: mail/em-subscribe-editor.c:852
 msgid "Please select a server."
 msgstr "Vennligst velg en tjener."
 
-#: mail/em-subscribe-editor.c:871
+#: mail/em-subscribe-editor.c:873
 msgid "No server has been selected"
 msgstr "Ingen tjener er valgt"
 
-#: mail/em-utils.c:95
+#: mail/em-utils.c:98
 msgid "Don't show this message again."
 msgstr "Ikke vis denne meldingen igjen."
 
-#: mail/em-utils.c:285
+#: mail/em-utils.c:288
 msgid "Filters"
 msgstr "Filtre"
 
-#: mail/em-utils.c:530
-msgid "-------- Forwarded Message --------"
-msgstr "---------Videresendt melding-------"
-
-#: mail/em-utils.c:1137
-msgid "an unknown sender"
-msgstr "en ukjent avsender"
-
-#. translators: attribution string used when quoting messages,
-#. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1147
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "%a, %d.%m.%Y kl. %H.%M %%+05d, skrev %%s:"
-
-#: mail/em-utils.c:1476
+#: mail/em-utils.c:402
 msgid "message"
 msgstr "melding"
 
-#: mail/em-utils.c:1579
+#: mail/em-utils.c:505
 msgid "Save Message..."
 msgstr "Lagre melding..."
 
-#: mail/em-utils.c:1628
+#: mail/em-utils.c:554
 msgid "Add address"
 msgstr "Legg til adresse"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2063
+#: mail/em-utils.c:989
 #, c-format
 msgid "Messages from %s"
 msgstr "Meldinger fra %s"
@@ -13647,11 +13656,11 @@ msgstr "Farge for utheving av sitattekst."
 
 #: mail/evolution-mail.schemas.in.in.h:6
 msgid "Composer Window default height"
-msgstr ""
+msgstr "Forvalgt høyde for skrivevindu"
 
 #: mail/evolution-mail.schemas.in.in.h:7
 msgid "Composer Window default width"
-msgstr ""
+msgstr "Forvalgt bredde for skrivevindu"
 
 #: mail/evolution-mail.schemas.in.in.h:8
 msgid "Default charset in which to compose messages"
@@ -13747,123 +13756,132 @@ msgid "List of Labels and their associated colors"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:30
-msgid "List of accounts"
+#, fuzzy
+msgid "List of accepted licenses"
 msgstr "Liste med kontoer"
 
 #: mail/evolution-mail.schemas.in.in.h:31
+msgid "List of accounts"
+msgstr "Liste med kontoer"
+
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:34
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:36
+msgid "List of protocol names whose license has been accepted."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Load images for HTML messages over http"
 msgstr "Last bilder for HTML-meldinger og http"
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
 "load images off the net 1 - Load images if sender is in the addressbook 2 - "
 "Always load images off the net"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Log filter actions"
 msgstr "Loggfør filterhandlinger"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Logfile to log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:47
 #, fuzzy
 msgid "Message Window default height"
 msgstr "Forvalgt vinduhøyde"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Minimum days between emptying the trash on exit"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid "New Mail Notify sound file"
 msgstr "Lydfil for varsel om ny e-post"
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify type"
 msgstr "Type varsel for ny e-post"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -13871,33 +13889,25 @@ msgstr ""
 "Spør når bruker prøver å sende HTML-meldinger til mottakere som ikke ønsker "
 "å motta HTML-meldinger."
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Spør når bruker prøver å sende en melding uten Til- eller Cc-mottakere."
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Spør når bruker prøver å sende uønsket HTML"
 
-#: mail/evolution-mail.schemas.in.in.h:60
-msgid "Recognize links in text and replace them."
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:61
-msgid "Recognize smileys in text and replace them with images."
-msgstr ""
-
 #: mail/evolution-mail.schemas.in.in.h:62
-msgid "Run junk test on incoming mail"
+msgid "Recognize links in text and replace them."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:63
-msgid "S3kr3t 0pt10n"
+msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:64
-msgid "S3kr3t 0pt10n."
+msgid "Run junk test on incoming mail"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:65
@@ -14122,18 +14132,14 @@ msgid "Evolution Mail composer configuration control"
 msgstr "Konfigurasjonskontroll for Evolution e-postredigering"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
-msgstr "Komponent for mappevisning for Evolution e-post"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
 msgid "Evolution Mail preferences control"
 msgstr "Brukervalg-kontroll for Evolution e-post"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
 msgid "Mail Accounts"
 msgstr "E-post-konti"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13 mail/mail-config.glade.h:96
 msgid "Mail Preferences"
 msgstr "Brukervalg for e-post"
 
@@ -14143,15 +14149,15 @@ msgstr "Evolution importerer gammel e-post fra Elm"
 
 #: mail/importers/elm-importer.c:89
 #: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:225
-#: mail/importers/netscape-importer.c:1221 mail/importers/pine-importer.c:117
+#: mail/importers/evolution-outlook-importer.c:226
+#: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Importerer..."
 
 #: mail/importers/elm-importer.c:91
 #: mail/importers/evolution-mbox-importer.c:222
-#: mail/importers/evolution-outlook-importer.c:227
-#: mail/importers/netscape-importer.c:1223 mail/importers/pine-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Vennligst vent"
 
@@ -14180,14 +14186,14 @@ msgid "Select folder to import into"
 msgstr "Velg mappe å importere til"
 
 #: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:224
-#: mail/importers/mail-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/mail-importer.c:226
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importerer «%s»"
 
-#: mail/importers/evolution-outlook-importer.c:271
-#: mail/importers/mail-importer.c:134
+#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/mail-importer.c:140
 msgid "Importing mailbox"
 msgstr "Importerer postboks"
 
@@ -14219,7 +14225,7 @@ msgstr "MBox (.mbox)"
 msgid "Outlook Express 4 (.mbx)"
 msgstr "Outlook Express 4 (.mbx)"
 
-#: mail/importers/mail-importer.c:354
+#: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
 msgstr "Søker i %s"
@@ -14229,7 +14235,7 @@ msgstr "Søker i %s"
 msgid "Priority Filter \"%s\""
 msgstr "Prioritetsfilter: «%s»"
 
-#: mail/importers/netscape-importer.c:651
+#: mail/importers/netscape-importer.c:662
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -14244,7 +14250,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:675
+#: mail/importers/netscape-importer.c:686
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -14252,7 +14258,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:692
+#: mail/importers/netscape-importer.c:703
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -14261,23 +14267,23 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1220
+#: mail/importers/netscape-importer.c:1250
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importerer dine gamle data fra Netscape"
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1707
 msgid "Importing Netscape data"
 msgstr "Importerer data fra Netscape"
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1907
 msgid "Settings"
 msgstr "Innstillinger"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1912
 msgid "Mail Filters"
 msgstr "E-post filtre"
 
-#: mail/importers/netscape-importer.c:1903
+#: mail/importers/netscape-importer.c:1933
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -14310,132 +14316,140 @@ msgid "Pine"
 msgstr "Pine"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:153
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Kontoredigering for Evolution"
 
-#: mail/mail-account-gui.c:946 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:246
+#, c-format
+msgid ""
+"\n"
+"Please read carefully the license agreement\n"
+"for %s displayed below\n"
+"and tick the check box for accepting it\n"
+msgstr ""
+"\n"
+"Vennligst les lisensavtalen for %s som vises\n"
+"under nøye\n"
+"og kryss av i ruten for å akseptere den\n"
+
+#: mail/mail-account-gui.c:252
+#, c-format
+msgid "%s License Agreement"
+msgstr "Lisensavtale for %s"
+
+#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
 msgid "_Host:"
 msgstr "_Vert:"
 
-#: mail/mail-account-gui.c:950 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
 msgid "User_name:"
 msgstr "Bruker_navn:"
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
 msgid "_Path:"
 msgstr "S_ti:"
 
-#: mail/mail-autofilter.c:75
+#: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
 msgstr "Send til %s"
 
-#: mail/mail-autofilter.c:261
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr "Emne er %s"
 
-#: mail/mail-autofilter.c:277
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr "E-post fra %s"
 
-#: mail/mail-autofilter.c:294
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr "%s e-postliste"
 
-#: mail/mail-autofilter.c:318
-#, c-format
-msgid "Replies to %s"
-msgstr "Svar til %s"
-
-#: mail/mail-autofilter.c:373
+#: mail/mail-autofilter.c:326
 msgid "Add Filter Rule"
 msgstr "Legg til filterregel"
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:457
 #, c-format
 msgid "%d deleted"
 msgstr "%d slettet"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:459
 #, c-format
 msgid "%d junk"
 msgstr "%d søppel"
 
-#: mail/mail-component.c:517
+#: mail/mail-component.c:482
 #, c-format
 msgid "%d drafts"
 msgstr "%d skisser"
 
-#: mail/mail-component.c:519
+#: mail/mail-component.c:484
 #, c-format
 msgid "%d sent"
 msgstr "%d sendt"
 
-#: mail/mail-component.c:521
+#: mail/mail-component.c:486
 #, c-format
 msgid "%d unsent"
 msgstr "%d usendt"
 
-#: mail/mail-component.c:525
+#: mail/mail-component.c:490
 #, c-format
 msgid "%d total"
 msgstr "%d totalt"
 
-#: mail/mail-component.c:527
+#: mail/mail-component.c:492
 #, c-format
 msgid ", %d unread"
 msgstr ", %d ulest"
 
-#: mail/mail-component.c:531
-#, c-format
-msgid ", %d selected"
-msgstr ", %d valgt"
-
-#: mail/mail-component.c:683
+#: mail/mail-component.c:648
 msgid "New Mail Message"
 msgstr "Ny e-post melding"
 
-#: mail/mail-component.c:684
+#: mail/mail-component.c:649
 msgid "_Mail Message"
 msgstr "Send _melding"
 
-#: mail/mail-component.c:685
+#: mail/mail-component.c:650
 msgid "Compose a new mail message"
 msgstr "Skriv en ny e-postmelding"
 
-#: mail/mail-component.c:691
+#: mail/mail-component.c:656
 msgid "New Mail Folder"
 msgstr "Ny e-postmappe"
 
-#: mail/mail-component.c:692
+#: mail/mail-component.c:657
 msgid "Mail _Folder"
 msgstr "_E-postmappe"
 
-#: mail/mail-component.c:693
+#: mail/mail-component.c:658
 msgid "Create a new mail folder"
 msgstr "Opprett en ny e-postmappe"
 
-#: mail/mail-component.c:871
-msgid "URI of the mail source that the view will display"
-msgstr "URI for e-postkilden som visningen skal vise"
+#: mail/mail-component.c:758
+msgid "Failed upgrading Mail settings or folders."
+msgstr "Feil under oppgradering av innstillinger eller mapper for e-post."
 
-#: mail/mail-config.c:888
+#: mail/mail-config.c:911
 msgid "Checking Service"
 msgstr "Sjekker tjeneste"
 
-#: mail/mail-config.c:966 mail/mail-config.c:970
+#: mail/mail-config.c:989 mail/mail-config.c:993
 msgid "Connecting to server..."
 msgstr "Kobler til tjener..."
 
-#: mail/mail-config-druid.c:364 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr "Identitet"
 
-#: mail/mail-config-druid.c:366
+#: mail/mail-config-druid.c:364
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -14445,12 +14459,12 @@ msgstr ""
 "under må ikke nødvendigvis fylles ut, hvis du ikke ønsker å inkludere denne "
 "informasjonen i meldingene du sender."
 
-#: mail/mail-config-druid.c:372 mail/mail-config-druid.c:379
+#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
 #: mail/mail-config.glade.h:116
 msgid "Receiving Mail"
 msgstr "Innkommende e-post"
 
-#: mail/mail-config-druid.c:374
+#: mail/mail-config-druid.c:372
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
 "not sure, ask your system administrator or Internet Service Provider."
@@ -14459,15 +14473,15 @@ msgstr ""
 "Hvis du ikke er sikker, kontakt din systemadministrator eller Internett "
 "tjenestetilbyder."
 
-#: mail/mail-config-druid.c:381
+#: mail/mail-config-druid.c:379
 msgid "Please select among the following options"
 msgstr "Vennligst velg mellom følgende alternativer"
 
-#: mail/mail-config-druid.c:384 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
 msgid "Sending Mail"
 msgstr "Utgående e-post"
 
-#: mail/mail-config-druid.c:386
+#: mail/mail-config-druid.c:384
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -14475,11 +14489,11 @@ msgstr ""
 "Vennligst skriv inn informasjon om måten du sender e-post. Hvis du ikke er "
 "sikker, kontakt din systemadministrator eller din Internett tjenestetilbyder."
 
-#: mail/mail-config-druid.c:391 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Håndtering av konti"
 
-#: mail/mail-config-druid.c:393
+#: mail/mail-config-druid.c:391
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
 "incoming mail server and outgoing mail transport method which you provided "
@@ -14515,19 +14529,19 @@ msgstr "<b>Språk</b> "
 
 #: mail/mail-config.glade.h:7
 msgid "<span weight=\"bold\">Account Information</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Kontoinformasjon</span>"
 
 #: mail/mail-config.glade.h:8
 msgid "<span weight=\"bold\">Alerts</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Varsel</span>"
 
 #: mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Authentication Type</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Autentiseringstyper</span>"
 
 #: mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Authentication</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Autentisering</span>"
 
 #: mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Checking for New Mail</span>"
@@ -14535,19 +14549,19 @@ msgstr "<span weight=\"bold\">Ser etter nye meldinger</span>"
 
 #: mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Composing Messages</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Skriving av meldinger</span>"
 
 #: mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Configuration</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Konfigurasjon</span>"
 
 #: mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Default Behavior</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Forvalgt oppførsel</span>"
 
 #: mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Delete Mail</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Sletting av e-post</span>"
 
 #: mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
@@ -14555,70 +14569,67 @@ msgstr "<span weight=\"bold\">_Meldingshoder som vises</span>"
 
 #: mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Filter Options</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Alternativer for filtre</span>"
 
 #: mail/mail-config.glade.h:18
 msgid "<span weight=\"bold\">General</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Generelt</span>"
 
 #: mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Labels and Colors</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Etiketter og farger</span>"
 
 #: mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">Loading Images</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Lasting av bilder</span>"
 
 #: mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Message Display</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Meldingsvisning</span>"
 
 #: mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Message Fonts</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Skrifter for meldinger</span>"
 
 #: mail/mail-config.glade.h:23
-#, fuzzy
 msgid "<span weight=\"bold\">New Mail Notification</span>"
-msgstr "Melding om ny e-post"
+msgstr "<span weight=\"bold\">Melding om ny e-post</span>"
 
 #: mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Optional Information</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Tilleggsinformasjon</span>"
 
 #: mail/mail-config.glade.h:25
 msgid "<span weight=\"bold\">Options</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Alternativer</span>"
 
 #: mail/mail-config.glade.h:26
-#, fuzzy
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
-msgstr "Pretty Good Privacy (PGP/GPG)"
+msgstr "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 
 #: mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Printed Fonts</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Skrifter for utskrift</span>"
 
 #: mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Required Information</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Nødvendig informasjon</span>"
 
 #: mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 
 #: mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Security</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Sikkerhet</span>"
 
 #: mail/mail-config.glade.h:31
-#, fuzzy
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
-msgstr "Sendte meldinger og skisser"
+msgstr "<span weight=\"bold\">Sendte meldinger og skisser</span>"
 
 #: mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Server Configuration</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Tjenerkonfigurasjon</span>"
 
 #: mail/mail-config.glade.h:33
 msgid "A_lso encrypt to self when sending encrypted mail"
@@ -15093,422 +15104,531 @@ msgstr "farge"
 msgid "description"
 msgstr "beskrivelse"
 
-#: mail/mail-errors.xml.in.h:1
-#, fuzzy
-msgid "A folder named \"{1}\" already exists. Please use a different name."
+#. mail:camel-service-auth-invalid primary
+#: mail/mail-errors.xml.h:2
+msgid "Invalid authentication"
+msgstr "Ugyldig autentisering"
+
+#. mail:camel-service-auth-invalid secondary
+#: mail/mail-errors.xml.h:4
+msgid ""
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+msgstr "Tjener støtter ikke denne typen autentisering. Det kan hende den ikke støtter autentisering i det hele tatt."
+
+#. mail:camel-service-auth-failed primary
+#: mail/mail-errors.xml.h:6
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr ""
-"En mappe med navn «%s» eksisterer allerede. Vennligst bruk et annet navn."
 
-#: mail/mail-errors.xml.in.h:2
+#. mail:camel-service-auth-failed secondary
+#: mail/mail-errors.xml.h:8
 msgid ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
+"Check to make sure your password is spelled correctly.  Remember that many "
+"passwords are case sensitive; your caps lock might be on."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:3
-msgid "Are you sure you want to delete this account?"
-msgstr "Er du sikker på at du vil slette denne kontoen?"
+#. mail:ask-send-html primary
+#: mail/mail-errors.xml.h:10
+msgid "Are you sure you want to send a message in HTML format?"
+msgstr "Er du sikker på at du vil sende en melding i HTML-format?"
 
-#: mail/mail-errors.xml.in.h:4
+#. mail:ask-send-html secondary
+#: mail/mail-errors.xml.h:12
 #, fuzzy
 msgid ""
-"Are you sure you want to permanently remove all the deleted message in "
-"folder \"{0}\"?"
-msgstr "Fjern alle slettede meldinger fra denne mappen permanent"
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}\n"
+"Send anyway?"
+msgstr ""
+"Du sender en melding i HMTL-format. Sjekk at følgende mottakere\n"
+"kan og ønsker og motta e-post som HTML:\n"
+"%sSend likevel?"
 
-#: mail/mail-errors.xml.in.h:5
-#, fuzzy
-msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
-msgstr "Fjern alle slettede meldinger fra alle mapper permanent"
+#: mail/mail-errors.xml.h:15 mail/mail-errors.xml.h:20
+#: mail/mail-errors.xml.h:27 mail/mail-errors.xml.h:32
+msgid "_Send"
+msgstr "_Send"
 
-#: mail/mail-errors.xml.in.h:6
-#, fuzzy
-msgid "Are you sure you want to send a message in HTML format?"
-msgstr "Er du sikker på at du vil fjerne denne URLen?"
+#. mail:ask-send-no-subject primary
+#: mail/mail-errors.xml.h:17
+msgid "Are you sure you want to send a message without a subject?"
+msgstr "Er du sikker på at du vil sende en melding uten emne?"
 
-#: mail/mail-errors.xml.in.h:7
-#, fuzzy
-msgid "Are you sure you want to send a message with only BCC recipients?"
+#. mail:ask-send-no-subject secondary
+#: mail/mail-errors.xml.h:19
+msgid ""
+"Adding a meaningful Subject line to your messages will give your recipients "
+"an idea of what your mail is about."
 msgstr ""
-"Spør når bruker prøver å sende en melding uten Til- eller Cc-mottakere."
 
-#: mail/mail-errors.xml.in.h:8
+#. mail:ask-send-only-bcc-contact primary
+#. mail:ask-send-only-bcc primary
+#: mail/mail-errors.xml.h:22 mail/mail-errors.xml.h:29
 #, fuzzy
-msgid "Are you sure you want to send a message without a subject?"
+msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr ""
-"Er du sikker på at du vil\n"
-"slette denne kontakten?"
+"Spør når bruker prøver å sende en melding uten Til- eller Cc-mottakere."
 
-#: mail/mail-errors.xml.in.h:9
-msgid "Because \"{0}\"."
+#. mail:ask-send-only-bcc-contact secondary
+#: mail/mail-errors.xml.h:24
+msgid ""
+"The contact list you are sending to is configured to hide list recipients.\n"
+"\n"
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients in "
+"your message. To avoid this, you should add at least one To: or CC: "
+"recipient. "
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:10 widgets/misc/e-system-errors.xml.in.h:2
-msgid "Because \"{1}\"."
+#. mail:ask-send-only-bcc secondary
+#: mail/mail-errors.xml.h:31
+msgid ""
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients to "
+"your message anyway. To avoid this, you should add at least one To: or CC: "
+"recipient."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:11
-msgid "Because \"{2}\"."
+#. mail:send-no-recipients primary
+#: mail/mail-errors.xml.h:34
+msgid ""
+"This message cannot be sent because you have not specified any Recipients"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:12
-msgid "Cannot add vFolder \"{0}\"."
+#. mail:send-no-recipients secondary
+#: mail/mail-errors.xml.h:36
+msgid ""
+"Please enter a valid email address in the To: field. You can search for "
+"email addresses by clicking on the To: button next to the entry box."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:13
-#, fuzzy
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "Kan ikke kopiere mappe: %s"
-
-#: mail/mail-errors.xml.in.h:14
-#, fuzzy
-msgid "Cannot create folder \"{0}\"."
-msgstr "Kan ikke opprette mappe: %s: %s"
-
-#: mail/mail-errors.xml.in.h:15
-#, fuzzy
-msgid "Cannot create temporary save directory."
-msgstr "Kunne ikke opprette midlertidig katalog: %s"
-
-#: mail/mail-errors.xml.in.h:16
-#, fuzzy
-msgid "Cannot create the save directory, because \"{1}\""
-msgstr "Kan ikke opprette katalog «%s»: %s."
-
-#: mail/mail-errors.xml.in.h:17
-msgid "Cannot delete folder \"{0}\"."
-msgstr "Kunne ikke slette mappe «{0}»."
+#. mail:ask-default-drafts primary
+#: mail/mail-errors.xml.h:38
+msgid "Use default drafts folder?"
+msgstr "Bruk forvalgt mappe for skisser?"
 
-#: mail/mail-errors.xml.in.h:18
+#. mail:ask-default-drafts secondary
+#: mail/mail-errors.xml.h:40
 #, fuzzy
-msgid "Cannot delete system folder \"{0}\"."
-msgstr "Kan ikke slette lokal %s-mappe."
+msgid ""
+"Unable to open the drafts folder for this account.  Use the system drafts "
+"folder instead?"
+msgstr ""
+"Kunne ikke åpne skisse-mappen for denne kontoen.\n"
+"Vil du bruke standard skisse-mappe?"
 
-#: mail/mail-errors.xml.in.h:19
-#, fuzzy
-msgid "Cannot edit vFolder \"{0}\" as it does not exist."
-msgstr "Mappen «%s» eksisterer ikke."
+#: mail/mail-errors.xml.h:41
+msgid "Use _Default"
+msgstr "Bruk _forvalg"
 
-#: mail/mail-errors.xml.in.h:20
+#. mail:ask-expunge primary
+#: mail/mail-errors.xml.h:43
 #, fuzzy
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
-msgstr "Kunne ikke flytte mappe: %s"
+msgid ""
+"Are you sure you want to permanently remove all the deleted message in "
+"folder \"{0}\"?"
+msgstr "Fjern alle slettede meldinger fra denne mappen permanent"
 
-#: mail/mail-errors.xml.in.h:21
-msgid "Cannot open source \"{1}\""
-msgstr "Kan ikke åpne kilde «{1}»"
+#. mail:ask-expunge secondary
+#. mail:ask-empty-trash secondary
+#: mail/mail-errors.xml.h:45 mail/mail-errors.xml.h:50
+msgid "If you continue, you will not be able to recover these messages."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:22
-#, fuzzy
-msgid "Cannot open source \"{2}\"."
-msgstr "Kunne ikke åpne kilde"
+#: mail/mail-errors.xml.h:46
+msgid "_Expunge"
+msgstr "T_øm"
 
-#: mail/mail-errors.xml.in.h:23
-#, fuzzy
-msgid "Cannot open target \"{2}\"."
-msgstr "Kan ikke åpne melding"
+#. mail:ask-empty-trash primary
+#: mail/mail-errors.xml.h:48
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr "Er du sikker på at du vil fjerne alle slettede meldinger fra alle mapper permanent?"
 
-#: mail/mail-errors.xml.in.h:24
-msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr ""
+#: mail/mail-errors.xml.h:51
+msgid "_Empty Trash"
+msgstr "Tøm søpp_elkurven"
 
-#: mail/mail-errors.xml.in.h:25
-#, fuzzy
-msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "Kan ikke endre navn på mappe: %s: Ingen slik mappe"
+#. mail:exit-unsaved primary
+#: mail/mail-errors.xml.h:53
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr "Du har usendte meldinger. Vil du avslutte likevel?"
 
-#: mail/mail-errors.xml.in.h:26
-msgid "Cannot save changes to account."
+#. mail:exit-unsaved secondary
+#: mail/mail-errors.xml.h:55
+msgid ""
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:27
-#, fuzzy
-msgid "Cannot save to directory \"{0}\"."
-msgstr "Kan ikke opprette katalog «%s»: %s."
-
-#: mail/mail-errors.xml.in.h:28
-#, fuzzy
-msgid "Cannot save to file \"{0}\"."
+#. mail:camel-exception primary
+#: mail/mail-errors.xml.h:57
+msgid "Your message message, with the subject \"{0}\" was not delivered."
 msgstr ""
-"Kan ikke lagre til «%s»\n"
-" %s"
-
-#: mail/mail-errors.xml.in.h:29
-#, fuzzy
-msgid "Cannot set signature script \"{0}\"."
-msgstr "_Legg til signatur"
 
-#: mail/mail-errors.xml.in.h:30
+#. mail:camel-exception secondary
+#: mail/mail-errors.xml.h:59
 msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
+"The message was sent via the \"sendmail\" external application.  Sendmail "
+"reports the following error: status 67: mail not sent.\n"
+"The message is stored in the Outbox folder.  Check the message for errors "
+"and resend."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:31
-msgid "Could not save signature file."
-msgstr "Kunne ikke lagre signaturfil."
-
-#: mail/mail-errors.xml.in.h:32
-msgid "Delete \"{0}\"?"
-msgstr "Slett «{0}»?"
-
-#: mail/mail-errors.xml.in.h:33
-msgid "Delete account?"
-msgstr "Slett konto?"
+#. mail:async-error primary
+#: mail/mail-errors.xml.h:62
+msgid "Error while {0}."
+msgstr "Feil under {0}."
 
-#: mail/mail-errors.xml.in.h:34
-msgid "Discard changed?"
-msgstr "Forkast endringer?"
+#. mail:async-error secondary
+#: mail/mail-errors.xml.h:64
+msgid "{1}."
+msgstr "{1}."
 
-#: mail/mail-errors.xml.in.h:35
-msgid "Do you wish to save your changes?"
-msgstr "Vil du lagre dine endringer?"
+#. mail:async-error-nodescribe primary
+#: mail/mail-errors.xml.h:66
+msgid "Error while performing operation."
+msgstr "Feil under utføring av operasjon."
 
-#: mail/mail-errors.xml.in.h:36
-msgid "Don't delete"
-msgstr "Ikke slett"
+#. mail:async-error-nodescribe secondary
+#: mail/mail-errors.xml.h:68
+msgid "{0}."
+msgstr "{0}."
+
+#. mail:session-message-info secondary
+#. mail:session-message-info-cancel secondary
+#. mail:session-message-warning secondary
+#. mail:session-message-warning-cancel secondary
+#. mail:session-message-error secondary
+#. mail:session-message-error-cancel secondary
+#. mail:ask-session-password secondary
+#. mail:filter-load-error secondary
+#: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
+#: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
+#: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
+#: mail/mail-errors.xml.h:84 mail/mail-errors.xml.h:88
+msgid "{0}"
+msgstr "{0}"
 
-#: mail/mail-errors.xml.in.h:37
+#. mail:ask-session-password primary
+#: mail/mail-errors.xml.h:82
 msgid "Enter password."
 msgstr "Oppgi passord."
 
-#: mail/mail-errors.xml.in.h:38
-#, fuzzy
+#. mail:filter-load-error primary
+#: mail/mail-errors.xml.h:86
 msgid "Error loading filter definitions."
-msgstr ""
-"Feil under lasting av filter-informasjon:\n"
-"%s"
-
-#: mail/mail-errors.xml.in.h:39
-#, fuzzy
-msgid "Error while performing operation."
-msgstr ""
-"Feil under utføring av operasjon:\n"
-"%s"
+msgstr "Feil under lasting av filterdefinisjoner."
 
-#: mail/mail-errors.xml.in.h:40
-#, fuzzy
-msgid "Error while {0}."
-msgstr ""
-"Feil under «%s»:\n"
-"%s"
-
-#: mail/mail-errors.xml.in.h:41
-#, fuzzy
-msgid "File exists but cannot overwrite it."
-msgstr "Filen eksisterer, overskriv?"
+#. mail:no-save-path primary
+#: mail/mail-errors.xml.h:90
+msgid "Cannot save to directory \"{0}\"."
+msgstr "Kan ikke lagre til katalog «{0}»."
 
-#: mail/mail-errors.xml.in.h:42
-#, fuzzy
-msgid "File exists but is not a regular file."
-msgstr "Fil «%s» eksisterer ikke eller er ikke en vanlig fil."
+#. mail:no-save-path secondary
+#: mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr "{1}"
 
-#: mail/mail-errors.xml.in.h:43
-msgid "If you continue, you will not be able to recover these messages."
-msgstr ""
+#. mail:no-create-path primary
+#. mail:no-write-path-exists primary
+#. mail:no-write-path-notfile primary
+#: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
+#: mail/mail-errors.xml.h:106
+msgid "Cannot save to file \"{0}\"."
+msgstr "Kan ikke lagre til fil «{0}»."
 
-#: mail/mail-errors.xml.in.h:44
-msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
-"will be deleted permanently."
-msgstr ""
+#. mail:no-create-path secondary
+#: mail/mail-errors.xml.h:96
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr "Kan ikke opprette katalog for lagring pga «{1}»"
 
-#: mail/mail-errors.xml.in.h:45
-msgid "If you proceed, the account information will be deleted permanently."
-msgstr ""
+#. mail:no-create-tmp-path primary
+#: mail/mail-errors.xml.h:98
+msgid "Cannot create temporary save directory."
+msgstr "Kan ikke opprette midlertidig katalog."
+
+#. mail:no-create-tmp-path secondary
+#. mail:no-delete-folder secondary
+#. system:no-save-file secondary
+#. system:no-load-file secondary
+#: mail/mail-errors.xml.h:100 mail/mail-errors.xml.h:112
+#: widgets/misc/e-system-errors.xml.h:11 widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr "pga «{1}»."
 
-#: mail/mail-errors.xml.in.h:46
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
-msgstr ""
+#. mail:no-write-path-exists secondary
+#: mail/mail-errors.xml.h:104
+msgid "File exists but cannot overwrite it."
+msgstr "Filen eksisterer men kan ikke overskrives."
 
-#: mail/mail-errors.xml.in.h:47
-msgid "Invalid authentication"
-msgstr "Ugyldig autentisering"
+#. mail:no-write-path-notfile secondary
+#: mail/mail-errors.xml.h:108
+msgid "File exists but is not a regular file."
+msgstr "Filen eksisterer, men den er ikke en vanlig fil."
 
-#: mail/mail-errors.xml.in.h:48
-msgid "Mail filters automatically updated."
-msgstr ""
+#. mail:no-delete-folder primary
+#: mail/mail-errors.xml.h:110
+msgid "Cannot delete folder \"{0}\"."
+msgstr "Kunne ikke slette mappe «{0}»."
 
-#: mail/mail-errors.xml.in.h:49
-msgid ""
-"Many email systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients to "
-"your message anyway. To avoid this, you should add at least one To: or CC: "
-"recipient."
-msgstr ""
+#. mail:no-delete-spethal-folder primary
+#: mail/mail-errors.xml.h:114
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "Kan ikke slette systemmappe «{0}»."
 
-#: mail/mail-errors.xml.in.h:50
+#. mail:no-delete-spethal-folder secondary
+#. mail:no-rename-spethal-folder secondary
+#: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
 msgid ""
-"Please enter a valid email address in the To: field. You can search for "
-"email addresses by clicking on the To: button next to the entry box."
+"System folders are required for Ximian Evolution to function correctly and "
+"cannot be renamed, moved, or deleted."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:51
+#. mail:no-rename-spethal-folder primary
+#: mail/mail-errors.xml.h:118
 #, fuzzy
-msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email: {0} Send anyway?"
-msgstr ""
-"Du sender en melding i HMTL-format. Sjekk at følgende mottakere\n"
-"kan og ønsker og motta e-post som HTML:\n"
-"%sSend likevel?"
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "Kan ikke endre navn på mappe: %s: Ingen slik mappe"
+
+#. mail:ask-delete-folder title
+#: mail/mail-errors.xml.h:122
+msgid "Delete \"{0}\"?"
+msgstr "Slett «{0}»?"
 
-#: mail/mail-errors.xml.in.h:52
+#. mail:ask-delete-folder primary
+#: mail/mail-errors.xml.h:124
 #, fuzzy
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "Vil du virkelig slette mappe «%s» og alle dens undermapper?"
 
-#: mail/mail-errors.xml.in.h:53
+#. mail:ask-delete-folder secondary
+#: mail/mail-errors.xml.h:126
 msgid ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
+"If you delete the folder, all of its contents and its subfolders contents "
+"will be deleted permanently."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:54
-msgid ""
-"The contact list you are sending to is configured to hide list recipients. "
-"Many email systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients in "
-"your message. To avoid this, you should add at least one To: or CC: "
-"recipient."
+#. mail:no-rename-folder-exists primary
+#. mail:no-rename-folder primary
+#: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
+msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:55
+#. mail:no-rename-folder-exists secondary
+#. mail:vfolder-notunique secondary
+#: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
 #, fuzzy
-msgid ""
-"The following filter rule(s): {0} Used the now removed folder: \"{1}\" And "
-"have been updated."
-msgstr ""
-"Følgende vFolder(e):\n"
-"%sBrukte fjernet mappe:\n"
-"    «%s»\n"
-"Og har blitt oppdatert."
-
-#: mail/mail-errors.xml.in.h:56
-#, fuzzy
-msgid ""
-"The following vFolder(s): {0} Used the now removed folder: \"{1}\" And have "
-"been updated."
-msgstr ""
-"Følgende vFolder(e):\n"
-"%sBrukte fjernet mappe:\n"
-"    «%s»\n"
-"Og har blitt oppdatert."
-
-#: mail/mail-errors.xml.in.h:57
-msgid ""
-"The message was sent via the \"sendmail\" external application. Sendmail "
-"reports the following error: status 67: mail not sent. The message is stored "
-"in the Outbox folder. Check the message for errors and resend."
+msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr ""
+"En mappe med navn «%s» eksisterer allerede. Vennligst bruk et annet navn."
 
-#: mail/mail-errors.xml.in.h:58
-msgid "The script file must exist and be executable."
+#. mail:no-rename-folder secondary
+#: mail/mail-errors.xml.h:134
+msgid "Because \"{2}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:59
-msgid ""
-"This folder may have been added implictly, go to the virtual folder editor "
-"to add it explictly, if required."
-msgstr ""
+#. mail:no-move-folder-nostore primary
+#. mail:no-move-folder-to-nostore primary
+#: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
+#, fuzzy
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "Kunne ikke flytte mappe: %s"
 
-#: mail/mail-errors.xml.in.h:60
-msgid ""
-"This message cannot be sent because you have not specified any Recipients"
-msgstr ""
+#. mail:no-move-folder-nostore secondary
+#. mail:no-copy-folder-nostore secondary
+#: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
+#, fuzzy
+msgid "Cannot open source \"{2}\"."
+msgstr "Kunne ikke åpne kilde"
 
-#: mail/mail-errors.xml.in.h:61
+#. mail:no-move-folder-to-nostore secondary
+#. mail:no-copy-folder-to-nostore secondary
+#: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
 #, fuzzy
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
-msgstr "SMTP-tjener %s støtter ikke etterspurt autentiseringstype %s."
+msgid "Cannot open target \"{2}\"."
+msgstr "Kan ikke åpne melding"
 
-#: mail/mail-errors.xml.in.h:62
+#. mail:no-copy-folder-nostore primary
+#. mail:no-copy-folder-to-nostore primary
+#: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
 #, fuzzy
-msgid "This signature has been changed, but has not been saved."
-msgstr ""
-"Denne signaturen er endret, men har ikke blitt lagret..\n"
-"\n"
-"Vil du lagre endringene?"
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgstr "Kan ikke kopiere mappe: %s"
 
-#: mail/mail-errors.xml.in.h:63
+#. mail:no-create-folder-nostore primary
+#: mail/mail-errors.xml.h:152
 #, fuzzy
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
-msgstr ""
-"Kunne ikke åpne skisse-mappen for denne kontoen.\n"
-"Vil du bruke standard skisse-mappe?"
+msgid "Cannot create folder \"{0}\"."
+msgstr "Kan ikke opprette mappe: %s: %s"
 
-#: mail/mail-errors.xml.in.h:64
-msgid "Use _Default"
-msgstr "Bruk _forvalg"
+#. mail:no-create-folder-nostore secondary
+#: mail/mail-errors.xml.h:154
+msgid "Cannot open source \"{1}\""
+msgstr "Kan ikke åpne kilde «{1}»"
 
-#: mail/mail-errors.xml.in.h:65
-msgid "Use default drafts folder?"
-msgstr "Bruk forvalgt mappe for skisser?"
+#. mail:account-incomplete primary
+#. mail:account-notunique primary
+#: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
+msgid "Cannot save changes to account."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:66
+#. mail:account-incomplete secondary
+#: mail/mail-errors.xml.h:158
 msgid "You have not filled in all of the required information."
 msgstr "Du har ikke fylt ut all nødvendig informasjon."
 
-#: mail/mail-errors.xml.in.h:67
-msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr "Du har usendte meldinger. Vil du avslutte likevel?"
-
-#: mail/mail-errors.xml.in.h:68
+#. mail:account-notunique secondary
+#: mail/mail-errors.xml.h:162
 msgid "You may not create two accounts with the same name."
 msgstr "Du kan ikke opprette to kontoer med samme navn."
 
-#: mail/mail-errors.xml.in.h:69
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+#. mail:ask-delete-account title
+#: mail/mail-errors.xml.h:164
+msgid "Delete account?"
+msgstr "Slett konto?"
+
+#. mail:ask-delete-account primary
+#: mail/mail-errors.xml.h:166
+msgid "Are you sure you want to delete this account?"
+msgstr "Er du sikker på at du vil slette denne kontoen?"
+
+#. mail:ask-delete-account secondary
+#: mail/mail-errors.xml.h:168
+msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:70
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+#: mail/mail-errors.xml.h:169
+msgid "Don't delete"
+msgstr "Ikke slett"
+
+#. mail:no-save-signature primary
+#: mail/mail-errors.xml.h:171
+msgid "Could not save signature file."
+msgstr "Kunne ikke lagre signaturfil."
+
+#. mail:no-save-signature secondary
+#: mail/mail-errors.xml.h:173
+msgid "Because \"{0}\"."
+msgstr ""
+
+#. mail:signature-notscript primary
+#: mail/mail-errors.xml.h:175
+#, fuzzy
+msgid "Cannot set signature script \"{0}\"."
+msgstr "_Legg til signatur"
+
+#. mail:signature-notscript secondary
+#: mail/mail-errors.xml.h:177
+msgid "The script file must exist and be executable."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:71
+#. mail:ask-signature-changed title
+#: mail/mail-errors.xml.h:179
+msgid "Discard changed?"
+msgstr "Forkast endringer?"
+
+#. mail:ask-signature-changed primary
+#: mail/mail-errors.xml.h:181
+msgid "Do you wish to save your changes?"
+msgstr "Vil du lagre dine endringer?"
+
+#. mail:ask-signature-changed secondary
+#: mail/mail-errors.xml.h:183
+msgid "This signature has been changed, but has not been saved."
+msgstr "Denne signaturen er endret, men er ikke lagret."
+
+#: mail/mail-errors.xml.h:184
 msgid "_Discard changes"
 msgstr "_Forkast endringene"
 
-#: mail/mail-errors.xml.in.h:72
-msgid "_Empty Trash"
-msgstr "Tøm søpp_elkurven"
+#. mail:vfolder-notexist primary
+#: mail/mail-errors.xml.h:186
+#, fuzzy
+msgid "Cannot edit vFolder \"{0}\" as it does not exist."
+msgstr "Mappen «%s» eksisterer ikke."
 
-#: mail/mail-errors.xml.in.h:73
-msgid "_Expunge"
-msgstr "T_øm"
+#. mail:vfolder-notexist secondary
+#: mail/mail-errors.xml.h:188
+msgid ""
+"This folder may have been added implictly, go to the virtual folder editor "
+"to add it explictly, if required."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:74
-msgid "_Send"
-msgstr "_Send"
+#. mail:vfolder-notunique primary
+#: mail/mail-errors.xml.h:190
+msgid "Cannot add vFolder \"{0}\"."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:75
+#. mail:vfolder-updated primary
+#: mail/mail-errors.xml.h:194
 msgid "vFolders automatically updated."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:76
-msgid "{0}"
+#. mail:vfolder-updated secondary
+#: mail/mail-errors.xml.h:196
+#, fuzzy
+msgid ""
+"The following vFolder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
+"Følgende vFolder(e):\n"
+"%sBrukte fjernet mappe:\n"
+"    «%s»\n"
+"Og har blitt oppdatert."
 
-#: mail/mail-errors.xml.in.h:77
-msgid "{0}."
+#. mail:filter-updated primary
+#: mail/mail-errors.xml.h:202
+msgid "Mail filters automatically updated."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:78
-msgid "{1}"
+#. mail:filter-updated secondary
+#: mail/mail-errors.xml.h:204
+#, fuzzy
+msgid ""
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
+msgstr ""
+"Følgende vFolder(e):\n"
+"%sBrukte fjernet mappe:\n"
+"    «%s»\n"
+"Og har blitt oppdatert."
+
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:210
+msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:79
-msgid "{1}."
+#. mail:ask-migrate-existing secondary
+#: mail/mail-errors.xml.h:212
+msgid ""
+"A non-empty folder at \"{1}\" already exists.\n"
+"\n"
+"You can choose to ignore this folder, overwrite or append its contents, or "
+"quit.\n"
 msgstr ""
 
+#: mail/mail-errors.xml.h:216
+msgid "Ignore"
+msgstr "Ignorer"
+
+#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+msgid "_Overwrite"
+msgstr "_Overskriv"
+
+#: mail/mail-errors.xml.h:218
+msgid "_Append"
+msgstr "_Legg til"
+
 #: mail/mail-folder-cache.c:786
 #, c-format
 msgid "Pinging %s"
@@ -15518,20 +15638,20 @@ msgstr "Pinger %s"
 msgid "Working"
 msgstr "Arbeider"
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:99
 msgid "Filtering Folder"
 msgstr "Filtrerer mappe"
 
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:260
 msgid "Fetching Mail"
 msgstr "Henter e-post"
 
-#: mail/mail-ops.c:532
+#: mail/mail-ops.c:543
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Feil under påføring av utgående filtre: %s"
 
-#: mail/mail-ops.c:557
+#: mail/mail-ops.c:568
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -15540,115 +15660,115 @@ msgstr ""
 "Kunne ikke legge til i %s: %s\n"
 "Legger til i lokal «Sendt»-mappe i stedet."
 
-#: mail/mail-ops.c:566
+#: mail/mail-ops.c:577
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Kunne ikke legge til i lokal Sendt-mappe: %s"
 
-#: mail/mail-ops.c:662
+#: mail/mail-ops.c:673
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sender melding %d av %d"
 
-#: mail/mail-ops.c:693
-#, fuzzy, c-format
+#: mail/mail-ops.c:704
+#, c-format
 msgid "Failed to send %d of %d messages"
-msgstr "Feilet på melding %d av %d"
+msgstr "Feil under sending av %d av %d meldinger"
 
-#: mail/mail-ops.c:697
+#: mail/mail-ops.c:708
 msgid "Complete."
 msgstr "Fullført."
 
-#: mail/mail-ops.c:794
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "Lagrer melding til mappe"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flytter melding(er) til %s"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopierer meldinger til %s"
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanner mapper i «%s»"
 
-#: mail/mail-ops.c:1105
+#: mail/mail-ops.c:1116
 msgid "Forwarded messages"
 msgstr "Videresendte meldinger"
 
-#: mail/mail-ops.c:1148
+#: mail/mail-ops.c:1159
 #, c-format
 msgid "Opening folder %s"
 msgstr "Åpner mappe %s"
 
-#: mail/mail-ops.c:1220
+#: mail/mail-ops.c:1231
 #, c-format
 msgid "Opening store %s"
 msgstr "Åpner lager %s"
 
-#: mail/mail-ops.c:1298
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Removing folder %s"
 msgstr "Fjerner mappe %s"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1403
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Lagrer mappe «%s»"
 
-#: mail/mail-ops.c:1457
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Tømmer og lagrer konto «%s»"
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1469
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Lagrer konto «%s»"
 
-#: mail/mail-ops.c:1513
+#: mail/mail-ops.c:1524
 msgid "Refreshing folder"
 msgstr "Oppdaterer mappe"
 
-#: mail/mail-ops.c:1549 mail/mail-ops.c:1600
+#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
 msgid "Expunging folder"
 msgstr "Tømmer mappe"
 
-#: mail/mail-ops.c:1597
+#: mail/mail-ops.c:1608
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Tømmer søppel i «%s»"
 
-#: mail/mail-ops.c:1598
+#: mail/mail-ops.c:1609
 msgid "Local Folders"
 msgstr "Lokale mapper"
 
-#: mail/mail-ops.c:1681
+#: mail/mail-ops.c:1692
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Henter melding %s"
 
-#: mail/mail-ops.c:1753
+#: mail/mail-ops.c:1764
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Henter %d melding"
 msgstr[1] "Henter %d melding(er)"
 
-#: mail/mail-ops.c:1839
+#: mail/mail-ops.c:1850
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Lagrer %d melding"
 msgstr[1] "Lagrer %d melding(er)"
 
-#: mail/mail-ops.c:1889
+#: mail/mail-ops.c:1900
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15657,7 +15777,7 @@ msgstr ""
 "Kunne ikke opprette utdatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1928
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15666,11 +15786,11 @@ msgstr ""
 "Feil under lagring av av meldinger til: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1988
+#: mail/mail-ops.c:1999
 msgid "Saving attachment"
 msgstr "Lagrer vedlegg"
 
-#: mail/mail-ops.c:2005
+#: mail/mail-ops.c:2016
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15679,17 +15799,17 @@ msgstr ""
 "Kunne ikke opprette utdatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2035
+#: mail/mail-ops.c:2046
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kan ikke skrive data: %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Kobler fra %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Kobler til %s på nytt"
@@ -15708,11 +15828,11 @@ msgstr "Finn:"
 
 #: mail/mail-security.glade.h:1
 msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Digital signatur</span>"
 
 #: mail/mail-security.glade.h:2
 msgid "<span weight=\"bold\">Encryption</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Kryptering</span>"
 
 #: mail/mail-security.glade.h:4
 msgid "Security Information"
@@ -15753,24 +15873,24 @@ msgstr "Oppdaterer..."
 msgid "Waiting..."
 msgstr "Venter..."
 
-#: mail/mail-session.c:237
+#: mail/mail-session.c:238
 msgid "User canceled operation."
 msgstr "Operasjon avbrutt av bruker."
 
-#: mail/mail-session.c:270
+#: mail/mail-session.c:271
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Skriv inn passord for %s"
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:273
 msgid "Enter Password"
 msgstr "Skriv inn passord"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:296
 msgid "_Remember this password"
 msgstr "Husk dette passo_rdet"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password for the remainder of this session"
 msgstr "Husk dette passo_rdet for resten av denne sesjonen"
 
@@ -15810,89 +15930,89 @@ msgstr "Videresendt melding"
 msgid "Invalid folder: `%s'"
 msgstr "Ugyldig mappe: «%s»"
 
-#: mail/mail-vfolder.c:88
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Setter opp VFolder: %s"
 
-#: mail/mail-vfolder.c:207
+#: mail/mail-vfolder.c:206
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Oppdaterer vfoldere for URI: %s"
 
-#: mail/mail-vfolder.c:922
+#: mail/mail-vfolder.c:921
 msgid "vFolders"
 msgstr "vMapper"
 
-#: mail/mail-vfolder.c:961
+#: mail/mail-vfolder.c:960
 msgid "Edit VFolder"
 msgstr "Rediger VFolder"
 
-#: mail/mail-vfolder.c:1045
+#: mail/mail-vfolder.c:1044
 msgid "New VFolder"
 msgstr "Ny VFolder"
 
-#: mail/message-list.c:911
+#: mail/message-list.c:916
 msgid "Unseen"
 msgstr "Ulest"
 
-#: mail/message-list.c:912
+#: mail/message-list.c:917
 msgid "Seen"
 msgstr "Lest"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:918
 msgid "Answered"
 msgstr "Besvart"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:919
 msgid "Multiple Unseen Messages"
 msgstr "Flere uleste meldinger"
 
-#: mail/message-list.c:915
+#: mail/message-list.c:920
 msgid "Multiple Messages"
 msgstr "Flere meldinger"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:924
 msgid "Lowest"
 msgstr "Lavest"
 
-#: mail/message-list.c:920
+#: mail/message-list.c:925
 msgid "Lower"
 msgstr "Lavere"
 
-#: mail/message-list.c:924
+#: mail/message-list.c:929
 msgid "Higher"
 msgstr "Høyere"
 
-#: mail/message-list.c:925
+#: mail/message-list.c:930
 msgid "Highest"
 msgstr "Høyest"
 
-#: mail/message-list.c:1244
+#: mail/message-list.c:1249
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1251
+#: mail/message-list.c:1256
 msgid "Today %l:%M %p"
 msgstr "I dag %l:%M %p"
 
-#: mail/message-list.c:1260
+#: mail/message-list.c:1265
 msgid "Yesterday %l:%M %p"
 msgstr "I går %l:%M %p"
 
-#: mail/message-list.c:1272
+#: mail/message-list.c:1277
 msgid "%a %l:%M %p"
 msgstr "%a %H.%M"
 
-#: mail/message-list.c:1280
+#: mail/message-list.c:1285
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H.%M"
 
-#: mail/message-list.c:1282
+#: mail/message-list.c:1287
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:3105
+#: mail/message-list.c:3124
 msgid "Generating message list"
 msgstr "Genererer meldingsliste"
 
@@ -15924,43 +16044,43 @@ msgstr "Mottatt"
 msgid "Size"
 msgstr "Størrelse"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:73
 msgid "Call"
 msgstr "Ring"
 
-#: mail/message-tag-followup.c:63
+#: mail/message-tag-followup.c:74
 msgid "Do Not Forward"
 msgstr "Ikke videresend"
 
-#: mail/message-tag-followup.c:64
+#: mail/message-tag-followup.c:75
 msgid "Follow-Up"
 msgstr "Følg opp"
 
-#: mail/message-tag-followup.c:65
+#: mail/message-tag-followup.c:76
 msgid "For Your Information"
 msgstr "Til din informasjon"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:42
+#: mail/message-tag-followup.c:77 ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Videresend"
 
-#: mail/message-tag-followup.c:67
+#: mail/message-tag-followup.c:78
 msgid "No Response Necessary"
 msgstr "Ingen respons nødvendig"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:85
+#: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Svar"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:86
+#: mail/message-tag-followup.c:81 ui/evolution-mail-message.xml.h:86
 msgid "Reply to All"
 msgstr "Svar til alle"
 
-#: mail/message-tag-followup.c:71
+#: mail/message-tag-followup.c:82
 msgid "Review"
 msgstr "Gjennomgå"
 
-#: mail/message-tag-followup.c:283 mail/message-tags.glade.h:3
+#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "Merk for oppfølging"
 
@@ -16061,31 +16181,28 @@ msgstr "e-post"
 msgid "Brought to you by"
 msgstr "Etter mange timers slit av"
 
-#: shell/e-shell.c:536
+#: shell/e-shell.c:545 shell/e-shell.c:546
 #, c-format
-msgid ""
-"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
-"The data hasn't been deleted, but it will not be seen by this version of "
-"Evolution.\n"
-msgstr ""
-"Advarsel: Evolution kunne ikke oppgradere alle dine data fra versjon %d.%d.%"
-"d.\n"
-"Ingen data er slettet, men de vil ikke kunne vises i denne versjonen av "
-"Evolution.\n"
+msgid "%ld KB"
+msgstr "%ld KB"
+
+#: shell/e-shell.c:744
+msgid "Uknown system error."
+msgstr "Ukjent systemfeil."
 
-#: shell/e-shell.c:1081
+#: shell/e-shell.c:1101
 msgid "Invalid arguments"
 msgstr "Ugyldige argumenter"
 
-#: shell/e-shell.c:1083
+#: shell/e-shell.c:1103
 msgid "Cannot register on OAF"
 msgstr "Kan ikke registrere i OAF"
 
-#: shell/e-shell.c:1085
+#: shell/e-shell.c:1105
 msgid "Configuration Database not found"
 msgstr "Konfigurasjonsdatabase ikke funnet"
 
-#: shell/e-shell.c:1087
+#: shell/e-shell.c:1107
 msgid "Generic error"
 msgstr "Vanlig feil"
 
@@ -16226,7 +16343,7 @@ msgstr "Kan ikke kjøre importprogram"
 msgid "_Import"
 msgstr "_Importer"
 
-#: shell/e-shell-offline-handler.c:595
+#: shell/e-shell-offline-handler.c:594
 msgid "Closing connections..."
 msgstr "Lukker forbindelser..."
 
@@ -16273,22 +16390,16 @@ msgid "'.' and '..' are reserved folder names."
 msgstr "«.» og «..» er reserverte mappenavn."
 
 #: shell/e-shell-window.c:336
-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."
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr "Evolution er koblet til. Klikk på denne knappen for å arbeide frakoblet."
 
 #: shell/e-shell-window.c:343
-msgid "Ximian Evolution is in the process of going offline."
-msgstr "Ximian Evolution er i ferd med å koble fra."
+msgid "Evolution is in the process of going offline."
+msgstr "Evolution er i ferd med å koble fra."
 
 #: shell/e-shell-window.c:349
-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."
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr "Evolution er frakoblet. Klikk på denne knappen for å arbeide tilkoblet."
 
 #: shell/e-shell-window-commands.c:63
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
@@ -16309,8 +16420,8 @@ msgid "Bug buddy could not be run."
 msgstr "Bug buddy kunne ikke kjøres."
 
 #: shell/e-shell-window-commands.c:170
-msgid "About Ximian Evolution"
-msgstr "Om Ximian Evolution"
+msgid "About Evolution"
+msgstr "Om Evolution"
 
 #: shell/e-shell-window-commands.c:381
 msgid "_Work Online"
@@ -16546,9 +16657,9 @@ msgstr "Evolution kan importere data fra følgende filer:"
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
+"of the Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It is getting close,\n"
+"This version of Evolution is not yet complete. It is getting close,\n"
 "but some features are either unfinished or do not work properly.\n"
 "\n"
 "If you want a stable version of Evolution, we urge you to uninstall\n"
@@ -16562,9 +16673,9 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 "Hei. Takk for at du har tatt deg tid til å laste ned denne prøveversjonen\n"
-"av Ximian Evolution gruppevarepakken.\n"
+"av Evolution gruppevarepakken.\n"
 "\n"
-"Denne versjonen av Ximian Evolution er ikke ferdig. Det nærmer seg,\n"
+"Denne versjonen av Evolution er ikke ferdig. Det nærmer seg,\n"
 "men deler av funksjonaliteten mangler eller er ikke fullført.\n"
 "\n"
 "Hvis du ønsker en stabil versjon av Evolution ber vi deg avinstallere\n"
@@ -16580,23 +16691,23 @@ msgstr ""
 #: shell/main.c:254
 msgid ""
 "Thanks\n"
-"The Ximian Evolution Team\n"
+"The Evolution Team\n"
 msgstr ""
 "Takk\n"
-"Ximian Evolution utviklerene\n"
+"Evolution utviklerene\n"
 
 #: shell/main.c:261
 msgid "Don't tell me again"
 msgstr "Ikke gi beskjed igjen"
 
 #: shell/main.c:391
-msgid "Cannot register the Ximian Evolution shell."
-msgstr "Kan ikke registrere skallet for Ximian Evolution."
+msgid "Cannot register the Evolution shell."
+msgstr "Kan ikke registrere skallet for Evolution."
 
 #: shell/main.c:400
 #, c-format
-msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr "Kan ikke initiere Ximian Evolution-skallet: %s"
+msgid "Cannot initialize the Evolution shell: %s"
+msgstr "Kan ikke initiere Evolution-skallet: %s"
 
 #: shell/main.c:497
 msgid "Start Evolution activating the specified component"
@@ -16635,6 +16746,41 @@ msgstr ""
 "%s: --online og --offline kan ikke brukes samtidig.\n"
 "  Bruk %s --help for mer informasjon.\n"
 
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+msgid "Insufficient disk space for upgrade."
+msgstr "Ikke nok diskplass for oppgraderingen."
+
+#. shell:upgrade-nospace secondary
+#: shell/shell-errors.xml.h:4
+msgid ""
+"Upgrading your data and settings will require upto {0} of disk space, but "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"can continue."
+msgstr ""
+
+#. shell:upgrade-failed primary
+#: shell/shell-errors.xml.h:8
+msgid ""
+"Upgrade from previous version failed:\n"
+"{0}"
+msgstr ""
+
+#. shell:upgrade-failed secondary
+#: shell/shell-errors.xml.h:11
+msgid ""
+"{1}\n"
+"\n"
+"If you choose to continue, you may not have access to some of your old "
+"data.\n"
+msgstr ""
+
+#: shell/shell-errors.xml.h:15
+msgid "Continue"
+msgstr "Fortsett"
+
 #: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
 #: smime/gui/certificate-manager.c:522
 msgid "Select a cert to import..."
@@ -17175,7 +17321,7 @@ msgid "Select all contacts"
 msgstr "Velg alle kontakter"
 
 #: ui/evolution-addressbook.xml.h:23
-msgid "Send a mess to the selected contacts."
+msgid "Send a message to the selected contacts."
 msgstr "Send en melding til valgte kontakter."
 
 #: ui/evolution-addressbook.xml.h:24
@@ -18734,7 +18880,7 @@ msgid "Evolution Query"
 msgstr "Evolution spørring"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:408
+#: widgets/misc/e-error.c:389
 #, fuzzy, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -18851,29 +18997,25 @@ msgstr "Tekst"
 msgid "Find _Now"
 msgstr "Finn _nå "
 
-#: widgets/misc/e-system-errors.xml.in.h:1
-msgid "Because \"{1}\""
-msgstr ""
-
-#: widgets/misc/e-system-errors.xml.in.h:3
-msgid "Cannot open file \"{0}\"."
-msgstr "Kan ikke åpne filen «{0}»."
-
-#: widgets/misc/e-system-errors.xml.in.h:4
-msgid "Cannot save file \"{0}\"."
-msgstr "Kan ikke lagre fil «{0}»."
+#. system:ask-save-file-exists-overwrite primary
+#: widgets/misc/e-system-errors.xml.h:4
+msgid "File exists \"{0}\"."
+msgstr "Filen eksisterer «{0}»."
 
-#: widgets/misc/e-system-errors.xml.in.h:5
+#. system:ask-save-file-exists-overwrite secondary
+#: widgets/misc/e-system-errors.xml.h:6
 msgid "Do you wish to overwrite it?"
 msgstr "Vil du overskrive den?"
 
-#: widgets/misc/e-system-errors.xml.in.h:6
-msgid "File exists \"{0}\"."
-msgstr "Filen eksisterer «{0}»."
+#. system:no-save-file primary
+#: widgets/misc/e-system-errors.xml.h:9
+msgid "Cannot save file \"{0}\"."
+msgstr "Kan ikke lagre fil «{0}»."
 
-#: widgets/misc/e-system-errors.xml.in.h:8
-msgid "_Overwrite"
-msgstr "_Overskriv"
+#. system:no-load-file primary
+#: widgets/misc/e-system-errors.xml.h:13
+msgid "Cannot open file \"{0}\"."
+msgstr "Kan ikke åpne filen «{0}»."
 
 #: widgets/misc/e-task-widget.c:211
 #, c-format
@@ -18885,6 +19027,89 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% fullført)"
 
+#~ msgid "UID of the contacts source that the view will display"
+#~ msgstr "UID for kontaktkilden som visningen skal vise"
+
+#~ msgid "The URI that the address book will display"
+#~ msgstr "URIen som adresseboken skal vise"
+
+#~ msgid "Evolution Addressbook folder viewer"
+#~ msgstr "Evolution adressebok mappevisning"
+
+#~ msgid "Address 2:"
+#~ msgstr "Adresse 2:"
+
+#~ msgid "Blog:"
+#~ msgstr "Weblogg:"
+
+#~ msgid "Could not open the folder in '%s'"
+#~ msgstr "Kunne ikke åpne mappen i «%s»"
+
+#~ msgid "The URI that the calendar will display"
+#~ msgstr "URIen som kalenderen skal vise"
+
+#~ msgid "The type of view to show"
+#~ msgstr "Type visning som skal brukes"
+
+#~ msgid "Select destination %s"
+#~ msgstr "Velg mål %s"
+
+#~ msgid "calendar"
+#~ msgstr "kalender"
+
+#~ msgid "task list"
+#~ msgstr "oppgaveliste"
+
+#~ msgid "Calendar file could not be updated!\n"
+#~ msgstr "Kalenderfilen kunne ikke oppdateres!\n"
+
+#~ msgid "Evolution Calendar viewer"
+#~ msgstr "Evolution kalendervisning"
+
+#~ msgid "Evolution Tasks viewer"
+#~ msgstr "Evolution oppgavevisning"
+
+#~ msgid "The URI of the tasks folder to display"
+#~ msgstr "URIen til oppgavemappen skal vises"
+
+#~ msgid "Could not load the tasks in `%s'"
+#~ msgstr "Kunne ikke laste oppgavene i «%s»"
+
+#~ msgid "VFolder on Thread"
+#~ msgstr "VFolder for tråd"
+
+#~ msgid "Filter on Thread"
+#~ msgstr "Filtrer på tråd"
+
+#~ msgid "Failed to migrate pop3 uid caches: %s"
+#~ msgstr "Feil under migrering av uid-buffer for pop3: %s"
+
+#~ msgid "Failed to migrate folder expand state: %s"
+#~ msgstr "Feil under migrering av utvidelsestilstand for mappe: %s"
+
+#~ msgid "Failed to open store for `%s': %s"
+#~ msgstr "Klarte ikke å åpne lager for «%s»: %s"
+
+#~ msgid "Evolution Mail folder viewer"
+#~ msgstr "Komponent for mappevisning for Evolution e-post"
+
+#~ msgid "Replies to %s"
+#~ msgstr "Svar til %s"
+
+#~ msgid "URI of the mail source that the view will display"
+#~ msgstr "URI for e-postkilden som visningen skal vise"
+
+#~ msgid ""
+#~ "Warning: Evolution could not upgrade all your data from version %d.%d.%"
+#~ "d.\n"
+#~ "The data hasn't been deleted, but it will not be seen by this version of "
+#~ "Evolution.\n"
+#~ msgstr ""
+#~ "Advarsel: Evolution kunne ikke oppgradere alle dine data fra versjon %d.%"
+#~ "d.%d.\n"
+#~ "Ingen data er slettet, men de vil ikke kunne vises i denne versjonen av "
+#~ "Evolution.\n"
+
 #~ msgid ""
 #~ "The task backend for\n"
 #~ "%s\n"
@@ -19169,13 +19394,6 @@ msgstr "%s (%d%% fullført)"
 #~ "%s"
 
 #~ msgid ""
-#~ "Unable to copy file descriptor: %s\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Kunne ikke kopiere fildeskriptor: %s\n"
-#~ "%s"
-
-#~ msgid ""
 #~ "Error autosaving message: %s\n"
 #~ " %s"
 #~ msgstr ""
author	Kjartan Maraas <kmaraas@gnome.org>	2004-05-12 23:53:12 +0800
committer	Kjartan Maraas <kmaraas@src.gnome.org>	2004-05-12 23:53:12 +0800
commit	0645ef8e562b36f965a2312af3c50a2add878917 (patch)
tree	182500204d314ecebf5bd0db81dc3ba11a1ed3f3
parent	7668792e0c401a5eddccdfc9f8974262add7d27a (diff)
download	gsoc2013-evolution-0645ef8e562b36f965a2312af3c50a2add878917.tar gsoc2013-evolution-0645ef8e562b36f965a2312af3c50a2add878917.tar.gz gsoc2013-evolution-0645ef8e562b36f965a2312af3c50a2add878917.tar.bz2 gsoc2013-evolution-0645ef8e562b36f965a2312af3c50a2add878917.tar.lz gsoc2013-evolution-0645ef8e562b36f965a2312af3c50a2add878917.tar.xz gsoc2013-evolution-0645ef8e562b36f965a2312af3c50a2add878917.tar.zst gsoc2013-evolution-0645ef8e562b36f965a2312af3c50a2add878917.zip