Updated Norwegian translation.

2004-01-11  Kjartan Maraas  <kmaraas@gnome.org>

	* no.po: Updated Norwegian translation.

svn path=/trunk/; revision=24155

1 files changed, 1367 insertions, 1179 deletions

diff --git a/po/no.po b/po/no.po
index 49d44cae7f..b869b3d100 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,18 +1,18 @@
 # Norwegian translation of evolution (bokmål dialect).
-# Copyright (C) 1998-2001 Free Software Foundation, Inc.
-# Kjartan Maraas <kmaraas@gnome.org>, 1998-2001.
+# Copyright (C) 1998-2004 Free Software Foundation, Inc.
+# Kjartan Maraas <kmaraas@gnome.org>, 1998-2004.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.5\n"
-"POT-Creation-Date: 2003-12-29 12:04-0500\n"
-"PO-Revision-Date: 2003-12-13 21:12+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-01-11 13:26+0100\n"
+"PO-Revision-Date: 2004-01-11 14:13+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <i18n-nb@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
@@ -46,6 +46,7 @@ msgstr "Konfigurer automatisk fullføring her"
 #. name = e_book_get_name (book);
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
 #: addressbook/tools/evolution-addressbook-export-list-folders.c:51
+#: calendar/gui/calendar-component.c:561
 #: mail/importers/netscape-importer.c:1844 shell/e-shortcuts.c:1088
 msgid "Contacts"
 msgstr "Kontakter"
@@ -84,20 +85,21 @@ msgstr "Konfigurasjonskontroll for mappeinnstillinger i Evolution"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
 msgid "Manager your S/Mime certificates here"
-msgstr ""
+msgstr "Håndter dine S/MIME-sertifikater her"
 
-#: addressbook/gui/component/addressbook-component.c:211
+#: addressbook/gui/component/addressbook-component.c:217
 #: addressbook/gui/component/ldap-config.glade.h:28
 msgid "New Addressbook"
 msgstr "Ny adressebok"
 
-#: addressbook/gui/component/addressbook-component.c:212
+#: addressbook/gui/component/addressbook-component.c:218
+#: calendar/gui/calendar-component.c:409 calendar/gui/tasks-component.c:402
 msgid "Properties..."
 msgstr "Egenskaper ..."
 
-#: addressbook/gui/component/addressbook-component.c:213
+#: addressbook/gui/component/addressbook-component.c:219
 #: addressbook/gui/widgets/e-addressbook-view.c:1017
-#: calendar/gui/calendar-component.c:436 calendar/gui/tasks-component.c:418
+#: calendar/gui/calendar-component.c:408 calendar/gui/tasks-component.c:400
 #: filter/libfilter-i18n.h:10 mail/em-account-prefs.c:236
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:3
@@ -105,62 +107,34 @@ msgstr "Egenskaper ..."
 msgid "Delete"
 msgstr "Slett"
 
-#: addressbook/gui/component/addressbook-component.c:214
-#: calendar/gui/calendar-component.c:435 calendar/gui/tasks-component.c:416
+#: addressbook/gui/component/addressbook-component.c:220
 msgid "Rename"
 msgstr "Gi nytt navn"
 
-#: addressbook/gui/component/addressbook-component.c:285
+#: addressbook/gui/component/addressbook-component.c:291
 msgid "New Contact"
 msgstr "Ny kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:286
+#: addressbook/gui/component/addressbook-component.c:292
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:287
+#: addressbook/gui/component/addressbook-component.c:293
 msgid "Create a new contact"
 msgstr "Opprett en ny kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:292
+#: addressbook/gui/component/addressbook-component.c:298
 msgid "New Contact List"
 msgstr "Ny kontaktliste"
 
-#: addressbook/gui/component/addressbook-component.c:293
+#: addressbook/gui/component/addressbook-component.c:299
 msgid "Contact _List"
 msgstr "Kontakt_liste"
 
-#: addressbook/gui/component/addressbook-component.c:294
+#: addressbook/gui/component/addressbook-component.c:300
 msgid "Create a new contact list"
 msgstr "Opprett en ny kontaktliste"
 
-#: addressbook/gui/component/addressbook-component.c:443
-#: calendar/gui/calendar-component.c:831 calendar/gui/tasks-component.c:772
-msgid "On This Computer"
-msgstr "På denne datamaskinen"
-
-#. orange
-#: addressbook/gui/component/addressbook-component.c:453
-#: calendar/gui/calendar-component.c:839 calendar/gui/migration.c:123
-#: calendar/gui/migration.c:146 calendar/gui/tasks-component.c:780
-#: filter/filter-label.c:123 mail/mail-config.c:65 mail/mail-config.glade.h:88
-#: shell/e-config-upgrade.c:1456
-msgid "Personal"
-msgstr "Personlig"
-
-#. red
-#: addressbook/gui/component/addressbook-component.c:460
-#: calendar/gui/calendar-component.c:846 filter/filter-label.c:122
-#: mail/mail-config.c:64 mail/mail-config.glade.h:135
-#: shell/e-config-upgrade.c:1455
-msgid "Work"
-msgstr "Arbeid"
-
-#. Create the LDAP source group
-#: addressbook/gui/component/addressbook-component.c:468
-msgid "On LDAP Servers"
-msgstr "På LDAP-tjenere"
-
 #. FIXME: parent
 #: addressbook/gui/component/addressbook-config.c:244
 msgid "Could not create a directory for the new addressbook."
@@ -194,6 +168,48 @@ msgstr "Feil under henting av schema-informasjon"
 msgid "Server did not respond with valid schema information"
 msgstr "Tjener svarte ikke med gyldig schema-informasjon"
 
+#: addressbook/gui/component/addressbook-migrate.c:45 mail/em-migrate.c:120
+msgid "Migrating..."
+msgstr "Migrerer..."
+
+#: addressbook/gui/component/addressbook-migrate.c:53
+msgid ""
+"The location and hierarchy of the Evolution contact folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-migrate.c:86 mail/em-migrate.c:161
+#, c-format
+msgid "Migrating `%s':"
+msgstr "Migrerer «%s»:"
+
+#. create the local source group
+#: addressbook/gui/component/addressbook-migrate.c:313
+#: calendar/gui/calendar-component.c:519 calendar/gui/calendar-component.c:529
+#: calendar/gui/tasks-component.c:503 calendar/gui/tasks-component.c:509
+msgid "On This Computer"
+msgstr "På denne datamaskinen"
+
+#. orange
+#: addressbook/gui/component/addressbook-migrate.c:323
+#: calendar/gui/calendar-component.c:536 calendar/gui/migration.c:124
+#: calendar/gui/migration.c:147 calendar/gui/tasks-component.c:516
+#: filter/filter-label.c:123 mail/mail-config.c:65 mail/mail-config.glade.h:88
+#: shell/e-config-upgrade.c:1456
+msgid "Personal"
+msgstr "Personlig"
+
+#. Create the LDAP source group
+#: addressbook/gui/component/addressbook-migrate.c:331
+msgid "On LDAP Servers"
+msgstr "På LDAP-tjenere"
+
+#: addressbook/gui/component/addressbook-migrate.c:463
+msgid "LDAP Servers"
+msgstr "LDAP-tjenere"
+
 #: addressbook/gui/component/addressbook.c:273
 msgid ""
 "More cards matched this query than either the server is \n"
@@ -224,43 +240,28 @@ msgstr "Denne spørringen ble ikke fullført."
 
 #: addressbook/gui/component/addressbook.c:592
 msgid ""
-"We were unable to open this addressbook.  Please check that the\n"
-"path exists and that you have permission to access it."
-msgstr ""
-"Kunne ikke åpne denne adresseboken. Vennligst sjekk at stien\n"
-"eksisterer og at du har rettigheter til å aksessere den."
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
+msgstr "Kunne ikke åpne denne adresseboken. Vennligst sjekk at stien eksisterer og at du har rettigheter til å aksessere den."
 
 #: addressbook/gui/component/addressbook.c:599
 msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or the LDAP server\n"
-"is unreachable."
-msgstr ""
-"Kunne ikke åpne denne adresseboken. Dette betyr enten\n"
-"at du har skrevet inn en ugyldig URI, eller at LDAP-tjeneren\n"
-"ikke kan nås."
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr "Kunne ikke åpne denne adresseboken. Dette betyr enten at du har skrevet inn en ugyldig URI, eller at LDAP-tjeneren ikke kan nås."
 
 #: addressbook/gui/component/addressbook.c:604
 msgid ""
-"This version of Evolution does not have LDAP support\n"
-"compiled in to it.  If you want to use LDAP in Evolution\n"
-"you must compile the program from the CVS sources after\n"
-"retrieving OpenLDAP from the link below.\n"
-msgstr ""
-"Denne versjonen av Evolution har ikke LDAP-støtte\n"
-"kompilert inn. Hvis du ønsker å bruke LDAP i Evolution\n"
-"må du kompilere programmet fra kildekoden i CVS etter å\n"
-"ha hentet OpenLDAP fra lenken under.\n"
+"This version of Evolution does not have LDAP support compiled in to it.  If "
+"you want to use LDAP in Evolution you must compile the program from the CVS "
+"sources after retrieving OpenLDAP from the link below."
+msgstr "Denne versjonen av Evolution har ikke LDAP-støtte kompilert inn. Hvis du ønsker å bruke LDAP i Evolution må du kompilere programmet fra kildekoden i CVS etter å ha hentet OpenLDAP fra lenken under."
 
 #: addressbook/gui/component/addressbook.c:613
 msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or the server\n"
-"is unreachable."
-msgstr ""
-"Kunne ikke åpne denne adresseboken. Dette betyr enten\n"
-"at du har skrevet inn en ugyldig URI, eller at tjeneren\n"
-"ikke kan nås."
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+msgstr "Kunne ikke åpne denne adresseboken. Dette betyr enten at du har skrevet inn en ugyldig URI, eller at tjeneren ikke kan nås."
 
 #: addressbook/gui/component/addressbook.c:630
 msgid "Unable to open addressbook"
@@ -280,13 +281,12 @@ msgid "%sEnter password for %s (user %s)"
 msgstr "%sSkriv inn passord for %s (bruker %s)"
 
 #: addressbook/gui/component/addressbook.c:1030
-#, fuzzy
 msgid "UID of the contacts source that the view will display"
-msgstr "URIen som kalenderen skal vise"
+msgstr "UID for kontaktkilden som visningen skal vise"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
-msgstr ""
+msgstr "EFolderList xml for listen med fullføringsURIer"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
 msgid ""
@@ -315,6 +315,7 @@ msgstr " V_is støttede baser "
 #: addressbook/gui/contact-editor/fullname.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
 #: calendar/gui/dialogs/alarm-options.glade.h:2
+#: calendar/gui/dialogs/calendar-setup.glade.h:1
 #: calendar/gui/dialogs/event-page.glade.h:2
 #: calendar/gui/dialogs/meeting-page.glade.h:1
 #: calendar/gui/dialogs/new-calendar.glade.h:1
@@ -407,16 +408,19 @@ msgstr ""
 "Evolution vil bruke denne e-post adressen til å autentisere deg mot tjeneren"
 
 #: addressbook/gui/component/ldap-config.glade.h:24
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "Finished"
 msgstr "Fullført"
 
 #: addressbook/gui/component/ldap-config.glade.h:25
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Generelt"
 
 #: addressbook/gui/component/ldap-config.glade.h:26
+#: calendar/gui/dialogs/calendar-setup.glade.h:12
 msgid "Group:"
 msgstr "Gruppe:"
 
@@ -444,7 +448,7 @@ msgid "S_earch scope: "
 msgstr "Sø_keområde: "
 
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-list-view.c:396 calendar/gui/e-cal-view.c:605
+#: calendar/gui/e-cal-list-view.c:396 calendar/gui/e-cal-view.c:659
 #: calendar/gui/gnome-cal.c:586
 msgid "Searching"
 msgstr "Søker"
@@ -494,6 +498,7 @@ msgstr ""
 "sikkerhetshull. "
 
 #: addressbook/gui/component/ldap-config.glade.h:45
+#: calendar/gui/dialogs/calendar-setup.glade.h:16
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
 "LDAP\n"
@@ -504,15 +509,13 @@ msgstr ""
 "for LDAP-søk, og for oppretting og redigering av kontakter. "
 
 #: addressbook/gui/component/ldap-config.glade.h:47
-#, fuzzy
 msgid ""
 "Specifying a display name and group is the first step in setting up an "
 "addressbook."
-msgstr ""
-"Spesifisering av visningsnavn er det siste steget i konfigurasjon av en LDAP-"
-"tjener."
+msgstr "Spesifisering av visningsnavn og gruppe er det siste steget i konfigurasjon av en adressebok."
 
 #: addressbook/gui/component/ldap-config.glade.h:48
+#: calendar/gui/dialogs/calendar-setup.glade.h:20
 msgid "Step 1: Folder Characteristics"
 msgstr "Steg 1: Karakteristikk for mappe"
 
@@ -562,7 +565,6 @@ msgstr ""
 "Hvis du lar denne stå tom vil søk starte ved roten av katalogtreet."
 
 #: addressbook/gui/component/ldap-config.glade.h:59
-#, fuzzy
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -571,13 +573,11 @@ msgid ""
 "A search scope of \"one\" will only include the entries one level beneath "
 "your base.\n"
 msgstr ""
-"Søkeområdet definerer hvor dypt du ønsker at søket skal gå ned i "
-"katalogtreet.\n"
+"Søkeområdet definerer hvor dypt du ønsker at søket skal gå ned i katalogtreet.\n"
 "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."
+"Et søkeområde som «one» vil kun ta med oppføringer ett nivå under basen.\n"
 
 #: addressbook/gui/component/ldap-config.glade.h:63
-#, fuzzy
 msgid ""
 "This assistant will help you create a new addressbook. \n"
 "\n"
@@ -585,12 +585,11 @@ msgid ""
 "parameters may be required. Please contact your system\n"
 "administrator if you need help finding this information."
 msgstr ""
-"Denne veiviseren vil hjelpe deg å aksessere katalogtjenester på nettet\n"
-"ved bruk av LDAP-tjenere (Lightweight Directory Access Protocol).\n"
+"Denne veiviseren vil hjelpe deg å opprette en ny adressebok.\n"
 "\n"
-"For å legge til en LDAP-tjener må du ha spesifikk informasjon\n"
-"om tjeneren. Vennligst kontakt din systemadministrator hvis du trenger\n"
-"hjelp med å finne denne informasjonen."
+"Mer informasjon vil være nødvendig avhengig av type adressebok du\n"
+"oppretter. Vennligst kontakt din systemadministrator hvis du trenger\n"
+"hjelp til å finne denne informasjonen."
 
 #: addressbook/gui/component/ldap-config.glade.h:68
 msgid ""
@@ -628,13 +627,11 @@ msgstr ""
 "Det brukes kun for visning på skjermen."
 
 #: addressbook/gui/component/ldap-config.glade.h:74
-#, fuzzy
+#: calendar/gui/dialogs/calendar-setup.glade.h:34
 msgid ""
 "This is the name that will appear in your Evolution folder list. It is for "
 "display purposes only. "
-msgstr ""
-"Dette er navnet på denne tjeneren som vises i mappelisten i Evolution. \n"
-"Det brukes kun for visning på skjermen."
+msgstr "Dette er navnet som vises i mappelisten i Evolution og brukes kun for visning på skjermen."
 
 #: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
@@ -682,6 +679,7 @@ msgstr ""
 "er."
 
 #: addressbook/gui/component/ldap-config.glade.h:85
+#: calendar/gui/dialogs/calendar-setup.glade.h:37
 msgid "_Display name:"
 msgstr "_Vis navn:"
 
@@ -695,7 +693,7 @@ msgstr "Grense for ne_dlasting:"
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:19
+#: ui/evolution-tasks.xml.h:20
 msgid "_Edit"
 msgstr "R_ediger"
 
@@ -725,49 +723,49 @@ msgstr "kort"
 
 #: addressbook/gui/component/ldap-config.glade.h:94
 msgid "connecting-tab"
-msgstr ""
+msgstr "connecting-tab"
 
 #: addressbook/gui/component/ldap-config.glade.h:95
 msgid "general-tab"
-msgstr ""
+msgstr "general-tab"
 
 #: addressbook/gui/component/ldap-config.glade.h:96
 msgid "searching-tab"
-msgstr ""
+msgstr "searching-tab"
 
 #: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
 msgid "Evolution Addressbook name selection interface"
 msgstr "Grensesnitt for navnevalg i Evolution adressebok"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:205
+#: addressbook/gui/component/select-names/e-select-names-popup.c:207
 msgid "Remove All"
 msgstr "Fjern alle"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:212
-#: addressbook/gui/component/select-names/e-select-names.c:694
+#: addressbook/gui/component/select-names/e-select-names-popup.c:214
+#: addressbook/gui/component/select-names/e-select-names.c:693
 #: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove"
 msgstr "Fjern"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:219
+#: addressbook/gui/component/select-names/e-select-names-popup.c:221
 msgid "View Contact List"
 msgstr "Vis kontaktliste"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:219
+#: addressbook/gui/component/select-names/e-select-names-popup.c:221
 msgid "View Contact Info"
 msgstr "Vis kontaktinformasjon"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:226
-#: addressbook/gui/component/select-names/e-select-names-popup.c:336
+#: addressbook/gui/component/select-names/e-select-names-popup.c:228
+#: addressbook/gui/component/select-names/e-select-names-popup.c:338
 msgid "Send HTML Mail?"
 msgstr "Send HTML e-post?"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:328
+#: addressbook/gui/component/select-names/e-select-names-popup.c:330
 #: addressbook/gui/widgets/eab-popup-control.c:1002
 msgid "Add to Contacts"
 msgstr "Legg til i kontakter"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:354
+#: addressbook/gui/component/select-names/e-select-names-popup.c:356
 msgid "Unnamed Contact"
 msgstr "Kontakt uten navn:"
 
@@ -783,201 +781,204 @@ msgstr "Navn"
 msgid "Source"
 msgstr "Kilde"
 
-#: addressbook/gui/component/select-names/e-select-names.c:518
-msgid "Select Contacts from Addressbook"
-msgstr "Velg kontakter fra adresseboken"
+#: addressbook/gui/component/select-names/e-select-names.c:494
+msgid "Select Contents from Address Book"
+msgstr "Velg innhold fra adressebok"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Find"
-msgstr "Finn"
+msgid "<b>Contacts</b>"
+msgstr "<b>Kontakter:</b> "
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "Velg navn"
+msgid "<b>Show Contacts</b>"
+msgstr "<b>Vis kontakter</b>"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Selected Contacts:"
-msgstr "Valgte kontakter:"
+msgid "Address _Book:"
+msgstr "Adresse_bok:"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:5
-msgid "Show Contacts"
-msgstr "Vis kontakter"
+msgid "C_ategory:"
+msgstr "K_ategori:"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid ""
-"Type a name into the entry, or\n"
-"select one from the list below:"
-msgstr ""
-"Skriv et navn inn i feltet,\n"
-"eller velg et fra listen under:"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:8
-msgid "_Category:"
-msgstr "_Kategori:"
+msgid "Select Contacts from Address Book"
+msgstr "Velg kontakter fra adresseboken"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:9
-msgid "_Folder:"
-msgstr "_Mappe:"
+#: addressbook/gui/component/select-names/select-names.glade.h:7
+msgid "_Find"
+msgstr "_Finn"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid " B_usiness:"
 msgstr "A_rbeid:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:3
+msgid ""
+"<b>Calendar Access</b>\n"
+"If this person publishes free/busy or other calendar information on the "
+"Internet, enter the address\n"
+"of that information here."
+msgstr ""
+"<b>Kalendertilgang</b>\n"
+"Hvis en person publiserer ledig-/opptatt informasjon eller annen kalenderinformasjon på internett, skriv inn adressen\n"
+"til denne informasjonen her."
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+msgid ""
+"<b>Video Conferencing</b>\n"
+"If this person has the ability to participate in a video conference, enter "
+"their address here."
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
 msgid "A_ddress..."
 msgstr "A_dresse..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "A_ssistant's name:"
 msgstr "A_ssistentens navn"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#, fuzzy
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "Addressbook:"
-msgstr "Adressebok"
+msgstr "Adressebok:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
 msgid "Anni_versary:"
 msgstr "Br_yllupsdag:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 msgid "Birthda_y:"
 msgstr "F_ødselsdag:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "Blog address:"
 msgstr "Adresse til weblogg:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Business fa_x:"
 msgstr "Fa_ks på arbeid:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Collaboration"
 msgstr "Samarbeid"
 
 #. Construct the app
-#: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:1520
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/e-contact-editor.c:1521
 msgid "Contact Editor"
 msgstr "Kontaktredigering"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "D_epartment:"
 msgstr "Avd_eling:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Detaljer"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "F_ree/Busy URL:"
 msgstr "L_edig/opptatt URL:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "File a_s:"
 msgstr "Lagre _som:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "Full _Name..."
 msgstr "Fullt _navn..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
-msgid ""
-"If this person publishes free/busy or other calendar information on the "
-"Internet, enter the address\n"
-"of that information here."
-msgstr ""
-"Hvis en person publiserer ledig-/opptatt informasjon eller annen "
-"kalenderinformasjon på internett, skriv inn adressen\n"
-"til denne informasjonen her."
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "New phone type"
 msgstr "Ny telefontype"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "No_tes:"
 msgstr "No_tater:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "Organi_zation:"
 msgstr "Organisas_jon:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "P_rofession:"
 msgstr "Y_rke:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "Primary _email:"
 msgstr "Primær _e-post:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "S_pouse:"
 msgstr "E_ktefelle:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "Wants to receive _HTML mail"
 msgstr "Vil motta _HTML e-post"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Add"
 msgstr "_Legg til"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Business:"
 msgstr "Ar_beid:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Categories..."
 msgstr "_Kategorier..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
-#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1236
-#: calendar/gui/e-cal-view.c:1267 calendar/gui/e-calendar-table.c:1043
-#: calendar/gui/e-calendar-table.c:1061 mail/em-folder-tree.c:1502
-#: mail/em-folder-view.c:706 ui/evolution-addressbook.xml.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1290
+#: calendar/gui/e-cal-view.c:1321 calendar/gui/e-calendar-table.c:1055
+#: calendar/gui/e-calendar-table.c:1073 mail/em-folder-tree.c:1502
+#: mail/em-folder-view.c:731 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
-#: ui/evolution-tasks.xml.h:18
+#: ui/evolution-tasks.xml.h:19
 msgid "_Delete"
 msgstr "_Slett"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Home:"
 msgstr "_Hjemme:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Job title:"
 msgstr "_Jobbtittel:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Manager's name:"
 msgstr "_Leders navn:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Mobile:"
 msgstr "_Mobil:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Nickname:"
 msgstr "Kalle_navn:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "_Office:"
 msgstr "Kont_or:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
 msgid "_Public Calendar URL:"
 msgstr "_Offentlig kalender-URL:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_This is the mailing address"
 msgstr "De_tte er postadressen"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:42
+msgid "_Video Conferencing URL:"
+msgstr "_Videokonferanse-URL:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:43
 msgid "_Web page address:"
 msgstr "_Hjemmeside-adresse:"
 
@@ -1195,10 +1196,13 @@ msgid "Comoros"
 msgstr "Komorene"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:185
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Congo"
 msgstr "Kongo-Brazaville"
 
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
+msgid "Congo, The Democratic Republic Of The"
+msgstr ""
+
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cook Islands"
 msgstr "Cookøyene"
@@ -1244,117 +1248,117 @@ msgid "Dominican Republic"
 msgstr "Den dominikanske republikk"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:198
-msgid "East Timor"
-msgstr "Øst-Timor"
-
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Ecuador"
 msgstr "Ecuador"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Egypt"
 msgstr "Egypt"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Equatorial Guinea"
 msgstr "Ekvatorial-Guinea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Eritrea"
 msgstr "Eritrea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Estonia"
 msgstr "Estland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Ethiopia"
 msgstr "Etiopia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "Falkland Islands"
 msgstr "Falklandsøyene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "Faroe Islands"
 msgstr "Færøyene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "Fiji"
 msgstr "Fiji"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Finland"
 msgstr "Finland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "France"
 msgstr "Frankrike"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "French Guiana"
 msgstr "Fransk Guyana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "French Polynesia"
 msgstr "Fransk Polynesia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "French Southern Territories"
 msgstr "Sydlige Franske territorier"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Gabon"
 msgstr "Gabon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Gambia"
 msgstr "Gambia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Georgia"
 msgstr "Georgia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Germany"
 msgstr "Tyskland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Ghana"
 msgstr "Ghana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Greece"
 msgstr "Hellas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Greenland"
 msgstr "Grønland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Grenada"
 msgstr "Grenada"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guadeloupe"
 msgstr "Guadelope"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guam"
 msgstr "Guam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Guatemala"
 msgstr "Guatemala"
 
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
+msgid "Guernsey"
+msgstr "Guernsey"
+
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Guinea"
 msgstr "Guinea"
@@ -1404,541 +1408,573 @@ msgid "Indonesia"
 msgstr "Indonesia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+msgid "Iran"
+msgstr "Iran"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+msgid "Iraq"
+msgstr "Irak"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Ireland"
 msgstr "Irland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+msgid "Isle of Man"
+msgstr "Isle of Man"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Israel"
 msgstr "Israel"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Italy"
 msgstr "Italia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Jamaica"
 msgstr "Jamaica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Japan"
 msgstr "Japan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+msgid "Jersey"
+msgstr "Jersey"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Jordan"
 msgstr "Jordan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Kazakhstan"
 msgstr "Kasakhstan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kenya"
 msgstr "Kenya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#, fuzzy
+msgid "Korea, Democratic People's Republic Of"
+msgstr "Sør-Korea"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Korea, Republic Of"
 msgstr "Sør-Korea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Kuwait"
 msgstr "Kuwait"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Kyrgyzstan"
 msgstr "Kirgisistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Laos"
 msgstr "Laos"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Latvia"
 msgstr "Latvia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Lebanon"
 msgstr "Libanon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Lesotho"
 msgstr "Lesotho"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Liberia"
 msgstr "Liberia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+msgid "Libya"
+msgstr "Libya"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Lithuania"
 msgstr "Litauen"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Luxembourg"
 msgstr "Luxembourg"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
-msgid "Macau"
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+msgid "Macao"
 msgstr "Macao"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Macedonia"
 msgstr "Makedonia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Madagascar"
 msgstr "Madagaskar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Malawi"
 msgstr "Malawi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Malaysia"
 msgstr "Malaysia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Maldives"
 msgstr "Maldivene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mali"
 msgstr "Mali"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Malta"
 msgstr "Malta"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Marshall Islands"
 msgstr "Marshalløyene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Martinique"
 msgstr "Martinique"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Mauritania"
 msgstr "Mauritania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Mauritius"
 msgstr "Mauritius"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mexico"
 msgstr "Mexico"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Micronesia"
 msgstr "Mikronesiaføderasjonen"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Moldova, Republic Of"
 msgstr "Moldova"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Monaco"
 msgstr "Monaco"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Mongolia"
 msgstr "Mongolia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Morocco"
 msgstr "Marokko"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Mozambique"
 msgstr "Mosambik"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Myanmar"
 msgstr "Myanmar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Namibia"
 msgstr "Namibia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "Nauru"
 msgstr "Nauru"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nepal"
 msgstr "Nepal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Netherlands"
 msgstr "Nederland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Netherlands Antilles"
 msgstr "De nederlandske antillene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "New Caledonia"
 msgstr "Ny-Caledonia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "New Zealand"
 msgstr "New Zealand"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Niger"
 msgstr "Niger"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Nigeria"
 msgstr "Nigeria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Niue"
 msgstr "Niue"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Norfolk Island"
 msgstr "Norfolkøya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Northern Mariana Islands"
 msgstr "Nord-Marianene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Norway"
 msgstr "Norge"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Oman"
 msgstr "Oman"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Palau"
 msgstr "Palau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Palestinian Territory"
 msgstr "Palestinsk område"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Panama"
 msgstr "Panama"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Papua New Guinea"
 msgstr "Papua Ny-Guinea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Paraguay"
 msgstr "Paraguay"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Peru"
 msgstr "Peru"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Philippines"
 msgstr "Filippinene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Poland"
 msgstr "Polen"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Portugal"
 msgstr "Portugal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Puerto Rico"
 msgstr "Puerto Rico"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Qatar"
 msgstr "Qatar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Reunion"
 msgstr "Réunion"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Romania"
 msgstr "Romania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Russian Federation"
 msgstr "Russland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "Rwanda"
 msgstr "Rwanda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Saint Kitts And Nevis"
 msgstr "Saint Kitts og Nevis"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Saint Lucia"
 msgstr "Saint Lucia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Saint Vincent And The Grena-dines"
 msgstr "Saint Vincent og Grenadinene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Samoa"
 msgstr "Samoa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "San Marino"
 msgstr "San Marino"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Sao Tome And Principe"
 msgstr "São Tomé og Príncipe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Saudi Arabia"
 msgstr "Saudi-Arabia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Senegal"
 msgstr "Senegal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+msgid "Serbia And Montenegro"
+msgstr "Serbia og Montenegro"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Seychelles"
 msgstr "Seychellene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Sierra Leone"
 msgstr "Sierra Leone"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Singapore"
 msgstr "Singapore"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "Slovakia"
 msgstr "Slovakia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "Slovenia"
 msgstr "Slovenia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Solomon Islands"
 msgstr "Salomonøyene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "Somalia"
 msgstr "Somalia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "South Africa"
 msgstr "Sør-Afrika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "Sør-Georgia og de sørlige Sandwichøyene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Spain"
 msgstr "Spania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "St. Helena"
 msgstr "St. Helena"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "St. Pierre And Miquelon"
 msgstr "Saint-Pierre-et-Miquelon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Sudan"
 msgstr "Sudan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Suriname"
 msgstr "Surinam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "Svalbard og Jan Mayen"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Swaziland"
 msgstr "Swaziland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Sweden"
 msgstr "Sverige"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Switzerland"
 msgstr "Sveits"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
+msgid "Syria"
+msgstr "Syria"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Tajikistan"
 msgstr "Tadsjikistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tanzania, United Republic Of"
 msgstr "Tanzania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Thailand"
 msgstr "Thailand"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
+msgid "Timor-Leste"
+msgstr "Timor-Leste"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Togo"
 msgstr "Togo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Tonga"
 msgstr "Tonga"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "Trinidad And Tobago"
 msgstr "Trinidad og Tobago"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Tunisia"
 msgstr "Tunisia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Turkey"
 msgstr "Tyrkia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Turkmenistan"
 msgstr "Turkmenistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "Turks And Caicos Islands"
 msgstr "Turks- og Caicosøyene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Uganda"
 msgstr "Uganda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Ukraine"
 msgstr "Ukraina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "United Arab Emirates"
 msgstr "De forente arabiske emirater"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "United Kingdom"
 msgstr "Storbritannia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "United States Minor Outlying Islands"
 msgstr "USA, mindre omliggende øyer"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Uzbekistan"
 msgstr "Usbekistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Viet Nam"
 msgstr "Vietnam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Virgin Islands, British"
 msgstr "Jomfruøyene (Storbritannia)"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Virgin Islands, U.S."
 msgstr "Jomfruøyene (USA)"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:373
 msgid "Wallis And Futuna Islands"
 msgstr "Wallis- og Futuna-øyene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:374
 msgid "Western Sahara"
 msgstr "Vest-Sahara"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:375
 msgid "Yemen"
 msgstr "Jemen"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:367
-msgid "Yugoslavia"
-msgstr "Jugoslavia"
-
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:376
 msgid "Zambia"
 msgstr "Zambia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:377
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:191
-#, fuzzy
 msgid "Source Book"
-msgstr "Kilde"
+msgstr "Kildebok"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:198
 msgid "Target Book"
-msgstr ""
+msgstr "Målbok"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:205
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:169
@@ -1959,19 +1995,19 @@ msgstr "Skrivbare felter"
 msgid "Changed"
 msgstr "Endret"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:976
+#: addressbook/gui/contact-editor/e-contact-editor.c:977
 msgid "Category editor not available."
 msgstr "Kategori editor ikke tilgjengelig."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:984
+#: addressbook/gui/contact-editor/e-contact-editor.c:985
 msgid "This contact belongs to these categories:"
 msgstr "Denne kontakten hører til disse kategoriene:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1206
+#: addressbook/gui/contact-editor/e-contact-editor.c:1207
 msgid "Save Contact as VCard"
 msgstr "Lagre kontakt som VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1246
+#: addressbook/gui/contact-editor/e-contact-editor.c:1247
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -1979,7 +2015,7 @@ msgstr ""
 "Er du sikker på at du vil\n"
 "slette disse kontaktene?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1249
+#: addressbook/gui/contact-editor/e-contact-editor.c:1250
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -1987,19 +2023,19 @@ msgstr ""
 "Er du sikker på at du vil\n"
 "slette denne kontakten?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2028
+#: addressbook/gui/contact-editor/e-contact-editor.c:2029
 msgid "Business"
 msgstr "Arbeid"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#: addressbook/gui/contact-editor/e-contact-editor.c:2030
 msgid "Home"
 msgstr "Hjemme"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2030
+#: addressbook/gui/contact-editor/e-contact-editor.c:2031
 msgid "Other"
 msgstr "Andre"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2569
+#: addressbook/gui/contact-editor/e-contact-editor.c:2574
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Kunne ikke finne widget for felt: «%s»"
@@ -2345,9 +2381,9 @@ msgstr "Klipp ut"
 
 #. create the dialog
 #: addressbook/gui/widgets/e-addressbook-view.c:1015
-#: calendar/gui/calendar-component.c:433
+#: calendar/gui/calendar-component.c:406
 #: calendar/gui/dialogs/copy-source-dialog.c:136
-#: calendar/gui/tasks-component.c:414 ui/evolution-addressbook.xml.h:2
+#: calendar/gui/tasks-component.c:398 ui/evolution-addressbook.xml.h:2
 #: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopier"
@@ -2358,7 +2394,7 @@ msgid "Paste"
 msgstr "Lim inn"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1021
-#: calendar/gui/e-cal-view.c:1205
+#: calendar/gui/e-cal-view.c:1259
 msgid "Current View"
 msgstr "Aktiv visning"
 
@@ -2612,9 +2648,8 @@ msgstr "Har markør"
 
 #: addressbook/gui/widgets/eab-contact-display.c:93
 #: addressbook/gui/widgets/eab-contact-display.c:114
-#, fuzzy
 msgid "Map It"
-msgstr "Mayport"
+msgstr ""
 
 #: addressbook/gui/widgets/eab-contact-display.c:198
 #: addressbook/gui/widgets/eab-contact-display.c:324
@@ -2656,7 +2691,7 @@ msgstr "Suksess"
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:536
-#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:1012
+#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:1010
 msgid "Unknown error"
 msgstr "Ukjent feil"
 
@@ -2683,7 +2718,7 @@ msgstr "Protokollen er ikke støttet"
 #: addressbook/gui/widgets/eab-gui-util.c:50
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:601
-#: calendar/gui/e-calendar-table.c:465 calendar/gui/e-tasks.c:213
+#: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:212
 #: calendar/gui/print.c:2319 camel/camel-service.c:734
 #: camel/camel-service.c:772 camel/camel-service.c:856
 #: camel/camel-service.c:896 camel/providers/pop3/camel-pop3-store.c:453
@@ -2883,7 +2918,7 @@ msgstr ""
 #: addressbook/printing/test-contact-print-style-editor.c:54
 #: addressbook/printing/test-print.c:53
 msgid "Copyright (C) 2000, Ximian, Inc."
-msgstr ""
+msgstr "Opphavsrett © 2000, Ximian, Inc."
 
 #: addressbook/gui/widgets/test-reflow.c:109
 msgid "This should test the reflow canvas item"
@@ -2894,12 +2929,12 @@ msgstr ""
 msgid "Print envelope"
 msgstr "Skriv ut konvolutt"
 
-#: addressbook/printing/e-contact-print.c:1003
+#: addressbook/printing/e-contact-print.c:1004
 msgid "Print contacts"
 msgstr "Skriv ut kontakter"
 
-#: addressbook/printing/e-contact-print.c:1069
-#: addressbook/printing/e-contact-print.c:1096
+#: addressbook/printing/e-contact-print.c:1070
+#: addressbook/printing/e-contact-print.c:1097
 msgid "Print contact"
 msgstr "Skriv ut kontakt"
 
@@ -3107,13 +3142,12 @@ msgid "OUTPUTFILE"
 msgstr "UTDATAFIL"
 
 #: addressbook/tools/evolution-addressbook-export.c:58
-#, fuzzy
 msgid "List local addressbook folders"
-msgstr "med alle lokale og aktive eksterne mapper"
+msgstr "Vis lokale adressebokmapper"
 
 #: addressbook/tools/evolution-addressbook-export.c:60
 msgid "Show cards as vcard or csv file"
-msgstr ""
+msgstr "Vis kontakter som vcard eller csv-fil"
 
 #: addressbook/tools/evolution-addressbook-export.c:60
 msgid "[vcard|csv]"
@@ -3121,7 +3155,7 @@ msgstr "[vcard|csv]"
 
 #: addressbook/tools/evolution-addressbook-export.c:61
 msgid "Export in asynchronous mode "
-msgstr ""
+msgstr "Eksporter i asynkron modus "
 
 #: addressbook/tools/evolution-addressbook-export.c:63
 msgid ""
@@ -3169,6 +3203,10 @@ msgstr "Ingen filnavn spesifisert."
 msgid "Unnamed List"
 msgstr "Liste uten navn"
 
+#: calendar/common/authentication.c:34 smime/gui/component.c:39
+msgid "Enter password"
+msgstr "Oppgi passord"
+
 #: calendar/conduits/calendar/calendar-conduit.c:206
 msgid "Split Multi-Day Events:"
 msgstr "Del opp hendelser som går over flere dager:"
@@ -3243,8 +3281,8 @@ msgid "Evolution's Tasks component"
 msgstr "Oppgavekomponent for Evolution"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1082 calendar/gui/print.c:1795
-#: calendar/gui/tasks-control.c:490
+#: calendar/gui/e-tasks.c:1042 calendar/gui/print.c:1795
+#: calendar/gui/tasks-control.c:506
 #: calendar/importers/icalendar-importer.c:717
 #: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
 msgid "Tasks"
@@ -3291,11 +3329,26 @@ msgstr "Utsett-tid (minutter)"
 msgid "_Edit appointment"
 msgstr "R_ediger avtale"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:871
+#: calendar/gui/alarm-notify/alarm-queue.c:900 calendar/gui/e-cal-view.c:1272
+#: calendar/gui/e-cal-view.c:1337 calendar/gui/e-calendar-table.c:1035
+#: calendar/gui/e-calendar-table.c:1076 mail/em-folder-view.c:706
+#: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:37
+msgid "_Open"
+msgstr "_Åpne"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:902
+msgid "_Dismiss"
+msgstr "_Se bort fra"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:904
+msgid "Dismiss _All"
+msgstr "Se bort fra _alle"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:969
 msgid "No description available."
 msgstr "Ingen beskrivelse tilgjengelig."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:889
+#: calendar/gui/alarm-notify/alarm-queue.c:987
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3304,12 +3357,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:976
-#: calendar/gui/alarm-notify/alarm-queue.c:1000
+#: calendar/gui/alarm-notify/alarm-queue.c:1079
+#: calendar/gui/alarm-notify/alarm-queue.c:1103
 msgid "Warning"
 msgstr "Advarsel"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:980
+#: calendar/gui/alarm-notify/alarm-queue.c:1083
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3321,7 +3374,7 @@ msgstr ""
 "å sende e-post. Evolution vil vise en vanlig dialog\n"
 "for påminnelse i stedet."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1006
+#: calendar/gui/alarm-notify/alarm-queue.c:1109
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3338,23 +3391,23 @@ msgstr ""
 "\n"
 "Er du sikker på at du ønsker å kjøre dette programmet?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1020
+#: calendar/gui/alarm-notify/alarm-queue.c:1123
 msgid "Do not ask me about this program again."
 msgstr "Ikke spør meg om dette programmet igjen."
 
-#: calendar/gui/alarm-notify/notify-main.c:159
+#: calendar/gui/alarm-notify/notify-main.c:160
 msgid "Could not initialize Bonobo"
 msgstr "Kunne ikke initiere Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:162
+#: calendar/gui/alarm-notify/notify-main.c:163
 msgid "Could not initialize gnome-vfs"
 msgstr "Kunne ikke initiere gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:171
+#: calendar/gui/alarm-notify/notify-main.c:172
 msgid "Could not create the alarm notify service factory"
 msgstr "Kunne ikke opprette factory for alarm-tjenesten"
 
-#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:111
+#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:110
 msgid "invalid time"
 msgstr "ugyldig tid"
 
@@ -3435,9 +3488,8 @@ msgid "Programs that can run as part of alarms"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
-#, fuzzy
 msgid "Show where events end in week and month views"
-msgstr "Vi_s tid for avtalers slutt i ukes- og månedsvisning"
+msgstr "Vis hvor hendelser slutter i ukes- og månedsvisning"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
 #, fuzzy
@@ -3500,137 +3552,142 @@ msgstr "Beskrivelse inneholder"
 msgid "Comment contains"
 msgstr "Kommentar inneholder"
 
-#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1134
+#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1113
 msgid "Unmatched"
 msgstr "Ingen treff"
 
-#: calendar/gui/calendar-commands.c:371
-#, fuzzy
+#: calendar/gui/calendar-commands.c:370
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
 "events."
-msgstr ""
-"Denne operasjonen vil fjerne alle oppgaver merket som slettet permanent. "
-"Hvis du fortsetter vil du ikke kunne gjenopprette disse oppgavene. \n"
-"\n"
-"Vil du virkelig slette disse oppgavene?"
+msgstr "Denne operasjonen vil fjerne alle hendelser innen valgt tidsrom permanent. Hvis du fortsetter vil du ikke kunne gjenopprette disse hendelsene. "
 
-#: calendar/gui/calendar-commands.c:378
+#: calendar/gui/calendar-commands.c:377
 msgid "Purge events older than"
 msgstr "Slett hendelser eldre enn"
 
-#: calendar/gui/calendar-commands.c:383
+#: calendar/gui/calendar-commands.c:382
 #: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:17
 msgid "days"
 msgstr "dager"
 
-#: calendar/gui/calendar-commands.c:452
+#: calendar/gui/calendar-commands.c:451
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:455 calendar/gui/e-day-view-top-item.c:692
-#: calendar/gui/e-day-view.c:1359 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/calendar-commands.c:454 calendar/gui/e-day-view-top-item.c:692
+#: calendar/gui/e-day-view.c:1365 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:457 calendar/gui/calendar-commands.c:462
-#: calendar/gui/calendar-commands.c:464
+#: calendar/gui/calendar-commands.c:456 calendar/gui/calendar-commands.c:461
+#: calendar/gui/calendar-commands.c:463
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:481 calendar/gui/calendar-commands.c:487
-#: calendar/gui/calendar-commands.c:493 calendar/gui/calendar-commands.c:495
+#: calendar/gui/calendar-commands.c:480 calendar/gui/calendar-commands.c:486
+#: calendar/gui/calendar-commands.c:492 calendar/gui/calendar-commands.c:494
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:485
+#: calendar/gui/calendar-commands.c:484
 #: calendar/gui/e-week-view-main-item.c:337 calendar/gui/print.c:1516
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:369
+#: calendar/gui/calendar-component.c:358
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
-msgstr ""
-
-#: calendar/gui/calendar-component.c:410
-msgid "Rename this calendar to"
-msgstr "Gi nytt navn til denne kalenderen"
+msgstr "Kalender «%s» vil bli fjernet. Er du sikker på at du vil fortsette?"
 
-#: calendar/gui/calendar-component.c:431
+#: calendar/gui/calendar-component.c:404
+#: calendar/gui/dialogs/calendar-setup.glade.h:13
 msgid "New Calendar"
 msgstr "Ny kalender"
 
-#: calendar/gui/calendar-component.c:615
+#. create the remote source group
+#: calendar/gui/calendar-component.c:523 calendar/gui/calendar-component.c:553
+msgid "On The Web"
+msgstr "På nettet"
+
+#. red
+#: calendar/gui/calendar-component.c:543 filter/filter-label.c:122
+#: mail/mail-config.c:64 mail/mail-config.glade.h:135
+#: shell/e-config-upgrade.c:1455
+msgid "Work"
+msgstr "Arbeid"
+
+#: calendar/gui/calendar-component.c:562 calendar/gui/calendar-component.c:574
+msgid "Birthdays & Anniversaries"
+msgstr "Fødselsdager og jubileum"
+
+#: calendar/gui/calendar-component.c:573
+msgid "Birthdays"
+msgstr "Fødselsdager"
+
+#: calendar/gui/calendar-component.c:677
 msgid "New appointment"
 msgstr "Ny avtale"
 
-#: calendar/gui/calendar-component.c:616
+#: calendar/gui/calendar-component.c:678
 msgid "_Appointment"
 msgstr "A_vtale"
 
-#: calendar/gui/calendar-component.c:617
+#: calendar/gui/calendar-component.c:679
 msgid "Create a new appointment"
 msgstr "Opprett en ny avtale"
 
-#: calendar/gui/calendar-component.c:622
+#: calendar/gui/calendar-component.c:684
 msgid "New meeting"
 msgstr "Nytt møte"
 
-#: calendar/gui/calendar-component.c:623
+#: calendar/gui/calendar-component.c:685
 msgid "M_eeting"
 msgstr "Møt_e"
 
-#: calendar/gui/calendar-component.c:624
+#: calendar/gui/calendar-component.c:686
 msgid "Create a new meeting request"
 msgstr "Opprett en ny møteforespørsel"
 
-#: calendar/gui/calendar-component.c:629
+#: calendar/gui/calendar-component.c:691
 msgid "New all day appointment"
 msgstr "Ny avtale for hele dagen"
 
-#: calendar/gui/calendar-component.c:630
+#: calendar/gui/calendar-component.c:692
 msgid "All _Day Appointment"
 msgstr "Avtale for hele _dagen"
 
-#: calendar/gui/calendar-component.c:631
+#: calendar/gui/calendar-component.c:693
 msgid "Create a new all-day appointment"
 msgstr "Opprett en ny avtale for hele dagen"
 
-#: calendar/gui/calendar-component.c:636
-#, fuzzy
+#: calendar/gui/calendar-component.c:698
 msgid "New calendar"
 msgstr "Ny kalender"
 
-#: calendar/gui/calendar-component.c:637
-#, fuzzy
+#: calendar/gui/calendar-component.c:699
 msgid "C_alendar"
 msgstr "K_alender"
 
-#: calendar/gui/calendar-component.c:638
+#: calendar/gui/calendar-component.c:700
 msgid "Create a new calendar"
 msgstr "Opprett en ny kalender"
 
-#: calendar/gui/calendar-component.c:705
+#: calendar/gui/calendar-component.c:767
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:718
+#: calendar/gui/calendar-component.c:780
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#. create the remote source group
-#: calendar/gui/calendar-component.c:855
-msgid "On The Web"
-msgstr ""
-
 #: calendar/gui/calendar-offline-handler.c:192
 #, c-format
 msgid "backend_go_offline(): %s"
@@ -3718,34 +3775,28 @@ msgstr "Alternativer for ukjente alarmer"
 #: calendar/gui/dialogs/recurrence-page.glade.h:1
 #: calendar/gui/dialogs/task-details-page.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
-#, fuzzy
 msgid "    "
-msgstr "      "
+msgstr "    "
 
 #: calendar/gui/dialogs/alarm-options.glade.h:3
-#, fuzzy
 msgid "<b>Alarm Action</b>"
-msgstr "<b>Kalenderalternativer</b>"
+msgstr "<b>Handling for alarm</b>"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:4
-#, fuzzy
 msgid "<b>Alarm Email</b>"
-msgstr "<b>Utgående e-post:</b>"
+msgstr "<b>E-post ved alarm</b>"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:5
-#, fuzzy
 msgid "<b>Alarm Repeat</b>"
-msgstr "Gjentagelse av alarm"
+msgstr "<b>Gjentagelse av alarm</b>"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:6
-#, fuzzy
 msgid "<b>Alarm Sound</b>"
-msgstr "<b>Kalenderalternativer</b>"
+msgstr "<b>Alarmlyd</b>"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:7
-#, fuzzy
 msgid "<b>Message to Display</b>"
-msgstr "Melding som skal vises:"
+msgstr "<b>Melding som skal vises</b>"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:8
 msgid "Message to Send"
@@ -3789,33 +3840,31 @@ msgstr "minutter"
 
 #: calendar/gui/dialogs/alarm-page.c:798
 msgid "Action/Trigger"
-msgstr ""
+msgstr "Handling/utløser"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:2
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
-#, fuzzy
 msgid "<b>Basics</b>"
-msgstr "<b>Status:</b> "
+msgstr "<b>Grunnleggende</b> "
 
 #: calendar/gui/dialogs/alarm-page.glade.h:3
-#, fuzzy
 msgid "<b>Reminders</b>"
-msgstr "Påminnelser"
+msgstr "<b>Påminnelser</b>"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:4
 #: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "Date/Time:"
 msgstr "Dato/klokke:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:465
+#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:463
 msgid "Display a message"
 msgstr "Vis en melding"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:461
+#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:459
 msgid "Play a sound"
 msgstr "Spill en lyd"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:473
+#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:471
 msgid "Run a program"
 msgstr "Kjør et program"
 
@@ -3826,7 +3875,7 @@ msgstr "Send en melding"
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:9
 #: calendar/gui/e-itip-control.c:933 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:168
+#: calendar/gui/e-tasks.c:167
 msgid "Summary:"
 msgstr "Sammendrag:"
 
@@ -3855,7 +3904,8 @@ msgstr "slutt på avtale"
 msgid "hour(s)"
 msgstr "time(r)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:182
+#: calendar/gui/dialogs/alarm-page.glade.h:16
+#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
 msgid "minute(s)"
 msgstr "minutt(er)"
 
@@ -3884,24 +3934,20 @@ msgid "60 minutes"
 msgstr "60 minutter"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-#, fuzzy
 msgid "<b>Alerts</b>"
-msgstr "<b>Starter:</b> "
+msgstr "<b>Varsel</b> "
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#, fuzzy
 msgid "<b>Task List</b>"
-msgstr "<b>Alternativer for oppgaveliste</b>"
+msgstr "<b>Oppgaveliste</b>"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#, fuzzy
 msgid "<b>Time</b>"
-msgstr "<b>Ferdig:</b> "
+msgstr "<b>Tid</b> "
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#, fuzzy
 msgid "<b>Work Week</b>"
-msgstr "Arbeidsuke"
+msgstr "<b>Arbeidsuke</b>"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Calendar and Tasks Settings"
@@ -4078,6 +4124,153 @@ msgstr "_On."
 msgid "before every appointment"
 msgstr "før hver avtale"
 
+#: calendar/gui/dialogs/calendar-setup.c:155
+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:163
+#, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "Kildelokasjon «%s» er ikke riktig utformet."
+
+#: calendar/gui/dialogs/calendar-setup.c:178
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:213
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:226
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:254
+msgid "Could not create directory for new calendar"
+msgstr "Kunne ikke opprette katalog for ny kalender"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+msgid "Calendar Creation Assistant"
+msgstr "Veiviser for oppretting av kalender"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+msgid "Calendar Properties"
+msgstr "Kalenderegenskaper"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+msgid ""
+"Congratulations, you are finished setting up this calendar.\n"
+"\n"
+"Please click the \"Finish\" button to save the settings you have entered "
+"here."
+msgstr ""
+"Gratulerer. Du har fullført oppsett av denne kalenderen. \n"
+"\n"
+"Vennligst klikk på «Fullfør»-knappen for å lagre innstillingenene du har oppgitt her."
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+msgid ""
+"Congratulations, you are finished setting up this task list.\n"
+"\n"
+"Please click the \"Finish\" button to save the settings you have entered "
+"here."
+msgstr ""
+"Gratulerer. Du har fullført oppsett av denne oppgavelisten. \n"
+"\n"
+"Vennligst klikk på «Fullfør»-knappen for å lagre innstillingenene du har oppgitt her."
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:14
+#: calendar/gui/tasks-component.c:396
+msgid "New Task List"
+msgstr "Ny oppgaveliste"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15
+msgid "Remote"
+msgstr "Ekstern"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#, fuzzy
+msgid ""
+"Specifying a display name and group is the first step in setting up a "
+"calendar."
+msgstr ""
+"Spesifisering av visningsnavn er det siste steget i konfigurasjon av en LDAP-"
+"tjener."
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:19
+#, fuzzy
+msgid ""
+"Specifying a display name and group is the first step in setting up a task "
+"list."
+msgstr ""
+"Spesifisering av visningsnavn er det siste steget i konfigurasjon av en LDAP-"
+"tjener."
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:21
+#, fuzzy
+msgid "Step 2: Remote Folder Parameters"
+msgstr "Steg 1: Karakteristikk for mappe"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:22
+msgid "Task List Creation Assistant"
+msgstr "Veiviser for oppretting av oppgaveliste"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:23
+msgid "Task List Properties"
+msgstr "Egenskaper for oppgaveliste"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:24
+#, fuzzy
+msgid ""
+"This assistant will help you create a new calendar. \n"
+"\n"
+"Depending on the type of calendar you create, additional\n"
+"parameters may be required. Please contact your system\n"
+"administrator if you need help finding this information."
+msgstr ""
+"Denne veiviseren vil hjelpe deg å aksessere katalogtjenester på nettet\n"
+"ved bruk av LDAP-tjenere (Lightweight Directory Access Protocol).\n"
+"\n"
+"For å legge til en LDAP-tjener må du ha spesifikk informasjon\n"
+"om tjeneren. Vennligst kontakt din systemadministrator hvis du trenger\n"
+"hjelp med å finne denne informasjonen."
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:29
+#, fuzzy
+msgid ""
+"This assistant will help you create a new task list.\n"
+"\n"
+"Depending on the type of task list you create, additional\n"
+"parameters may be required. Please contact your system\n"
+"administrator if you need help finding this information."
+msgstr ""
+"Denne veiviseren vil hjelpe deg å aksessere katalogtjenester på nettet\n"
+"ved bruk av LDAP-tjenere (Lightweight Directory Access Protocol).\n"
+"\n"
+"For å legge til en LDAP-tjener må du ha spesifikk informasjon\n"
+"om tjeneren. Vennligst kontakt din systemadministrator hvis du trenger\n"
+"hjelp med å finne denne informasjonen."
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:35
+msgid ""
+"You're creating a folder in a group that's stored in a remote location. This "
+"requires you\n"
+"to specify additional parameters."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:38
+msgid "_Refresh Interval:"
+msgstr "Oppdate_ringsintervall:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:39
+msgid "_Source URL:"
+msgstr "_Kilde-URL:"
+
 #: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
@@ -4184,60 +4377,59 @@ msgstr " (Ferdig "
 msgid "Due "
 msgstr "Ferdig "
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:404
 msgid "Could not update object"
 msgstr "Kunne ikke oppdatere objekt"
 
-#: calendar/gui/dialogs/comp-editor.c:818
-#: calendar/gui/dialogs/comp-editor.c:855
+#: calendar/gui/dialogs/comp-editor.c:870
+#: calendar/gui/dialogs/comp-editor.c:907
 msgid "Edit Appointment"
 msgstr "Rediger avtale"
 
-#: calendar/gui/dialogs/comp-editor.c:823
-#: calendar/gui/dialogs/comp-editor.c:860
+#: calendar/gui/dialogs/comp-editor.c:875
+#: calendar/gui/dialogs/comp-editor.c:912
 #, c-format
 msgid "Appointment - %s"
 msgstr "Avtale - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:826
-#: calendar/gui/dialogs/comp-editor.c:863
+#: calendar/gui/dialogs/comp-editor.c:878
+#: calendar/gui/dialogs/comp-editor.c:915
 #, c-format
 msgid "Task - %s"
 msgstr "Oppgave - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:829
-#: calendar/gui/dialogs/comp-editor.c:866
+#: calendar/gui/dialogs/comp-editor.c:881
+#: calendar/gui/dialogs/comp-editor.c:918
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journaloppføring - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:840
-#: calendar/gui/dialogs/comp-editor.c:876
+#: calendar/gui/dialogs/comp-editor.c:892
+#: calendar/gui/dialogs/comp-editor.c:928
 msgid "No summary"
 msgstr "Ingen sammendrag"
 
-#: calendar/gui/dialogs/comp-editor.c:1313 calendar/gui/e-cal-view.c:992
-#: calendar/gui/e-calendar-table.c:1175 composer/e-msg-composer.c:1138
+#: calendar/gui/dialogs/comp-editor.c:1353 calendar/gui/e-cal-view.c:1046
+#: calendar/gui/e-calendar-table.c:1187 composer/e-msg-composer.c:1128
 msgid "Save as..."
 msgstr "Lagre som..."
 
-#: calendar/gui/dialogs/comp-editor.c:1416
-#: calendar/gui/dialogs/comp-editor.c:1440
-#: calendar/gui/dialogs/comp-editor.c:1466
+#: calendar/gui/dialogs/comp-editor.c:1456
+#: calendar/gui/dialogs/comp-editor.c:1480
+#: calendar/gui/dialogs/comp-editor.c:1506
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Endringer som gjøres i denne oppføringen kan bli forkastet hvis det kommer "
 "enoppdatering"
 
-#: calendar/gui/dialogs/comp-editor.c:1506
-#: calendar/gui/dialogs/comp-editor.c:1515
-msgid "Unable to obtain current version!"
-msgstr "Kan ikke hente versjonsdata!"
+#: calendar/gui/dialogs/comp-editor.c:1562
+msgid "Unable to use current version!"
+msgstr "Kan ikke bruke denne versjonen!"
 
 #: calendar/gui/dialogs/copy-source-dialog.c:142
 #, fuzzy
 msgid "Select destination source"
-msgstr "Velg en målmappe for å importere data"
+msgstr "Velg en målmappe"
 
 #: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
@@ -4314,24 +4506,20 @@ msgid "The item could not be deleted because permission was denied"
 msgstr "Oppføringen kunne ikke slettes fordi tilgang ble nektet"
 
 #: calendar/gui/dialogs/delete-error.c:84
-#, fuzzy
 msgid "The event could not be deleted due to an error"
-msgstr "Hendelsen kunne ikke slettes pga en CORBA-feil"
+msgstr "Hendelsen kunne ikke slettes pga en feil"
 
 #: calendar/gui/dialogs/delete-error.c:87
-#, fuzzy
 msgid "The task could not be deleted due to an error"
-msgstr "Oppgaven kunne ikke slettes pga en CORBA-feil"
+msgstr "Oppgaven kunne ikke slettes pga en feil"
 
 #: calendar/gui/dialogs/delete-error.c:90
-#, fuzzy
 msgid "The journal entry could not be deleted due to an error"
-msgstr "Journaloppføringen kunne ikke slette pga en CORBA-feil"
+msgstr "Journaloppføringen kunne ikke slette pga en feil"
 
 #: calendar/gui/dialogs/delete-error.c:93
-#, fuzzy
 msgid "The item could not be deleted due to an error"
-msgstr "Oppføringen kunne ikke slettes pga en CORBA-feil"
+msgstr "Oppføringen kunne ikke slettes pga en feil"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
 msgid "Addressbook..."
@@ -4386,43 +4574,37 @@ msgid "End time is wrong"
 msgstr "Tid for slutt er feil"
 
 #: calendar/gui/dialogs/event-page.c:1228
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to open the calendar '%s'."
-msgstr "Tilgang nektet ved åpning av kalender"
+msgstr "Kunne ikke åpne kalender «%s»."
 
 #: calendar/gui/dialogs/event-page.glade.h:3
 #: calendar/gui/dialogs/task-page.glade.h:3
-#, fuzzy
 msgid "<b>Classification</b>"
-msgstr "Klassifisering"
+msgstr "<b>Klassifisering</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:4
 #: calendar/gui/dialogs/task-page.glade.h:4
-#, fuzzy
 msgid "<b>Date &amp; Time</b>"
-msgstr "Dato & klokke"
+msgstr "<b>Dato &amp; klokke</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:5
 #: calendar/gui/dialogs/task-page.glade.h:5
-#, fuzzy
 msgid "<b>Description</b>"
-msgstr "Beskrivelse"
+msgstr "<b>Beskrivelse</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#, fuzzy
 msgid "<b>L_ocation</b>"
-msgstr "_Plassering:"
+msgstr "<b>L_okasjon</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
-#, fuzzy
 msgid "<b>Show Time As</b>"
-msgstr "Vis tid som"
+msgstr "<b>Vis tid som</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
 #: calendar/gui/dialogs/task-page.glade.h:6
-#, fuzzy
 msgid "<b>Su_mmary</b>"
-msgstr "<b>Starter:</b> "
+msgstr "<b>Sa_mmendrag</b> "
 
 #: calendar/gui/dialogs/event-page.glade.h:9
 msgid "A_ll day event"
@@ -4438,9 +4620,8 @@ msgid "Ca_tegories..."
 msgstr "Kate_gorier..."
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#, fuzzy
 msgid "Calendar:"
-msgstr "K_alender"
+msgstr "Kalender:"
 
 #: calendar/gui/dialogs/event-page.glade.h:13
 msgid "Co_nfidential"
@@ -4471,8 +4652,8 @@ msgstr "_Start-tid:"
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
 #: calendar/gui/dialogs/meeting-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:593 composer/e-msg-composer.c:2050
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:715
+#: calendar/gui/e-cal-model-tasks.c:593 composer/e-msg-composer.c:2040
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:740
 #: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1783
 #: mail/mail-config.glade.h:80
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:194
@@ -4548,9 +4729,8 @@ msgid "Status"
 msgstr "Status"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#, fuzzy
 msgid "Add A_ttendee"
-msgstr "Deltaker"
+msgstr "Legg til del_taker"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
 #: calendar/gui/e-itip-control.glade.h:9
@@ -4566,44 +4746,6 @@ msgstr "En_dre organisator"
 msgid "_Invite Others..."
 msgstr "_Inviter andre..."
 
-#: calendar/gui/dialogs/new-calendar.c:102
-#: calendar/gui/dialogs/new-task-list.c:46
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr ""
-
-#: calendar/gui/dialogs/new-calendar.c:116
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
-msgstr ""
-
-#: calendar/gui/dialogs/new-calendar.c:125
-#, fuzzy, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "Metoden som er nødvendig for å laste «%s» er ikke støttet"
-
-#: calendar/gui/dialogs/new-calendar.c:138
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr ""
-
-#: calendar/gui/dialogs/new-calendar.c:155
-#, fuzzy
-msgid "Could not create cache for new calendar"
-msgstr "Kan ikke opprette katalog %s: %s"
-
-#: calendar/gui/dialogs/new-calendar.c:174
-#, fuzzy
-msgid "Could not create directory for new calendar"
-msgstr "Kan ikke opprette katalog %s: %s"
-
-#: calendar/gui/dialogs/new-calendar.c:254
-#: calendar/gui/dialogs/new-task-list.c:131
-msgid "A group must be selected"
-msgstr "En gruppe må velges"
-
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
 msgstr "<b>Kalenderalternativer</b>"
@@ -4624,11 +4766,6 @@ msgstr "Kalenderlokasjon"
 msgid "Calendar Name"
 msgstr "Kalendernavn"
 
-#: calendar/gui/dialogs/new-task-list.c:56
-#, fuzzy
-msgid "Could not create directory for new task list"
-msgstr "Kan ikke opprette katalog %s: %s"
-
 #: calendar/gui/dialogs/new-task-list.glade.h:2
 msgid "<b>Task List Options</b>"
 msgstr "<b>Alternativer for oppgaveliste</b>"
@@ -4638,14 +4775,12 @@ msgid "Add New Task List"
 msgstr "Legg til ny oppgaveliste"
 
 #: calendar/gui/dialogs/new-task-list.glade.h:4
-#, fuzzy
 msgid "Task List Group"
-msgstr "Oppgaveliste"
+msgstr "Oppgavelistegruppe"
 
 #: calendar/gui/dialogs/new-task-list.glade.h:5
-#, fuzzy
 msgid "Task List Name"
-msgstr "Oppgaveliste"
+msgstr "Navn på oppgaveliste"
 
 #: calendar/gui/dialogs/recur-comp.c:50
 msgid "You are modifying a recurring event, what would you like to modify?"
@@ -4730,19 +4865,16 @@ msgid "Date/Time"
 msgstr "Dato/klokkeslett"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:3
-#, fuzzy
 msgid "<b>Exceptions</b>"
-msgstr "Unntak"
+msgstr "<b>Unntak</b>"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:4
-#, fuzzy
 msgid "<b>Preview</b>"
-msgstr "Forhåndsvis"
+msgstr "<b>Forhåndsvis</b>"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:5
-#, fuzzy
 msgid "<b>Recurrence Rule</b>"
-msgstr "Regel for gjenintreffelse"
+msgstr "<b>Regel for gjenintreffelse</b>"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:6
 msgid "A_dd"
@@ -4806,7 +4938,7 @@ msgstr ""
 "\n"
 "Vil du lagre endringene?"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1555
+#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1545
 msgid "_Discard Changes"
 msgstr "_Forkast endringer"
 
@@ -4840,58 +4972,56 @@ msgid "% _Complete"
 msgstr "% _fullført"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#, fuzzy
 msgid "<b>Progress</b>"
-msgstr "Fremdrift"
+msgstr "<b>Fremdrift</b>"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#, fuzzy
 msgid "<b>Web Page</b>"
-msgstr "<b>Feltverdi</b>"
+msgstr "<b>Nettside</b>"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:599
-#: calendar/gui/e-calendar-table.c:464 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-calendar-table.c:466 calendar/gui/e-meeting-model.c:289
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:210
+#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:209
 #: calendar/gui/print.c:2316
 msgid "Completed"
 msgstr "Fullført"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:389 calendar/gui/e-tasks.c:231
+#: calendar/gui/e-calendar-table.c:391 calendar/gui/e-tasks.c:230
 #: mail/message-list.c:919
 msgid "High"
 msgstr "Høy"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:597
-#: calendar/gui/e-cal-model-tasks.c:659 calendar/gui/e-calendar-table.c:463
-#: calendar/gui/e-tasks.c:207 calendar/gui/print.c:2313
+#: calendar/gui/e-cal-model-tasks.c:659 calendar/gui/e-calendar-table.c:465
+#: calendar/gui/e-tasks.c:206 calendar/gui/print.c:2313
 msgid "In Progress"
 msgstr "Under arbeid"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:391 calendar/gui/e-tasks.c:235
+#: calendar/gui/e-calendar-table.c:393 calendar/gui/e-tasks.c:234
 #: mail/message-list.c:917
 msgid "Low"
 msgstr "Lav"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:390
-#: calendar/gui/e-tasks.c:233 mail/message-list.c:918
+#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:392
+#: calendar/gui/e-tasks.c:232 mail/message-list.c:918
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
 #: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:595
-#: calendar/gui/e-calendar-table.c:462 calendar/gui/e-tasks.c:217
+#: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:216
 #: calendar/gui/print.c:2310
 msgid "Not Started"
 msgstr "Ikke startet"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:392
+#: calendar/gui/e-calendar-table.c:394
 msgid "Undefined"
 msgstr "Udefinert"
 
@@ -4923,21 +5053,20 @@ msgstr "Ferdigdato er feil"
 
 #: calendar/gui/dialogs/task-page.c:545
 msgid "Due date is before start date!"
-msgstr ""
+msgstr "Ferdigdato er før startdato!"
 
 #: calendar/gui/dialogs/task-page.c:810
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to open tasks in '%s'."
-msgstr "Kunne ikke åpne adresseboken"
+msgstr "Kan ikke åpne oppgaver i «%s»."
 
 #: calendar/gui/dialogs/task-page.glade.h:8
 msgid "Con_fidential"
 msgstr "Ko_nfidensiell"
 
 #: calendar/gui/dialogs/task-page.glade.h:9
-#, fuzzy
 msgid "Folder:"
-msgstr "_Mappe:"
+msgstr "Mappe:"
 
 #: calendar/gui/dialogs/task-page.glade.h:12
 msgid "Sta_rt Date:"
@@ -4947,111 +5076,111 @@ msgstr "Sta_rt dato:"
 msgid "_Due Date:"
 msgstr "Fer_dig-dato:"
 
-#: calendar/gui/e-alarm-list.c:397
+#: calendar/gui/e-alarm-list.c:395
 #, c-format
 msgid "%d days"
 msgstr "%d dager"
 
-#: calendar/gui/e-alarm-list.c:400
+#: calendar/gui/e-alarm-list.c:398
 msgid "1 day"
 msgstr "1 dag"
 
-#: calendar/gui/e-alarm-list.c:405
+#: calendar/gui/e-alarm-list.c:403
 #, c-format
 msgid "%d weeks"
 msgstr "%d uker"
 
-#: calendar/gui/e-alarm-list.c:408
+#: calendar/gui/e-alarm-list.c:406
 msgid "1 week"
 msgstr "1 uke"
 
-#: calendar/gui/e-alarm-list.c:413
+#: calendar/gui/e-alarm-list.c:411
 #, c-format
 msgid "%d hours"
 msgstr "%d timer"
 
-#: calendar/gui/e-alarm-list.c:416
+#: calendar/gui/e-alarm-list.c:414
 msgid "1 hour"
 msgstr "1 time"
 
-#: calendar/gui/e-alarm-list.c:421
+#: calendar/gui/e-alarm-list.c:419
 #, c-format
 msgid "%d minutes"
 msgstr "%d minutter"
 
-#: calendar/gui/e-alarm-list.c:424
+#: calendar/gui/e-alarm-list.c:422
 msgid "1 minute"
 msgstr "1 minutt"
 
-#: calendar/gui/e-alarm-list.c:429
+#: calendar/gui/e-alarm-list.c:427
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekunder"
 
-#: calendar/gui/e-alarm-list.c:432
+#: calendar/gui/e-alarm-list.c:430
 msgid "1 second"
 msgstr "1 sekund"
 
-#: calendar/gui/e-alarm-list.c:469
+#: calendar/gui/e-alarm-list.c:467
 msgid "Send an email"
 msgstr "Send en melding"
 
-#: calendar/gui/e-alarm-list.c:479
+#: calendar/gui/e-alarm-list.c:477
 msgid "Unknown action to be performed"
 msgstr "Ukjent handling som skal utføres"
 
-#: calendar/gui/e-alarm-list.c:491
+#: calendar/gui/e-alarm-list.c:489
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s før avtalen starter"
 
-#: calendar/gui/e-alarm-list.c:494
+#: calendar/gui/e-alarm-list.c:492
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s etter avtalen har startet"
 
-#: calendar/gui/e-alarm-list.c:499
+#: calendar/gui/e-alarm-list.c:497
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s ved avtalens start"
 
-#: calendar/gui/e-alarm-list.c:508
+#: calendar/gui/e-alarm-list.c:506
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s før avtalen slutter"
 
-#: calendar/gui/e-alarm-list.c:511
+#: calendar/gui/e-alarm-list.c:509
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s etter avtalens slutt"
 
-#: calendar/gui/e-alarm-list.c:516
+#: calendar/gui/e-alarm-list.c:514
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s ved avtalens slutt"
 
-#: calendar/gui/e-alarm-list.c:540
+#: calendar/gui/e-alarm-list.c:538
 #, c-format
 msgid "%s at %s"
 msgstr "%s ved %s"
 
-#: calendar/gui/e-alarm-list.c:546
+#: calendar/gui/e-alarm-list.c:544
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s for en ukjent utløsertype"
 
 #: calendar/gui/e-cal-list-view.c:262 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:367
+#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:369
 msgid "Public"
 msgstr "Offentlig"
 
 #: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:292
-#: calendar/gui/e-calendar-table.c:368
+#: calendar/gui/e-calendar-table.c:370
 msgid "Private"
 msgstr "Privat"
 
 #: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:294
-#: calendar/gui/e-calendar-table.c:369
+#: calendar/gui/e-calendar-table.c:371
 msgid "Confidential"
 msgstr "Konfidensiell"
 
@@ -5084,11 +5213,11 @@ msgstr "farge"
 msgid "component"
 msgstr "komponent"
 
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:441
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:443
 msgid "Free"
 msgstr "Ledig"
 
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:442
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:444
 #: calendar/gui/e-meeting-time-sel.c:399
 msgid "Busy"
 msgstr "Opptatt"
@@ -5157,178 +5286,171 @@ msgstr "Gjeninntreffer"
 msgid "Assigned"
 msgstr "Tildelt"
 
-#: calendar/gui/e-cal-view.c:626 calendar/gui/e-calendar-table.c:686
+#: calendar/gui/e-cal-view.c:680 calendar/gui/e-calendar-table.c:698
 msgid "Deleting selected objects"
 msgstr "Sletter valgte objekter"
 
-#: calendar/gui/e-cal-view.c:730 calendar/gui/e-calendar-table.c:847
+#: calendar/gui/e-cal-view.c:784 calendar/gui/e-calendar-table.c:859
 msgid "Updating objects"
 msgstr "Oppdaterer objekter"
 
-#: calendar/gui/e-cal-view.c:1190 calendar/gui/e-cal-view.c:1275
+#: calendar/gui/e-cal-view.c:1244 calendar/gui/e-cal-view.c:1329
 msgid "New _Appointment..."
 msgstr "Ny _avtale..."
 
-#: calendar/gui/e-cal-view.c:1191 calendar/gui/e-cal-view.c:1277
+#: calendar/gui/e-cal-view.c:1245 calendar/gui/e-cal-view.c:1331
 msgid "New All Day _Event"
 msgstr "Ny avtale som varer h_ele dagen"
 
-#: calendar/gui/e-cal-view.c:1192 calendar/gui/e-cal-view.c:1279
+#: calendar/gui/e-cal-view.c:1246 calendar/gui/e-cal-view.c:1333
 msgid "New Meeting"
 msgstr "Nytt møte"
 
-#: calendar/gui/e-cal-view.c:1193 calendar/gui/e-cal-view.c:1281
+#: calendar/gui/e-cal-view.c:1247 calendar/gui/e-cal-view.c:1335
 msgid "New Task"
 msgstr "Ny oppgave"
 
-#: calendar/gui/e-cal-view.c:1197 calendar/gui/e-cal-view.c:1220
-#: calendar/gui/e-cal-view.c:1287 calendar/gui/e-calendar-table.c:1026
-#: calendar/gui/e-calendar-table.c:1068 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-cal-view.c:1251 calendar/gui/e-cal-view.c:1274
+#: calendar/gui/e-cal-view.c:1341 calendar/gui/e-calendar-table.c:1038
+#: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
-#: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
+#: ui/evolution-tasks.xml.h:23 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "S_kriv ut..."
 
-#: calendar/gui/e-cal-view.c:1201 calendar/gui/e-cal-view.c:1227
-#: calendar/gui/e-cal-view.c:1285 calendar/gui/e-calendar-table.c:1032
-#: calendar/gui/e-calendar-table.c:1066 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-cal-view.c:1255 calendar/gui/e-cal-view.c:1281
+#: calendar/gui/e-cal-view.c:1339 calendar/gui/e-calendar-table.c:1044
+#: calendar/gui/e-calendar-table.c:1078 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:20
+#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:22
 msgid "_Paste"
 msgstr "_Lim inn"
 
-#: calendar/gui/e-cal-view.c:1207 calendar/gui/e-cal-view.c:1271
+#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1325
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr "Gå _til i dag"
 
-#: calendar/gui/e-cal-view.c:1208 calendar/gui/e-cal-view.c:1273
+#: calendar/gui/e-cal-view.c:1262 calendar/gui/e-cal-view.c:1327
 msgid "_Go to Date..."
 msgstr "_Gå til dato..."
 
-#: calendar/gui/e-cal-view.c:1212 ui/evolution-calendar.xml.h:40
+#: calendar/gui/e-cal-view.c:1266 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "_Publiser ledig/opptatt-informasjon"
 
-#: calendar/gui/e-cal-view.c:1218 calendar/gui/e-cal-view.c:1283
-#: calendar/gui/e-calendar-table.c:1023 calendar/gui/e-calendar-table.c:1064
-#: mail/em-folder-view.c:681 shell/e-shortcuts-view.c:422
-#: ui/evolution-addressbook.xml.h:37
-msgid "_Open"
-msgstr "_Åpne"
-
-#: calendar/gui/e-cal-view.c:1219 calendar/gui/e-cal-view.c:1289
-#: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1070
-#: mail/em-folder-view.c:683 mail/em-popup.c:597 mail/em-popup.c:712
+#: calendar/gui/e-cal-view.c:1273 calendar/gui/e-cal-view.c:1343
+#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1082
+#: mail/em-folder-view.c:708 mail/em-popup.c:597 mail/em-popup.c:712
 #: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "Lagre _som..."
 
-#: calendar/gui/e-cal-view.c:1225 calendar/gui/e-cal-view.c:1265
-#: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1059
+#: calendar/gui/e-cal-view.c:1279 calendar/gui/e-cal-view.c:1319
+#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1071
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Kli_pp ut"
 
-#: calendar/gui/e-cal-view.c:1226 calendar/gui/e-cal-view.c:1263
-#: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-cal-view.c:1280 calendar/gui/e-cal-view.c:1317
+#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1069
 #: mail/em-folder-tree.c:1497 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:17
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
 msgid "_Copy"
 msgstr "_Kopier"
 
-#: calendar/gui/e-cal-view.c:1231
+#: calendar/gui/e-cal-view.c:1285
 msgid "_Schedule Meeting..."
 msgstr "_Sett opp møte..."
 
-#: calendar/gui/e-cal-view.c:1232
+#: calendar/gui/e-cal-view.c:1286
 msgid "_Forward as iCalendar..."
 msgstr "_Videresend som iCalendar..."
 
-#: calendar/gui/e-cal-view.c:1237 calendar/gui/e-cal-view.c:1268
+#: calendar/gui/e-cal-view.c:1291 calendar/gui/e-cal-view.c:1322
 msgid "Delete this _Occurrence"
 msgstr "Slett denne _hendelsen"
 
-#: calendar/gui/e-cal-view.c:1238 calendar/gui/e-cal-view.c:1269
+#: calendar/gui/e-cal-view.c:1292 calendar/gui/e-cal-view.c:1323
 msgid "Delete _All Occurrences"
 msgstr "Slett _alle hendelser"
 
-#: calendar/gui/e-cal-view.c:1291 ui/evolution.xml.h:30
+#: calendar/gui/e-cal-view.c:1345 ui/evolution.xml.h:30
 msgid "_Settings..."
 msgstr "Inn_stillinger..."
 
-#: calendar/gui/e-calendar-table.c:411
+#: calendar/gui/e-calendar-table.c:413
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:412
+#: calendar/gui/e-calendar-table.c:414
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:413
+#: calendar/gui/e-calendar-table.c:415
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:414
+#: calendar/gui/e-calendar-table.c:416
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:415
+#: calendar/gui/e-calendar-table.c:417
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:416
+#: calendar/gui/e-calendar-table.c:418
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:417
+#: calendar/gui/e-calendar-table.c:419
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:418
+#: calendar/gui/e-calendar-table.c:420
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:419
+#: calendar/gui/e-calendar-table.c:421
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:420
+#: calendar/gui/e-calendar-table.c:422
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:421
+#: calendar/gui/e-calendar-table.c:423
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:1024
+#: calendar/gui/e-calendar-table.c:1036
 msgid "Open _Web Page"
 msgstr "_Åpne nettside"
 
-#: calendar/gui/e-calendar-table.c:1036
+#: calendar/gui/e-calendar-table.c:1048
 msgid "_Assign Task"
 msgstr "Tildel oppg_ave"
 
-#: calendar/gui/e-calendar-table.c:1037
+#: calendar/gui/e-calendar-table.c:1049
 msgid "_Forward as iCalendar"
 msgstr "_Videresend som iCalendar"
 
-#: calendar/gui/e-calendar-table.c:1038
+#: calendar/gui/e-calendar-table.c:1050
 msgid "_Mark as Complete"
 msgstr "_Merk som fullført"
 
-#: calendar/gui/e-calendar-table.c:1039
+#: calendar/gui/e-calendar-table.c:1051
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Merk valgte oppgaver som fullført"
 
-#: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1062
+#: calendar/gui/e-calendar-table.c:1056 calendar/gui/e-calendar-table.c:1074
 msgid "_Delete Selected Tasks"
 msgstr "Sle_tt valgte oppgaver"
 
-#: calendar/gui/e-calendar-table.c:1355
+#: calendar/gui/e-calendar-table.c:1367
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Klikk for å legge til en oppgave"
@@ -5343,7 +5465,7 @@ msgid "Alarms"
 msgstr "Alarmer"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:576
+#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:578
 msgid "Complete"
 msgstr "Fullført"
 
@@ -5401,26 +5523,26 @@ msgstr "%02i minutters oppdeling"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1342
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1348
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1532
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1375
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1381
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:596 calendar/gui/e-week-view.c:325
+#: calendar/gui/e-day-view.c:602 calendar/gui/e-week-view.c:334
 #: calendar/gui/print.c:818
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:599 calendar/gui/e-week-view.c:328
+#: calendar/gui/e-day-view.c:605 calendar/gui/e-week-view.c:337
 #: calendar/gui/print.c:820
 msgid "pm"
 msgstr "pm"
@@ -5545,7 +5667,7 @@ msgid "Location:"
 msgstr "Plassering:"
 
 #. write status
-#: calendar/gui/e-itip-control.c:956 calendar/gui/e-tasks.c:203
+#: calendar/gui/e-itip-control.c:956 calendar/gui/e-tasks.c:202
 msgid "Status:"
 msgstr "Status:"
 
@@ -5569,7 +5691,7 @@ msgid "Declined"
 msgstr "Avslått"
 
 #: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6
-#: calendar/gui/e-tasks.c:247 composer/e-msg-composer-attachment.glade.h:3
+#: calendar/gui/e-tasks.c:246 composer/e-msg-composer-attachment.glade.h:3
 #: mail/mail-config.glade.h:45
 msgid "Description:"
 msgstr "Beskrivelse:"
@@ -5587,7 +5709,7 @@ msgstr "Oppdater"
 #: calendar/gui/e-itip-control.c:1030 calendar/gui/e-itip-control.c:1061
 #: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1097
 #: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1123
-#: shell/e-shell.c:1002 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1000 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
@@ -5616,8 +5738,8 @@ msgid "Send Latest Information"
 msgstr "Send siste informasjon"
 
 #: calendar/gui/e-itip-control.c:1122 calendar/gui/itip-utils.c:438
-#: mail/mail-send-recv.c:386 mail/mail-send-recv.c:438
-#: shell/e-shell-startup-wizard.c:788 ui/evolution-mail-global.xml.h:1
+#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
+#: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -6069,81 +6191,79 @@ msgstr "Tid for møtets _start:"
 msgid "Meeting _end time:"
 msgstr "Tid for møtets slutt:"
 
-#: calendar/gui/e-tasks.c:181
+#: calendar/gui/e-tasks.c:180
 msgid "Start Date:"
 msgstr "Startdato:"
 
-#: calendar/gui/e-tasks.c:197
+#: calendar/gui/e-tasks.c:196
 msgid "Due Date:"
 msgstr "Ferdig-dato:"
 
 #. write priority
-#: calendar/gui/e-tasks.c:225
+#: calendar/gui/e-tasks.c:224
 msgid "Priority:"
 msgstr "Prioritet:"
 
 #. URL
-#: calendar/gui/e-tasks.c:281
+#: calendar/gui/e-tasks.c:280
 msgid "Web Page:"
 msgstr "Nettside:"
 
-#: calendar/gui/e-tasks.c:710 calendar/gui/tasks-control.c:200
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "Kunne ikke laste oppgavene i «%s»"
-
-#: calendar/gui/e-tasks.c:725
+#: calendar/gui/e-tasks.c:730 calendar/gui/gnome-cal.c:1890
 #, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr "Metoden som er nødvendig for å laste «%s» er ikke støttet"
+msgid ""
+"Error on %s:\n"
+" %s"
+msgstr ""
+"Feil på «%s»:\n"
+" %s"
 
-#: calendar/gui/e-tasks.c:739 calendar/gui/gnome-cal.c:1765
+#: calendar/gui/e-tasks.c:793
 #, c-format
-msgid "You don't have permission to open the folder in `%s'"
-msgstr "Du har ikke rettigheter til å åpne mappen i «%s»"
+msgid "Opening tasks at %s"
+msgstr "Åpner oppgaver på %s"
 
-#: calendar/gui/e-tasks.c:800 calendar/gui/gnome-cal.c:1978
+#: calendar/gui/e-tasks.c:808
 #, c-format
 msgid ""
-"Error on %s:\n"
-" %s"
+"Error opening %s:\n"
+"%s"
 msgstr ""
-"Feil på «%s»:\n"
+"Feil under åpning av «%s»:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:958
+#: calendar/gui/e-tasks.c:825
+msgid "Loading tasks"
+msgstr "Laster oppgaver"
+
+#: calendar/gui/e-tasks.c:918
 msgid "Completing tasks..."
 msgstr "Fullfører oppgaver..."
 
-#: calendar/gui/e-tasks.c:981
+#: calendar/gui/e-tasks.c:941
 msgid "Deleting selected objects..."
 msgstr "Sletter valgte objekter..."
 
-#: calendar/gui/e-tasks.c:1006
+#: calendar/gui/e-tasks.c:966
 msgid "Expunging"
 msgstr "Tømmer"
 
-#: calendar/gui/gnome-cal.c:1604 mail/importers/netscape-importer.c:1843
+#: calendar/gui/gnome-cal.c:1607 mail/importers/netscape-importer.c:1843
 #: shell/e-shortcuts.c:1086
 msgid "Calendar"
 msgstr "Kalender"
 
-#: calendar/gui/gnome-cal.c:1737
+#: calendar/gui/gnome-cal.c:1755
 #, c-format
-msgid "Could not open the folder in `%s'"
-msgstr "Kunne ikke åpne mappen i «%s»"
+msgid "Opening %s"
+msgstr "Åpner %s"
 
-#: calendar/gui/gnome-cal.c:1751
+#: calendar/gui/gnome-cal.c:1766
 #, c-format
-msgid "The method required to open `%s' is not supported"
-msgstr "Metoden som er nødvendig for å åpne «%s» er ikke støttet"
-
-#: calendar/gui/gnome-cal.c:1808
-#, fuzzy, c-format
-msgid "Adding %s"
-msgstr "Sender «%s»"
+msgid "Could not open '%s': %s"
+msgstr "Kunne ikke åpne «%s»: %s"
 
-#: calendar/gui/gnome-cal.c:1999
+#: calendar/gui/gnome-cal.c:1911
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6151,7 +6271,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2007
+#: calendar/gui/gnome-cal.c:1919
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6159,7 +6279,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2867
+#: calendar/gui/gnome-cal.c:2798
 msgid "Purging"
 msgstr "Sletter"
 
@@ -6492,7 +6612,7 @@ msgid "Contacts: "
 msgstr "Kontakter: "
 
 #: calendar/gui/print.c:2530 calendar/gui/print.c:2616
-#: calendar/gui/tasks-control.c:567 mail/em-format-html-print.c:147
+#: calendar/gui/tasks-control.c:583 mail/em-format-html-print.c:147
 msgid "Print Preview"
 msgstr "Forhåndsvisning av utskrift"
 
@@ -6507,57 +6627,51 @@ msgstr "Skriveroppsett"
 #: calendar/gui/tasks-component.c:350
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
-msgstr ""
-
-#: calendar/gui/tasks-component.c:391
-msgid "Rename this task list to"
-msgstr "Gi nytt navn til denne oppgavelisten"
+msgstr "Oppgaveliste «%s» vil bli fjernet. Er du sikker på at du vil fortsette?"
 
-#: calendar/gui/tasks-component.c:412
-msgid "New Task List"
-msgstr "Ny oppgaveliste"
-
-#: calendar/gui/tasks-component.c:587
+#: calendar/gui/tasks-component.c:623
 msgid "New task"
 msgstr "Ny oppgave"
 
-#: calendar/gui/tasks-component.c:588
+#: calendar/gui/tasks-component.c:624
 msgid "_Task"
 msgstr "_Oppgave"
 
-#: calendar/gui/tasks-component.c:589
+#: calendar/gui/tasks-component.c:625
 msgid "Create a new task"
 msgstr "Opprett en ny oppgave"
 
-#: calendar/gui/tasks-component.c:594
-#, fuzzy
+#: calendar/gui/tasks-component.c:630
 msgid "New task list"
 msgstr "Ny oppgaveliste"
 
-#: calendar/gui/tasks-component.c:595
-#, fuzzy
+#: calendar/gui/tasks-component.c:631
 msgid "_Task List"
-msgstr "Oppgaveliste"
+msgstr "_Oppgaveliste"
 
-#: calendar/gui/tasks-component.c:596
-#, fuzzy
+#: calendar/gui/tasks-component.c:632
 msgid "Create a new task list"
-msgstr "Opprett en ny oppgave"
+msgstr "Opprett en ny oppgaveliste"
 
-#: calendar/gui/tasks-component.c:663
+#: calendar/gui/tasks-component.c:699
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:676
+#: calendar/gui/tasks-component.c:712
 msgid "There is no calendar available for creating tasks"
-msgstr ""
+msgstr "Ingen kalender tilgjengelig for opppretting av oppgaver"
 
-#: calendar/gui/tasks-control.c:148
+#: calendar/gui/tasks-control.c:151
 msgid "The URI of the tasks folder to display"
 msgstr "URIen til oppgavemappen skal vises"
 
-#: calendar/gui/tasks-control.c:450
+#: calendar/gui/tasks-control.c:203
+#, c-format
+msgid "Could not load the tasks in `%s'"
+msgstr "Kunne ikke laste oppgavene i «%s»"
+
+#: calendar/gui/tasks-control.c:466
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6569,11 +6683,11 @@ msgstr ""
 "\n"
 "Vil du virkelig slette disse oppgavene?"
 
-#: calendar/gui/tasks-control.c:454
+#: calendar/gui/tasks-control.c:470
 msgid "Do not ask me again."
 msgstr "Ikke spør meg igjen."
 
-#: calendar/gui/tasks-control.c:596
+#: calendar/gui/tasks-control.c:612
 msgid "Print Tasks"
 msgstr "Skriv ut oppgaver"
 
@@ -8209,11 +8323,15 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr "Re-synkroniserer med tjener"
 
-#: camel/camel-disco-folder.c:90
+#: camel/camel-disco-folder.c:41
+msgid "Copy folder content locally for offline operation"
+msgstr "Kopier mappeinnhold lokalt for frakoblet operasjon"
+
+#: camel/camel-disco-folder.c:101
 msgid "Downloading new messages for offline mode"
-msgstr ""
+msgstr "Laster ned nye meldinger for frakoblet modus"
 
-#: camel/camel-disco-folder.c:351
+#: camel/camel-disco-folder.c:441
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Forbereder mappe «%s» på frakobling"
@@ -8390,7 +8508,7 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:778 camel/camel-gpg-context.c:1268
 #: camel/camel-gpg-context.c:1427 camel/camel-gpg-context.c:1507
-#: camel/camel-gpg-context.c:1614 mail/mail-send-recv.c:572
+#: camel/camel-gpg-context.c:1614 mail/mail-send-recv.c:574
 msgid "Cancelled."
 msgstr "Avbrutt"
 
@@ -8452,11 +8570,8 @@ msgstr "Dette er en digitalt signert meldingsdel"
 #: camel/camel-gpg-context.c:1386 camel/camel-gpg-context.c:1395
 #: camel/camel-smime-context.c:708 camel/camel-smime-context.c:719
 #: camel/camel-smime-context.c:726
-#, fuzzy
 msgid "Cannot verify message signature: Incorrect message format"
-msgstr ""
-"Kunne ikke verifisere meldingens signatur: kunne ikke opprette midlertidig "
-"fil: %s"
+msgstr "Kunne ikke verifisere meldingens signatur: Ugyldig meldingsformat"
 
 #: camel/camel-gpg-context.c:1402
 #, c-format
@@ -8753,7 +8868,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:1217
+#: camel/providers/imap/camel-imap-store.c:1221
 msgid "Bad authentication response from server."
 msgstr "Ugyldig svar på autentisering fra tjener."
 
@@ -8971,11 +9086,11 @@ msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Kan ikke opprette mappe: Ugyldig operasjon på dette lageret"
 
 #: camel/camel-store.c:791 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1119
+#: mail/mail-ops.c:1098
 msgid "Trash"
 msgstr "Papirkurv"
 
-#: camel/camel-store.c:793 mail/mail-ops.c:1125
+#: camel/camel-store.c:793 mail/mail-ops.c:1104
 #: ui/evolution-mail-message.xml.h:46
 msgid "Junk"
 msgstr "Søppel"
@@ -9231,15 +9346,58 @@ msgstr "Kan ikke endre navn på mappe: %s: Ugyldig operasjon"
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kan ikke endre navn på mappe: %s: Ingen slik mappe"
 
+#: camel/providers/groupwise/camel-groupwise-provider.c:53
+#: camel/providers/imap/camel-imap-provider.c:50
+msgid "Checking for new mail"
+msgstr "Ser etter nye meldinger"
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:55
+#: camel/providers/imap/camel-imap-provider.c:52
+msgid "Check for new messages in all folders"
+msgstr "Se etter nye meldinger i alle mapper"
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:71
+msgid "Apply filters to new messages in Inbox on this server"
+msgstr "Bruk filtre for nye meldinger i Innboks på denne tjeneren"
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:74
+#: camel/providers/imap/camel-imap-provider.c:66
+msgid "Automatically synchronize remote mail locally"
+msgstr "Synkroniser eksterne meldinger med lokale meldinger automatisk"
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:82
+msgid "Novell GroupWise"
+msgstr "Novell GroupWise"
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:84
+msgid "For accesing Novell Groupwise servers"
+msgstr "For å aksessere Novel GroupWise-tjenere"
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:99
+#: camel/providers/imap/camel-imap-provider.c:89
+#: camel/providers/imapp/camel-imapp-provider.c:65
+#: camel/providers/nntp/camel-nntp-store.c:265
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
+msgid "Password"
+msgstr "Passord"
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:101
+#: camel/providers/imap/camel-imap-provider.c:91
+#: camel/providers/imapp/camel-imapp-provider.c:67
+msgid "This option will connect to the IMAP server using a plaintext password."
+msgstr ""
+"Dette valget vil la deg koble til en IMAP-tjener ved å bruke et klartekst-"
+"passord."
+
 #: camel/providers/imap/camel-imap-command.c:221
 #: camel/providers/imap/camel-imap-command.c:260
 #: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2817
+#: camel/providers/imap/camel-imap-store.c:2821
 msgid "Operation cancelled"
 msgstr "Operasjon avbrutt"
 
 #: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2820
+#: camel/providers/imap/camel-imap-store.c:2824
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Tjener koblet fra uventet: %s"
@@ -9288,21 +9446,21 @@ msgstr "Kan ikke opprette katalog %s: %s"
 msgid "Could not load summary for %s"
 msgstr "Kunne ikke laste sammendrag for %s"
 
-#: camel/providers/imap/camel-imap-folder.c:308
+#: camel/providers/imap/camel-imap-folder.c:314
 msgid "Folder was destroyed and recreated on server."
 msgstr "Mappen ble ødelagt og laget på nytt på tjeneren."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:550
+#: camel/providers/imap/camel-imap-folder.c:560
 msgid "Scanning for changed messages"
 msgstr "Søker etter endrede meldinger"
 
-#: camel/providers/imap/camel-imap-folder.c:1886
+#: camel/providers/imap/camel-imap-folder.c:1896
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Kan ikke hente melding: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1923
+#: camel/providers/imap/camel-imap-folder.c:1933
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -9318,24 +9476,24 @@ msgstr ""
 "Kan ikke hente melding: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1923
+#: camel/providers/imap/camel-imap-folder.c:1933
 #: 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:1946
-#: camel/providers/imap/camel-imap-folder.c:2542
+#: camel/providers/imap/camel-imap-folder.c:1956
+#: camel/providers/imap/camel-imap-folder.c:2552
 msgid "This message is not currently available"
 msgstr "Denne meldingen er ikke tilgjengelig"
 
-#: camel/providers/imap/camel-imap-folder.c:2206
-#: camel/providers/imap/camel-imap-folder.c:2276
+#: camel/providers/imap/camel-imap-folder.c:2216
+#: camel/providers/imap/camel-imap-folder.c:2286
 msgid "Fetching summary information for new messages"
 msgstr "Henter sammendragsinformasjon for nye meldinger"
 
-#: camel/providers/imap/camel-imap-folder.c:2580
+#: camel/providers/imap/camel-imap-folder.c:2590
 msgid "Could not find message body in FETCH response."
 msgstr "Kunne ikke finne meldingskropp i FETCH-svar."
 
@@ -9362,22 +9520,13 @@ msgid "Connection to Server"
 msgstr "Tilkobling til tjener"
 
 #: camel/providers/imap/camel-imap-provider.c:45
-#, fuzzy
 msgid "Use custom command to connect to server"
-msgstr "Kunne ikke koble til LDAP-tjener"
+msgstr "Bruk egendefinert kommando for å koble til tjener"
 
 #: camel/providers/imap/camel-imap-provider.c:47
 msgid "Command:"
 msgstr "Kommando:"
 
-#: camel/providers/imap/camel-imap-provider.c:50
-msgid "Checking for new mail"
-msgstr "Ser etter nye meldinger"
-
-#: camel/providers/imap/camel-imap-provider.c:52
-msgid "Check for new messages in all folders"
-msgstr "Se etter nye meldinger i alle mapper"
-
 #: camel/providers/imap/camel-imap-provider.c:55
 msgid "Folders"
 msgstr "Mapper"
@@ -9398,10 +9547,6 @@ msgstr "Navneområde"
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Bruk filtre for nye meldinger i INNBOKS på denne tjeneren"
 
-#: camel/providers/imap/camel-imap-provider.c:66
-msgid "Automatically synchronize remote mail locally"
-msgstr "Synkroniser eksterne meldinger med lokale meldinger automatisk"
-
 #: camel/providers/imap/camel-imap-provider.c:72
 msgid "IMAP"
 msgstr "IMAP"
@@ -9410,20 +9555,6 @@ 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-provider.c:89
-#: camel/providers/imapp/camel-imapp-provider.c:65
-#: camel/providers/nntp/camel-nntp-store.c:265
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
-msgid "Password"
-msgstr "Passord"
-
-#: camel/providers/imap/camel-imap-provider.c:91
-#: camel/providers/imapp/camel-imapp-provider.c:67
-msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr ""
-"Dette valget vil la deg koble til en IMAP-tjener ved å bruke et klartekst-"
-"passord."
-
 #: camel/providers/imap/camel-imap-store.c:459
 #, c-format
 msgid "IMAP server %s"
@@ -9481,28 +9612,28 @@ msgstr "SSL-forhandling feilet"
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Kunne ikke koble til med kommando «%s»: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1247
+#: camel/providers/imap/camel-imap-store.c:1251
 #, 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:1257
+#: camel/providers/imap/camel-imap-store.c:1261
 #: 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:1280
+#: camel/providers/imap/camel-imap-store.c:1284
 #: camel/providers/imapp/camel-imapp-store.c:349
 #, 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:1294
+#: camel/providers/imap/camel-imap-store.c:1298
 msgid "You didn't enter a password."
 msgstr "Du skrev ikke inn et passord."
 
-#: camel/providers/imap/camel-imap-store.c:1323
+#: camel/providers/imap/camel-imap-store.c:1327
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9513,24 +9644,24 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1670
-#: camel/providers/imap/camel-imap-store.c:1812
+#: camel/providers/imap/camel-imap-store.c:1674
+#: camel/providers/imap/camel-imap-store.c:1816
 #, c-format
 msgid "No such folder %s"
 msgstr "Mappen %s eksisterer ikke"
 
-#: camel/providers/imap/camel-imap-store.c:2013
+#: camel/providers/imap/camel-imap-store.c:2017
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "Mappenavn «%s» er ugyldig fordi det inneholder tegnet «%c»"
 
-#: camel/providers/imap/camel-imap-store.c:2025
+#: camel/providers/imap/camel-imap-store.c:2029
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Ukjent opphavsmappe: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2061
+#: camel/providers/imap/camel-imap-store.c:2065
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Opphavsmappen tillates ikke å ha undermapper"
 
@@ -9686,9 +9817,9 @@ msgstr "Kunne ikke slette indeksfil for mappe «%s»: %s"
 
 #: camel/providers/local/camel-local-store.c:421
 #: camel/providers/local/camel-mbox-store.c:295
-#, fuzzy, c-format
+#, c-format
 msgid "Could not delete folder meta file `%s': %s"
-msgstr "Kunne ikke slette sammendragsfil for mappe «%s»: %s"
+msgstr "Kunne ikke slette metadatafil for mappe «%s»: %s"
 
 #: camel/providers/local/camel-local-summary.c:398
 #, c-format
@@ -10067,7 +10198,7 @@ msgstr "Vennligst oppgi NNTP-passord for %s@%s"
 
 #: camel/providers/nntp/camel-nntp-auth.c:64
 msgid "Server rejected username"
-msgstr ""
+msgstr "Tjener godtok ikke brukernavn"
 
 #: camel/providers/nntp/camel-nntp-auth.c:70
 msgid "Failed to send username to server"
@@ -10080,7 +10211,7 @@ msgstr "Tjener avviste brukernavn/passord"
 #: camel/providers/nntp/camel-nntp-folder.c:114
 #, c-format
 msgid "Internal error: uid in invalid format: %s"
-msgstr ""
+msgstr "Intern feil: uid i ugyldig format: %s"
 
 #: camel/providers/nntp/camel-nntp-folder.c:155
 #: camel/providers/nntp/camel-nntp-folder.c:161
@@ -10101,24 +10232,19 @@ msgid "User cancelled"
 msgstr "Bruker avbrøt"
 
 #: camel/providers/nntp/camel-nntp-grouplist.c:45
-#, fuzzy
 msgid "Could not get group list from server."
-msgstr "Kunne ikke hente gruppe: %s"
+msgstr "Kunne ikke hente gruppeliste fra tjener."
 
 #: camel/providers/nntp/camel-nntp-grouplist.c:98
 #: camel/providers/nntp/camel-nntp-grouplist.c:107
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to load grouplist file for %s: %s"
-msgstr ""
-"Kunne ikke opprette utdatafil: %s\n"
-" %s"
+msgstr "Kunne ikke laste gruppelistefil for %s: %s"
 
 #: camel/providers/nntp/camel-nntp-grouplist.c:158
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to save grouplist file for %s: %s"
-msgstr ""
-"Kunne ikke opprette utdatafil: %s\n"
-" %s"
+msgstr "Kunne ikke lagre gruppelistefil for %s: %s"
 
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
@@ -10540,7 +10666,7 @@ msgstr "SMTP e-postlevering via %s"
 msgid "Cannot send message: sender address not valid."
 msgstr "Kan ikke sende melding: senderadresse ikke gyldig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:632
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:611
 msgid "Sending message"
 msgstr "Sender melding"
 
@@ -10779,27 +10905,26 @@ msgid "Posting destination"
 msgstr "Destinasjon for post"
 
 #: composer/e-msg-composer-hdrs.c:548
-#, fuzzy
 msgid "Choose a folder to post the message to."
-msgstr "Legg en fil ved meldingen"
+msgstr "Velg en mappe å poste meldingen til."
 
 #: composer/e-msg-composer-select-file.c:119
 msgid "Attach file(s)"
 msgstr "Legg ved fil(er)"
 
-#: composer/e-msg-composer.c:651
+#: composer/e-msg-composer.c:654
 #, fuzzy
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for from account"
 msgstr "_Alltid signer utgående meldinger når denne kontoen brukes"
 
-#: composer/e-msg-composer.c:657
+#: composer/e-msg-composer.c:660
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
 msgstr ""
 
-#: composer/e-msg-composer.c:788
+#: composer/e-msg-composer.c:791
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10808,30 +10933,30 @@ msgstr ""
 "Feil under lesing av fil %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1153
+#: composer/e-msg-composer.c:1143
 msgid "File exists, overwrite?"
 msgstr "Filen eksisterer, overskriv?"
 
-#: composer/e-msg-composer.c:1164 composer/e-msg-composer.c:1180
+#: composer/e-msg-composer.c:1154 composer/e-msg-composer.c:1170
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Feil under lagring av fil: %s"
 
-#: composer/e-msg-composer.c:1204
+#: composer/e-msg-composer.c:1194
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Feil under lasting av fil: %s"
 
-#: composer/e-msg-composer.c:1242
+#: composer/e-msg-composer.c:1232
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Feil under tilgang til fil: %s"
 
-#: composer/e-msg-composer.c:1250
+#: composer/e-msg-composer.c:1240
 msgid "Unable to retrieve message from editor"
 msgstr "Kunne ikke hente melding fra editor"
 
-#: composer/e-msg-composer.c:1257
+#: composer/e-msg-composer.c:1247
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10840,7 +10965,7 @@ msgstr ""
 "Kunne ikke søke i fil: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1264
+#: composer/e-msg-composer.c:1254
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10849,7 +10974,7 @@ msgstr ""
 "Kunne ikke kutte av fil: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1273
+#: composer/e-msg-composer.c:1263
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10858,7 +10983,7 @@ msgstr ""
 "Kunne ikke kopiere fildeskriptor: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1282
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10867,15 +10992,15 @@ msgstr ""
 "Feil under autolagring av av melding: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1386
+#: composer/e-msg-composer.c:1376
 msgid ""
-"Ximian Evolution has found unsaved files from a previous session.\n"
+"Ximian Evolution has found unsaved messages from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 "Ximian Evolution har funnet ikke-lagrede filer fra en tidligere sesjon.\n"
-"Vil du prøve å gjenopprette dem?"
+"Vil du gjenopprette dem?"
 
-#: composer/e-msg-composer.c:1550
+#: composer/e-msg-composer.c:1540
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10886,28 +11011,43 @@ msgstr ""
 "\n"
 "Vil du lagre endringene?"
 
-#: composer/e-msg-composer.c:1559
+#: composer/e-msg-composer.c:1549
 msgid "Warning: Modified Message"
 msgstr "Advarsel: Endret melding"
 
-#: composer/e-msg-composer.c:1592
+#: composer/e-msg-composer.c:1582
 msgid "Open file"
 msgstr "Åpne fil"
 
-#: composer/e-msg-composer.c:2011
+#: composer/e-msg-composer.c:2001
 msgid "Signature:"
 msgstr "Signatur:"
 
-#: composer/e-msg-composer.c:2051 mail/mail-account-gui.c:1260
+#: composer/e-msg-composer.c:2041 mail/mail-account-gui.c:1260
 msgid "Autogenerated"
 msgstr "Generert automatisk"
 
-#: composer/e-msg-composer.c:2231 composer/e-msg-composer.c:2929
-#: composer/e-msg-composer.c:2930
+#: composer/e-msg-composer.c:2203
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] ""
+msgstr[1] ""
+
+#: composer/e-msg-composer.c:2232
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr "Skjul _vedleggsfeltet (slipp vedlegg her)"
+
+#: composer/e-msg-composer.c:2235 composer/e-msg-composer.c:3067
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr "Vis _vedleggsfeltet (slipp vedlegg her)"
+
+#: composer/e-msg-composer.c:2252 composer/e-msg-composer.c:2951
+#: composer/e-msg-composer.c:2952
 msgid "Compose a message"
 msgstr "Skriv en melding"
 
-#: composer/e-msg-composer.c:2961
+#: composer/e-msg-composer.c:2983
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10915,7 +11055,7 @@ msgstr ""
 "Kunne ikke opprette vindu for ny melding:\n"
 "Klarte ikke å aktivere kontroll for adressevelger."
 
-#: composer/e-msg-composer.c:2991
+#: composer/e-msg-composer.c:3012
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10927,7 +11067,7 @@ msgstr ""
 "Vennligst sjekk at du har installert korrekt\n"
 "versjon av gtkhtml og libgtkhtml.\n"
 
-#: composer/e-msg-composer.c:3061
+#: composer/e-msg-composer.c:3113
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10935,7 +11075,7 @@ msgstr ""
 "Kunne ikke opprette skrivevindu:\n"
 "Klarte ikke å aktivere HTML-redigeringskomponenten."
 
-#: composer/e-msg-composer.c:4071
+#: composer/e-msg-composer.c:4126
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10959,46 +11099,6 @@ msgstr "adressekort"
 msgid "calendar information"
 msgstr "kalenderinformasjon"
 
-#: default_user/searches.xml.h:1
-msgid "Body contains"
-msgstr "Kropp inneholder"
-
-#: default_user/searches.xml.h:2
-msgid "Body does not contain"
-msgstr "Kropp inneholder ikke"
-
-#: default_user/searches.xml.h:3
-msgid "Body or subject contains"
-msgstr "Kropp eller emne inneholder"
-
-#: default_user/searches.xml.h:4
-msgid "Message contains"
-msgstr "Melding inneholder"
-
-#: default_user/searches.xml.h:5
-msgid "Recipients contain"
-msgstr "Mottakere inneholder"
-
-#: default_user/searches.xml.h:6
-msgid "Sender contains"
-msgstr "Sender inneholder"
-
-#: default_user/searches.xml.h:7
-msgid "Subject contains"
-msgstr "Emne inneholder"
-
-#: default_user/searches.xml.h:8
-msgid "Subject does not contain"
-msgstr "Emne inneholder ikke"
-
-#: default_user/vfolders.xml.h:1
-msgid "Important mail (local)"
-msgstr "Viktige meldinger (lokalt)"
-
-#: default_user/vfolders.xml.h:2
-msgid "Unread mail (local)"
-msgstr "Uleste meldinger (lokal)"
-
 #: designs/OOA/ooa.glade.h:1
 msgid ""
 "<b>Currently, your status is \"Out of the Office\". </b>\n"
@@ -11549,7 +11649,7 @@ msgstr "Uttrykk"
 msgid "Follow Up"
 msgstr "Følg opp"
 
-#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:714
+#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:739
 msgid "Label"
 msgstr "Etikett"
 
@@ -11630,7 +11730,7 @@ msgstr "Spesifikk header"
 msgid "Stop Processing"
 msgstr "Stopp behandling"
 
-#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1449 mail/em-format.c:678
+#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1472 mail/em-format.c:679
 #: mail/em-mailer-prefs.c:72 mail/message-list.etspec.h:13
 #: mail/message-tag-followup.c:305 smime/lib/e-cert.c:1074
 msgid "Subject"
@@ -11754,6 +11854,38 @@ msgstr "Regelnavn"
 msgid "Score Rules"
 msgstr "Poengregler"
 
+#: filter/searchtypes.xml.h:1
+msgid "Body contains"
+msgstr "Kropp inneholder"
+
+#: filter/searchtypes.xml.h:2
+msgid "Body does not contain"
+msgstr "Kropp inneholder ikke"
+
+#: filter/searchtypes.xml.h:3
+msgid "Body or subject contains"
+msgstr "Kropp eller emne inneholder"
+
+#: filter/searchtypes.xml.h:4
+msgid "Message contains"
+msgstr "Melding inneholder"
+
+#: filter/searchtypes.xml.h:5
+msgid "Recipients contain"
+msgstr "Mottakere inneholder"
+
+#: filter/searchtypes.xml.h:6
+msgid "Sender contains"
+msgstr "Sender inneholder"
+
+#: filter/searchtypes.xml.h:7
+msgid "Subject contains"
+msgstr "Emne inneholder"
+
+#: filter/searchtypes.xml.h:8
+msgid "Subject does not contain"
+msgstr "Emne inneholder ikke"
+
 #: filter/vfolder-rule.c:209
 msgid "You must name this vfolder."
 msgstr "Du må gi navn til denne vfolderen."
@@ -11812,7 +11944,7 @@ msgstr "Komponent for mappevisning for Evolution e-post"
 msgid "Evolution Mail preferences control"
 msgstr "Brukervalg-kontroll for Evolution e-post"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:804
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:810
 #: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
 #: mail/importers/pine-importer.c:572
 msgid "Mail"
@@ -11892,14 +12024,15 @@ msgid "Signature(s)"
 msgstr "Signatur(er)"
 
 #: mail/em-composer-utils.c:123
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
 "%sSend anyway?"
 msgstr ""
 "Du sender en melding i HMTL-format. Sjekk at følgende mottakere\n"
-"kan og vil motta e-post som HTML:\n"
+"kan og ønsker og motta e-post som HTML:\n"
+"%sSend likevel?"
 
 #: mail/em-composer-utils.c:137
 msgid ""
@@ -11966,27 +12099,27 @@ msgstr "Spesifiser hvor mappen skal opprettes:"
 msgid "Folder _name:"
 msgstr "Mappe_navn:"
 
-#: mail/em-folder-tree-model.c:559 mail/em-utils.c:1994
+#: mail/em-folder-tree-model.c:560 mail/em-utils.c:1994
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Kunne ikke opprette midlertidig katalog: %s"
 
-#: mail/em-folder-tree-model.c:568
-#, fuzzy, c-format
+#: mail/em-folder-tree-model.c:569
+#, c-format, fuzzy
 msgid "Could not create temporary mbox store: %s"
 msgstr "Kunne ikke opprette midlertidig katalog: %s"
 
-#: mail/em-folder-tree-model.c:577
+#: mail/em-folder-tree-model.c:578
 #, fuzzy, c-format
 msgid "Could not create temporary mbox folder: %s"
 msgstr "Kunne ikke opprette midlertidig fil «%s»: %s"
 
-#: mail/em-folder-tree-model.c:592
+#: mail/em-folder-tree-model.c:593
 #, fuzzy, c-format
 msgid "Could not copy messages to temporary mbox folder: %s"
 msgstr "Kunne ikke lukke midlertidig mappe: %s"
 
-#: mail/em-folder-tree-model.c:771 mail/em-folder-tree-model.c:1001
+#: mail/em-folder-tree-model.c:772 mail/em-folder-tree-model.c:1062
 msgid "Loading..."
 msgstr "Laster..."
 
@@ -11996,7 +12129,7 @@ msgid "%s"
 msgstr "%s"
 
 #: mail/em-folder-tree.c:985 mail/em-folder-tree.c:998
-#: mail/em-folder-view.c:591 mail/em-folder-view.c:605
+#: mail/em-folder-view.c:616 mail/em-folder-view.c:630
 #: shell/e-shell-importer.c:1060
 msgid "Select folder"
 msgstr "Velg mappe"
@@ -12075,267 +12208,271 @@ msgid "_Properties..."
 msgstr "Egenska_per..."
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:682 mail/em-popup.c:596
+#: mail/em-folder-view.c:707 mail/em-popup.c:596
 msgid "_Edit as New Message..."
 msgstr "R_ediger som ny melding..."
 
-#: mail/em-folder-view.c:684
+#: mail/em-folder-view.c:709
 msgid "_Print"
 msgstr "S_kriv ut"
 
-#: mail/em-folder-view.c:687 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:712 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "Sva_r til sender"
 
-#: mail/em-folder-view.c:688 mail/em-popup.c:716
+#: mail/em-folder-view.c:713 mail/em-popup.c:716
 #: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Svar til _listen"
 
-#: mail/em-folder-view.c:689 mail/em-popup.c:717
+#: mail/em-folder-view.c:714 mail/em-popup.c:717
 #: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: mail/em-folder-view.c:690 mail/em-popup.c:719
+#: mail/em-folder-view.c:715 mail/em-popup.c:719
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: mail/em-folder-view.c:693
+#: mail/em-folder-view.c:718
 msgid "Follo_w Up..."
 msgstr "Føl_g opp..."
 
-#: mail/em-folder-view.c:694
+#: mail/em-folder-view.c:719
 msgid "Fla_g Completed"
 msgstr "Mer_k som fullført"
 
-#: mail/em-folder-view.c:695
+#: mail/em-folder-view.c:720
 msgid "Cl_ear Flag"
 msgstr "Fj_ern flagg"
 
-#: mail/em-folder-view.c:698 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:723 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "Mer_k som lest"
 
-#: mail/em-folder-view.c:699
+#: mail/em-folder-view.c:724
 msgid "Mark as _Unread"
 msgstr "Merk som _ulest"
 
-#: mail/em-folder-view.c:700
+#: mail/em-folder-view.c:725
 msgid "Mark as _Important"
 msgstr "Merk som v_iktig"
 
-#: mail/em-folder-view.c:701
+#: mail/em-folder-view.c:726
 msgid "_Mark as Unimportant"
 msgstr "_Merk som uviktig"
 
-#: mail/em-folder-view.c:702 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:727 ui/evolution-mail-message.xml.h:52
 msgid "Mark as _Junk"
 msgstr "Merk som _søppel"
 
-#: mail/em-folder-view.c:703 ui/evolution-mail-message.xml.h:53
-#, fuzzy
+#: mail/em-folder-view.c:728 ui/evolution-mail-message.xml.h:53
 msgid "Mark as _Not Junk"
-msgstr "Merk som v_iktig"
+msgstr "Merk som _ikke søppel"
 
-#: mail/em-folder-view.c:707
+#: mail/em-folder-view.c:732
 msgid "U_ndelete"
 msgstr "A_ngre slett"
 
-#: mail/em-folder-view.c:710
+#: mail/em-folder-view.c:735
 msgid "Mo_ve to Folder..."
 msgstr "Fl_ytt til mappe..."
 
-#: mail/em-folder-view.c:711 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:736 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "K_opier til mappe..."
 
-#: mail/em-folder-view.c:719
+#: mail/em-folder-view.c:744
 msgid "Add Sender to Address_book"
 msgstr "Legg til sender i adresse_bok"
 
-#: mail/em-folder-view.c:722
+#: mail/em-folder-view.c:747
 msgid "Appl_y Filters"
 msgstr "_Påfør filtre"
 
-#: mail/em-folder-view.c:725
+#: mail/em-folder-view.c:750
 msgid "Crea_te Rule From Message"
 msgstr "Oppre_tt regel fra melding"
 
-#: mail/em-folder-view.c:726
+#: mail/em-folder-view.c:751
 msgid "VFolder on _Subject"
 msgstr "VFolder på e_mne"
 
-#: mail/em-folder-view.c:727
+#: mail/em-folder-view.c:752
 msgid "VFolder on Se_nder"
 msgstr "VFolder for se_nder"
 
-#: mail/em-folder-view.c:728
+#: mail/em-folder-view.c:753
 msgid "VFolder on _Recipients"
 msgstr "VFolder for mottake_re"
 
-#: mail/em-folder-view.c:729
+#: mail/em-folder-view.c:754
 msgid "VFolder on Mailing _List"
 msgstr "VFolder på e-post_liste"
 
-#: mail/em-folder-view.c:731
+#: mail/em-folder-view.c:756
 msgid "VFolder on Thread"
 msgstr "VFolder for tråd"
 
-#: mail/em-folder-view.c:735
+#: mail/em-folder-view.c:760
 msgid "Filter on Sub_ject"
 msgstr "Filtrer på em_ne"
 
-#: mail/em-folder-view.c:736
+#: mail/em-folder-view.c:761
 msgid "Filter on Sen_der"
 msgstr "Filtrer på sen_der"
 
-#: mail/em-folder-view.c:737
+#: mail/em-folder-view.c:762
 msgid "Filter on Re_cipients"
 msgstr "Filtrer på motta_ker"
 
-#: mail/em-folder-view.c:738
+#: mail/em-folder-view.c:763
 msgid "Filter on _Mailing List"
 msgstr "Filtrer på e-_postliste"
 
-#: mail/em-folder-view.c:740
+#: mail/em-folder-view.c:765
 msgid "Filter on Thread"
 msgstr "Filtrer på tråd"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1512 mail/em-folder-view.c:1550
+#: mail/em-folder-view.c:1537 mail/em-folder-view.c:1575
 #: mail/mail-config.glade.h:41
 msgid "Default"
 msgstr "Forvalgt"
 
-#: mail/em-folder-view.c:1584
+#: mail/em-folder-view.c:1611
 msgid "Print Message"
 msgstr "Skriv ut melding"
 
-#: mail/em-folder-view.c:1826
+#: mail/em-folder-view.c:1865
 msgid "_Copy Link Location"
 msgstr "_Kopier lokasjon for lenke"
 
+#: mail/em-folder-view.c:2113
+#, c-format
+msgid "Click to mail %s"
+msgstr "Klikk for å sende melding til %s"
+
+#: mail/em-folder-view.c:2115
+#, c-format
+msgid "Click to open %s"
+msgstr "Klikk for å åpne %s"
+
 #. message-search popup match count string
-#: mail/em-format-html-display.c:373
+#: mail/em-format-html-display.c:395
 #, c-format
 msgid "Matches: %d"
 msgstr "Treff: %d"
 
-#: mail/em-format-html-display.c:603 mail/em-format-html.c:564
+#: mail/em-format-html-display.c:632 mail/em-format-html.c:564
 msgid "Unsigned"
 msgstr "Usignert"
 
-#: mail/em-format-html-display.c:603
-#, fuzzy
+#: mail/em-format-html-display.c:632
 msgid ""
 "This message is not signed.  There is no guarantee the sender of the message "
 "is authentic."
-msgstr "Denne meldingen er digitalt signert, men kan ikke finnes autentisk."
+msgstr "Denne meldingen er ikke signert. Du har ingen garanti for at avsender av meldingen er autentisk."
 
-#: mail/em-format-html-display.c:604 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:633 mail/em-format-html.c:565
 msgid "Valid signature"
 msgstr "Gyldig signatur"
 
-#: mail/em-format-html-display.c:604
+#: mail/em-format-html-display.c:633
 msgid ""
 "This message is signed and is valid, the sender of this message is very "
 "likely who they claim to be."
 msgstr ""
 
-#: mail/em-format-html-display.c:605 mail/em-format-html.c:566
+#: mail/em-format-html-display.c:634 mail/em-format-html.c:566
 msgid "Invalid signature"
 msgstr "Ugyldig signatur"
 
-#: mail/em-format-html-display.c:605
+#: mail/em-format-html-display.c:634
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:606 mail/em-format-html.c:567
+#: mail/em-format-html-display.c:635 mail/em-format-html.c:567
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:606
+#: mail/em-format-html-display.c:635
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 msgstr ""
 
-#: mail/em-format-html-display.c:612 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:573
 msgid "Unencrypted"
 msgstr "Ukryptert"
 
-#: mail/em-format-html-display.c:612
+#: mail/em-format-html-display.c:641
 msgid ""
-"This message is not encrypted.  It's content may be viewed in transit across "
-"The Internet."
+"This message is not encrypted.  Its content may be viewed in transit across "
+"the Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:613 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:642 mail/em-format-html.c:574
 msgid "Encrypted, weak"
 msgstr ""
 
-#: mail/em-format-html-display.c:613
+#: mail/em-format-html-display.c:642
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm.  It would "
 "be difficult, but not impossible for an outsider to view the content of this "
 "message in a practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:614 mail/em-format-html.c:575
+#: mail/em-format-html-display.c:643 mail/em-format-html.c:575
 msgid "Encrypted"
 msgstr "Kryptert"
 
-#: mail/em-format-html-display.c:614
+#: mail/em-format-html-display.c:643
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr ""
 
-#: mail/em-format-html-display.c:615 mail/em-format-html.c:576
+#: mail/em-format-html-display.c:644 mail/em-format-html.c:576
 msgid "Encrypted, strong"
 msgstr ""
 
-#: mail/em-format-html-display.c:615
+#: mail/em-format-html-display.c:644
 msgid ""
 "This message is encrypted, with a strong encryption algorithm.  It would be "
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:699
-#, fuzzy
+#: mail/em-format-html-display.c:728
 msgid "_View Certificate"
-msgstr "_Sertifikat-ID:"
+msgstr "_Vis sertifikat"
 
-#: mail/em-format-html-display.c:704
-#, fuzzy
+#: mail/em-format-html-display.c:733
 msgid "This certificate is not viewable"
-msgstr "Sertifikatet er ikke gyldig ennå"
+msgstr "Dette sertifikatet kan ikke vises"
 
-#: mail/em-format-html-display.c:866 mail/em-format-html.c:645
+#: mail/em-format-html-display.c:895 mail/em-format-html.c:645
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Kunne ikke lese S/MIME-melding: Ukjent feil"
 
-#: mail/em-format-html-display.c:902 mail/em-format-html.c:1051
-#: mail/em-format.c:1198
-#, fuzzy
+#: mail/em-format-html-display.c:931 mail/em-format-html.c:1051
+#: mail/em-format.c:1201
 msgid "Unsupported signature format"
-msgstr "Ustøttet schema"
+msgstr "Ustøttet signaturformat"
 
-#: mail/em-format-html-display.c:910 mail/em-format-html.c:1059
-#, fuzzy
+#: mail/em-format-html-display.c:939 mail/em-format-html.c:1059
 msgid "Unknown error verifying signature"
-msgstr "Feil under verifisering av sertifikater."
+msgstr "Ukjent feil under verifisering av signatur"
 
-#: mail/em-format-html-display.c:1007
+#: mail/em-format-html-display.c:1070
 msgid "_View Inline"
 msgstr "_Vis i meldingsteksten"
 
-#: mail/em-format-html-display.c:1008
+#: mail/em-format-html-display.c:1071
 msgid "_Hide"
 msgstr "_Skjul"
 
@@ -12386,71 +12523,67 @@ msgstr "Kunne ikke lese MIME-melding. Viser ren meldingstekst."
 msgid "Formatting message"
 msgstr "Formatterer melding"
 
-#: mail/em-format-html.c:1434 mail/em-format.c:673 mail/em-mailer-prefs.c:67
+#: mail/em-format-html.c:1419 mail/em-format.c:674 mail/em-mailer-prefs.c:67
 #: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
 msgid "From"
 msgstr "Fra"
 
-#: mail/em-format-html.c:1436 mail/em-format.c:674 mail/em-mailer-prefs.c:68
+#: mail/em-format-html.c:1419 mail/em-format.c:675 mail/em-mailer-prefs.c:68
 msgid "Reply-To"
 msgstr "Svar-til"
 
-#: mail/em-format-html.c:1438 mail/em-format.c:675 mail/em-mailer-prefs.c:69
+#: mail/em-format-html.c:1419 mail/em-format.c:676 mail/em-mailer-prefs.c:69
 #: mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Til"
 
-#: mail/em-format-html.c:1440 mail/em-format.c:676 mail/em-mailer-prefs.c:70
+#: mail/em-format-html.c:1419 mail/em-format.c:677 mail/em-mailer-prefs.c:70
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/em-format-html.c:1442 mail/em-format.c:677 mail/em-mailer-prefs.c:71
+#: mail/em-format-html.c:1419 mail/em-format.c:678 mail/em-mailer-prefs.c:71
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/em-format-html.c:1458 mail/em-mailer-prefs.c:631
+#: mail/em-format-html.c:1479 mail/em-mailer-prefs.c:631
 msgid "Mailer"
 msgstr "E-postprogram"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1485
+#: mail/em-format-html.c:1505
 msgid "<I> (%a, %R %Z)</I>"
-msgstr ""
+msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1488
+#: mail/em-format-html.c:1508
 msgid "<I> (%R %Z)</I>"
-msgstr ""
+msgstr "<I> (%R %Z)</I>"
 
-#: mail/em-format-html.c:1499 mail/em-format.c:679 mail/em-mailer-prefs.c:73
+#: mail/em-format-html.c:1520 mail/em-format.c:680 mail/em-mailer-prefs.c:73
 #: mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Dato"
 
-#: mail/em-format.c:893
+#: mail/em-format.c:896
 #, c-format
 msgid "%s attachment"
 msgstr "%s-vedlegg"
 
-#: mail/em-format.c:1186
+#: mail/em-format.c:1189
 msgid "Session not initialised"
 msgstr "Sesjonen er ikke initiert"
 
-#: mail/em-format.c:1212
+#: mail/em-format.c:1215
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Denne meldingen er digitalt signert og er funnet autentisk."
 
-#: mail/em-format.c:1214
+#: mail/em-format.c:1217
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr "Denne meldingen er digitalt signert, men kan ikke finnes autentisk."
 
 #: mail/em-junk-filter.c:72
 msgid "Spamassassin (built-in)"
-msgstr ""
-
-#: mail/em-migrate.c:120
-msgid "Migrating..."
-msgstr "Migrerer..."
+msgstr "Spamassassin (integrert)"
 
 #: mail/em-migrate.c:128
 msgid ""
@@ -12460,22 +12593,22 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:161
-#, c-format
-msgid "Migrating `%s':"
-msgstr "Migrerer «%s»:"
-
-#: mail/em-migrate.c:775
+#: mail/em-migrate.c:833
 #, c-format
 msgid "Failed to migrate `%s': %s"
 msgstr "Feil under migrering av «%s»: %s"
 
-#: mail/em-migrate.c:801 mail/em-migrate.c:818
+#: mail/em-migrate.c:857 mail/em-migrate.c:872
+#, fuzzy, c-format
+msgid "Failed to migrate pop3 uid caches: %s"
+msgstr "Feil under migrering av «%s»: %s"
+
+#: mail/em-migrate.c:931 mail/em-migrate.c:948
 #, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr "Klarte ikke å opprette katalog «%s»: %s"
 
-#: mail/em-migrate.c:830
+#: mail/em-migrate.c:960
 #, fuzzy, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "Klarte ikke å slå opp vert «%s»: %s"
@@ -12487,7 +12620,7 @@ msgstr "Lagre som..."
 #: mail/em-popup.c:624
 #, c-format
 msgid "untitled_image.%s"
-msgstr ""
+msgstr "bilde_uten_navn.%s"
 
 #: mail/em-popup.c:713
 msgid "Set as _Background"
@@ -12523,7 +12656,7 @@ msgstr "Denne tjeneren støtter ikke LDAPv3 schema-informasjon"
 msgid "Subscribed"
 msgstr "Abonnert"
 
-#: mail/em-subscribe-editor.c:616
+#: mail/em-subscribe-editor.c:616 shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Mappe"
 
@@ -12590,9 +12723,9 @@ msgid "message"
 msgstr "melding"
 
 #: mail/em-utils.c:1432
-#, fuzzy, c-format
+#, c-format
 msgid "Error: '%s' exists and is not a regular file"
-msgstr "Fil «%s» eksisterer ikke eller er ikke en vanlig fil"
+msgstr "Feil: «%s» eksisterer og er ikke en vanlig fil"
 
 #: mail/em-utils.c:1486
 msgid "Save Message..."
@@ -12632,11 +12765,11 @@ msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:1
 msgid "Automatic link recognition"
-msgstr ""
+msgstr "Automatisk gjenkjenning av lenker"
 
 #: mail/evolution-mail.schemas.in.in.h:2
 msgid "Automatic smiley recognition"
-msgstr ""
+msgstr "Automatisk gjenkjenning av smilefjes"
 
 #: mail/evolution-mail.schemas.in.in.h:3
 msgid "Check incoming mail being junk"
@@ -12785,14 +12918,12 @@ msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:37
-#, fuzzy
 msgid "New Mail Notify sound file"
-msgstr "Melding om ny e-post"
+msgstr "Lydfil for varsel om ny e-post"
 
 #: mail/evolution-mail.schemas.in.in.h:38
-#, fuzzy
 msgid "New Mail Notify type"
-msgstr "Melding om ny e-post"
+msgstr "Type varsel for ny e-post"
 
 #: mail/evolution-mail.schemas.in.in.h:39
 msgid "Prompt on empty subject"
@@ -13117,7 +13248,7 @@ msgstr "Skanner e-postfiltre"
 msgid "Scanning directory"
 msgstr "Søker i katalog"
 
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:563
+#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:569
 msgid "Starting import"
 msgstr "Starter import"
 
@@ -13260,25 +13391,18 @@ msgstr ""
 msgid "On this Computer"
 msgstr "På denne datamaskinen"
 
-#: mail/mail-component.c:379
+#: mail/mail-component.c:389
 msgid "New Mail Message"
 msgstr "Ny e-post melding"
 
-#: mail/mail-component.c:380
+#: mail/mail-component.c:390
 msgid "_Mail Message"
 msgstr "Send _melding"
 
-#: mail/mail-component.c:381
+#: mail/mail-component.c:391
 msgid "Compose a new mail message"
 msgstr "Skriv en ny e-postmelding"
 
-#: mail/mail-component.c:496
-#, c-format
-msgid ""
-"The following error occured while migrating your mail data:\n"
-"%s"
-msgstr ""
-
 #: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
 msgid "Identity"
 msgstr "Identitet"
@@ -13447,7 +13571,7 @@ msgstr "Ser etter nye meldinger"
 
 #: mail/mail-config.glade.h:30
 msgid "Checks incoming mail messages to be Junk"
-msgstr ""
+msgstr "Sjekker om innkommende meldinger er søppel"
 
 #: mail/mail-config.glade.h:31
 msgid "Color for _misspelled words:"
@@ -13777,7 +13901,7 @@ msgstr ""
 
 #: mail/mail-config.glade.h:128
 msgid "Use _Daemon"
-msgstr ""
+msgstr "Bruk _daemon"
 
 #: mail/mail-config.glade.h:130
 msgid "V_ariable-width:"
@@ -13847,7 +13971,7 @@ msgstr "_Aktiver"
 
 #: mail/mail-config.glade.h:150
 msgid "_Encrypt outgoing messages (by default)"
-msgstr ""
+msgstr "Krypt_er utgående meldinger (som forvalg)"
 
 #: mail/mail-config.glade.h:151
 msgid "_Forward style:"
@@ -13870,12 +13994,12 @@ msgid "_Junk"
 msgstr "_Søppel"
 
 #: mail/mail-config.glade.h:158
-msgid "_Load images if sender is in addressbook"
+msgid "_Load images if sender is in address book"
 msgstr "_Last bilder hvis avsender er i adresseboken"
 
 #: mail/mail-config.glade.h:159
 msgid "_Local Tests Only"
-msgstr ""
+msgstr "Kun _lokale tester"
 
 #: mail/mail-config.glade.h:160
 msgid "_Make this my default account"
@@ -13988,122 +14112,122 @@ msgstr "Arbeider"
 msgid "Filtering Folder"
 msgstr "Filtrerer mappe"
 
-#: mail/mail-ops.c:264
+#: mail/mail-ops.c:243
 msgid "Fetching Mail"
 msgstr "Henter e-post"
 
-#: mail/mail-ops.c:558
-#, fuzzy, c-format
+#: mail/mail-ops.c:537
+#, c-format
 msgid "Failed to apply outgoing filters: %s"
-msgstr "Kunne ikke lagre post i midlertidig fil %s: %s"
+msgstr "Feil under påføring av utgående filtre: %s"
 
-#: mail/mail-ops.c:579
+#: mail/mail-ops.c:558
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:588
+#: mail/mail-ops.c:567
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Kunne ikke lagre post i midlertidig fil %s: %s"
 
-#: mail/mail-ops.c:630
+#: mail/mail-ops.c:609
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Sender «%s»"
 
-#: mail/mail-ops.c:748
+#: mail/mail-ops.c:727
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sender melding %d av %d"
 
-#: mail/mail-ops.c:767
+#: mail/mail-ops.c:746
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Feilet på melding %d av %d"
 
-#: mail/mail-ops.c:769
+#: mail/mail-ops.c:748
 msgid "Complete."
 msgstr "Fullført."
 
-#: mail/mail-ops.c:863
+#: mail/mail-ops.c:842
 msgid "Saving message to folder"
 msgstr "Lagrer melding til mappe"
 
-#: mail/mail-ops.c:944
+#: mail/mail-ops.c:923
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flytter melding(er) til %s"
 
-#: mail/mail-ops.c:944
+#: mail/mail-ops.c:923
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopierer meldinger til %s"
 
-#: mail/mail-ops.c:1057
+#: mail/mail-ops.c:1036
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanner mapper i «%s»"
 
-#: mail/mail-ops.c:1260
+#: mail/mail-ops.c:1239
 msgid "Forwarded messages"
 msgstr "Videresendte meldinger"
 
-#: mail/mail-ops.c:1303
+#: mail/mail-ops.c:1282
 #, c-format
 msgid "Opening folder %s"
 msgstr "Åpner mappe %s"
 
-#: mail/mail-ops.c:1375
+#: mail/mail-ops.c:1354
 #, c-format
 msgid "Opening store %s"
 msgstr "Åpner lager %s"
 
-#: mail/mail-ops.c:1453
+#: mail/mail-ops.c:1432
 #, c-format
 msgid "Removing folder %s"
 msgstr "Fjerner mappe %s"
 
-#: mail/mail-ops.c:1547
+#: mail/mail-ops.c:1526
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Lagrer mappe «%s»"
 
-#: mail/mail-ops.c:1598
+#: mail/mail-ops.c:1577
 msgid "Refreshing folder"
 msgstr "Oppdaterer mappe"
 
-#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
+#: mail/mail-ops.c:1613 mail/mail-ops.c:1664
 msgid "Expunging folder"
 msgstr "Tømmer mappe"
 
-#: mail/mail-ops.c:1682
+#: mail/mail-ops.c:1661
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Tømmer søppel i «%s»"
 
-#: mail/mail-ops.c:1683
+#: mail/mail-ops.c:1662
 msgid "Local Folders"
 msgstr "Lokale mapper"
 
-#: mail/mail-ops.c:1766
+#: mail/mail-ops.c:1745
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Henter melding %s"
 
-#: mail/mail-ops.c:1838
+#: mail/mail-ops.c:1817
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Henter %d melding(er)"
 
-#: mail/mail-ops.c:1922
+#: mail/mail-ops.c:1901
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Lagrer %d melding(er)"
 
-#: mail/mail-ops.c:1970
+#: mail/mail-ops.c:1949
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -14112,7 +14236,7 @@ msgstr ""
 "Kunne ikke opprette utdatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1998
+#: mail/mail-ops.c:1977
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14121,11 +14245,11 @@ msgstr ""
 "Feil under lagring av av meldinger til: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2069
+#: mail/mail-ops.c:2048
 msgid "Saving attachment"
 msgstr "Lagrer vedlegg"
 
-#: mail/mail-ops.c:2086
+#: mail/mail-ops.c:2065
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14134,24 +14258,24 @@ msgstr ""
 "Kunne ikke opprette utdatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2116
+#: mail/mail-ops.c:2095
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kan ikke skrive data: %s"
 
-#: mail/mail-ops.c:2264
+#: mail/mail-ops.c:2243
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Kobler fra %s"
 
-#: mail/mail-ops.c:2264
+#: mail/mail-ops.c:2243
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Kobler til %s på nytt"
 
-#: mail/mail-ops.c:2366
+#: mail/mail-ops.c:2345
 msgid "Changing junk status"
-msgstr ""
+msgstr "Endrer søppelstatus"
 
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
@@ -14204,15 +14328,15 @@ msgstr "Type: %s"
 msgid "Send & Receive Mail"
 msgstr "Send & motta e-post"
 
-#: mail/mail-send-recv.c:307
+#: mail/mail-send-recv.c:309
 msgid "Cancel _All"
 msgstr "Avbryt _alle"
 
-#: mail/mail-send-recv.c:388
+#: mail/mail-send-recv.c:390
 msgid "Updating..."
 msgstr "Oppdaterer..."
 
-#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
+#: mail/mail-send-recv.c:390 mail/mail-send-recv.c:442
 msgid "Waiting..."
 msgstr "Venter..."
 
@@ -14390,7 +14514,7 @@ msgstr "%d %b %H.%M"
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:3085
+#: mail/message-list.c:3091
 msgid "Generating message list"
 msgstr "Genererer meldingsliste"
 
@@ -14616,52 +14740,6 @@ msgstr ""
 msgid "mail"
 msgstr "e-post"
 
-#: shell/e-setup.c:144
-msgid "Could not update files correctly"
-msgstr "Kunne ikke oppdatere filene."
-
-#: shell/e-setup.c:165
-#, c-format
-msgid ""
-"Cannot create the directory\n"
-"%s\n"
-"Error: %s"
-msgstr ""
-"Kan ikke opprette katalogen\n"
-"%s\n"
-"Feil: %s"
-
-#: shell/e-setup.c:176
-#, c-format
-msgid ""
-"An error occurred in copying files into\n"
-"`%s'."
-msgstr ""
-"En feil oppsto under kopiering av filer til\n"
-"«%s»."
-
-#: shell/e-setup.c:242
-#, c-format
-msgid ""
-"The file `%s' is not a directory.\n"
-"Please move it in order to allow installation\n"
-"of the Evolution user files."
-msgstr ""
-"Filen «%s» er ikke en katalog.\n"
-"Vennligst flytt denne for å tillate installasjon\n"
-"av Evolution's brukerfiler."
-
-#: shell/e-setup.c:251
-#, c-format
-msgid ""
-"The directory `%s' exists but is not the\n"
-"Evolution directory.  Please move it in order\n"
-"to allow installation of the Evolution user files."
-msgstr ""
-"Katalogen «%s» eksisterer men er ikke.\n"
-"Evolution-katalogen. Vennligst flytt den for å \n"
-"tillate installasjon av Evolution's brukerfiler."
-
 #: shell/e-shell-about-box.c:45
 msgid "Brought to you by"
 msgstr "Etter mange timers slit av"
@@ -14799,7 +14877,7 @@ msgstr ""
 "Du kan velge «Automatisk» hvis du ikke vet, så vil Evolution prøve å finne "
 "ut hvilken type det er for deg."
 
-#: shell/e-shell-importer.c:147 shell/e-shell-startup-wizard.c:731
+#: shell/e-shell-importer.c:147 shell/e-shell-startup-wizard.c:737
 msgid "Please select the information that you would like to import:"
 msgstr "Vennligst velg informasjon du ønsker å importere:"
 
@@ -14899,7 +14977,7 @@ msgstr "Importer data og innstillinger fra _eldre programmer"
 msgid "Import a _single file"
 msgstr "Importer en en_kelt fil"
 
-#: shell/e-shell-importer.c:754 shell/e-shell-startup-wizard.c:560
+#: shell/e-shell-importer.c:754 shell/e-shell-startup-wizard.c:566
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -14911,7 +14989,7 @@ msgstr ""
 msgid "Starting Intelligent Importers"
 msgstr "Starter intelligent import"
 
-#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:686
+#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:692
 #, c-format
 msgid "From %s:"
 msgstr "Fra %s:"
@@ -14962,7 +15040,7 @@ msgstr "Kunne ikke åpne delt mappe: %s"
 msgid "Cannot find the specified shared folder."
 msgstr "Kan ikke finne spesifisert delt mappe."
 
-#: shell/e-shell-startup-wizard.c:778
+#: shell/e-shell-startup-wizard.c:784
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -14971,7 +15049,7 @@ msgid ""
 "Do you want to quit using the Assistant now?"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:789
+#: shell/e-shell-startup-wizard.c:795
 msgid "Quit Assistant"
 msgstr "Avslutt assistent"
 
@@ -15065,19 +15143,19 @@ msgstr ""
 "Ximian Evolution er frakoblet. Klikk på denne knappen for å arbeide "
 "tilkoblet."
 
-#: shell/e-shell.c:1004
+#: shell/e-shell.c:1002
 msgid "Invalid arguments"
 msgstr "Ugyldige argumenter"
 
-#: shell/e-shell.c:1006
+#: shell/e-shell.c:1004
 msgid "Cannot register on OAF"
 msgstr "Kan ikke registrere i OAF"
 
-#: shell/e-shell.c:1008
+#: shell/e-shell.c:1006
 msgid "Configuration Database not found"
 msgstr "Konfigurasjonsdatabase ikke funnet"
 
-#: shell/e-shell.c:1010
+#: shell/e-shell.c:1008
 msgid "Generic error"
 msgstr "Vanlig feil"
 
@@ -15202,6 +15280,10 @@ msgstr "Innboks"
 msgid "Shortcuts"
 msgstr "Snarveier"
 
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Checkbox"
+msgstr "Avkryssingsboks"
+
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -15260,6 +15342,18 @@ msgstr ""
 "Feilen fra aktiveringssystemet er:\n"
 "%s"
 
+#: shell/evolution-test-component.c:125
+msgid "New Test"
+msgstr "Ny test"
+
+#: shell/evolution-test-component.c:126
+msgid "_Test"
+msgstr "_Test"
+
+#: shell/evolution-test-component.c:127
+msgid "Create a new test item"
+msgstr "Opprett en ny testoppføring"
+
 #: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Active Connections"
 msgstr "Aktive tilkoblinger"
@@ -15404,16 +15498,16 @@ msgstr "Ikke spør meg igjen"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution kan importere data fra følgende filer:"
 
-#: shell/main.c:114 shell/main.c:559
+#: shell/main.c:113 shell/main.c:558
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:120
+#: shell/main.c:119
 msgid "Evolution is now exiting ..."
 msgstr "Evolution avslutter nå..."
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:270
+#: shell/main.c:269
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -15448,7 +15542,7 @@ msgstr ""
 "Vi håper at du nyter resultatene av vårt harde arbeid, og vi venter i\n"
 "spenning på at du tilbyr din hjelp!\n"
 
-#: shell/main.c:294
+#: shell/main.c:293
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -15456,11 +15550,11 @@ msgstr ""
 "Takk\n"
 "Ximian Evolution utviklerene\n"
 
-#: shell/main.c:302
+#: shell/main.c:301
 msgid "Don't tell me again"
 msgstr "Ikke gi beskjed igjen"
 
-#: shell/main.c:352
+#: shell/main.c:351
 #, c-format
 msgid ""
 "Warning: Evolution could not upgrade all your data from version %s.\n"
@@ -15468,36 +15562,36 @@ msgid ""
 "Evolution.\n"
 msgstr ""
 
-#: shell/main.c:411
+#: shell/main.c:410
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Kan ikke aksessere Ximian Evolution-skallet."
 
-#: shell/main.c:420
+#: shell/main.c:419
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Kan ikke initiere Ximian Evolution-skallet: %s"
 
-#: shell/main.c:526
+#: shell/main.c:525
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:528
+#: shell/main.c:527
 msgid "Start in offline mode"
 msgstr "Start i frakoblet modus"
 
-#: shell/main.c:530
+#: shell/main.c:529
 msgid "Start in online mode"
 msgstr "Start i tilkoblet modus"
 
-#: shell/main.c:533
+#: shell/main.c:532
 msgid "Forcibly shut down all evolution components"
 msgstr "Steng ned alle komponenter i Evolution"
 
-#: shell/main.c:536
+#: shell/main.c:535
 msgid "Send the debugging output of all components to a file."
 msgstr "Send feilsøkingsutskrift for alle komponentene til en fil."
 
-#: shell/main.c:563
+#: shell/main.c:562
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -15506,38 +15600,43 @@ msgstr ""
 "%s: --online og --offline kan ikke brukes samtidig.\n"
 "  Bruk %s --help for mer informasjon.\n"
 
-#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:238
-#: smime/gui/certificate-manager.c:395
+#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:311
+#: smime/gui/certificate-manager.c:458
 msgid "Select a cert to import..."
 msgstr "Velg et sertifikat som skal importeres..."
 
-#: smime/gui/certificate-manager.c:156 smime/gui/certificate-manager.c:317
-#: smime/gui/certificate-manager.c:473
+#: smime/gui/certificate-manager.c:233 smime/gui/certificate-manager.c:395
+#: smime/gui/certificate-manager.c:541
 msgid "Certificate Name"
 msgstr "Navn på sertifikat"
 
-#: smime/gui/certificate-manager.c:162 smime/gui/certificate-manager.c:329
+#: smime/gui/certificate-manager.c:241 smime/gui/certificate-manager.c:411
 msgid "Purposes"
 msgstr "Hensikter"
 
-#: smime/gui/certificate-manager.c:168 smime/gui/smime-ui.glade.h:36
+#: smime/gui/certificate-manager.c:249 smime/gui/smime-ui.glade.h:36
 #: smime/lib/e-cert.c:512
 msgid "Serial Number"
 msgstr "Serienummer"
 
-#: smime/gui/certificate-manager.c:174
+#: smime/gui/certificate-manager.c:257
 msgid "Expires"
 msgstr "Utgår"
 
-#: smime/gui/certificate-manager.c:323
+#: smime/gui/certificate-manager.c:403
 msgid "E-Mail Address"
 msgstr "E-postadresse"
 
-#: smime/gui/certificate-viewer.c:281
+#: smime/gui/certificate-viewer.c:326
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Sertifikatvisning: %s"
 
+#: smime/gui/component.c:36
+#, c-format
+msgid "Enter the password for `%s'"
+msgstr "Oppgi passord for «%s»"
+
 #. FIXME: add serial no, validity date, uses
 #: smime/gui/e-cert-selector.c:116
 #, c-format
@@ -15554,19 +15653,20 @@ msgid ""
 "Issued by:\n"
 "  Subject: %s\n"
 msgstr ""
+"Utstedt av:\n"
+"  Emne: %s\n"
 
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
-msgstr ""
+msgstr "<Ikke en del av sertifikatet>"
 
 #: smime/gui/smime-ui.glade.h:2
-#, fuzzy
 msgid "<b>Certificate Fields</b>"
-msgstr "Sertifikat trukket tilbake"
+msgstr "<b>Sertifikatfelt</b>"
 
 #: smime/gui/smime-ui.glade.h:3
 msgid "<b>Certificate Hierarchy</b>"
-msgstr ""
+msgstr "<b>Sertifikathierarki</b>"
 
 #: smime/gui/smime-ui.glade.h:4
 msgid "<b>Field Value</b>"
@@ -15586,7 +15686,7 @@ msgstr "<b>Utstedt til</b> "
 
 #: smime/gui/smime-ui.glade.h:8
 msgid "<b>This certificate has been verified for the following uses:</b>"
-msgstr ""
+msgstr "<b>Dette sertifikatet er verifisert for følgende bruk:</b>"
 
 #: smime/gui/smime-ui.glade.h:9
 msgid "<b>Validity</b>"
@@ -15635,11 +15735,11 @@ msgstr "_Sertifikat-ID:"
 #: smime/gui/smime-ui.glade.h:21
 #, no-c-format
 msgid "Do you want to trust \"%s\" for the following purposes?"
-msgstr ""
+msgstr "Vil du stole på «%s» for følgende formål?"
 
 #: smime/gui/smime-ui.glade.h:22
 msgid "Dummy window only"
-msgstr ""
+msgstr "Dummyvindu"
 
 #: smime/gui/smime-ui.glade.h:23
 msgid "Edit"
@@ -15680,11 +15780,11 @@ msgstr "SHA1-fingeravtrykk"
 
 #: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
 msgid "SSL Client Certificate"
-msgstr ""
+msgstr "SSL-klientsertifikat"
 
 #: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
 msgid "SSL Server Certificate"
-msgstr ""
+msgstr "SSL-tjenersertifikat"
 
 #: smime/gui/smime-ui.glade.h:37
 msgid "Trust this CA to identify email users."
@@ -15728,7 +15828,7 @@ msgstr ""
 msgid "Your Certificates"
 msgstr "Dine sertifikater"
 
-#: smime/lib/e-cert-db.c:494
+#: smime/lib/e-cert-db.c:566
 msgid "Certificate already exists"
 msgstr "Sertifikatet eksisterer allerede"
 
@@ -15754,15 +15854,15 @@ msgstr "Versjon 3"
 
 #: smime/lib/e-cert.c:576
 msgid "PKCS #1 MD2 With RSA Encryption"
-msgstr ""
+msgstr "PKCS #1 MD2 med RSA-kryptering"
 
 #: smime/lib/e-cert.c:579
 msgid "PKCS #1 MD5 With RSA Encryption"
-msgstr ""
+msgstr "PKCS #1 MD5 med RSA-kryptering"
 
 #: smime/lib/e-cert.c:582
 msgid "PKCS #1 SHA-1 With RSA Encryption"
-msgstr ""
+msgstr "PKCS #1 SHA-1 med RSA-kryptering"
 
 #: smime/lib/e-cert.c:585
 msgid "C"
@@ -15798,7 +15898,7 @@ msgstr "ST"
 
 #: smime/lib/e-cert.c:609
 msgid "PKCS #1 RSA Encryption"
-msgstr ""
+msgstr "PKCS #1 RSA-kryptering"
 
 #: smime/lib/e-cert.c:612
 #, fuzzy
@@ -15826,11 +15926,11 @@ msgstr "Objektidentifikator (%s)"
 
 #: smime/lib/e-cert.c:681
 msgid "Algorithm Identifier"
-msgstr ""
+msgstr "Algoritmeidentifikator"
 
 #: smime/lib/e-cert.c:689
 msgid "Algorithm Parameters"
-msgstr ""
+msgstr "Parametere for algoritme"
 
 #: smime/lib/e-cert.c:711
 msgid "Subject Public Key Info"
@@ -15855,9 +15955,8 @@ msgid "Object Signer"
 msgstr ""
 
 #: smime/lib/e-cert.c:777
-#, fuzzy
 msgid "SSL Certificate Authority"
-msgstr "Ugyldig sertifikatmyndighet (CA)"
+msgstr "SSL-sertifikatmyndighet"
 
 #: smime/lib/e-cert.c:781
 #, fuzzy
@@ -15922,7 +16021,7 @@ msgstr "Utsteder"
 
 #: smime/lib/e-cert.c:1097
 msgid "Issuer Unique ID"
-msgstr ""
+msgstr "Unik ID for utsteder"
 
 #: smime/lib/e-cert.c:1116
 #, fuzzy
@@ -15934,16 +16033,15 @@ msgstr "Emne er %s"
 msgid "Certificate Signature Value"
 msgstr "Feil med sertifikatsignatur"
 
-#: smime/lib/e-pkcs12.c:246
+#: smime/lib/e-pkcs12.c:261
 msgid "PKCS12 File Password"
-msgstr ""
+msgstr "Passord for PKCS12-fil"
 
-#: smime/lib/e-pkcs12.c:246
-#, fuzzy
+#: smime/lib/e-pkcs12.c:261
 msgid "Enter password for PKCS12 file:"
-msgstr "Skriv inn passord for %s"
+msgstr "Oppgi passord for PKCS12-fil:"
 
-#: smime/lib/e-pkcs12.c:379
+#: smime/lib/e-pkcs12.c:359
 msgid "Imported Certificate"
 msgstr "Importert sertifikat"
 
@@ -16055,9 +16153,8 @@ msgid "Send selected contacts to another person."
 msgstr "Send valgte kontakter til en annen person."
 
 #: ui/evolution-addressbook.xml.h:26
-#, fuzzy
 msgid "Show contact preview window"
-msgstr "Vis vindu for forhåndsvisning av melding"
+msgstr "Vis vindu for forhåndsvisning av kontakter"
 
 #: ui/evolution-addressbook.xml.h:27
 msgid "Stop"
@@ -16077,7 +16174,7 @@ msgstr "Vis aktiv kontakt"
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:23
+#: ui/evolution-tasks.xml.h:17 ui/evolution.xml.h:23
 msgid "_Actions"
 msgstr "H_andlinger"
 
@@ -16202,9 +16299,8 @@ msgid "Show the working week"
 msgstr "Vis arbeidsuken"
 
 #: ui/evolution-calendar.xml.h:30
-#, fuzzy
 msgid "View the current appointment"
-msgstr "Vis aktiv kontakt"
+msgstr "Vis denne avtalen"
 
 #: ui/evolution-calendar.xml.h:31
 msgid "Week"
@@ -16215,9 +16311,8 @@ msgid "Work Week"
 msgstr "Arbeidsuke"
 
 #: ui/evolution-calendar.xml.h:37
-#, fuzzy
 msgid "_Open Appointment"
-msgstr "A_vtale"
+msgstr "_Åpne avtale"
 
 #: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2
@@ -16649,9 +16744,8 @@ msgid "Display the previous unread message"
 msgstr "Vis forrige uleste melding"
 
 #: ui/evolution-mail-message.xml.h:32
-#, fuzzy
 msgid "F_orward As..."
-msgstr "V_ideresend"
+msgstr "V_ideresend som..."
 
 #: ui/evolution-mail-message.xml.h:33
 msgid "Filter on Mailing _List..."
@@ -17235,6 +17329,14 @@ msgstr "Forhåndsviser listen over oppgaver som skal skrives ut"
 msgid "Print the list of tasks"
 msgstr "Skriv ut denne listen over oppgaver"
 
+#: ui/evolution-tasks.xml.h:16
+msgid "View the selected task"
+msgstr "Vis valgt oppgave"
+
+#: ui/evolution-tasks.xml.h:21
+msgid "_Open Task"
+msgstr "_Åpne oppgave"
+
 #: ui/evolution.xml.h:1
 msgid "About Ximian Evolution..."
 msgstr "Om Ximian Evolution..."
@@ -17607,6 +17709,92 @@ msgstr "Tekst"
 msgid "Find _Now"
 msgstr "Finn _nå "
 
+#~ msgid "Select Names"
+#~ msgstr "Velg navn"
+
+#~ msgid "Selected Contacts:"
+#~ msgstr "Valgte kontakter:"
+
+#~ msgid ""
+#~ "Type a name into the entry, or\n"
+#~ "select one from the list below:"
+#~ msgstr ""
+#~ "Skriv et navn inn i feltet,\n"
+#~ "eller velg et fra listen under:"
+
+#~ msgid "_Folder:"
+#~ msgstr "_Mappe:"
+
+#~ msgid "East Timor"
+#~ msgstr "Øst-Timor"
+
+#~ msgid "Yugoslavia"
+#~ msgstr "Jugoslavia"
+
+#~ msgid "Rename this calendar to"
+#~ msgstr "Gi nytt navn til denne kalenderen"
+
+#~ msgid "A group must be selected"
+#~ msgstr "En gruppe må velges"
+
+#~ msgid "The method required to load `%s' is not supported"
+#~ msgstr "Metoden som er nødvendig for å laste «%s» er ikke støttet"
+
+#~ msgid "You don't have permission to open the folder in `%s'"
+#~ msgstr "Du har ikke rettigheter til å åpne mappen i «%s»"
+
+#~ msgid "Could not open the folder in `%s'"
+#~ msgstr "Kunne ikke åpne mappen i «%s»"
+
+#~ msgid "The method required to open `%s' is not supported"
+#~ msgstr "Metoden som er nødvendig for å åpne «%s» er ikke støttet"
+
+#~ msgid "Rename this task list to"
+#~ msgstr "Gi nytt navn til denne oppgavelisten"
+
+#~ msgid "Important mail (local)"
+#~ msgstr "Viktige meldinger (lokalt)"
+
+#~ msgid "Unread mail (local)"
+#~ msgstr "Uleste meldinger (lokal)"
+
+#~ msgid "Could not update files correctly"
+#~ msgstr "Kunne ikke oppdatere filene."
+
+#~ msgid ""
+#~ "Cannot create the directory\n"
+#~ "%s\n"
+#~ "Error: %s"
+#~ msgstr ""
+#~ "Kan ikke opprette katalogen\n"
+#~ "%s\n"
+#~ "Feil: %s"
+
+#~ msgid ""
+#~ "An error occurred in copying files into\n"
+#~ "`%s'."
+#~ msgstr ""
+#~ "En feil oppsto under kopiering av filer til\n"
+#~ "«%s»."
+
+#~ msgid ""
+#~ "The file `%s' is not a directory.\n"
+#~ "Please move it in order to allow installation\n"
+#~ "of the Evolution user files."
+#~ msgstr ""
+#~ "Filen «%s» er ikke en katalog.\n"
+#~ "Vennligst flytt denne for å tillate installasjon\n"
+#~ "av Evolution's brukerfiler."
+
+#~ msgid ""
+#~ "The directory `%s' exists but is not the\n"
+#~ "Evolution directory.  Please move it in order\n"
+#~ "to allow installation of the Evolution user files."
+#~ msgstr ""
+#~ "Katalogen «%s» eksisterer men er ikke.\n"
+#~ "Evolution-katalogen. Vennligst flytt den for å \n"
+#~ "tillate installasjon av Evolution's brukerfiler."
+
 #~ msgid "Basics"
 #~ msgstr "Basis"