Updated Norwegian Nynorsk translation.

2004-01-29 Ãsmund SkjÃ¦veland <aasmunds@fys.uio.no> * nn.po: Updated Norwegian Nynorsk translation. svn path=/trunk/; revision=24516
author: Ãsmund SkjÃ¦veland <aasmunds@fys.uio.no> 2004-01-29 18:58:23 +0800
committer: Åsmund Skjæveland <aasmunds@src.gnome.org> 2004-01-29 18:58:23 +0800
commit: 2f04af5ec0ce21850e346bf08f294ecb416b7431 (patch)
tree: f829c4b9b5d38b401baec24fe34346406cef6d25 /po/nn.po
parent: cd7969810436f5f4074736e72e6f68fac9469074 (diff)
download: gsoc2013-evolution-2f04af5ec0ce21850e346bf08f294ecb416b7431.tar
gsoc2013-evolution-2f04af5ec0ce21850e346bf08f294ecb416b7431.tar.gz
gsoc2013-evolution-2f04af5ec0ce21850e346bf08f294ecb416b7431.tar.bz2
gsoc2013-evolution-2f04af5ec0ce21850e346bf08f294ecb416b7431.tar.lz
gsoc2013-evolution-2f04af5ec0ce21850e346bf08f294ecb416b7431.tar.xz
gsoc2013-evolution-2f04af5ec0ce21850e346bf08f294ecb416b7431.tar.zst
gsoc2013-evolution-2f04af5ec0ce21850e346bf08f294ecb416b7431.zip
1 files changed, 3160 insertions, 2643 deletions
diff --git a/po/nn.po b/po/nn.po
index 5dbd9002b7..246e3c85a0 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -2,14 +2,14 @@
 # Norwegian (Nynorsk) translation of Evolution
 # Copyright (C) 2001-2002 Roy-Magne Mo, 2003 Åsmund Skjæveland
 # Roy-Magne Mo <rmo@sunnmore.net>, 2001-2002.
-# Åsmund Skjæveland <aasmunds@fys.uio.no>, 2003.
+# Åsmund Skjæveland <aasmunds@fys.uio.no>, 2003, 2004.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: nn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-27 17:45+0100\n"
-"PO-Revision-Date: 2003-10-28 11:42+0100\n"
+"POT-Creation-Date: 2004-01-29 08:34+0100\n"
+"PO-Revision-Date: 2004-01-29 11:57+0100\n"
 "Last-Translator: Åsmund Skjæveland <aasmunds@fys.uio.no>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
@@ -23,9 +23,8 @@ msgstr "Standard synkroniseringsaddresse:"
 
 #: addressbook/conduit/address-conduit.c:1150
 #: addressbook/conduit/address-conduit.c:1151
-#, fuzzy
 msgid "Could not load addressbook"
-msgstr "Klarte ikkje å laste %s: %s"
+msgstr "Klarte ikkje å lasta adressebok"
 
 #: addressbook/conduit/address-conduit.c:1214
 #: addressbook/conduit/address-conduit.c:1217
@@ -33,19 +32,16 @@ msgid "Could not read pilot's Address application block"
 msgstr "Klarte ikkje å lese addresseblokka i programmet til piloten"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#, fuzzy
 msgid "Autocompletion"
-msgstr "Autofullføringsmapper"
+msgstr "Autofullføring"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-#, fuzzy
 msgid "Certificates"
-msgstr "_Sertifikat-ID:"
+msgstr "Sertifikat"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
 msgid "Configure autocomple here"
-msgstr "Set opp e-postkontoar"
+msgstr "Set opp autofullføring her"
 
 #. Fix me *
 #. can not get name, should be a bug of e-book.Anyway, should set a default name.
@@ -53,7 +49,8 @@ msgstr "Set opp e-postkontoar"
 #. 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
-#: mail/importers/netscape-importer.c:1844 shell/e-shortcuts.c:1088
+#: calendar/gui/migration.c:345 mail/importers/netscape-importer.c:1844
+#: shell/e-shortcuts.c:1088
 msgid "Contacts"
 msgstr "Kontakter"
 
@@ -84,7 +81,7 @@ msgstr "Evolution adressebok mappevisar"
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
 #, fuzzy
 msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution e-postinnstillingskontroll"
+msgstr "Evolution S/Mime-sertifikatstyring"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
 msgid "Evolution folder settings configuration control"
@@ -94,122 +91,134 @@ msgstr "Evolution oppsettkontroll for mappeinnstillingar"
 msgid "Manager your S/Mime certificates here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:145
+#: addressbook/gui/component/addressbook-component.c:212
+#, c-format
+msgid "Addressbook '%s' will be removed. Are you sure you want to continue?"
+msgstr "Adresseboka «%s» vil verta fjerna. Er du sikker på at du vil halda fram?"
+
+#: addressbook/gui/component/addressbook-component.c:268
 #: addressbook/gui/component/ldap-config.glade.h:28
-#, fuzzy
 msgid "New Addressbook"
-msgstr "Adressebok"
-
-#: addressbook/gui/component/addressbook-component.c:146
-msgid "Properties..."
-msgstr "Eigenskapar ..."
+msgstr "Ny adressebok"
 
-#: addressbook/gui/component/addressbook-component.c:147
-#: addressbook/gui/widgets/e-addressbook-view.c:1017
-#: calendar/gui/calendar-component.c:440 calendar/gui/tasks-component.c:414
-#: filter/libfilter-i18n.h:10 mail/em-account-prefs.c:236
+#: addressbook/gui/component/addressbook-component.c:269
+#: addressbook/gui/widgets/e-addressbook-view.c:1046
+#: calendar/gui/calendar-component.c:360 calendar/gui/tasks-component.c:363
+#: filter/libfilter-i18n.h:11 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
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 msgid "Delete"
 msgstr "Slett"
 
-#: addressbook/gui/component/addressbook-component.c:148
-#: calendar/gui/calendar-component.c:439 calendar/gui/tasks-component.c:412
-#, fuzzy
-msgid "Rename"
-msgstr "_Gje nytt namn"
+#: addressbook/gui/component/addressbook-component.c:270
+#: calendar/gui/calendar-component.c:361 calendar/gui/tasks-component.c:365
+msgid "Properties..."
+msgstr "Eigenskapar ..."
 
-#: addressbook/gui/component/addressbook-component.c:217
-#, fuzzy
+#: addressbook/gui/component/addressbook-component.c:341
 msgid "New Contact"
 msgstr "Ny kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:218
+#: addressbook/gui/component/addressbook-component.c:342
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:219
+#: addressbook/gui/component/addressbook-component.c:343
 msgid "Create a new contact"
 msgstr "Opprett ny kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:224
+#: addressbook/gui/component/addressbook-component.c:348
 msgid "New Contact List"
 msgstr "Ny kontaktliste"
 
-#: addressbook/gui/component/addressbook-component.c:225
-#, fuzzy
+#: addressbook/gui/component/addressbook-component.c:349
 msgid "Contact _List"
-msgstr "Ny kontakt_liste"
+msgstr "Kontakt_liste"
 
-#: addressbook/gui/component/addressbook-component.c:226
+#: addressbook/gui/component/addressbook-component.c:350
 msgid "Create a new contact list"
-msgstr "Opprett ny kontaktliste"
-
-#: addressbook/gui/component/addressbook-component.c:375
-#: calendar/gui/calendar-component.c:833 calendar/gui/tasks-component.c:767
-msgid "On This Computer"
-msgstr ""
-
-#. orange
-#: addressbook/gui/component/addressbook-component.c:385
-#: calendar/gui/calendar-component.c:841 calendar/gui/migration.c:123
-#: calendar/gui/migration.c:146 calendar/gui/tasks-component.c:775
-#: filter/filter-label.c:123 mail/mail-config.c:65 mail/mail-config.glade.h:88
-#: shell/e-config-upgrade.c:1456
-#, fuzzy
-msgid "Personal"
-msgstr "Personleg"
-
-#. red
-#: addressbook/gui/component/addressbook-component.c:392
-#: calendar/gui/calendar-component.c:848 filter/filter-label.c:122
-#: mail/mail-config.c:64 mail/mail-config.glade.h:135
-#: shell/e-config-upgrade.c:1455
-#, fuzzy
-msgid "Work"
-msgstr "Arbeid"
-
-#. Create the LDAP source group
-#: addressbook/gui/component/addressbook-component.c:400
-#, fuzzy
-msgid "On LDAP Servers"
-msgstr "LDAP-tenar"
+msgstr "Lag ei ny kontaktliste"
 
-#. FIXME: parent
-#: addressbook/gui/component/addressbook-config.c:244
-#, fuzzy
-msgid "Could not create a directory for the new addressbook."
-msgstr "Kan ikkje laga mappa %s: %s"
-
-#: addressbook/gui/component/addressbook-config.c:416
+#: addressbook/gui/component/addressbook-config.c:391
 msgid "Failed to connect to LDAP server"
 msgstr "Klarte ikkje å kopla til LDAP-tenar"
 
-#: addressbook/gui/component/addressbook-config.c:440
+#: addressbook/gui/component/addressbook-config.c:415
 msgid "Failed to authenticate with LDAP server"
 msgstr "Ikkje i stand til å autentisere mot IMAP-tenar"
 
-#: addressbook/gui/component/addressbook-config.c:468
+#: addressbook/gui/component/addressbook-config.c:443
 msgid "Could not perform query on Root DSE"
 msgstr "Kunne ikke utføra spørjing på Root DSE"
 
-#: addressbook/gui/component/addressbook-config.c:792
+#: addressbook/gui/component/addressbook-config.c:767
 msgid "The server responded with no supported search bases"
 msgstr "Tenaren svarte ikkje med nokon støtta basisar for søk"
 
-#: addressbook/gui/component/addressbook-config.c:1203
+#: addressbook/gui/component/addressbook-config.c:1178
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Denne tenaren stør ikkje LDAPv3 skjemainformasjon"
 
-#: addressbook/gui/component/addressbook-config.c:1225
+#: addressbook/gui/component/addressbook-config.c:1200
 msgid "Error retrieving schema information"
 msgstr "Feil ved henting av skjemainformasjon"
 
-#: addressbook/gui/component/addressbook-config.c:1233
+#: addressbook/gui/component/addressbook-config.c:1208
 msgid "Server did not respond with valid schema information"
 msgstr "Tenaren svarte ikkje med gyldig skjema-informasjon"
 
+#: addressbook/gui/component/addressbook-migrate.c:46
+#: calendar/gui/migration.c:127 mail/em-migrate.c:1071
+msgid "Migrating..."
+msgstr "Overfører ..."
+
+#: addressbook/gui/component/addressbook-migrate.c:54
+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 ""
+"Plasseringa til og hierarkiet i Evolution-kontaktmappene har endra seg "
+"sidan Evolution 1.x.\n"
+"\n"
+"Ha tolmod medan Evolution overfører mappene dine ..."
+
+#: addressbook/gui/component/addressbook-migrate.c:87
+#: calendar/gui/migration.c:174 mail/em-migrate.c:1112
+#, c-format
+msgid "Migrating `%s':"
+msgstr "Overfører «%s»:"
+
+#. create the local source group
+#: addressbook/gui/component/addressbook-migrate.c:393
+#: calendar/gui/migration.c:382 calendar/gui/migration.c:448
+msgid "On This Computer"
+msgstr "På denne datamaskina"
+
+#. Create the default Person addressbook
+#: addressbook/gui/component/addressbook-migrate.c:401
+#: calendar/gui/migration.c:395 calendar/gui/migration.c:461
+#: calendar/gui/migration.c:530 calendar/gui/migration.c:617
+#: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:65
+#: mail/mail-config.glade.h:90
+msgid "Personal"
+msgstr "Personleg"
+
+#. Create the LDAP source group
+#: addressbook/gui/component/addressbook-migrate.c:409
+msgid "On LDAP Servers"
+msgstr "På LDAP-tenarar"
+
+#: addressbook/gui/component/addressbook-migrate.c:536
+msgid "LDAP Servers"
+msgstr "LDAP-tenarar"
+
+#: addressbook/gui/component/addressbook-migrate.c:656
+msgid "Autocompletion Settings"
+msgstr "Autofullføringsinnstillingar"
+
 #: addressbook/gui/component/addressbook.c:273
 msgid ""
 "More cards matched this query than either the server is \n"
@@ -249,78 +258,80 @@ msgstr ""
 # TRN. «Aksessera». Blæ.
 #: 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."
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
 msgstr ""
-"Kan ikkje opna denne adresseboka. Sjå etter at stien\n"
+"Kan ikkje opna denne adresseboka. Sjå etter at stien "
 "finst og at du har løyve til å aksessera han."
 
 #: addressbook/gui/component/addressbook.c:599
-#, fuzzy
 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."
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
 msgstr ""
-"Kan ikkje opna denne adresseboka. Det betyr anten at\n"
-"du har skrive inn ein ugyldig URI, eller at LDAP-tenaren\n"
+"Kan ikkje opna denne adresseboka. Det betyr anten at "
+"du har skrive inn ei ugyldig adresse, eller at LDAP-tenaren "
 "ikkje kan nåast."
 
 #: 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"
+"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 er ikkje kompilert med\n"
-"LDAP-støtte. Dersom du ynsjer å bruka LDAP i\n"
-"Evolution, må du kompilera programmet frå kjeldekoden\n"
-"i CVS etter at du har henta OpenLDAP frå lenkja under.\n"
+"Denne versjonen av Evolution er ikkje kompilert med "
+"LDAP-støtte. Dersom du ynsjer å bruka LDAP i "
+"Evolution, må du kompilera programmet frå kjeldekoden "
+"i CVS etter at du har henta OpenLDAP frå lenkja 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."
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
 msgstr ""
+"Kan ikkje opna denne adresseboka. Det betyr anten at "
+"du har skrive inn ei ugyldig adresse, eller at tenaren "
+"ikkje kan nåast."
 
 #: addressbook/gui/component/addressbook.c:630
 msgid "Unable to open addressbook"
-msgstr "Ikkje i stand å opne adresseboka"
+msgstr "Ikkje i stand å opna adresseboka"
 
 # TRN: Må finna betre ord for «aksessera». Kanskje dette duger?
-#: addressbook/gui/component/addressbook.c:700
+#: addressbook/gui/component/addressbook.c:714
 msgid "Accessing LDAP Server anonymously"
 msgstr "Hentar data frå LDAP-tenar anonymt"
 
-#: addressbook/gui/component/addressbook.c:770
+#: addressbook/gui/component/addressbook.c:783
 msgid "Failed to authenticate.\n"
 msgstr "Kan ikkje autentisera.\n"
 
-#: addressbook/gui/component/addressbook.c:776
+#: addressbook/gui/component/addressbook.c:789
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sSkriv inn passord for %s (brukar %s)"
 
-#: addressbook/gui/component/addressbook.c:1030
-#, fuzzy
+#: addressbook/gui/component/addressbook.c:1070
 msgid "UID of the contacts source that the view will display"
-msgstr "URI-en som kalenderen skal visa"
+msgstr "UID til kontaktkjelda som framvisinga vil visa"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
 msgstr ""
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+msgid "Position of the vertical pane in main view"
+msgstr ""
+
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
 msgid ""
 "The number of characters that must be typed before evolution will attempt to "
 "autocomplete"
-msgstr ""
+msgstr "Talet på teikn som må vera skrivne for at Evolution skal prøva å autofullføra"
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
 msgid "URI for the folder last used in the select names dialog"
-msgstr ""
+msgstr "Adresse til mappa som vart sist brukt i vel namn-dialogen"
 
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
@@ -330,21 +341,24 @@ msgstr "\n"
 
 #: addressbook/gui/component/ldap-config.glade.h:3
 msgid "  S_how Supported Bases "
-msgstr "V_is støtta basar"
+msgstr "  V_is støtta basar "
 
 #: addressbook/gui/component/ldap-config.glade.h:4
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 #: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/im.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
 #: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/calendar-setup.glade.h:1
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
 #: calendar/gui/dialogs/new-calendar.glade.h:1
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:1
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:7
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
@@ -376,50 +390,46 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-#, fuzzy
 msgid "Addressbook Creation Assistant"
-msgstr "Konfigurasjonsassistent for LDAP"
+msgstr "Vegvisar for oppretting av adressebok"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
+msgid "Addressbook Properties"
+msgstr "Addressebokeigenskapar"
+
+#: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Addressbook Sources"
 msgstr "Addressebokkjelder"
 
-#: addressbook/gui/component/ldap-config.glade.h:13 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:65
+#: mail/mail-config.glade.h:17
 msgid "Always"
 msgstr "Alltid"
 
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:15
 msgid "Anonymously"
 msgstr "Anonymt"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
-#, fuzzy
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid ""
 "Congratulations, you are finished setting up this addressbook.\n"
 "\n"
 "Please click the \"Finish\" button to save the settings you have entered "
 "here."
 msgstr ""
-"Til lukke. Du har fullført oppsettet av denne LDAP-tenaren. Du er\n"
-"no klar til å bruka dene katalogen.\n"
+"Til lukke. Du har fullført oppsettet av denne adresseboka.\n"
 "\n"
 "Trykk på «Fullfør»-knappen for å lagra innstillingane du har\n"
 "skrive inn her."
 
-#: addressbook/gui/component/ldap-config.glade.h:18
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Connecting"
 msgstr "Koplar til"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Distinguished _name:"
 msgstr "Distinguished _name:"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
-#, fuzzy
-msgid "Edit LDAP Server"
-msgstr "LDAP-tenar"
-
 #: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Email address:"
 msgstr "E-postadresse:"
@@ -429,29 +439,30 @@ msgid "Evolution will use this DN to authenticate you with the server"
 msgstr "Evolution vil bruka DN til å autentisera deg mot tenaren"
 
 #: addressbook/gui/component/ldap-config.glade.h:23
-msgid ""
-"Evolution will use this email address to authenticate you with the server"
+msgid "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 "Evolution kjem til å bruke denne e-postaddressa for å autentisere deg "
 "ovanfor tenaren"
 
 #: addressbook/gui/component/ldap-config.glade.h:24
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "Finished"
 msgstr "Ferdig"
 
 #: 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:18
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Allmennt"
 
 #: addressbook/gui/component/ldap-config.glade.h:26
-#, fuzzy
+#: calendar/gui/dialogs/calendar-setup.glade.h:12
 msgid "Group:"
-msgstr "Gruppe"
+msgstr "Gruppe:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:68
-#: mail/mail-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:67
+#: mail/mail-config.glade.h:80
 msgid "Never"
 msgstr "Aldri"
 
@@ -479,8 +490,6 @@ 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:579
-#: calendar/gui/gnome-cal.c:585
 msgid "Searching"
 msgstr "Søker"
 
@@ -525,6 +534,7 @@ msgstr ""
 "for eventuelle trygglekshol."
 
 #: 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"
@@ -534,35 +544,31 @@ msgstr ""
 "for LDAP-søk, og for å oppretta og redigera kontaktar."
 
 #: 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 ""
-"Det siste steget i å setja opp ein LDAP-tenar er å setja eit visingsnamn."
+msgstr "Det fyrste steget i å laga ei adressebok er å velja eit skjermnamn og gruppe."
 
 #: addressbook/gui/component/ldap-config.glade.h:48
+#: calendar/gui/dialogs/calendar-setup.glade.h:20
 msgid "Step 1: Folder Characteristics"
-msgstr ""
+msgstr "Steg 1: Mappekarakteristikk"
 
 #: addressbook/gui/component/ldap-config.glade.h:49
-#, fuzzy
 msgid "Step 2: Server Information"
-msgstr "Steg 1: Tenarinformasjon"
+msgstr "Steg 2: Tenarinformasjon"
 
 #: addressbook/gui/component/ldap-config.glade.h:50
-#, fuzzy
 msgid "Step 3: Connecting to Server"
-msgstr "Steg 2: Koplar til tenar"
+msgstr "Steg 3: Koplar til tenar"
 
 #: addressbook/gui/component/ldap-config.glade.h:51
-#, fuzzy
 msgid "Step 4: Searching the Directory"
-msgstr "Steg 3: Søker gjennom katalogen"
+msgstr "Steg 4: Søker gjennom katalogen"
 
 #: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Sub"
-msgstr "Sub"
+msgstr "Under"
 
 #: addressbook/gui/component/ldap-config.glade.h:53
 msgid "Supported Search Bases"
@@ -606,7 +612,6 @@ msgstr ""
 "brukast.\n"
 
 #: addressbook/gui/component/ldap-config.glade.h:63
-#, fuzzy
 msgid ""
 "This assistant will help you create a new addressbook. \n"
 "\n"
@@ -614,12 +619,11 @@ msgid ""
 "parameters may be required. Please contact your system\n"
 "administrator if you need help finding this information."
 msgstr ""
-"Denne assistenten hjelper deg med å få tilgang til katalogtenester\n"
-"på nettverket ved hjelp av LDAP (Lightweight Directory Access Protocol)-"
-"tenarar. \n"
-"Å leggja til ein ny LDAP-tenar krev litt informasjon om tenaren. Ta kontakt "
-"med din systemansvarlege dersom du treng hjelp til å finna denne "
-"informasjonen."
+"Denne vegvisaren vil hjelpa deg å laga ei ny adressebok.\n"
+"\n"
+"Alt etter kva slags adressebok du vil laga, kan det vera at du treng meir\n"
+"informasjon. Ta kontakt med din systemansvarlege dersom du treng \n"
+"hjelp til å finna denne informasjonen."
 
 #: addressbook/gui/component/ldap-config.glade.h:68
 msgid ""
@@ -657,12 +661,12 @@ msgstr ""
 "Det vert berre brukt til å visast 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 det namnet på tenaren som vert vist i Evolution si mappeliste.\n"
+"Dette er det namnet på tenaren som vert vist i Evolution si mappeliste. "
 "Det vert berre brukt til å visast på skjermen."
 
 #: addressbook/gui/component/ldap-config.glade.h:75
@@ -692,13 +696,12 @@ msgstr "Bruker distinguished name (DN)"
 msgid "Using email address"
 msgstr "Brukar e-post adresse"
 
-#: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:66
+#: mail/mail-config.glade.h:136
 msgid "Whenever Possible"
 msgstr "Når det er mogleg"
 
 #: addressbook/gui/component/ldap-config.glade.h:83
-#, fuzzy
 msgid ""
 "You have decided to configure an LDAP server. The first step in doing this "
 "is to provide its name and your\n"
@@ -706,11 +709,12 @@ msgid ""
 "of this information."
 msgstr ""
 "Det fyrste steget i å setja opp ein LDAP-tenar er å skriva inn namnet på "
-"tenaren\n"
-"og informasjonen som trengst for å logga inn. Spør systemadministratoren din "
+"tenaren og informasjonen \n"
+"som trengst for å logga inn. Spør systemadministratoren din "
 "dersom du er usikker på kva denne informasjonen er."
 
 #: addressbook/gui/component/ldap-config.glade.h:85
+#: calendar/gui/dialogs/calendar-setup.glade.h:37
 msgid "_Display name:"
 msgstr "_Vist namn:"
 
@@ -718,13 +722,15 @@ msgstr "_Vist namn:"
 msgid "_Download limit:"
 msgstr "Grense for ne_dlasting:"
 
-#: addressbook/gui/component/ldap-config.glade.h:87 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
-#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:8
+#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:34
+#: ui/evolution-calendar.xml.h:36 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:43
 #: 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_edigér"
 
@@ -768,35 +774,36 @@ msgstr "søke-fane"
 msgid "Evolution Addressbook name selection interface"
 msgstr "Grensesnitt for val av namn 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
+#: calendar/gui/dialogs/cal-prefs-dialog.c:663
 #: 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 e-post i HTML-format?"
 
-#: 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 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 utan namn"
 
@@ -812,46 +819,30 @@ msgstr "Namn"
 msgid "Source"
 msgstr "Kjelde"
 
-#: addressbook/gui/component/select-names/e-select-names.c:518
-#, fuzzy
-msgid "Select Contacts from Addressbook"
+#: addressbook/gui/component/select-names/e-select-names.c:494
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+msgid "Select Contacts from Address Book"
 msgstr "Vel kontaktar frå adresseboka"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-#, fuzzy
-msgid "Find"
-msgstr "Finn:"
+msgid "<b>Contacts</b>"
+msgstr "<b>Kontaktar:</b>"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
-#, fuzzy
-msgid "Select Names"
-msgstr "Vel ei fil"
+msgid "<b>Show Contacts</b>"
+msgstr "<b>Vis kontaktar</b>"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
-#, fuzzy
-msgid "Selected Contacts:"
-msgstr "Vel alle kontatene"
+msgid "Address _Book:"
+msgstr "Adresse_bok:"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:5
-#, fuzzy
-msgid "Show Contacts"
-msgstr "Vis kontaktar"
-
-#: 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 ""
+msgid "C_ategory:"
+msgstr "K_ategori:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
-#, fuzzy
-msgid "_Category:"
-msgstr "_Kategori:"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:9
-#, fuzzy
-msgid "_Folder:"
-msgstr "_Mapper:"
+#: 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:"
@@ -866,22 +857,20 @@ msgid "A_ssistant's name:"
 msgstr "Namn på _assistent:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#, fuzzy
 msgid "Addressbook:"
-msgstr "Adressebok"
+msgstr "Adressebok:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
 msgid "Anni_versary:"
-msgstr "_Merkedag"
+msgstr "_Bryllupsdag:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "Birthda_y:"
 msgstr "_Fødselsdag:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#, fuzzy
 msgid "Blog address:"
-msgstr "E-postadresse:"
+msgstr "Adresse til vevlogg:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "Business fa_x:"
@@ -893,7 +882,7 @@ 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/e-contact-editor.c:2013
 msgid "Contact Editor"
 msgstr "Kontaktredigering"
 
@@ -908,18 +897,30 @@ msgid "Details"
 msgstr "Detaljar"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:14
+msgid "Enter the person's instant messenger accounts here."
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "F_ree/Busy URL:"
 msgstr "_Ledig/Oppteken URL:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "File a_s:"
 msgstr "Arkiver _som:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "Full _Name..."
 msgstr "Fullt _namn ..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+msgid ""
+"If this person has the ability to participate in a video conference, enter "
+"their address here."
+msgstr ""
+"Skriv inn adressa her dersom denne personen har høve til å delta i "
+"ein videokonferanse."
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid ""
 "If this person publishes free/busy or other calendar information on the "
 "Internet, enter the address\n"
@@ -929,90 +930,100 @@ msgstr ""
 "kalenderinformasjon på internett, skriv inn adresa til denne informasjonen "
 "her."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+# TRN: «Send» betre enn «post»?
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+msgid "Instant Messaging"
+msgstr ""
+
+#: 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 "M_erknadar:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "Organi_zation:"
 msgstr "O_rganisasjon:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "P_rofession:"
 msgstr "_Yrke:"
 
-#: 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-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 "_Firma:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Categories..."
 msgstr "_Kategoriar ..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
-#: calendar/gui/dialogs/meeting-page.c:633 calendar/gui/e-cal-view.c:1210
-#: calendar/gui/e-cal-view.c:1241 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
-#: ui/evolution-calendar.xml.h:34 ui/evolution-comp-editor.xml.h:17
+#. FIXME: need to disable for undeletable folders
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1259
+#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-table.c:1075 mail/em-folder-tree.c:1766
+#: mail/em-folder-view.c:736 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:35
 msgid "_Home:"
 msgstr "_Heime:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Job title:"
 msgstr "_Jobb-tittel:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Manager's name:"
 msgstr "Namn på _leiar:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Mobile:"
 msgstr "_Mobil:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "_Nickname:"
 msgstr "Kalle_namn:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
 msgid "_Office:"
 msgstr "K_ontor:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Public Calendar URL:"
 msgstr "_Offentleg kalender-URL:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "_This is the mailing address"
 msgstr "_Dette er postadressa"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:43
+msgid "_Video Conferencing URL:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:44
 msgid "_Web page address:"
 msgstr "Ne_ttsideadresse"
 
@@ -1022,7 +1033,8 @@ msgstr "Adresse"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: addressbook/gui/contact-editor/e-contact-editor.c:226
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:139
+#: addressbook/gui/contact-editor/e-contact-editor.c:242
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
 #: addressbook/gui/widgets/e-addressbook-model.c:312
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
@@ -1232,10 +1244,13 @@ msgstr "Komorane"
 
 # TRN: Er dette Kongo-Brazaville (Congo), cg, eller Kongo (The Democratic republic of the Congo) cd?
 #: 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øyane"
@@ -1281,118 +1296,118 @@ msgid "Dominican Republic"
 msgstr "Den dominikanske republikken"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:198
-msgid "East Timor"
-msgstr "Aust-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øyane"
 
-#: 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øyane"
 
-#: 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"
 
 # TRN: Inga offisiell omsetjing
-#: 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 "Franske sørlege territorium"
 
-#: 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 "Guadeloupe"
 
-#: 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"
@@ -1443,580 +1458,669 @@ 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 ""
+
+#: 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 ""
+
+#: 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 ""
+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
+msgid "Korea, Democratic People's Republic Of"
+msgstr "Nord-Korea"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Korea, Republic Of"
-msgstr ""
+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"
-msgstr ""
+#: 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 "Maldivane"
 
-#: 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øyane"
 
-#: 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 "Dei nederlandske antillane"
 
-#: 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-Marianane"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Norway"
 msgstr "Noreg"
 
-#: 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"
 
 # TRN: Ikkje ei offisiell omsetjing
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Palestinian Territory"
 msgstr "Palestinske territorium"
 
-#: 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 "Fillipinane"
 
-#: 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"
 
 # TRN: Aksentar.
-#: 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 "St. 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 "St. Lucia"
 
 # TRN: Feil i original streng
-#: 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 "St. Vincent og Grenadinane"
 
-#: 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"
 
 # TRN: Legg til tødlar og slikt.
-#: 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 ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Seychelles"
 msgstr "Seychellane"
 
-#: 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øyane"
 
-#: 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"
 
 # TRN: Ikkje offisiell omsetjing
-#: 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 dei sørlege Sandwich-øyane"
 
-#: 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 ""
+
+#: 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øyane"
 
-#: 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 "Ukrainia"
 
-#: 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 "Dei sameinte arabiske emirata"
 
-#: 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 ""
 
-#: 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øyane (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øyane (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 ""
 
-#: 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
+# TRN: «Send» betre enn «post»?
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+msgid "AOL Instant Messenger"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:63
+#: addressbook/gui/contact-editor/e-contact-editor.c:2837
+msgid "Jabber"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+msgid "Yahoo Messenger"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "MSN Messenger"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
+#: addressbook/gui/contact-editor/e-contact-editor.c:2840
+msgid "ICQ"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:116
+#: addressbook/gui/contact-editor/e-contact-editor.c:710
+msgid "Service"
+msgstr "Teneste"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:125
+#: calendar/gui/dialogs/cal-prefs-dialog.c:426
 #, fuzzy
+msgid "Location"
+msgstr "Plassering"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:132
+msgid "Username"
+msgstr "Brukarnamn"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:245
+#: addressbook/gui/contact-editor/e-contact-editor.c:2527
+msgid "Home"
+msgstr "Heim"
+
+#. red
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:249
+#: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:64
+#: mail/mail-config.glade.h:137
+msgid "Work"
+msgstr "Arbeid"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:253
+#: addressbook/gui/contact-editor/e-contact-editor.c:2528
+msgid "Other"
+msgstr "Anna"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:207
 msgid "Source Book"
-msgstr "Kjelde"
+msgstr "Kjeldebok"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:198
+#: addressbook/gui/contact-editor/e-contact-editor.c:214
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:205
+#: addressbook/gui/contact-editor/e-contact-editor.c:221
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:169
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:189
 msgid "Contact"
 msgstr "Kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:212
-#, fuzzy
+#: addressbook/gui/contact-editor/e-contact-editor.c:228
 msgid "Is New Contact"
-msgstr "Ny kontakt"
+msgstr "Er ny kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:219
+#: addressbook/gui/contact-editor/e-contact-editor.c:235
 msgid "Writable Fields"
 msgstr "Skrivbare felt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:233
+#: addressbook/gui/contact-editor/e-contact-editor.c:249
 msgid "Changed"
 msgstr "Endra"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:976
+#: addressbook/gui/contact-editor/e-contact-editor.c:724
+msgid "Account Name"
+msgstr "Kontonamn"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1447
 msgid "Category editor not available."
 msgstr "Kategoriredigering ikkje tilgjengeleg."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:984
+#: addressbook/gui/contact-editor/e-contact-editor.c:1455
 msgid "This contact belongs to these categories:"
 msgstr "Denne kontakten høyrer til desse kategoriane:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1206
+#: addressbook/gui/contact-editor/e-contact-editor.c:1678
 msgid "Save Contact as VCard"
-msgstr "Lagre kontakt som VKort"
+msgstr "Lagra kontakt som VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1246
+#: addressbook/gui/contact-editor/e-contact-editor.c:1718
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2024,7 +2128,7 @@ msgstr ""
 "Er du sikker på at du vil\n"
 "sletta desse kontaktane?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1249
+#: addressbook/gui/contact-editor/e-contact-editor.c:1721
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -2032,19 +2136,23 @@ msgstr ""
 "Er du sikker på at du vil\n"
 " slette denne kontakta?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2028
+#: addressbook/gui/contact-editor/e-contact-editor.c:2526
 msgid "Business"
 msgstr "Firma"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2029
-msgid "Home"
-msgstr "Heim"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2836
+msgid "AIM"
+msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2030
-msgid "Other"
-msgstr "Anna"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2838
+msgid "Yahoo"
+msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2569
+#: addressbook/gui/contact-editor/e-contact-editor.c:2839
+msgid "MSN"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:3127
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Kan ikkje finna skjermelement for felt: «%s»"
@@ -2070,7 +2178,6 @@ msgid "Address _2:"
 msgstr "Adresse _2:"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:3
-#, fuzzy
 msgid "Ci_ty:"
 msgstr "_Poststad:"
 
@@ -2167,6 +2274,24 @@ msgstr "E_tterstaving:"
 msgid "_Title:"
 msgstr "_Tittel:"
 
+#: addressbook/gui/contact-editor/im.glade.h:2
+msgid "Account name:"
+msgstr "Kontonamn:"
+
+#: addressbook/gui/contact-editor/im.glade.h:3
+msgid "Add IM Account"
+msgstr ""
+
+#: addressbook/gui/contact-editor/im.glade.h:4
+msgid "IM Service:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/im.glade.h:5
+#: calendar/gui/e-itip-control.c:948
+#, fuzzy
+msgid "Location:"
+msgstr "Plassering:"
+
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "Members"
 msgstr "Medlemar"
@@ -2207,7 +2332,7 @@ msgstr "Redigering av kontakter"
 
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:502
 msgid "Save List as VCard"
-msgstr "Lagre liste som VCard"
+msgstr "Lagra liste som VCard"
 
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
@@ -2248,24 +2373,22 @@ msgstr ""
 
 #. FIXME: get the toplevel window...
 #: addressbook/gui/search/e-addressbook-search-dialog.c:116
-#: widgets/misc/e-filter-bar.c:148
+#: widgets/misc/e-filter-bar.c:154
 msgid "Advanced Search"
 msgstr "Avansert søk"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:148
-#, fuzzy
 msgid "No contacts"
-msgstr "Vis kontaktar"
+msgstr "Ingen kontaktar"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:151
-#, fuzzy
 msgid "1 contact"
-msgstr "Kontakt"
+msgstr "1 kontakt"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:154
-#, fuzzy, c-format
+#, c-format
 msgid "%d contacts"
-msgstr "Kontakter"
+msgstr "%d kontaktar"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:305
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
@@ -2318,99 +2441,99 @@ msgstr "Avansert ..."
 msgid "Type"
 msgstr "Type"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:459
+#: addressbook/gui/widgets/e-addressbook-view.c:486
 #: mail/importers/pine-importer.c:577
 msgid "Addressbook"
 msgstr "Adressebok"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:781
-#: addressbook/gui/widgets/e-addressbook-view.c:1001
-#: addressbook/gui/widgets/e-addressbook-view.c:1928
+#: addressbook/gui/widgets/e-addressbook-view.c:810
+#: addressbook/gui/widgets/e-addressbook-view.c:1030
+#: addressbook/gui/widgets/e-addressbook-view.c:1964
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
-msgstr "Lagre som VKort"
+msgstr "Lagra som VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:988
+#: addressbook/gui/widgets/e-addressbook-view.c:1017
 msgid "New Contact..."
 msgstr "Ny kontakt ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:989
+#: addressbook/gui/widgets/e-addressbook-view.c:1018
 msgid "New Contact List..."
 msgstr "Ny kontaktliste ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:992
+#: addressbook/gui/widgets/e-addressbook-view.c:1021
 msgid "Go to Folder..."
 msgstr "Gå til mappe ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:993
+#: addressbook/gui/widgets/e-addressbook-view.c:1022
 msgid "Import..."
 msgstr "Importér ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:995
+#: addressbook/gui/widgets/e-addressbook-view.c:1024
 msgid "Search for Contacts..."
 msgstr "Søk etter kontakter ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:996
+#: addressbook/gui/widgets/e-addressbook-view.c:1025
 msgid "Addressbook Sources..."
 msgstr "Adressebokkjelder ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:998
+#: addressbook/gui/widgets/e-addressbook-view.c:1027
 msgid "Pilot Settings..."
 msgstr "Pilot-innstillingar ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1002
+#: addressbook/gui/widgets/e-addressbook-view.c:1031
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Vidaresend kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1003
+#: addressbook/gui/widgets/e-addressbook-view.c:1032
 msgid "Send Message to Contact"
 msgstr "Send melding til kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1004 calendar/gui/print.c:2452
+#: addressbook/gui/widgets/e-addressbook-view.c:1033 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Skriv ut"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1006
+#: addressbook/gui/widgets/e-addressbook-view.c:1035
 msgid "Print Envelope"
 msgstr "Skriv ut konvolutt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1010
+#: addressbook/gui/widgets/e-addressbook-view.c:1039
 msgid "Copy to folder..."
 msgstr "Kopier til mappe ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1011
+#: addressbook/gui/widgets/e-addressbook-view.c:1040
 msgid "Move to folder..."
 msgstr "Flytt til mappe ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1014
+#: addressbook/gui/widgets/e-addressbook-view.c:1043
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Klipp ut"
 
 #. create the dialog
-#: addressbook/gui/widgets/e-addressbook-view.c:1015
-#: calendar/gui/calendar-component.c:437
-#: calendar/gui/dialogs/copy-source-dialog.c:135
-#: calendar/gui/tasks-component.c:410 ui/evolution-addressbook.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:1044
+#: calendar/gui/calendar-component.c:358
+#: calendar/gui/dialogs/copy-source-dialog.c:158
+#: calendar/gui/tasks-component.c:361 ui/evolution-addressbook.xml.h:2
 #: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopier"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1016
+#: addressbook/gui/widgets/e-addressbook-view.c:1045
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
 msgid "Paste"
 msgstr "Lim inn"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1021
-#: calendar/gui/e-cal-view.c:1179
+#: addressbook/gui/widgets/e-addressbook-view.c:1050
+#: calendar/gui/e-cal-view.c:1228
 msgid "Current View"
 msgstr "Aktiv vising"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1206
+#: addressbook/gui/widgets/e-addressbook-view.c:1235
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2422,11 +2545,10 @@ msgstr ""
 "har krasja. Du må starta Evolution på nytt for å bruka han igjen."
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1526
+#: addressbook/gui/widgets/e-addressbook-view.c:1555
 #: calendar/gui/cal-search-bar.c:353
-#, fuzzy
 msgid "Any Category"
-msgstr "_Kategori:"
+msgstr "Einkvar kategori"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
 msgid "Assistant"
@@ -2493,9 +2615,8 @@ msgid "File As"
 msgstr "Arkiver som"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-#, fuzzy
 msgid "Given Name"
-msgstr "Feltnamn"
+msgstr "Førenamn"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Home Fax"
@@ -2510,14 +2631,12 @@ msgid "Home Phone 2"
 msgstr "Heime-telefon 2"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
-#, fuzzy
 msgid "ISDN Phone"
-msgstr "Telefon"
+msgstr "ISDN-telefon"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
-#, fuzzy
 msgid "Journal"
-msgstr "Jordan"
+msgstr "Journal"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Manager"
@@ -2588,9 +2707,8 @@ msgid "Title"
 msgstr "Tittel"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-#, fuzzy
 msgid "Unit"
-msgstr "Unst"
+msgstr "Eining"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Web Site"
@@ -2669,30 +2787,26 @@ 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
-#, fuzzy
 msgid "List Members"
-msgstr "Medlemar"
+msgstr "Listemedlemmar"
 
 #: addressbook/gui/widgets/eab-contact-display.c:214
 #: addressbook/gui/widgets/eab-contact-display.c:344
-#, fuzzy
 msgid "Job Title"
-msgstr "_Jobb-tittel:"
+msgstr "Jobbtittel:"
 
 #: addressbook/gui/widgets/eab-contact-display.c:221
 msgid "Home Address"
 msgstr "Heime-adresse"
 
 #: addressbook/gui/widgets/eab-contact-display.c:222
-#, fuzzy
 msgid "Work Address"
-msgstr "Heime-adresse"
+msgstr "Arbeidsadresse"
 
 #: addressbook/gui/widgets/eab-contact-display.c:223
 msgid "Other Address"
@@ -2700,15 +2814,13 @@ msgstr "Alternativ adresse"
 
 #: addressbook/gui/widgets/eab-contact-display.c:227
 #: addressbook/gui/widgets/eab-contact-display.c:375
-#, fuzzy
 msgid "Home page"
-msgstr "Heime-faks"
+msgstr "Heimeside"
 
 #: addressbook/gui/widgets/eab-contact-display.c:228
 #: addressbook/gui/widgets/eab-contact-display.c:383
-#, fuzzy
 msgid "Blog"
-msgstr "Bologna"
+msgstr "Vevlogg"
 
 #: addressbook/gui/widgets/eab-gui-util.c:43
 msgid "Success"
@@ -2717,8 +2829,8 @@ msgstr "Vellukka"
 #: addressbook/gui/widgets/eab-gui-util.c:44
 #: 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:1011
+#: camel/providers/pop3/camel-pop3-store.c:540
+#: camel/providers/pop3/camel-pop3-store.c:547 shell/e-shell.c:1076
 msgid "Unknown error"
 msgstr "Ukjend feil"
 
@@ -2731,14 +2843,12 @@ msgid "Permission denied"
 msgstr "Nekta tilgang"
 
 #: addressbook/gui/widgets/eab-gui-util.c:47
-#, fuzzy
 msgid "Contact not found"
-msgstr "Fann ikkje kort"
+msgstr "Fann ikkje kontakt"
 
 #: addressbook/gui/widgets/eab-gui-util.c:48
-#, fuzzy
 msgid "Contact ID already exists"
-msgstr "Kort-id eksisterar allereide"
+msgstr "Kontakt-ID finst frå før"
 
 #: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Protocol not supported"
@@ -2746,12 +2856,12 @@ msgstr "Protokollen er ikkje støtta"
 
 #: addressbook/gui/widgets/eab-gui-util.c:50
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:600
-#: calendar/gui/e-calendar-table.c:465 calendar/gui/e-tasks.c:213
-#: calendar/gui/print.c:2320 camel/camel-service.c:734
+#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599
+#: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:213
+#: calendar/gui/print.c:2349 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
-#: camel/providers/pop3/camel-pop3-store.c:530
+#: camel/providers/pop3/camel-pop3-store.c:534
 msgid "Cancelled"
 msgstr "Avbroten"
 
@@ -2777,7 +2887,7 @@ msgstr "Anna feil"
 
 #: addressbook/gui/widgets/eab-gui-util.c:82
 msgid "Do you want to save changes?"
-msgstr "Vil du lagre endringar?"
+msgstr "Vil du lagra endringane?"
 
 #: addressbook/gui/widgets/eab-gui-util.c:84
 msgid "_Discard"
@@ -2789,18 +2899,16 @@ msgstr "Feil ved tillegging av liste"
 
 #: addressbook/gui/widgets/eab-gui-util.c:103
 #: addressbook/gui/widgets/eab-gui-util.c:457
-#, fuzzy
 msgid "Error adding contact"
-msgstr "Feil ved tilleggjing av kort"
+msgstr "Feil når kontakt vart lagt til"
 
 #: addressbook/gui/widgets/eab-gui-util.c:112
 msgid "Error modifying list"
 msgstr "Feil ved endring av liste"
 
 #: addressbook/gui/widgets/eab-gui-util.c:112
-#, fuzzy
 msgid "Error modifying contact"
-msgstr "Feil ved endringa av kort"
+msgstr "Feil ved endring av kontakt"
 
 #: addressbook/gui/widgets/eab-gui-util.c:122
 msgid "Error removing list"
@@ -2808,18 +2916,17 @@ msgstr "Feil ved fjerning av liste"
 
 #: addressbook/gui/widgets/eab-gui-util.c:122
 #: addressbook/gui/widgets/eab-gui-util.c:415
-#, fuzzy
 msgid "Error removing contact"
-msgstr "Feil ved fjerning av kort"
+msgstr "Feil ved fjerning av kontakt"
 
 #: addressbook/gui/widgets/eab-gui-util.c:204
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
 msgstr ""
-"Å opna %d kort vil også opna %d nye vindauge på skjermen.\n"
-"Vil du verkeleg visa alle desse korta?"
+"Å opna %d kontaktar vil også opna %d nye vindauge på skjermen.\n"
+"Vil du verkeleg visa alle desse kontaktane?"
 
 #: addressbook/gui/widgets/eab-gui-util.c:230
 #, c-format
@@ -2849,33 +2956,29 @@ msgid "list"
 msgstr "liste"
 
 #: addressbook/gui/widgets/eab-gui-util.c:513
-#, fuzzy
 msgid "Move contact to"
-msgstr "Flytt kort til"
+msgstr "Flytt kontakt til"
 
 #: addressbook/gui/widgets/eab-gui-util.c:515
-#, fuzzy
 msgid "Copy contact to"
-msgstr "Kopiér kort til"
+msgstr "Kopiér kontakt til"
 
 #: addressbook/gui/widgets/eab-gui-util.c:518
-#, fuzzy
 msgid "Move contacts to"
-msgstr "Flytt kort til"
+msgstr "Flytt kontakt til"
 
 #: addressbook/gui/widgets/eab-gui-util.c:520
-#, fuzzy
 msgid "Copy contacts to"
-msgstr "Kopiér kort til"
+msgstr "Kopiér kontakt til"
 
-#: addressbook/gui/widgets/eab-gui-util.c:706
+#: addressbook/gui/widgets/eab-gui-util.c:707
 msgid "Multiple VCards"
-msgstr "Fleire VKort"
+msgstr "Fleire VCard"
 
-#: addressbook/gui/widgets/eab-gui-util.c:714
+#: addressbook/gui/widgets/eab-gui-util.c:710
 #, c-format
 msgid "VCard for %s"
-msgstr "VKort for %s"
+msgstr "VCard for %s"
 
 #.
 #. * This is the code for the UI thingie that lets you manipulate the e-mail
@@ -2917,37 +3020,34 @@ msgid "Merge E-Mail Address"
 msgstr "Flett e-postadresser"
 
 #: addressbook/gui/widgets/eab-vcard-control.c:140
-#, fuzzy, c-format
+#, c-format
 msgid "and %d other contacts."
-msgstr "og %d andre kort."
+msgstr "og %d andre kontaktar."
 
 #: addressbook/gui/widgets/eab-vcard-control.c:142
-#, fuzzy
 msgid "and one other contact."
-msgstr "og eitt anna kort."
+msgstr "og ein annan kontakt."
 
 #: addressbook/gui/widgets/eab-vcard-control.c:225
 #: addressbook/gui/widgets/eab-vcard-control.c:275
-#, fuzzy
 msgid "Show Full VCard"
-msgstr "Vis heile meldings_hovudet"
+msgstr "Vis fullt VCard"
 
 #: addressbook/gui/widgets/eab-vcard-control.c:229
-#, fuzzy
 msgid "Show Compact VCard"
-msgstr "Lagre kontakt som VKort"
+msgstr "Vis kompakt VCard"
 
 #: addressbook/gui/widgets/eab-vcard-control.c:280
 msgid "Save in addressbook"
-msgstr "Lagre i addressebok"
+msgstr "Lagra i addressebok"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
-msgstr "Kort-visning"
+msgstr "Kort-framvising"
 
 #: addressbook/gui/widgets/gal-view-factory-treeview.c:25
 msgid "GTK Tree View"
-msgstr "GTK-trevisning"
+msgstr "GTK-trevising"
 
 #: addressbook/gui/widgets/test-reflow.c:106
 msgid "Reflow Test"
@@ -2956,9 +3056,8 @@ msgstr ""
 #: addressbook/gui/widgets/test-reflow.c:107
 #: addressbook/printing/test-contact-print-style-editor.c:54
 #: addressbook/printing/test-print.c:53
-#, fuzzy
 msgid "Copyright (C) 2000, Ximian, Inc."
-msgstr "Opphavsrett © 1999, 2000, 2001 Ximian, Inc."
+msgstr "Opphavsrett © 2000, Ximian, Inc."
 
 #: addressbook/gui/widgets/test-reflow.c:109
 msgid "This should test the reflow canvas item"
@@ -2969,16 +3068,14 @@ msgstr ""
 msgid "Print envelope"
 msgstr "Skriv ut konvolutt"
 
-#: addressbook/printing/e-contact-print.c:1003
-#, fuzzy
+#: addressbook/printing/e-contact-print.c:1008
 msgid "Print contacts"
-msgstr "Skriv ut merka kontaktar"
+msgstr "Skriv ut kontaktar"
 
-#: addressbook/printing/e-contact-print.c:1069
-#: addressbook/printing/e-contact-print.c:1096
-#, fuzzy
+#: addressbook/printing/e-contact-print.c:1074
+#: addressbook/printing/e-contact-print.c:1101
 msgid "Print contact"
-msgstr "Skriv ut merka kontaktar"
+msgstr "Skriv ut kontakt"
 
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
@@ -3068,7 +3165,7 @@ msgstr "Margar"
 msgid "Number of columns:"
 msgstr "Tal på kolonnar:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:85
 msgid "Options"
 msgstr "Val"
 
@@ -3149,18 +3246,16 @@ msgid "_Font..."
 msgstr "_Skrifttype ..."
 
 #: addressbook/printing/test-contact-print-style-editor.c:53
-#, fuzzy
 msgid "Contact Print Style Editor Test"
-msgstr "Redigering av kontakter"
+msgstr ""
 
 #: addressbook/printing/test-contact-print-style-editor.c:56
 msgid "This should test the contact print style editor widget"
 msgstr ""
 
 #: addressbook/printing/test-print.c:52
-#, fuzzy
 msgid "Contact Print Test"
-msgstr "Kontakt_liste"
+msgstr ""
 
 #: addressbook/printing/test-print.c:55
 msgid "This should test the contact print code"
@@ -3169,14 +3264,12 @@ msgstr ""
 #: addressbook/tools/evolution-addressbook-export-list-cards.c:629
 #: addressbook/tools/evolution-addressbook-export-list-cards.c:667
 #: addressbook/tools/evolution-addressbook-export-list-folders.c:58
-#, fuzzy
 msgid "Can not open file"
-msgstr "Kan ikkje opne melding"
+msgstr "Kan ikkje opna fil"
 
 #: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-#, fuzzy
 msgid "Can not load URI"
-msgstr "Fann ikkje kort"
+msgstr "Kan ikkje lasta adresse"
 
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
@@ -3203,8 +3296,7 @@ msgid "Export in asynchronous mode "
 msgstr "Eksporter i asynkron modus"
 
 #: addressbook/tools/evolution-addressbook-export.c:63
-msgid ""
-"The number of cards in one output file in asychronous mode,default size 100."
+msgid "The number of cards in one output file in asychronous mode,default size 100."
 msgstr "Talet på kort i ei utfil i asynkron modus, standard storleik er 100."
 
 #: addressbook/tools/evolution-addressbook-export.c:63
@@ -3212,8 +3304,7 @@ msgid "NUMBER"
 msgstr "TAL"
 
 #: addressbook/tools/evolution-addressbook-export.c:91
-msgid ""
-"Command line arguments error, please use --help option to see the usage."
+msgid "Command line arguments error, please use --help option to see the usage."
 msgstr "Feil i kommandolinjeargumenta. Bruk --help for å sjå ein hjelpetekst."
 
 #: addressbook/tools/evolution-addressbook-export.c:105
@@ -3246,10 +3337,15 @@ msgstr "Inndata fil"
 msgid "No filename provided."
 msgstr "Filnamn ikkje oppgjeve."
 
-#: addressbook/util/eab-destination.c:675
+#: addressbook/util/eab-destination.c:677
 msgid "Unnamed List"
 msgstr "Liste utan namn"
 
+#: calendar/common/authentication.c:34 calendar/gui/itip-utils.c:1156
+#: smime/gui/component.c:39
+msgid "Enter password"
+msgstr "Skriv inn passord"
+
 #: calendar/conduits/calendar/calendar-conduit.c:206
 msgid "Split Multi-Day Events:"
 msgstr "Del opp hendingar som går over fleire dagar:"
@@ -3283,9 +3379,8 @@ msgid "Calendar and Tasks"
 msgstr "Kalender og oppgåver"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#, fuzzy
 msgid "Calendars"
-msgstr "Kalender"
+msgstr "Kalenderar"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
 msgid "Configure your timezone, Calendar and Task List here "
@@ -3316,28 +3411,25 @@ msgid "Evolution Tasks viewer"
 msgstr "Evolution oppgåvevisar"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
 msgid "Evolution's Calendar component"
-msgstr "Evolution kalender og oppgåver-komponent"
+msgstr "Evolution kalenderkomponent"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
 msgid "Evolution's Tasks component"
-msgstr "Evolution testkomponent"
+msgstr "Evolution oppgåvekomponent"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1082 calendar/gui/print.c:1796
-#: calendar/gui/tasks-control.c:486
-#: calendar/importers/icalendar-importer.c:716
+#: calendar/gui/e-tasks.c:1112 calendar/gui/print.c:1825
+#: calendar/gui/tasks-control.c:516
+#: calendar/importers/icalendar-importer.c:717
 #: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
 msgid "Tasks"
 msgstr "Oppgåver"
 
 # TRN: Påminning om ein alarm? Rare greier.
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-#, fuzzy
 msgid "Evolution Calendar alarm notification service"
-msgstr "Evolution Kalender alarmpåminningsteneste"
+msgstr "Evolution kalender alarmpåminningsteneste"
 
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
 msgid "Starting:"
@@ -3375,11 +3467,26 @@ msgstr "Tid alarmen skal utsetjast (minutt):"
 msgid "_Edit appointment"
 msgstr "R_edigér avtale"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:871
+#: calendar/gui/alarm-notify/alarm-queue.c:899 calendar/gui/e-cal-view.c:1241
+#: calendar/gui/e-cal-view.c:1306 calendar/gui/e-calendar-table.c:1037
+#: calendar/gui/e-calendar-table.c:1078 mail/em-folder-view.c:711
+#: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:37
+msgid "_Open"
+msgstr "_Opna"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:901
+msgid "_Dismiss"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:903
+msgid "Dismiss _All"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:968
 msgid "No description available."
 msgstr "Inga skildring tilgjengeleg"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:889
+#: calendar/gui/alarm-notify/alarm-queue.c:986
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3392,12 +3499,12 @@ msgstr ""
 "Startar %s\n"
 "Sluttar %s"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:976
-#: calendar/gui/alarm-notify/alarm-queue.c:1000
+#: calendar/gui/alarm-notify/alarm-queue.c:1078
+#: calendar/gui/alarm-notify/alarm-queue.c:1102
 msgid "Warning"
 msgstr "Åtvaring"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:980
+#: calendar/gui/alarm-notify/alarm-queue.c:1082
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3409,7 +3516,7 @@ msgstr ""
 "senda ein e-post. Evolution vil visa ein normal\n"
 "påminnar-dialogboks i staden."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1006
+#: calendar/gui/alarm-notify/alarm-queue.c:1108
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3426,7 +3533,7 @@ msgstr ""
 "\n"
 "Er du sikker på at du vil køyra dette programmet?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1020
+#: calendar/gui/alarm-notify/alarm-queue.c:1122
 msgid "Do not ask me about this program again."
 msgstr "Ikkje spør om dette programmet fleire gongar."
 
@@ -3451,19 +3558,16 @@ msgid "Allocate less space to weekend appointments"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
-#, fuzzy
 msgid "Calendars to run alarms for"
-msgstr "iCalendar-feil"
+msgstr "Kalender å køyra alarmar for"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
-#, fuzzy
 msgid "Color of tasks that are due today"
-msgstr "Farge for oppgåver som skal vera ferdige i dag"
+msgstr "Farge på oppgåver som skal vera ferdige i dag"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
-#, fuzzy
 msgid "Color of tasks that are overdue"
-msgstr "Farge for oppgåver som skal vera ferdige i dag"
+msgstr "Farge på oppgåver som er over tida"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
 msgid "Days that are work days"
@@ -3486,98 +3590,96 @@ msgid "Intervals shown in Day and Work Week views"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
-msgid "Minute the workday ends on"
+msgid "List of urls for free/busy publishing"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
-msgid "Minute the workday starts on"
+msgid "Minute the workday ends on"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
-msgid "Number of units for default reminder"
+msgid "Minute the workday starts on"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
-msgid "Number of units for determining when to hide tasks"
+msgid "Number of units for default reminder"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
-msgid "Position of the horizontal pane"
+msgid "Number of units for determining when to hide tasks"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
-msgid "Position of the horizontal pane in the month view"
+msgid "Position of the horizontal pane"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
-msgid "Position of the vertical pane"
+msgid "Position of the horizontal pane in the month view"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
-msgid "Position of the vertical pane in the month view"
+msgid "Position of the vertical pane"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
-msgid "Position of the vertical pane in the task view"
+msgid "Position of the vertical pane in the month view"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
-msgid "Programs that can run as part of alarms"
+msgid "Position of the vertical pane in the task view"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
-#, fuzzy
-msgid "Show where events end in week and month views"
-msgstr "_Vis sluttidspunkt for avtalar i veke- og månadsvising"
+msgid "Programs that can run as part of alarms"
+msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
-#, fuzzy
-msgid "The view showing when the calendar starts"
-msgstr "Førehandsvisar kalenderen som skal skrivast ut"
+msgid "Show where events end in week and month views"
+msgstr "Vis kor hendingar sluttar i veke- og månadsvisingar"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
-msgid "Time last alarm ran"
-msgstr ""
+msgid "The view showing when the calendar starts"
+msgstr "Framvisinga som vert vist når kalenderen startar"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
-msgid "Units for determining when to hide tasks"
-msgstr ""
+msgid "Time last alarm ran"
+msgstr "Tida alarmen vart køyrt sist"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
-msgid "Units of default reminder"
-msgstr ""
+msgid "Units for determining when to hide tasks"
+msgstr "Einingar for å avgjera når oppgåver skal gøymast"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
-msgid "Weekday the week starts on"
-msgstr ""
+msgid "Units of default reminder"
+msgstr "Einingar på standard påminning"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
-#, fuzzy
-msgid "Whether to ask for confirmation on appointment deletion"
-msgstr "_Be om stadfesting når oppføringar vert sletta"
+msgid "Weekday the week starts on"
+msgstr "Vekedag veka byrjar på"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
-#, fuzzy
-msgid "Whether to ask for confirmation when folder is expunged"
-msgstr "_Be om stadfesting når oppføringar vert sletta"
+msgid "Whether to ask for confirmation on appointment deletion"
+msgstr "Om det skal spørjast etter stadfesting når avtalar vert sletta"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
-#, fuzzy
-msgid "Whether to hide completed tasks"
-msgstr "Slett utførte oppgåver"
+msgid "Whether to ask for confirmation when folder is expunged"
+msgstr "Om det skal spørjast etter stadfesting når mapper vert tømde"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
-msgid "Whether to set a default reminder for events"
-msgstr ""
+msgid "Whether to hide completed tasks"
+msgstr "Om utførte oppgåver skal gøymast"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
-msgid "Whether to show times in 24h format instead of using am/pm"
-msgstr ""
+msgid "Whether to set a default reminder for events"
+msgstr "Om hendingar skal ha ei standardpåminning"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
-#, fuzzy
+msgid "Whether to show times in 24h format instead of using am/pm"
+msgstr "Om tider skal visast i 24-timarsformat i staden for 12-timars"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Whether to show week numbers in date navigator"
-msgstr "Vis veke_nummer i datonavigatøren"
+msgstr "Om vekenummer skal visast i minikalenderen"
 
 #: calendar/gui/cal-search-bar.c:49
 msgid "Summary contains"
@@ -3591,11 +3693,16 @@ msgstr "Skildring inneheld"
 msgid "Comment contains"
 msgstr "Merknad inneheld"
 
-#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1134
+#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1109
 msgid "Unmatched"
 msgstr "Ikkje truffe"
 
-#: calendar/gui/calendar-commands.c:360
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1603
+#: mail/importers/netscape-importer.c:1843 shell/e-shortcuts.c:1086
+msgid "Calendar"
+msgstr "Kalender"
+
+#: calendar/gui/calendar-commands.c:351
 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 "
@@ -3605,185 +3712,168 @@ msgstr ""
 "tidslengda. Dersom du held fram, vil du ikkje kunna gjenoppretta desse "
 "hendingane."
 
-#: calendar/gui/calendar-commands.c:366
+#: calendar/gui/calendar-commands.c:357
 msgid "Purge events older than"
 msgstr "Fjern hendingar eldre enn"
 
-#: calendar/gui/calendar-commands.c:371
+#: calendar/gui/calendar-commands.c:362
 #: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
 msgid "days"
 msgstr "dagar"
 
-#: calendar/gui/calendar-commands.c:440
+#: calendar/gui/calendar-commands.c:431
 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:443 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:434 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 "%d. %a %b"
 
-#: calendar/gui/calendar-commands.c:445 calendar/gui/calendar-commands.c:450
-#: calendar/gui/calendar-commands.c:452
+#: calendar/gui/calendar-commands.c:436 calendar/gui/calendar-commands.c:441
+#: calendar/gui/calendar-commands.c:443
 msgid "%a %d %b %Y"
 msgstr "%d. %a %b %Y"
 
-#: calendar/gui/calendar-commands.c:469 calendar/gui/calendar-commands.c:475
-#: calendar/gui/calendar-commands.c:481 calendar/gui/calendar-commands.c:483
+#: calendar/gui/calendar-commands.c:460 calendar/gui/calendar-commands.c:466
+#: calendar/gui/calendar-commands.c:472 calendar/gui/calendar-commands.c:474
 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:473
-#: calendar/gui/e-week-view-main-item.c:337 calendar/gui/print.c:1517
+#: calendar/gui/calendar-commands.c:464
+#: calendar/gui/e-week-view-main-item.c:337 calendar/gui/print.c:1503
 msgid "%d %B"
 msgstr "%d. %b"
 
-#: calendar/gui/calendar-component.c:375
+#: calendar/gui/calendar-component.c:301
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
-msgstr ""
+msgstr "Kalenderen «%s» vil verta fjerna. Er du sikker på at du vil halda fram?"
 
-#: calendar/gui/calendar-component.c:415
-#, fuzzy
-msgid "Rename this calendar to"
-msgstr "Skriv ut denne kalenderen"
-
-#: calendar/gui/calendar-component.c:435
-#, fuzzy
+#: calendar/gui/calendar-component.c:356
+#: calendar/gui/dialogs/calendar-setup.glade.h:13
 msgid "New Calendar"
-msgstr "Ny-Caledonia"
+msgstr "Ny kalender"
 
-#: calendar/gui/calendar-component.c:619
+#: calendar/gui/calendar-component.c:601
 msgid "New appointment"
 msgstr "Ny avtale"
 
-#: calendar/gui/calendar-component.c:620
+#: calendar/gui/calendar-component.c:602
 msgid "_Appointment"
 msgstr "A_vtale"
 
-#: calendar/gui/calendar-component.c:621
+#: calendar/gui/calendar-component.c:603
 msgid "Create a new appointment"
 msgstr "Lag ein ny avtale"
 
-#: calendar/gui/calendar-component.c:626
+#: calendar/gui/calendar-component.c:608
 msgid "New meeting"
 msgstr "Nytt møte"
 
-#: calendar/gui/calendar-component.c:627
+#: calendar/gui/calendar-component.c:609
 msgid "M_eeting"
 msgstr "Møt_e"
 
-#: calendar/gui/calendar-component.c:628
-#, fuzzy
+#: calendar/gui/calendar-component.c:610
 msgid "Create a new meeting request"
 msgstr "Lag ein ny møteførespurnad"
 
-#: calendar/gui/calendar-component.c:633
-#, fuzzy
+#: calendar/gui/calendar-component.c:615
 msgid "New all day appointment"
 msgstr "Ny avtale for heile dagen"
 
-#: calendar/gui/calendar-component.c:634
+#: calendar/gui/calendar-component.c:616
 msgid "All _Day Appointment"
 msgstr "Avtale for heile _dagen"
 
-#: calendar/gui/calendar-component.c:635
-#, fuzzy
+#: calendar/gui/calendar-component.c:617
 msgid "Create a new all-day appointment"
-msgstr "Lag ein ny avtale"
+msgstr "Lag ein ny avtale for heile dagen"
 
-#: calendar/gui/calendar-component.c:640
-#, fuzzy
+#: calendar/gui/calendar-component.c:622
 msgid "New calendar"
-msgstr "Ny-Caledonia"
+msgstr "Ny kalender"
 
-#: calendar/gui/calendar-component.c:641
-#, fuzzy
+#: calendar/gui/calendar-component.c:623
 msgid "C_alendar"
-msgstr "K_alender:"
+msgstr "K_alender"
 
-#: calendar/gui/calendar-component.c:642
-#, fuzzy
+#: calendar/gui/calendar-component.c:624
 msgid "Create a new calendar"
-msgstr "Lag ei ny mappe"
+msgstr "Lag ein ny kalender"
 
-#: calendar/gui/calendar-component.c:709
+#: calendar/gui/calendar-component.c:691
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:721
+#: calendar/gui/calendar-component.c:703
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#. create the remote source group
-#: calendar/gui/calendar-component.c:857
-msgid "On The Web"
-msgstr ""
-
-#: calendar/gui/calendar-offline-handler.c:190
+#: calendar/gui/calendar-offline-handler.c:192
 #, c-format
 msgid "backend_go_offline(): %s"
 msgstr ""
 
-#: calendar/gui/calendar-offline-handler.c:212
+#: calendar/gui/calendar-offline-handler.c:215
 #, c-format
 msgid "backend_go_online(): %s"
 msgstr ""
 
 #: calendar/gui/calendar-view-factory.c:118
 msgid "Day View"
-msgstr "Dagsvisning"
+msgstr "Dagsvising"
 
 #: calendar/gui/calendar-view-factory.c:121
 msgid "Work Week View"
-msgstr "Arbeidsvekevisning"
+msgstr "Arbeidsvekevising"
 
 #: calendar/gui/calendar-view-factory.c:124
 msgid "Week View"
-msgstr "Vekesvisning"
+msgstr "Vekesvising"
 
 #: calendar/gui/calendar-view-factory.c:127
 msgid "Month View"
 msgstr "Månadsvising"
 
 #: calendar/gui/calendar-view-factory.c:130
-#, fuzzy
 msgid "List View"
-msgstr "Tilpassa visning"
+msgstr "Listevising"
 
-#: calendar/gui/comp-editor-factory.c:451
+#: calendar/gui/comp-editor-factory.c:410
 msgid "Error while opening the calendar"
 msgstr "Feil under opning av kalenderen"
 
-#: calendar/gui/comp-editor-factory.c:462
+#: calendar/gui/comp-editor-factory.c:421
 msgid "Method not supported when opening the calendar"
 msgstr "Metoden er ikkje støtta når kalenderen vert opna"
 
-#: calendar/gui/comp-editor-factory.c:468
+#: calendar/gui/comp-editor-factory.c:427
 msgid "Permission denied to open the calendar"
 msgstr "Nekta tilgang til å opna kalenderen"
 
-#: calendar/gui/comp-editor-factory.c:516
+#: calendar/gui/comp-editor-factory.c:476
 #, c-format
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/control-factory.c:133
+#: calendar/gui/control-factory.c:140
 #, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "Kan ikkje opna mappa i «%s»"
 
-#: calendar/gui/control-factory.c:179
+#: calendar/gui/control-factory.c:190
 msgid "The URI that the calendar will display"
 msgstr "URI-en som kalenderen skal visa"
 
-#: calendar/gui/control-factory.c:186
+#: calendar/gui/control-factory.c:197
 msgid "The type of view to show"
 msgstr "Typen vising som skal brukast"
 
@@ -3808,14 +3898,12 @@ msgid "Unknown Alarm Options"
 msgstr "Alternativ for ukjente alarmar"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:2
-#, fuzzy
 msgid "Alarm Repeat"
-msgstr "Alarmen repeterar"
+msgstr "Alarmgjentaking"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:3
-#, fuzzy
 msgid "Message to Display:"
-msgstr "Meldingsvising"
+msgstr "Melding å visa:"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:4
 msgid "Message to Send"
@@ -3872,20 +3960,19 @@ msgstr "Enkel"
 msgid "Date/Time:"
 msgstr "Dato/tid:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:465
+#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:463
 msgid "Display a message"
 msgstr "Vis ei melding"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:461
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:459
 msgid "Play a sound"
 msgstr "Spel ein lyd"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:5
-#, fuzzy
 msgid "Reminders"
-msgstr "Påminning"
+msgstr "Påminningar"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:473
+#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:471
 msgid "Run a program"
 msgstr "Køyr eit program"
 
@@ -3895,7 +3982,7 @@ msgstr "Send ein e-post"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:983 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:939 calendar/gui/e-itip-control.glade.h:11
 #: calendar/gui/e-tasks.c:168
 msgid "Summary:"
 msgstr "Samandrag:"
@@ -3925,7 +4012,8 @@ msgstr "slutt på avtale"
 msgid "hour(s)"
 msgstr "time/timar"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:182
+#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:184
 msgid "minute(s)"
 msgstr "minutt"
 
@@ -3933,6 +4021,39 @@ msgstr "minutt"
 msgid "start of appointment"
 msgstr "byrjing på avtale"
 
+#. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
+#. has "activatable" set.
+#: calendar/gui/dialogs/cal-prefs-dialog.c:415 mail/em-account-prefs.c:487
+#: mail/em-composer-prefs.c:712 mail/em-composer-prefs.c:858
+msgid "Enabled"
+msgstr "På"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.c:660
+msgid "Are you sure you want to remove this URL?"
+msgstr "Er du sikker på at du vil fjerna denne adressa?"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.c:668
+msgid "Don't Remove"
+msgstr "Ikkje fjern"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.c:714
+#: calendar/gui/dialogs/cal-prefs-dialog.c:746
+#: calendar/gui/dialogs/cal-prefs-dialog.c:777 mail/em-account-prefs.c:315
+#: mail/em-account-prefs.c:356 mail/em-account-prefs.c:397
+#: mail/em-composer-prefs.c:679 mail/em-composer-prefs.c:697
+#: mail/em-composer-prefs.c:721
+msgid "Disable"
+msgstr "Skru av"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.c:714
+#: calendar/gui/dialogs/cal-prefs-dialog.c:746
+#: calendar/gui/dialogs/cal-prefs-dialog.c:779 mail/em-account-prefs.c:315
+#: mail/em-account-prefs.c:356 mail/em-account-prefs.c:399
+#: mail/em-composer-prefs.c:679 mail/em-composer-prefs.c:697
+#: mail/em-composer-prefs.c:721
+msgid "Enable"
+msgstr "Skru på"
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid "05 minutes"
 msgstr "05 minutt"
@@ -3953,7 +4074,7 @@ msgstr "30 minutt"
 msgid "60 minutes"
 msgstr "60 minutt"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:16
 msgid "Alerts"
 msgstr "Åtvaringar"
 
@@ -3978,180 +4099,326 @@ msgid "Days"
 msgstr "Dagar"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: mail/mail-config.glade.h:53
+msgid "E_nable"
+msgstr "S_lå på"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:607
+#: calendar/gui/e-itip-control.c:563
 msgid "Friday"
 msgstr "Fredag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Hours"
 msgstr "Timar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Minutes"
 msgstr "Minutt"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:559
 msgid "Monday"
 msgstr "Måndag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "S_un"
 msgstr "Su_n"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:564
 msgid "Saturday"
 msgstr "Laurdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Sh_ow a reminder"
 msgstr "_Vis ei påminning"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Show week _numbers in date navigator"
 msgstr "Vis veke_nummer i datonavigatøren"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:602
+#: calendar/gui/e-itip-control.c:558
 msgid "Sunday"
 msgstr "Søndag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "T_asks due today:"
 msgstr "_Oppgåver som skal vera ferdige i dag:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "T_hu"
 msgstr "T_or"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#, fuzzy
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "Task List"
 msgstr "Oppgåveliste"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:562
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Time"
 msgstr "Tid"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Time _zone:"
 msgstr "Tid_ssone:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 msgid "Time format:"
 msgstr "Tidsformat:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:560
 msgid "Tuesday"
 msgstr "Tysdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "W_eek starts:"
 msgstr "_Veka byrjar:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:605
+#: calendar/gui/e-itip-control.c:561
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: ui/evolution-calendar.xml.h:32
 msgid "Work Week"
 msgstr "Arbeidsveke"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Work days:"
 msgstr "Arbeidsdagar:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_12 hour (AM/PM)"
 msgstr "_12 timers (AM/PM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_24 hour"
 msgstr "_24 timar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+msgid "_Add URL"
+msgstr "_Legg til adresse"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Be om stadfesting når oppføringar vert sletta"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_Compress weekends in month view"
 msgstr "_Komprimer helger i månadsvising"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_Day begins:"
 msgstr "_Dagen byrjar:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Display"
 msgstr "_Vis"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+msgid "_Free/Busy Publishing"
+msgstr "_offentleggjering av ledig/oppteken-tid"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Fri"
 msgstr "_Fre"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:153
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: mail/mail-config.glade.h:155
 msgid "_General"
 msgstr "_Generelt"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Hide completed tasks after"
 msgstr "_Gøym fullførte oppgåver etter"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Mon"
 msgstr "_Mån"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Overdue tasks:"
 msgstr "_Oppgåver som har gått over tida:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Sat"
 msgstr "_Lau"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_Show appointment end times in week and month views"
 msgstr "_Vis sluttidspunkt for avtalar i veke- og månadsvising"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_Time divisions:"
 msgstr "Oppdeling a_v tid:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Tue"
 msgstr "T_ys"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Wed"
 msgstr "_Ons"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "before every appointment"
 msgstr "før kvar avtale"
 
+#: calendar/gui/dialogs/calendar-setup.c:156
+msgid "You must specify a location to get the calendar from."
+msgstr "Du må oppgje ei adresse å henta kalenderen frå."
+
+#: calendar/gui/dialogs/calendar-setup.c:164
+#, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "Kjeldeadressa «%s» er ikkje velforma."
+
+#: calendar/gui/dialogs/calendar-setup.c:179
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr "Kjelda «%s» er ikkje ei webcal-kjelde."
+
+#: calendar/gui/dialogs/calendar-setup.c:216
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr "Kjelde med namnet «%s» finst frå før i den valde gruppa"
+
+#: calendar/gui/dialogs/calendar-setup.c:229
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr "Gruppa «%s» er ekstern. Du må oppgje ei adresse å henta kalenderen frå"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+msgid "Calendar Creation Assistant"
+msgstr "Vegvisar for kalenderoppretting"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+msgid "Calendar Properties"
+msgstr "Kalendereigenskapar"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+msgid ""
+"Congratulations, you are finished setting up this calendar.\n"
+"\n"
+"Please click the \"Apply\" button to save the settings you have entered here."
+msgstr ""
+"Til lukke. Du er ferdig med å setja opp denne kalenderen.\n"
+"\n"
+"Trykk på «Bruk»-knappen for å lagra innstillingane du har "
+"skrive inn her."
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+msgid ""
+"Congratulations, you are finished setting up this task list.\n"
+"\n"
+"Please click the \"Apply\" button to save the settings you have entered here."
+msgstr ""
+"Til lukke. Du er ferdig med å setja opp denne oppgåvelista.\n"
+"\n"
+"Trykk på «Bruk»-knappen for å lagra innstillingane du har\n"
+"skrive inn her."
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:14
+#: calendar/gui/tasks-component.c:359
+msgid "New Task List"
+msgstr "Ny oppgåveliste"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15
+msgid "Remote"
+msgstr "Estern"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:18
+msgid ""
+"Specifying a display name and group is the first step in setting up a "
+"calendar."
+msgstr "Det fyrste steget i å setja opp ein kalender er å velja eit skjermnamn og gruppe."
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:19
+msgid ""
+"Specifying a display name and group is the first step in setting up a task "
+"list."
+msgstr "Det fyrste steget i å setja opp ei oppgåveliste er å velja eit skjermnamn og gruppe."
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:21
+msgid "Step 2: Remote Folder Parameters"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:22
+msgid "Task List Creation Assistant"
+msgstr "Vegvisar for oppretting av oppgåveliste"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:23
+msgid "Task List Properties"
+msgstr "Eigenskapar for oppgåveliste"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:24
+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 vegvisaren vil hjelpa deg å laga ein ny kalender.\n"
+"\n"
+"Alt etter kva slags kalender du vil laga, kan det vera at du treng meir\n"
+"informasjon. Ta kontakt med din systemansvarlege dersom du treng \n"
+"hjelp til å finna denne informasjonen."
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:29
+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 vegvisaren vil hjelpa deg å laga ei ny oppgåveliste.\n"
+"\n"
+"Alt etter kva slags oppgåveliste du vil laga, kan det vera at du treng meir\n"
+"informasjon. Ta kontakt med din systemansvarlege dersom du treng \n"
+"hjelp til å finna 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 ""
+"Du lagar ei mappe i ei gruppe som er lagra på ei ekstern adresse. "
+"Dette krev at du\n"
+"oppgjev fleire parameterar."
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:38
+msgid "_Refresh Interval:"
+msgstr "Tid mellom oppf_riskingar:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:39
+msgid "_Source URL:"
+msgstr "_Kjeldeadresse:"
+
 #: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
-msgstr ""
-"Hendinga som vert sletta er eit møte. Vil du senda ut ei melding om avlysing?"
+msgstr "Hendinga som vert sletta er eit møte. Vil du senda ut ei melding om avlysing?"
 
 #: calendar/gui/dialogs/cancel-comp.c:60
 msgid "Are you sure you want to cancel and delete this meeting?"
@@ -4179,8 +4446,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cancel-comp.c:78
 msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr ""
-"Er du sikker på at du vil kansellera og sletta denne journaloppføringa?"
+msgstr "Er du sikker på at du vil kansellera og sletta denne journaloppføringa?"
 
 #: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
@@ -4221,8 +4487,7 @@ msgstr "Journalopføringa er endra."
 #: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
-msgstr ""
-"%s  Du har gjort endringar. Forkast desse endringane og oppdater redigering?"
+msgstr "%s  Du har gjort endringar. Forkast desse endringane og oppdater redigering?"
 
 #: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
@@ -4234,80 +4499,90 @@ msgstr "%s Du har ikkje gjort nokon endringar. Oppdater redigering?"
 msgid "Validation error: %s"
 msgstr "Valideringsfeil: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2229
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
 msgid " to "
 msgstr " til "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2233
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
 msgid " (Completed "
 msgstr " (Ferdig "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2235
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
 msgid "Completed "
 msgstr "Ferdig "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2240
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
 msgid " (Due "
 msgstr " (Ferdig"
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2242
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
 msgid "Due "
 msgstr "Ferdig"
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:402
 msgid "Could not update object"
 msgstr "Kan ikkje oppdatera objekt"
 
-#: calendar/gui/dialogs/comp-editor.c:818
-#: calendar/gui/dialogs/comp-editor.c:855
+#: calendar/gui/dialogs/comp-editor.c:877
+#: calendar/gui/dialogs/comp-editor.c:914
 msgid "Edit Appointment"
 msgstr "Redigér avtale"
 
-#: calendar/gui/dialogs/comp-editor.c:823
-#: calendar/gui/dialogs/comp-editor.c:860
+#: calendar/gui/dialogs/comp-editor.c:882
+#: calendar/gui/dialogs/comp-editor.c:919
 #, 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:885
+#: calendar/gui/dialogs/comp-editor.c:922
 #, c-format
 msgid "Task - %s"
 msgstr "Oppgåve - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:829
-#: calendar/gui/dialogs/comp-editor.c:866
+#: calendar/gui/dialogs/comp-editor.c:888
+#: calendar/gui/dialogs/comp-editor.c:925
 #, 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:899
+#: calendar/gui/dialogs/comp-editor.c:935
 msgid "No summary"
 msgstr "Ikkje noko samandrag"
 
-#: calendar/gui/dialogs/comp-editor.c:1313 calendar/gui/e-cal-view.c:966
-#: calendar/gui/e-calendar-table.c:1175 composer/e-msg-composer.c:1138
+#: calendar/gui/dialogs/comp-editor.c:1360 calendar/gui/e-cal-view.c:1042
+#: calendar/gui/e-calendar-table.c:1190 composer/e-msg-composer.c:1146
 msgid "Save as..."
-msgstr "Lagre som ..."
+msgstr "Lagra 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:1463
+#: calendar/gui/dialogs/comp-editor.c:1487
+#: calendar/gui/dialogs/comp-editor.c:1513
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Endringar som vert gjort i denne oppføringa kan verta forkasta dersom det "
 "kjem ei oppdatering"
 
-#: calendar/gui/dialogs/comp-editor.c:1506
-#: calendar/gui/dialogs/comp-editor.c:1515
-msgid "Unable to obtain current version!"
-msgstr ""
+#: calendar/gui/dialogs/comp-editor.c:1552
+msgid "Unable to use current version!"
+msgstr "Kan ikkje bruka noverande versjon!"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:141
-#, fuzzy
+#: calendar/gui/dialogs/copy-source-dialog.c:83
+msgid "Could not open source"
+msgstr "Klarte ikkje opna kjelde"
+
+#: calendar/gui/dialogs/copy-source-dialog.c:91
+msgid "Could not open destination"
+msgstr "Klarte ikkje opna mål"
+
+#: calendar/gui/dialogs/copy-source-dialog.c:100
+msgid "Destination is read only"
+msgstr "Målet er skrivebeskytta"
+
+#: calendar/gui/dialogs/copy-source-dialog.c:164
 msgid "Select destination source"
-msgstr "Vel ei målmappe for importerte data"
+msgstr "Vel målkjelde"
 
 #: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
@@ -4384,24 +4659,20 @@ msgid "The item could not be deleted because permission was denied"
 msgstr "Oppføringa kan ikkje slettast fordi tilgang vert nekta"
 
 #: calendar/gui/dialogs/delete-error.c:84
-#, fuzzy
 msgid "The event could not be deleted due to an error"
-msgstr "Hendinga kan ikkje slettast på grunn av ein CORBA-feil"
+msgstr "Hendinga kan ikkje slettast på grunn av ein feil"
 
 #: calendar/gui/dialogs/delete-error.c:87
-#, fuzzy
 msgid "The task could not be deleted due to an error"
-msgstr "Oppgåva kan ikkje slettast på grunn av ein CORBA-feil"
+msgstr "Oppgåva kan ikkje slettast på grunn av ein feil"
 
 #: calendar/gui/dialogs/delete-error.c:90
-#, fuzzy
 msgid "The journal entry could not be deleted due to an error"
-msgstr "Journaloppføringa kan ikkje slettast på grunn av ein CORBA-feil"
+msgstr "Journaloppføringa kan ikkje slettast på grunn av ein feil"
 
 #: calendar/gui/dialogs/delete-error.c:93
-#, fuzzy
 msgid "The item could not be deleted due to an error"
-msgstr "Oppføringa kan ikkje slettast på grunn av ein CORBA-feil"
+msgstr "Oppføringa kan ikkje slettast på grunn av ein feil"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
 msgid "Addressbook..."
@@ -4415,7 +4686,7 @@ msgstr "Delegér til:"
 msgid "Enter Delegate"
 msgstr "Tast inn delegat"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2266
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Avtale"
 
@@ -4430,9 +4701,8 @@ msgstr "Repetering"
 #: calendar/gui/dialogs/event-editor.c:221
 #: calendar/gui/dialogs/event-editor.c:294
 #: calendar/gui/dialogs/event-editor.c:438
-#, fuzzy
 msgid "Scheduling"
-msgstr "Planlegg"
+msgstr ""
 
 #: calendar/gui/dialogs/event-editor.c:228
 #: calendar/gui/dialogs/event-editor.c:297
@@ -4440,26 +4710,26 @@ msgstr "Planlegg"
 msgid "Meeting"
 msgstr "Møte"
 
-#: calendar/gui/dialogs/event-page.c:608 calendar/gui/dialogs/task-page.c:511
+#: calendar/gui/dialogs/event-page.c:609 calendar/gui/dialogs/task-page.c:512
 msgid "Start date is wrong"
 msgstr "Startdato er feil"
 
-#: calendar/gui/dialogs/event-page.c:618
+#: calendar/gui/dialogs/event-page.c:619
 msgid "End date is wrong"
 msgstr "Sluttdato er feil"
 
-#: calendar/gui/dialogs/event-page.c:641
+#: calendar/gui/dialogs/event-page.c:642
 msgid "Start time is wrong"
 msgstr "Starttid er feil"
 
-#: calendar/gui/dialogs/event-page.c:648
+#: calendar/gui/dialogs/event-page.c:649
 msgid "End time is wrong"
 msgstr "Sluttid er feil"
 
-#: calendar/gui/dialogs/event-page.c:1227
-#, fuzzy, c-format
+#: calendar/gui/dialogs/event-page.c:1228
+#, c-format
 msgid "Unable to open the calendar '%s'."
-msgstr "Nekta tilgang til å opna kalenderen"
+msgstr "Kan ikkje opna kalenderen «%s»."
 
 #: calendar/gui/dialogs/event-page.glade.h:2
 msgid "A_ll day event"
@@ -4475,9 +4745,8 @@ msgid "Ca_tegories..."
 msgstr "Ka_tegoriar ..."
 
 #: calendar/gui/dialogs/event-page.glade.h:5
-#, fuzzy
 msgid "Calendar:"
-msgstr "K_alender:"
+msgstr "Kalender:"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
 #: calendar/gui/dialogs/task-page.glade.h:3
@@ -4492,18 +4761,16 @@ msgstr "Ko_nfidensiell"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
 #: calendar/gui/dialogs/task-page.glade.h:5
-#, fuzzy
 msgid "Date & Time"
-msgstr "Dato/tid:"
+msgstr "Dato og tid"
 
 #: calendar/gui/dialogs/event-page.glade.h:9
 msgid "F_ree"
 msgstr "_Ledig"
 
 #: calendar/gui/dialogs/event-page.glade.h:10
-#, fuzzy
 msgid "L_ocation:"
-msgstr "Plassering:"
+msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:11
 #: calendar/gui/dialogs/task-page.glade.h:8
@@ -4516,7 +4783,6 @@ msgid "Pu_blic"
 msgstr "_Offentleg"
 
 #: calendar/gui/dialogs/event-page.glade.h:13
-#, fuzzy
 msgid "Show Time As"
 msgstr "Vis tid som"
 
@@ -4534,31 +4800,31 @@ msgid "_Start time:"
 msgstr "_Start-tid:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:310
-#: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:592 composer/e-msg-composer.c:2050
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:715
-#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1783
-#: mail/mail-config.glade.h:80
+#: calendar/gui/dialogs/meeting-page.c:311
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2084
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:745
+#: mail/mail-account-gui.c:1258 mail/mail-account-gui.c:1782
+#: mail/mail-config.glade.h:82
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:194
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
 #: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Ingen"
 
-#: calendar/gui/dialogs/meeting-page.c:415
+#: calendar/gui/dialogs/meeting-page.c:416
 msgid "The organizer selected no longer has an account."
 msgstr "Den valde organisatoren har ikkje konto lenger."
 
-#: calendar/gui/dialogs/meeting-page.c:421
+#: calendar/gui/dialogs/meeting-page.c:422
 msgid "An organizer is required."
 msgstr "Det må vera ein organisator."
 
-#: calendar/gui/dialogs/meeting-page.c:436
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "At least one attendee is required."
 msgstr "Det må vera minst ein deltakar."
 
-#: calendar/gui/dialogs/meeting-page.c:629
+#: calendar/gui/dialogs/meeting-page.c:645
 msgid "_Delegate To..."
 msgstr "_Delegér til ..."
 
@@ -4599,7 +4865,7 @@ msgid "Member"
 msgstr "Medlem"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1066 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4607,113 +4873,64 @@ msgstr "RSVP"
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:14
 #: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:3
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+msgid "Add A_ttendee"
+msgstr "Legg _til deltakar"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Organisator:"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.glade.h:5
 msgid "_Change Organizer"
 msgstr "_Endre organisator"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
+#: calendar/gui/dialogs/meeting-page.glade.h:6
 #: calendar/gui/e-meeting-time-sel.c:417
 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 krevst for å lasta «%s» er ikkje støtta"
-
-#: 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 "Lag ei ny mappe"
-
-#: calendar/gui/dialogs/new-calendar.c:174
-#, fuzzy
-msgid "Could not create directory for new calendar"
-msgstr "Kan ikkje laga mappa %s: %s"
-
-#: calendar/gui/dialogs/new-calendar.c:254
-#: calendar/gui/dialogs/new-task-list.c:131
-#, fuzzy
-msgid "A group must be selected"
-msgstr "Det må vera ein organisator."
-
 #: calendar/gui/dialogs/new-calendar.glade.h:2
-#, fuzzy
 msgid "<b>Calendar options</b>"
-msgstr "Kalenderinformasjon"
+msgstr "   Kalenderalternativ</b>                <b>"
 
 #: calendar/gui/dialogs/new-calendar.glade.h:3
-#, fuzzy
 msgid "Add New Calendar"
-msgstr "Ny-Caledonia"
+msgstr "Legg til ny kalender"
 
 #: calendar/gui/dialogs/new-calendar.glade.h:4
-#, fuzzy
 msgid "Calendar Group"
-msgstr "iCalendar-feil"
+msgstr "Kalendergrupppe"
 
 #: calendar/gui/dialogs/new-calendar.glade.h:5
-#, fuzzy
 msgid "Calendar Location"
-msgstr "Kalenderinformasjon"
+msgstr "Kalenderadresse"
 
 #: calendar/gui/dialogs/new-calendar.glade.h:6
-#, fuzzy
 msgid "Calendar Name"
-msgstr "Kalender"
-
-#: calendar/gui/dialogs/new-task-list.c:56
-#, fuzzy
-msgid "Could not create directory for new task list"
-msgstr "Kan ikkje laga mappa %s: %s"
+msgstr "Kalendernamn"
 
 #: calendar/gui/dialogs/new-task-list.glade.h:2
-#, fuzzy
 msgid "<b>Task List Options</b>"
-msgstr "Kalenderinformasjon"
+msgstr "   Alternativ for oppgåveliste</b>                <b>"
 
 #: calendar/gui/dialogs/new-task-list.glade.h:3
-#, fuzzy
 msgid "Add New Task List"
-msgstr "Oppgåveliste"
+msgstr "Legg til ny oppgåveliste"
 
 #: calendar/gui/dialogs/new-task-list.glade.h:4
-#, fuzzy
 msgid "Task List Group"
-msgstr "Oppgåveliste"
+msgstr "Oppgåvelistegruppe"
 
 #: calendar/gui/dialogs/new-task-list.glade.h:5
-#, fuzzy
 msgid "Task List Name"
-msgstr "Oppgåveliste"
+msgstr "Oppgåvelistenamn"
 
 #: calendar/gui/dialogs/recur-comp.c:50
 msgid "You are modifying a recurring event, what would you like to modify?"
@@ -4724,19 +4941,16 @@ msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr "Du endrar ei oppgåve som skal gjerast fleire gongar. Kva vil du endra?"
 
 #: calendar/gui/dialogs/recur-comp.c:58
-msgid ""
-"You are modifying a recurring journal entry, what would you like to modify?"
-msgstr ""
-"Du endrar ei journaloppføring som står fleire gongar. Kva vil du endra?"
+msgid "You are modifying a recurring journal entry, what would you like to modify?"
+msgstr "Du endrar ei journaloppføring som står fleire gongar. Kva vil du endra?"
 
 #: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
 msgstr "Berre denne instansen"
 
 #: calendar/gui/dialogs/recur-comp.c:76
-#, fuzzy
 msgid "This and Prior Instances"
-msgstr "Denne og framtidige instansar"
+msgstr "Denne og tidlegare instansar"
 
 #: calendar/gui/dialogs/recur-comp.c:82
 msgid "This and Future Instances"
@@ -4748,8 +4962,7 @@ msgstr "Alle instansane"
 
 #: calendar/gui/dialogs/recurrence-page.c:542
 msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr ""
-"Denne avtalen skal gjenta seg på ein måte som Evolution ikkje kan redigera."
+msgstr "Denne avtalen skal gjenta seg på ein måte som Evolution ikkje kan redigera."
 
 #: calendar/gui/dialogs/recurrence-page.c:816
 msgid "Recurrence date is invalid"
@@ -4797,9 +5010,8 @@ msgid "occurrences"
 msgstr "gong(ar)"
 
 #: calendar/gui/dialogs/recurrence-page.c:2334
-#, fuzzy
 msgid "Date/Time"
-msgstr "Dato/tid:"
+msgstr "Dato/klokkeslett"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:1
 msgid "A_dd"
@@ -4810,31 +5022,27 @@ msgid "Every"
 msgstr "Kvar"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:5
-#, fuzzy
 msgid "Exceptions"
 msgstr "Unntak"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:6
-#, fuzzy
+#, fuzz
 msgid "Preview"
-msgstr "Førehandsvising:"
+msgstr "Førehandsvising"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:7
-#, fuzzy
 msgid "Recurrence Rule"
-msgstr "Regel for repetering"
+msgstr "Regel for gjentaking"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:9
-#, fuzzy
 msgid "_Custom recurrence"
-msgstr "_Tilpassa repetering"
+msgstr "_Sjølvvald repetering"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "_Modify"
 msgstr "_Endre"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:11
-#, fuzzy
 msgid "_No recurrence"
 msgstr "_Inga repetering"
 
@@ -4843,7 +5051,6 @@ msgid "_Remove"
 msgstr "Fje_rn"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:13
-#, fuzzy
 msgid "_Simple recurrence"
 msgstr "_Enkel repetering"
 
@@ -4881,7 +5088,7 @@ msgstr ""
 "\n"
 "Vil du lagra endringane?"
 
-#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1555
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1563
 msgid "_Discard Changes"
 msgstr "_Forkast endringar"
 
@@ -4916,53 +5123,52 @@ msgid "% _Complete"
 msgstr "% _ferdig"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:598
-#: calendar/gui/e-calendar-table.c:464 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:597
+#: 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/print.c:2317
+#: calendar/gui/print.c:2346
 msgid "Completed"
 msgstr "Ferdig"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:389 calendar/gui/e-tasks.c:231
-#: mail/message-list.c:919
+#: calendar/gui/e-calendar-table.c:391 calendar/gui/e-tasks.c:231
+#: mail/message-list.c:939
 msgid "High"
 msgstr "Høg"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:596
-#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-calendar-table.c:463
-#: calendar/gui/e-tasks.c:207 calendar/gui/print.c:2314
+#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:595
+#: calendar/gui/e-cal-model-tasks.c:657 calendar/gui/e-calendar-table.c:465
+#: calendar/gui/e-tasks.c:207 calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr "Under arbeid"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:391 calendar/gui/e-tasks.c:235
-#: mail/message-list.c:917
+#: calendar/gui/e-calendar-table.c:393 calendar/gui/e-tasks.c:235
+#: mail/message-list.c:937
 msgid "Low"
 msgstr "Lav"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: 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:233 mail/message-list.c:938
 msgid "Normal"
 msgstr "Vanleg"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:594
-#: calendar/gui/e-calendar-table.c:462 calendar/gui/e-tasks.c:217
-#: calendar/gui/print.c:2311
+#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:593
+#: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:217
+#: calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "Ikkje starta"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#, fuzzy
 msgid "Progress"
-msgstr "Under arbeid"
+msgstr "Framgang"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:392
+#: calendar/gui/e-calendar-table.c:394
 msgid "Undefined"
 msgstr "Udefinert"
 
@@ -4992,33 +5198,32 @@ msgstr "Enkel"
 msgid "Assignment"
 msgstr "Tildeling"
 
-#: calendar/gui/dialogs/task-page.c:484
+#: calendar/gui/dialogs/task-page.c:485
 msgid "Due date is wrong"
 msgstr "Forfallsdato er feil"
 
-#: calendar/gui/dialogs/task-page.c:544
+#: calendar/gui/dialogs/task-page.c:545
 msgid "Due date is before start date!"
 msgstr "Forfallsdato er før startdato"
 
-#: calendar/gui/dialogs/task-page.c:809
-#, fuzzy, c-format
+#: calendar/gui/dialogs/task-page.c:810
+#, c-format
 msgid "Unable to open tasks in '%s'."
-msgstr "Ikkje i stand å opne adresseboka"
+msgstr "Ikkje i stand å opna oppgåver i «%s»."
 
 #: calendar/gui/dialogs/task-page.glade.h:4
 msgid "Con_fidential"
 msgstr "Kon_fidensielt"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:994
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:247
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:46
 msgid "Description:"
 msgstr "Skildring:"
 
 #: calendar/gui/dialogs/task-page.glade.h:7
-#, fuzzy
 msgid "Folder:"
-msgstr "_Mapper:"
+msgstr "Mappe:"
 
 #: calendar/gui/dialogs/task-page.glade.h:10
 msgid "Sta_rt Date:"
@@ -5028,111 +5233,159 @@ msgstr "Sta_rt-dato:"
 msgid "_Due Date:"
 msgstr "Forfalls_dato:"
 
-#: calendar/gui/e-alarm-list.c:397
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
+msgid "Authentication Credentials for HTTP Server"
+msgstr ""
+
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:3
+msgid "Calendars selected for publishing"
+msgstr ""
+
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:4
+msgid "Daily"
+msgstr "Dagleg"
+
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:5
+msgid "Free/Busy Editor"
+msgstr "Redigering av ledig/oppteken-informasjon"
+
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:6
+msgid "Free/Busy Publishing Location"
+msgstr "Adresse for offentleggjering av ledig/oppteken-informasjon"
+
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:7
+msgid "Login name:"
+msgstr "Påloggingsnamn:"
+
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:8
+msgid "Password:"
+msgstr "Passord:"
+
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:9
+msgid "Publishing Frequency"
+msgstr ""
+
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:10
+msgid "Remember password"
+msgstr "Hugs dette passordet"
+
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:11
+msgid "URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:12
+msgid "User Publishes"
+msgstr ""
+
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:13
+msgid "Weekly"
+msgstr "Kvar veke"
+
+#: calendar/gui/e-alarm-list.c:395
 #, c-format
 msgid "%d days"
 msgstr "%d dagar"
 
-#: 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 veker"
 
-#: calendar/gui/e-alarm-list.c:408
+#: calendar/gui/e-alarm-list.c:406
 msgid "1 week"
 msgstr "1 veke"
 
-#: calendar/gui/e-alarm-list.c:413
+#: calendar/gui/e-alarm-list.c:411
 #, c-format
 msgid "%d hours"
 msgstr "%d timar"
 
-#: 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 minutt"
 
-#: 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 sekund"
 
-#: 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 ein e-post"
 
-#: 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ørast"
 
-#: 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 byrjing på avtalen"
 
-#: 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 byrjinga på avtalen"
 
-#: 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 byrjinga av avtalen"
 
-#: 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 er slutt"
 
-#: 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 at avtalen er 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 slutten av avtalen"
 
-#: calendar/gui/e-alarm-list.c:540
+#: calendar/gui/e-alarm-list.c:538
 #, c-format
 msgid "%s at %s"
 msgstr "%s %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 ein ukjent utløysartype"
 
-#: 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-list-view.c:264 calendar/gui/e-cal-model.c:283
+#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:369
 msgid "Public"
 msgstr "Offentleg"
 
-#: 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-cal-list-view.c:265 calendar/gui/e-cal-model.c:292
+#: 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-cal-list-view.c:266 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-calendar-table.c:371
 msgid "Confidential"
 msgstr "Konfidensiell"
 
@@ -5152,7 +5405,7 @@ msgstr "Start-dato"
 msgid "Summary"
 msgstr "Samandrag"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:182
 msgid "color"
 msgstr "farge"
 
@@ -5161,11 +5414,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 "Oppteke"
@@ -5186,7 +5439,7 @@ msgstr "E"
 msgid "W"
 msgstr "V"
 
-#: calendar/gui/e-cal-model-tasks.c:546
+#: calendar/gui/e-cal-model-tasks.c:545
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -5196,7 +5449,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:932 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-model.c:261
 #: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:529
 #: calendar/gui/e-meeting-model.c:782 calendar/gui/e-meeting-store.c:159
@@ -5204,7 +5457,7 @@ msgstr ""
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:932 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-model.c:273
 #: calendar/gui/e-meeting-model.c:783 calendar/gui/e-meeting-store.c:171
 msgid "No"
@@ -5212,7 +5465,7 @@ msgstr "Nei"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299
-#: calendar/gui/e-itip-control.c:1023 calendar/gui/e-itip-control.c:1239
+#: calendar/gui/e-itip-control.c:979 calendar/gui/e-itip-control.c:1181
 #: calendar/gui/e-meeting-list-view.c:144
 #: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-model.c:217
 #: calendar/gui/e-meeting-model.c:252 calendar/gui/e-meeting-model.c:317
@@ -5221,7 +5474,7 @@ msgstr "Nei"
 #: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1664
 #: camel/camel-gpg-context.c:1715 camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1952
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2096
 #: shell/e-component-registry.c:164 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Ukjend"
@@ -5234,178 +5487,171 @@ msgstr "Repeterande"
 msgid "Assigned"
 msgstr "Tildelt"
 
-#: calendar/gui/e-cal-view.c:600 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 "Slettar valde objekt"
 
-#: calendar/gui/e-cal-view.c:704 calendar/gui/e-calendar-table.c:847
+#: calendar/gui/e-cal-view.c:784 calendar/gui/e-calendar-table.c:861
 msgid "Updating objects"
 msgstr "Oppdaterar objekt"
 
-#: calendar/gui/e-cal-view.c:1164 calendar/gui/e-cal-view.c:1249
+#: calendar/gui/e-cal-view.c:1213 calendar/gui/e-cal-view.c:1298
 msgid "New _Appointment..."
 msgstr "Ny _avtale ..."
 
-#: calendar/gui/e-cal-view.c:1165 calendar/gui/e-cal-view.c:1251
+#: calendar/gui/e-cal-view.c:1214 calendar/gui/e-cal-view.c:1300
 msgid "New All Day _Event"
 msgstr "Ny h_eildagshending"
 
-#: calendar/gui/e-cal-view.c:1166 calendar/gui/e-cal-view.c:1253
+#: calendar/gui/e-cal-view.c:1215 calendar/gui/e-cal-view.c:1302
 msgid "New Meeting"
 msgstr "Nytt møte"
 
-#: calendar/gui/e-cal-view.c:1167 calendar/gui/e-cal-view.c:1255
+#: calendar/gui/e-cal-view.c:1216 calendar/gui/e-cal-view.c:1304
 msgid "New Task"
 msgstr "Ny oppgåve"
 
-#: calendar/gui/e-cal-view.c:1171 calendar/gui/e-cal-view.c:1194
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-calendar-table.c:1026
-#: calendar/gui/e-calendar-table.c:1068 ui/evolution-addressbook.xml.h:40
-#: ui/evolution-calendar.xml.h:37 ui/evolution-comp-editor.xml.h:19
+#: calendar/gui/e-cal-view.c:1220 calendar/gui/e-cal-view.c:1243
+#: calendar/gui/e-cal-view.c:1310 calendar/gui/e-calendar-table.c:1040
+#: calendar/gui/e-calendar-table.c:1082 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:1175 calendar/gui/e-cal-view.c:1201
-#: calendar/gui/e-cal-view.c:1259 calendar/gui/e-calendar-table.c:1032
-#: calendar/gui/e-calendar-table.c:1066 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:36 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-cal-view.c:1224 calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-cal-view.c:1308 calendar/gui/e-calendar-table.c:1046
+#: calendar/gui/e-calendar-table.c:1080 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:22
 msgid "_Paste"
 msgstr "_Lim inn"
 
-#: calendar/gui/e-cal-view.c:1181 calendar/gui/e-cal-view.c:1245
+#: calendar/gui/e-cal-view.c:1230 calendar/gui/e-cal-view.c:1294
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr "Gå _til idag"
 
-#: calendar/gui/e-cal-view.c:1182 calendar/gui/e-cal-view.c:1247
+#: calendar/gui/e-cal-view.c:1231 calendar/gui/e-cal-view.c:1296
 msgid "_Go to Date..."
 msgstr "_Gå til dato ..."
 
-#: calendar/gui/e-cal-view.c:1186 ui/evolution-calendar.xml.h:38
+#: calendar/gui/e-cal-view.c:1235 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "_Publiser ledig/oppteken-informasjon"
 
-#: calendar/gui/e-cal-view.c:1192 calendar/gui/e-cal-view.c:1257
-#: 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 "_Opne"
-
-#: calendar/gui/e-cal-view.c:1193 calendar/gui/e-cal-view.c:1263
-#: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1070
-#: mail/em-folder-view.c:683 mail/em-popup.c:590 mail/em-popup.c:646
+#: calendar/gui/e-cal-view.c:1242 calendar/gui/e-cal-view.c:1312
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1084
+#: mail/em-folder-view.c:713 mail/em-popup.c:659 mail/em-popup.c:774
 #: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
-msgstr "_Lagre som ..."
+msgstr "_Lagra som ..."
 
-#: calendar/gui/e-cal-view.c:1199 calendar/gui/e-cal-view.c:1239
-#: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1059
+#: calendar/gui/e-cal-view.c:1248 calendar/gui/e-cal-view.c:1288
+#: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1073
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Kl_ipp ut"
 
-#: calendar/gui/e-cal-view.c:1200 calendar/gui/e-cal-view.c:1237
-#: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1057
-#: mail/em-folder-tree.c:1497 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:33 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-cal-view.c:1249 calendar/gui/e-cal-view.c:1286
+#: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1071
+#: mail/em-folder-tree.c:1759 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:18
 msgid "_Copy"
 msgstr "_Kopier"
 
-#: calendar/gui/e-cal-view.c:1205
+#: calendar/gui/e-cal-view.c:1254
 msgid "_Schedule Meeting..."
 msgstr "_Set opp møte ..."
 
-#: calendar/gui/e-cal-view.c:1206
+#: calendar/gui/e-cal-view.c:1255
 msgid "_Forward as iCalendar..."
 msgstr "_Send vidare som iCalendar ..."
 
-#: calendar/gui/e-cal-view.c:1211 calendar/gui/e-cal-view.c:1242
+#: calendar/gui/e-cal-view.c:1260 calendar/gui/e-cal-view.c:1291
 msgid "Delete this _Occurrence"
 msgstr "Slett denne _hendinga"
 
-#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1243
+#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1292
 msgid "Delete _All Occurrences"
 msgstr "Slett _alle hendingane"
 
-#: calendar/gui/e-cal-view.c:1265 ui/evolution.xml.h:30
+#: calendar/gui/e-cal-view.c:1314 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "_Innstillingar ..."
 
-#: 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:1038
 msgid "Open _Web Page"
 msgstr "_Opna nettside"
 
-#: calendar/gui/e-calendar-table.c:1036
+#: calendar/gui/e-calendar-table.c:1050
 msgid "_Assign Task"
 msgstr "_Tildel oppgåve"
 
-#: calendar/gui/e-calendar-table.c:1037
+#: calendar/gui/e-calendar-table.c:1051
 msgid "_Forward as iCalendar"
 msgstr "Send _vidare som iCalendar"
 
-#: calendar/gui/e-calendar-table.c:1038
+#: calendar/gui/e-calendar-table.c:1052
 msgid "_Mark as Complete"
 msgstr "_Merk som komplett"
 
-#: calendar/gui/e-calendar-table.c:1039
+#: calendar/gui/e-calendar-table.c:1053
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Merk valde oppgåver som ferdige"
 
-#: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1062
+#: calendar/gui/e-calendar-table.c:1058 calendar/gui/e-calendar-table.c:1076
 msgid "_Delete Selected Tasks"
 msgstr "Slett _den valde oppgåver"
 
-#: calendar/gui/e-calendar-table.c:1351
+#: calendar/gui/e-calendar-table.c:1370
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Trykk her for å leggje til ei oppgåve"
@@ -5420,7 +5666,7 @@ msgid "Alarms"
 msgstr "Alarmar"
 
 #: 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:583
 msgid "Complete"
 msgstr "Ferdig"
 
@@ -5479,139 +5725,134 @@ msgstr "%02i minutt 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-week-view-main-item.c:320 calendar/gui/print.c:1533
+#: 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:1519
 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/print.c:818
+#: calendar/gui/e-day-view.c:602 calendar/gui/e-week-view.c:334
+#: calendar/gui/print.c:843
 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/print.c:820
+#: calendar/gui/e-day-view.c:605 calendar/gui/e-week-view.c:337
+#: calendar/gui/print.c:845
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-itip-control.c:139
-#, c-format
-msgid "start_calendar_server(): %s"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:636
+#: calendar/gui/e-itip-control.c:592
 msgid "Yes. (Complex Recurrence)"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:648
+#: calendar/gui/e-itip-control.c:604
 msgid "Every day"
 msgstr "Kvar dag"
 
-#: calendar/gui/e-itip-control.c:650
+#: calendar/gui/e-itip-control.c:606
 #, c-format
 msgid "Every %d days"
 msgstr "Kvar %d. dag"
 
-#: calendar/gui/e-itip-control.c:656
+#: calendar/gui/e-itip-control.c:612
 msgid "Every week"
 msgstr "Kvar veke"
 
-#: calendar/gui/e-itip-control.c:658
+#: calendar/gui/e-itip-control.c:614
 #, c-format
 msgid "Every %d weeks"
 msgstr "Kvar %d. veke"
 
-#: calendar/gui/e-itip-control.c:661
+#: calendar/gui/e-itip-control.c:617
 msgid "Every week on "
 msgstr "Kvar veke på "
 
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:619
 #, c-format
 msgid "Every %d weeks on "
 msgstr "Kvar %d. veke på "
 
-#: calendar/gui/e-itip-control.c:671
+#: calendar/gui/e-itip-control.c:627
 msgid " and "
 msgstr " og "
 
-#: calendar/gui/e-itip-control.c:678
+#: calendar/gui/e-itip-control.c:634
 #, c-format
 msgid "The %s day of "
 msgstr "Den %s dagen i "
 
-#: calendar/gui/e-itip-control.c:691
+#: calendar/gui/e-itip-control.c:647
 #, c-format
 msgid "The %s %s of "
 msgstr "Den %s %s i "
 
-#: calendar/gui/e-itip-control.c:696
+#: calendar/gui/e-itip-control.c:652
 msgid "every month"
 msgstr "kvar månad"
 
-#: calendar/gui/e-itip-control.c:701
+#: calendar/gui/e-itip-control.c:657
 #, c-format
 msgid "every %d months"
 msgstr "kvar %d. månad"
 
-#: calendar/gui/e-itip-control.c:707
+#: calendar/gui/e-itip-control.c:663
 msgid "Every year"
 msgstr "Kvart år"
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:665
 #, c-format
 msgid "Every %d years"
 msgstr "Kvart %d. år"
 
-#: calendar/gui/e-itip-control.c:721
+#: calendar/gui/e-itip-control.c:677
 #, c-format
 msgid " a total of %d times"
 msgstr " totalt %d gongar"
 
-#: calendar/gui/e-itip-control.c:730
+#: calendar/gui/e-itip-control.c:686
 msgid ", ending on "
 msgstr ", sluttar på"
 
-#: calendar/gui/e-itip-control.c:754
+#: calendar/gui/e-itip-control.c:710
 msgid "<b>Starts:</b> "
 msgstr "<b>Byrjar:</b> "
 
-#: calendar/gui/e-itip-control.c:764
+#: calendar/gui/e-itip-control.c:720
 msgid "<b>Ends:</b> "
 msgstr "<b>Sluttar:</b>"
 
-#: calendar/gui/e-itip-control.c:784
+#: calendar/gui/e-itip-control.c:740
 msgid "<b>Completed:</b> "
 msgstr "<b>Fullført:</b> "
 
-#: calendar/gui/e-itip-control.c:794
+#: calendar/gui/e-itip-control.c:750
 msgid "<b>Due:</b> "
 msgstr "<b>Skal vera ferdig:</b>"
 
-#: calendar/gui/e-itip-control.c:831 calendar/gui/e-itip-control.c:884
+#: calendar/gui/e-itip-control.c:787 calendar/gui/e-itip-control.c:840
 msgid "iCalendar Information"
 msgstr "iCalendar-informasjon"
 
 #. Title
-#: calendar/gui/e-itip-control.c:846
+#: calendar/gui/e-itip-control.c:802
 msgid "iCalendar Error"
 msgstr "iCalendar-feil"
 
-#: calendar/gui/e-itip-control.c:915 calendar/gui/e-itip-control.c:931
-#: calendar/gui/e-itip-control.c:942 calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:871 calendar/gui/e-itip-control.c:887
+#: calendar/gui/e-itip-control.c:898 calendar/gui/e-itip-control.c:915
 msgid "An unknown person"
 msgstr "Ein ukjent person"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:966
+#: calendar/gui/e-itip-control.c:922
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5619,335 +5860,318 @@ msgstr ""
 "<br> Sjå gjennom den følgjande informasjon, og velj ei handling frå menyen "
 "under."
 
-#: calendar/gui/e-itip-control.c:981
+#: calendar/gui/e-itip-control.c:937
 msgid "<i>None</i>"
 msgstr "<i>Ingen</i>"
 
-#: calendar/gui/e-itip-control.c:992
-msgid "Location:"
-msgstr "Plassering:"
-
 #. write status
-#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-tasks.c:203
+#: calendar/gui/e-itip-control.c:962 calendar/gui/e-tasks.c:203
 msgid "Status:"
 msgstr "Status:"
 
-#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:967 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-model.c:281 calendar/gui/e-meeting-model.c:304
 #: calendar/gui/e-meeting-model.c:796 calendar/gui/e-meeting-store.c:179
-#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:418
+#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Akseptert"
 
-#: calendar/gui/e-itip-control.c:1015 calendar/gui/itip-utils.c:421
+#: calendar/gui/e-itip-control.c:971 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Mellombels godteke"
 
-#: calendar/gui/e-itip-control.c:1019 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:975 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-model.c:283 calendar/gui/e-meeting-model.c:306
 #: calendar/gui/e-meeting-model.c:797 calendar/gui/e-meeting-store.c:181
-#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:424
-#: calendar/gui/itip-utils.c:450
+#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:428
+#: calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Avslått"
 
-#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1106
-#: calendar/gui/e-itip-control.c:1132 calendar/gui/e-itip-control.c:1145
-#: calendar/gui/e-itip-control.c:1158 calendar/gui/e-itip-control.c:1171
+#: calendar/gui/e-itip-control.c:1034 calendar/gui/e-itip-control.c:1062
+#: calendar/gui/e-itip-control.c:1088 calendar/gui/e-itip-control.c:1101
+#: calendar/gui/e-itip-control.c:1114 calendar/gui/e-itip-control.c:1127
 msgid "Choose an action:"
 msgstr "Vel ei handling:"
 
-#: calendar/gui/e-itip-control.c:1079
+#: calendar/gui/e-itip-control.c:1035
 msgid "Update"
 msgstr "Oppdater"
 
-#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1111
-#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
-#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
-#: shell/e-shell.c:1001 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1036 calendar/gui/e-itip-control.c:1067
+#: calendar/gui/e-itip-control.c:1090 calendar/gui/e-itip-control.c:1103
+#: calendar/gui/e-itip-control.c:1116 calendar/gui/e-itip-control.c:1129
+#: shell/e-shell.c:1066 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1107
+#: calendar/gui/e-itip-control.c:1063
 msgid "Accept"
 msgstr "Godta"
 
-#: calendar/gui/e-itip-control.c:1108
+#: calendar/gui/e-itip-control.c:1064
 msgid "Tentatively accept"
 msgstr "Godta mellombels"
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1065
 msgid "Decline"
 msgstr "Avslå"
 
-#: calendar/gui/e-itip-control.c:1133
+#: calendar/gui/e-itip-control.c:1089
 msgid "Send Free/Busy Information"
 msgstr "Send ledig/oppteken-informasjon"
 
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1102
 msgid "Update respondent status"
 msgstr "Opdatér status på svar"
 
-#: calendar/gui/e-itip-control.c:1159
+#: calendar/gui/e-itip-control.c:1115
 msgid "Send Latest Information"
 msgstr "Send nyaste informasjon"
 
-#: calendar/gui/e-itip-control.c:1172 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
+#: calendar/gui/e-itip-control.c:1128 calendar/gui/itip-utils.c:442
+#: mail/mail-send-recv.c:393 mail/mail-send-recv.c:445
+#: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1204
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> bar publisert møteinformasjon."
 
-#: calendar/gui/e-itip-control.c:1262
+#: calendar/gui/e-itip-control.c:1205
 msgid "Meeting Information"
 msgstr "Møteinformasjon"
 
-#: calendar/gui/e-itip-control.c:1267
+#: calendar/gui/e-itip-control.c:1210
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> ber om at %s er til stades på eit møte."
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1212
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> spør etter deg for å stille opp på eit møte."
 
-#: calendar/gui/e-itip-control.c:1270
+#: calendar/gui/e-itip-control.c:1213
 msgid "Meeting Proposal"
 msgstr "Møteframlegg"
 
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1217
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> ynskjer å leggje til noko til eit eksisterande møte."
 
-#: calendar/gui/e-itip-control.c:1275
+#: calendar/gui/e-itip-control.c:1218
 msgid "Meeting Update"
 msgstr "Møteoppdatering"
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1222
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> ber om å få den nyaste møteinformasjonen."
 
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1223
 msgid "Meeting Update Request"
 msgstr "Førespurnad om møteoppdatering"
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1230
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> har svart på ein førespurnad om eit møte."
 
-#: calendar/gui/e-itip-control.c:1288
+#: calendar/gui/e-itip-control.c:1231
 msgid "Meeting Reply"
 msgstr "Møtesvar"
 
-#: calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1238
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> har avlyst eit møte."
 
-#: calendar/gui/e-itip-control.c:1296
+#: calendar/gui/e-itip-control.c:1239
 msgid "Meeting Cancellation"
 msgstr "Møtekansellering"
 
-#: calendar/gui/e-itip-control.c:1303 calendar/gui/e-itip-control.c:1370
-#: calendar/gui/e-itip-control.c:1405
+#: calendar/gui/e-itip-control.c:1246 calendar/gui/e-itip-control.c:1314
+#: calendar/gui/e-itip-control.c:1349
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> har sendt ei uforståeleg melding."
 
-#: calendar/gui/e-itip-control.c:1304
+#: calendar/gui/e-itip-control.c:1247
 msgid "Bad Meeting Message"
 msgstr "Feil i møtemelding"
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1272
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> har publisert informasjon om ei oppgåve."
 
-#: calendar/gui/e-itip-control.c:1329
+#: calendar/gui/e-itip-control.c:1273
 msgid "Task Information"
 msgstr "Oppgåveinformasjon"
 
-#: calendar/gui/e-itip-control.c:1334
+#: calendar/gui/e-itip-control.c:1278
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> ber om at %s utfører ei oppgåve."
 
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1280
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> ber om at du utfører ei oppgåve."
 
-#: calendar/gui/e-itip-control.c:1337
+#: calendar/gui/e-itip-control.c:1281
 msgid "Task Proposal"
 msgstr "Oppgåveframlegg"
 
-#: calendar/gui/e-itip-control.c:1341
+#: calendar/gui/e-itip-control.c:1285
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> ønskjar å leggje til ei eksisterande oppgåve."
 
-#: calendar/gui/e-itip-control.c:1342
+#: calendar/gui/e-itip-control.c:1286
 msgid "Task Update"
 msgstr "Oppgåveoppdatering"
 
-#: calendar/gui/e-itip-control.c:1346
+#: calendar/gui/e-itip-control.c:1290
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> ber om å få den nyaste oppgåveinformasjonen."
 
-#: calendar/gui/e-itip-control.c:1347
+#: calendar/gui/e-itip-control.c:1291
 msgid "Task Update Request"
 msgstr "Oppgåveoppdateringsforepørjing"
 
-#: calendar/gui/e-itip-control.c:1354
+#: calendar/gui/e-itip-control.c:1298
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> har svart på ei  oppgåvetildeling."
 
-#: calendar/gui/e-itip-control.c:1355
+#: calendar/gui/e-itip-control.c:1299
 msgid "Task Reply"
 msgstr "Oppgåvesvar"
 
-#: calendar/gui/e-itip-control.c:1362
+#: calendar/gui/e-itip-control.c:1306
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> har kansellert ei oppgåve."
 
-#: calendar/gui/e-itip-control.c:1363
+#: calendar/gui/e-itip-control.c:1307
 msgid "Task Cancellation"
 msgstr "Oppgåvekansellering"
 
-#: calendar/gui/e-itip-control.c:1371
+#: calendar/gui/e-itip-control.c:1315
 msgid "Bad Task Message"
 msgstr "Ugyldig oppgåvemelding"
 
-#: calendar/gui/e-itip-control.c:1390
+#: calendar/gui/e-itip-control.c:1334
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> har publisert ledig/oppteken-informasjon."
 
-#: calendar/gui/e-itip-control.c:1391
+#: calendar/gui/e-itip-control.c:1335
 msgid "Free/Busy Information"
 msgstr "Fri/ledig-informasjon"
 
-#: calendar/gui/e-itip-control.c:1395
+#: calendar/gui/e-itip-control.c:1339
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> spør etter ledig/oppteken-informasjonen din."
 
-#: calendar/gui/e-itip-control.c:1396
+#: calendar/gui/e-itip-control.c:1340
 msgid "Free/Busy Request"
 msgstr "Fri/ledig forespørsel"
 
-#: calendar/gui/e-itip-control.c:1400
+#: calendar/gui/e-itip-control.c:1344
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
-msgstr ""
-"<b>%s</b> har svart på ein førespurnad etter ledig/oppteken-informasjon."
+msgstr "<b>%s</b> har svart på ein førespurnad etter ledig/oppteken-informasjon."
 
-#: calendar/gui/e-itip-control.c:1401
+#: calendar/gui/e-itip-control.c:1345
 msgid "Free/Busy Reply"
 msgstr "Fri/Oppteke svar"
 
-#: calendar/gui/e-itip-control.c:1406
+#: calendar/gui/e-itip-control.c:1350
 msgid "Bad Free/Busy Message"
 msgstr "Ugyldig ledig/oppteken-melding"
 
-#: calendar/gui/e-itip-control.c:1482
+#: calendar/gui/e-itip-control.c:1423
 msgid "The message does not appear to be properly formed"
 msgstr "Meldinga ser ikkje ut til å vera rett forma"
 
-#: calendar/gui/e-itip-control.c:1550
+#: calendar/gui/e-itip-control.c:1482
 msgid "The message contains only unsupported requests."
 msgstr "Denne meldingar inneheld berre førespurnader som ikkje er støtta."
 
-#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1587
+#: calendar/gui/e-itip-control.c:1513
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Vedlegg inneheld ikkje ei gyldig kalendermelding."
 
-#: calendar/gui/e-itip-control.c:1612
+#: calendar/gui/e-itip-control.c:1543
 msgid "The attachment has no viewable calendar items"
 msgstr "Vedlegget inneheld ingen kalendervedlegg som let seg visa."
 
-#: calendar/gui/e-itip-control.c:1851
+#: calendar/gui/e-itip-control.c:1774
 msgid "Calendar file could not be updated!\n"
 msgstr "Kalenderfila kan ikkje oppdaterast!\n"
 
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1776
 msgid "Update complete\n"
 msgstr "Oppdateringa er ferdig\n"
 
-#: calendar/gui/e-itip-control.c:1883 calendar/gui/e-itip-control.c:1955
+#: calendar/gui/e-itip-control.c:1806 calendar/gui/e-itip-control.c:1878
 msgid "Attendee status can not be updated because the item no longer exists"
-msgstr ""
-"Deltakarstatus kan ikkje oppdaterast, for oppføringa finst ikkje lenger."
+msgstr "Deltakarstatus kan ikkje oppdaterast, for oppføringa finst ikkje lenger."
 
-#: calendar/gui/e-itip-control.c:1899 calendar/gui/e-itip-control.c:1937
+#: calendar/gui/e-itip-control.c:1822 calendar/gui/e-itip-control.c:1860
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objektet er ugyldig og kan ikkje oppdaterast\n"
 
-#: calendar/gui/e-itip-control.c:1909
+#: calendar/gui/e-itip-control.c:1832
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Dette svaret er ikkje frå ein aktiv deltakar. Skal vedkommande leggjast til "
 "som deltakar?"
 
-#: calendar/gui/e-itip-control.c:1921
+#: calendar/gui/e-itip-control.c:1844
 msgid "Attendee status could not be updated because of an invalid status!\n"
-msgstr ""
-"Deltakarstatusen kan ikkje oppdaterast på grunn av ein ugyldig status!\n"
+msgstr "Deltakarstatusen kan ikkje oppdaterast på grunn av ein ugyldig status!\n"
 
-#: calendar/gui/e-itip-control.c:1940
+#: calendar/gui/e-itip-control.c:1863
 msgid "There was an error on the CORBA system\n"
 msgstr "Det oppstod ein feil i CORBA-systemet\n"
 
-#: calendar/gui/e-itip-control.c:1943
+#: calendar/gui/e-itip-control.c:1866
 msgid "Object could not be found\n"
 msgstr "Fann ikkje objekt.\n"
 
-#: calendar/gui/e-itip-control.c:1946
+#: calendar/gui/e-itip-control.c:1869
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Du har ikkje dei løyva som trengst for å oppdatera kalenderen\n"
 
-#: calendar/gui/e-itip-control.c:1949
+#: calendar/gui/e-itip-control.c:1872
 msgid "Attendee status updated\n"
 msgstr "Deltakarstatus oppdatert\n"
 
-#: calendar/gui/e-itip-control.c:1952
+#: calendar/gui/e-itip-control.c:1875
 msgid "Attendee status could not be updated!\n"
 msgstr "Deltakarstatus kan ikkje oppdaterast!\n"
 
-#: calendar/gui/e-itip-control.c:1990
+#: calendar/gui/e-itip-control.c:1906
 msgid "Removal Complete"
 msgstr "Fjerning ferdig"
 
-#: calendar/gui/e-itip-control.c:2024 calendar/gui/e-itip-control.c:2072
+#: calendar/gui/e-itip-control.c:1929 calendar/gui/e-itip-control.c:1977
 msgid "Item sent!\n"
 msgstr "Oppføring sendt!\n"
 
-#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2076
+#: calendar/gui/e-itip-control.c:1931 calendar/gui/e-itip-control.c:1981
 msgid "The item could not be sent!\n"
 msgstr "Oppføringen kan ikkje sendast!\n"
 
-#: calendar/gui/e-itip-control.c:2170
-#, fuzzy
-msgid "Select Calendar Folder"
-msgstr "Vel standardmappe"
-
-#: calendar/gui/e-itip-control.c:2176
-#, fuzzy
-msgid "Select Tasks Folder"
-msgstr "Vel mappe"
-
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
 msgid "%P %%"
@@ -5990,7 +6214,7 @@ msgid "Chair Persons"
 msgstr "Møteleiarar"
 
 #: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:456 calendar/gui/e-meeting-model.c:78
+#: calendar/gui/e-meeting-list-view.c:479 calendar/gui/e-meeting-model.c:78
 #: calendar/gui/e-meeting-model.c:1635
 msgid "Required Participants"
 msgstr "Deltakarar som må vera med"
@@ -6044,7 +6268,6 @@ msgstr "Deltakar som må vera med"
 #: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-model.c:231
 #: calendar/gui/e-meeting-model.c:248 calendar/gui/e-meeting-model.c:768
 #: calendar/gui/e-meeting-store.c:129 calendar/gui/e-meeting-store.c:146
-#, fuzzy
 msgid "Optional Participant"
 msgstr "Valfri deltakar"
 
@@ -6058,9 +6281,8 @@ msgstr "Ikkje-deltakar"
 #: calendar/gui/e-meeting-model.c:302 calendar/gui/e-meeting-model.c:535
 #: calendar/gui/e-meeting-model.c:795 calendar/gui/e-meeting-store.c:177
 #: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
-#, fuzzy
 msgid "Needs Action"
-msgstr "Må behandlast"
+msgstr "Krev handling"
 
 #: calendar/gui/e-meeting-list-view.c:182 calendar/gui/e-meeting-model.c:285
 #: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:798
@@ -6180,22 +6402,12 @@ msgstr "Prioritet:"
 msgid "Web Page:"
 msgstr "Nettside:"
 
-#: calendar/gui/e-tasks.c:710 calendar/gui/tasks-control.c:200
+#: calendar/gui/e-tasks.c:314 mail/em-folder-view.c:2137
 #, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "Kan ikkje lasta oppgåvene i «%s»"
+msgid "Click to open %s"
+msgstr "Klikk for å opna %s"
 
-#: calendar/gui/e-tasks.c:725
-#, fuzzy, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr "Metoden som krevst for å opna «%s» er ikkje støtta"
-
-#: calendar/gui/e-tasks.c:739 calendar/gui/gnome-cal.c:1764
-#, fuzzy, c-format
-msgid "You don't have permission to open the folder in `%s'"
-msgstr "Kan ikkje opna mappa i «%s»"
-
-#: calendar/gui/e-tasks.c:800 calendar/gui/gnome-cal.c:1977
+#: calendar/gui/e-tasks.c:747 calendar/gui/gnome-cal.c:1887
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6204,58 +6416,64 @@ msgstr ""
 "Feil på %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:958
+#. FIXME: this doesn't remove the task list from the list or anything
+#: calendar/gui/e-tasks.c:766 calendar/gui/gnome-cal.c:1908
+#, c-format
+msgid ""
+"The task backend for\n"
+"%s\n"
+" has crashed."
+msgstr ""
+
+#: calendar/gui/e-tasks.c:846
+#, c-format
+msgid "Opening tasks at %s"
+msgstr "Opnar oppgåver på %s"
+
+#: calendar/gui/e-tasks.c:867
+#, c-format
+msgid ""
+"Error opening %s:\n"
+"%s"
+msgstr ""
+"Feil under opning av %s:\n"
+" %s"
+
+#: calendar/gui/e-tasks.c:886
+msgid "Loading tasks"
+msgstr "Lastar oppgåver"
+
+#: calendar/gui/e-tasks.c:988
 msgid "Completing tasks..."
 msgstr "Fullfører oppgåver ..."
 
-#: calendar/gui/e-tasks.c:981
+#: calendar/gui/e-tasks.c:1011
 msgid "Deleting selected objects..."
 msgstr "Slettar valde objekt ..."
 
-#: calendar/gui/e-tasks.c:1006
+#: calendar/gui/e-tasks.c:1036
 msgid "Expunging"
 msgstr "Tømer"
 
-#: calendar/gui/gnome-cal.c:1603 mail/importers/netscape-importer.c:1843
-#: shell/e-shortcuts.c:1086
-msgid "Calendar"
-msgstr "Kalender"
-
-#: calendar/gui/gnome-cal.c:1736
+#: calendar/gui/gnome-cal.c:1752
 #, c-format
-msgid "Could not open the folder in `%s'"
-msgstr "Kan ikkje opna mappa i «%s»"
+msgid "Opening %s"
+msgstr "Opnar %s"
 
-#: calendar/gui/gnome-cal.c:1750
+#: calendar/gui/gnome-cal.c:1763
 #, c-format
-msgid "The method required to open `%s' is not supported"
-msgstr "Metoden som krevst for å opna «%s» er ikkje støtta"
+msgid "Could not open '%s': %s"
+msgstr "Kan ikkje opna «%s»: %s"
 
-#: calendar/gui/gnome-cal.c:1807
-#, fuzzy, c-format
-msgid "Adding %s"
-msgstr "Sender «%s»"
-
-#: calendar/gui/gnome-cal.c:1998
+#: calendar/gui/gnome-cal.c:1916
 #, c-format
 msgid ""
-"The task backend for\n"
-"%s\n"
-" has crashed. You will have to restart Evolution in order to use it again"
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:2006
-#, fuzzy, c-format
-msgid ""
 "The calendar backend for\n"
 "%s\n"
-" has crashed. You will have to restart Evolution in order to use it again"
+" has crashed."
 msgstr ""
-"Adressebok-bakdelen for\n"
-"%s\n"
-"har krasja. Du må starta Evolution på nytt for å bruka han igjen."
 
-#: calendar/gui/gnome-cal.c:2851
+#: calendar/gui/gnome-cal.c:2803
 msgid "Purging"
 msgstr "Tømmer"
 
@@ -6315,347 +6533,369 @@ msgstr "Oktober"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/itip-utils.c:267 calendar/gui/itip-utils.c:315
-#: calendar/gui/itip-utils.c:347
+#: calendar/gui/itip-utils.c:271 calendar/gui/itip-utils.c:319
+#: calendar/gui/itip-utils.c:351
 msgid "An organizer must be set."
 msgstr "Det må vera ein organisator."
 
-#: calendar/gui/itip-utils.c:302
+#: calendar/gui/itip-utils.c:306
 msgid "At least one attendee is necessary"
 msgstr "Det må vera minst ein deltakar"
 
-#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
+#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
 msgid "Event information"
 msgstr "Informasjon om hending"
 
-#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:501
+#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:505
 msgid "Task information"
 msgstr "Informasjon om oppgåve"
 
-#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
+#: calendar/gui/itip-utils.c:398 calendar/gui/itip-utils.c:507
 msgid "Journal information"
 msgstr "Journalinformasjon"
 
-#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:521
+#: calendar/gui/itip-utils.c:400 calendar/gui/itip-utils.c:525
 msgid "Free/Busy information"
 msgstr "Ledig/oppteken-informasjon"
 
-#: calendar/gui/itip-utils.c:398
+#: calendar/gui/itip-utils.c:402
 msgid "Calendar information"
 msgstr "Kalenderinformasjon"
 
-#: calendar/gui/itip-utils.c:434
+#: calendar/gui/itip-utils.c:438
 msgid "Updated"
 msgstr "Oppdatert"
 
-#: calendar/gui/itip-utils.c:442
+#: calendar/gui/itip-utils.c:446
 msgid "Refresh"
 msgstr "Oppdater"
 
-#: calendar/gui/itip-utils.c:446
+#: calendar/gui/itip-utils.c:450
 msgid "Counter-proposal"
 msgstr "Motframlegg"
 
-#: calendar/gui/itip-utils.c:517
+#: calendar/gui/itip-utils.c:521
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Ledig/oppteken-informasjon (%s til %s)"
 
-#: calendar/gui/itip-utils.c:527
+#: calendar/gui/itip-utils.c:531
 msgid "iCalendar information"
 msgstr "iCalendar-informasjon"
 
-#: calendar/gui/itip-utils.c:667
+#: calendar/gui/itip-utils.c:671
 msgid "You must be an attendee of the event."
 msgstr "Du må delta på denne hendinga."
 
-#: calendar/gui/print.c:476
+#: calendar/gui/itip-utils.c:1155
+#, c-format
+msgid "Enter the password for %s"
+msgstr "Skriv inn passordet for %s"
+
+#: calendar/gui/migration.c:136
+msgid ""
+"The location and hierarchy of the Evolution task folders has changed since "
+"Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: calendar/gui/migration.c:140
+msgid ""
+"The location and hierarchy of the Evolution calendar folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: calendar/gui/migration.c:349
+msgid "Birthdays & Anniversaries"
+msgstr ""
+
+#. Create the web group
+#: calendar/gui/migration.c:405
+msgid "On The Web"
+msgstr ""
+
+#: calendar/gui/print.c:500
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:476
+#: calendar/gui/print.c:500
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:476
+#: calendar/gui/print.c:500
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:476
+#: calendar/gui/print.c:500
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:476
+#: calendar/gui/print.c:500
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:501
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:501
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:501
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:501
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:501
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:502
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:502
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:502
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:502
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:502
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:503
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:503
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:503
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:503
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:503
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:504
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:504
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:504
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:504
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:504
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:505
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:505
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:505
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:505
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:505
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:506
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:556
+#: calendar/gui/print.c:581
 msgid "Su"
 msgstr "Sun"
 
-#: calendar/gui/print.c:556
+#: calendar/gui/print.c:581
 msgid "Mo"
 msgstr "Mån"
 
-#: calendar/gui/print.c:556
+#: calendar/gui/print.c:581
 msgid "Tu"
 msgstr "Tys"
 
-#: calendar/gui/print.c:556
+#: calendar/gui/print.c:581
 msgid "We"
 msgstr "Ons"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:582
 msgid "Th"
 msgstr "Tor"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:582
 msgid "Fr"
 msgstr "Fre"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:582
 msgid "Sa"
 msgstr "Lau"
 
 #. Day
-#: calendar/gui/print.c:1891
+#: calendar/gui/print.c:1920
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Vald dag (%a %d %b %Y)"
 
-#: calendar/gui/print.c:1916 calendar/gui/print.c:1920
+#: calendar/gui/print.c:1945 calendar/gui/print.c:1949
 msgid "%a %b %d"
 msgstr "%a %d. %b"
 
-#: calendar/gui/print.c:1917
+#: calendar/gui/print.c:1946
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1921 calendar/gui/print.c:1923
-#: calendar/gui/print.c:1924
+#: calendar/gui/print.c:1950 calendar/gui/print.c:1952
+#: calendar/gui/print.c:1953
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/print.c:1928
+#: calendar/gui/print.c:1957
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Vald veke (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1936
+#: calendar/gui/print.c:1965
 msgid "Selected month (%b %Y)"
 msgstr "Vald månad (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1943
+#: calendar/gui/print.c:1972
 msgid "Selected year (%Y)"
 msgstr "Vald år (%Y)"
 
-#: calendar/gui/print.c:2268
+#: calendar/gui/print.c:2297
 msgid "Task"
 msgstr "Oppgåve"
 
-#: calendar/gui/print.c:2327
+#: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: calendar/gui/print.c:2344
+#: calendar/gui/print.c:2373
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioritet: %s"
 
-#: calendar/gui/print.c:2356
+#: calendar/gui/print.c:2385
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Prosent ferdig: %i"
 
-#: calendar/gui/print.c:2368
+#: calendar/gui/print.c:2397
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2382
+#: calendar/gui/print.c:2411
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategoriar %s"
 
-#: calendar/gui/print.c:2393
+#: calendar/gui/print.c:2422
 msgid "Contacts: "
 msgstr "Kontaktar: "
 
-#: calendar/gui/print.c:2531 calendar/gui/print.c:2617
-#: calendar/gui/tasks-control.c:563 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2559 calendar/gui/print.c:2645
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:147
 msgid "Print Preview"
 msgstr "Førehandsvising av utskrift"
 
-#: calendar/gui/print.c:2565
+#: calendar/gui/print.c:2593
 msgid "Print Item"
 msgstr "Skriv ut element"
 
-#: calendar/gui/print.c:2638
+#: calendar/gui/print.c:2759
 msgid "Print Setup"
 msgstr "Utskriftoppsett"
 
-#: calendar/gui/tasks-component.c:348
+#: calendar/gui/tasks-component.c:302
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:388
-#, fuzzy
-msgid "Rename this task list to"
-msgstr "Gi denne snarvegen nytt namn"
-
-#: calendar/gui/tasks-component.c:408
-#, fuzzy
-msgid "New Task List"
-msgstr "Oppgåveliste"
-
-#: calendar/gui/tasks-component.c:584
+#: calendar/gui/tasks-component.c:556
 msgid "New task"
 msgstr "Ny oppgåve"
 
-#: calendar/gui/tasks-component.c:585
+#: calendar/gui/tasks-component.c:557
 msgid "_Task"
 msgstr "_Oppgåve"
 
-#: calendar/gui/tasks-component.c:586
+#: calendar/gui/tasks-component.c:558
 msgid "Create a new task"
 msgstr "Opprett ei ny oppgåve"
 
-#: calendar/gui/tasks-component.c:591
-#, fuzzy
+#: calendar/gui/tasks-component.c:563
 msgid "New task list"
-msgstr "Oppgåveliste"
+msgstr "Ny oppgåveliste"
 
-#: calendar/gui/tasks-component.c:592
-#, fuzzy
+#: calendar/gui/tasks-component.c:564
 msgid "_Task List"
-msgstr "Oppgåveliste"
+msgstr "_Oppgåveliste"
 
-#: calendar/gui/tasks-component.c:593
-#, fuzzy
+#: calendar/gui/tasks-component.c:565
 msgid "Create a new task list"
-msgstr "Opprett ei ny oppgåve"
+msgstr "Lag ei ny oppgåveliste"
 
-#: calendar/gui/tasks-component.c:660
+#: calendar/gui/tasks-component.c:632
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:672
+#: calendar/gui/tasks-component.c:644
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:148
+#: calendar/gui/tasks-control.c:152
 msgid "The URI of the tasks folder to display"
 msgstr "Adressa til oppgåvemappa som skal visast"
 
-#: calendar/gui/tasks-control.c:447
+#: calendar/gui/tasks-control.c:211
+#, c-format
+msgid "Could not load the tasks in `%s'"
+msgstr "Kan ikkje lasta oppgåvene i «%s»"
+
+#: calendar/gui/tasks-control.c:478
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6667,11 +6907,11 @@ msgstr ""
 "\n"
 "Vil du sletta desse oppgåvene?"
 
-#: calendar/gui/tasks-control.c:450
+#: calendar/gui/tasks-control.c:481
 msgid "Do not ask me again."
 msgstr "Ikkje spør igjen"
 
-#: calendar/gui/tasks-control.c:592
+#: calendar/gui/tasks-control.c:539
 msgid "Print Tasks"
 msgstr "Skriv ut oppgåver"
 
@@ -6699,15 +6939,15 @@ msgstr "iCalendar-filer (.ics)"
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar-filer (.vcf)"
 
-#: calendar/importers/icalendar-importer.c:469
+#: calendar/importers/icalendar-importer.c:470
 msgid "Reminder!!"
 msgstr "Påminning!"
 
-#: calendar/importers/icalendar-importer.c:709
+#: calendar/importers/icalendar-importer.c:710
 msgid "Calendar Events"
 msgstr "Kalenderhending"
 
-#: calendar/importers/icalendar-importer.c:734
+#: calendar/importers/icalendar-importer.c:735
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -6715,7 +6955,7 @@ msgstr ""
 "Evolution har funne Gnome Calendar-filer.\n"
 "Vil du importera desse inn i Evolution?"
 
-#: calendar/importers/icalendar-importer.c:741
+#: calendar/importers/icalendar-importer.c:742
 msgid "Gnome Calendar"
 msgstr "Gnome Calendar"
 
@@ -7617,7 +7857,6 @@ msgid "Asia/Macao"
 msgstr "Asia/Macao"
 
 #: calendar/zones.h:230
-#, fuzzy
 msgid "Asia/Macau"
 msgstr "Asia/Macau"
 
@@ -7626,9 +7865,8 @@ msgid "Asia/Magadan"
 msgstr "Asia/Magadan"
 
 #: calendar/zones.h:232
-#, fuzzy
 msgid "Asia/Makassar"
-msgstr "Asia/Magadan"
+msgstr "Asia/Makassar"
 
 #: calendar/zones.h:233
 msgid "Asia/Manila"
@@ -7651,7 +7889,6 @@ msgid "Asia/Omsk"
 msgstr "Asia/Omsk"
 
 #: calendar/zones.h:238
-#, fuzzy
 msgid "Asia/Oral"
 msgstr "Asia/Oral"
 
@@ -7672,7 +7909,6 @@ msgid "Asia/Qatar"
 msgstr "Asia/Qatar"
 
 #: calendar/zones.h:243
-#, fuzzy
 msgid "Asia/Qyzylorda"
 msgstr "Asia/Qyzylorda"
 
@@ -7785,32 +8021,26 @@ msgid "Atlantic/Faeroe"
 msgstr "Atlantisk/Færøyane"
 
 #: calendar/zones.h:271
-#, fuzzy
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atlanterhavet/Jan_Mayen"
 
 #: calendar/zones.h:272
-#, fuzzy
 msgid "Atlantic/Madeira"
 msgstr "Atlanterhavet/Madeira"
 
 #: calendar/zones.h:273
-#, fuzzy
 msgid "Atlantic/Reykjavik"
 msgstr "Atlanterhavet/Reykjavik"
 
 #: calendar/zones.h:274
-#, fuzzy
 msgid "Atlantic/South_Georgia"
 msgstr "Atlanterhavet/Sør-Georgia"
 
 #: calendar/zones.h:275
-#, fuzzy
 msgid "Atlantic/St_Helena"
-msgstr "Atlanterhavet/St_Helena"
+msgstr "Atlanterhavet/St._Helena"
 
 #: calendar/zones.h:276
-#, fuzzy
 msgid "Atlantic/Stanley"
 msgstr "Atlanterhavet/Stanley"
 
@@ -8059,59 +8289,48 @@ msgid "Europe/Zurich"
 msgstr "Europa/Zürich"
 
 #: calendar/zones.h:338
-#, fuzzy
 msgid "Indian/Antananarivo"
 msgstr "Indiahavet/Antananarivo"
 
 #: calendar/zones.h:339
-#, fuzzy
 msgid "Indian/Chagos"
 msgstr "Indiahavet/Chagos"
 
 #: calendar/zones.h:340
-#, fuzzy
 msgid "Indian/Christmas"
-msgstr "Indiahavet/Christmas"
+msgstr "Indiahavet/Christmasøya"
 
 #: calendar/zones.h:341
-#, fuzzy
 msgid "Indian/Cocos"
-msgstr "Indiahavet/Cocos"
+msgstr "Indiahavet/Kokosøyane"
 
 #: calendar/zones.h:342
-#, fuzzy
 msgid "Indian/Comoro"
-msgstr "Indiahavet/Comoro"
+msgstr "Indiahavet/Komorane"
 
 #: calendar/zones.h:343
-#, fuzzy
 msgid "Indian/Kerguelen"
 msgstr "Indiahavet/Kerguelen"
 
 #: calendar/zones.h:344
-#, fuzzy
 msgid "Indian/Mahe"
 msgstr "Indiahavet/Mahe"
 
 #: calendar/zones.h:345
-#, fuzzy
 msgid "Indian/Maldives"
-msgstr "Indiahavet/Maldivene"
+msgstr "Indiahavet/Maldivane"
 
 #: calendar/zones.h:346
-#, fuzzy
 msgid "Indian/Mauritius"
 msgstr "Indiahavet/Mauritius"
 
 #: calendar/zones.h:347
-#, fuzzy
 msgid "Indian/Mayotte"
 msgstr "Indiahavet/Mayotte"
 
 #: calendar/zones.h:348
-#, fuzzy
 msgid "Indian/Reunion"
-msgstr "Indiahavet/Reunion"
+msgstr "Indiahavet/Réunion"
 
 #: calendar/zones.h:349
 msgid "Pacific/Apia"
@@ -8270,40 +8489,34 @@ msgid "Pacific/Yap"
 msgstr "Stillehavet/Yap"
 
 #: camel/camel-cipher-context.c:101
-#, fuzzy
 msgid "Signing is not supported by this cipher"
-msgstr "Den oppgitte fila finst ikkje"
+msgstr ""
 
 #: camel/camel-cipher-context.c:140
-#, fuzzy
 msgid "Verifying is not supported by this cipher"
-msgstr "Den oppgitte fila finst ikkje"
+msgstr ""
 
 #: camel/camel-cipher-context.c:180
-#, fuzzy
 msgid "Encryption is not supported by this cipher"
-msgstr "Knapp (ikkje støtta av KControl)"
+msgstr ""
 
 #: camel/camel-cipher-context.c:219
-#, fuzzy
 msgid "Decryption is not supported by this cipher"
-msgstr "Den oppgitte fila finst ikkje"
+msgstr ""
 
 #: camel/camel-cipher-context.c:254
-#, fuzzy
 msgid "You may not import keys with this cipher"
-msgstr "Den oppgitte fila finst ikkje"
+msgstr ""
 
 #: camel/camel-cipher-context.c:284
-#, fuzzy
 msgid "You may not export keys with this cipher"
-msgstr "Den oppgitte fila finst ikkje"
+msgstr ""
 
 #: camel/camel-data-cache.c:133
 msgid "Unable to create cache path"
 msgstr "Kan ikkje oppretta sti til mellomlager"
 
-#: camel/camel-data-cache.c:370
+#: camel/camel-data-cache.c:375
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Kan ikkje fjerna oppføring i mellomlageret: %s %s"
@@ -8323,28 +8536,30 @@ msgid ""
 "%s\n"
 "Changes made to this folder will not be resynchronized."
 msgstr ""
-"Klarte ikkje å opne «%s»:\n"
+"Klarte ikkje å opna «%s»:\n"
 "%s\n"
 "Endringar gjort på mappa vil ikkje bli resynkronisert."
 
 #: camel/camel-disco-diary.c:282
-#, fuzzy
 msgid "Resynchronizing with server"
-msgstr "Registrerer hjå tenaren ..."
+msgstr "Resynkroniserer med tenaren"
+
+#: camel/camel-disco-folder.c:41
+msgid "Copy folder content locally for offline operation"
+msgstr ""
 
-#: camel/camel-disco-folder.c:90
+#: camel/camel-disco-folder.c:101
 msgid "Downloading new messages for offline mode"
 msgstr ""
 
-#: camel/camel-disco-folder.c:351
-#, fuzzy, c-format
+#: camel/camel-disco-folder.c:441
+#, c-format
 msgid "Preparing folder '%s' for offline"
-msgstr "Lagrar mappe «%s»"
+msgstr "Gjer mappa «%s» klar for fråkopla bruk"
 
 #: camel/camel-disco-store.c:367
-#, fuzzy
 msgid "You must be working online to complete this operation"
-msgstr "Kan ikkje gjera LIST-operasjon ferdig"
+msgstr "Du må vera tilkopla for å fullføra denne handlinga"
 
 #: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
@@ -8382,9 +8597,8 @@ msgid "Unable to open spool folder"
 msgstr ""
 
 #: camel/camel-filter-driver.c:1117
-#, fuzzy
 msgid "Unable to process spool folder"
-msgstr "Kan ikkje laga 'spool'-katalog"
+msgstr "Kan ikkje prosessera spool-mappa"
 
 #: camel/camel-filter-driver.c:1132
 #, c-format
@@ -8393,7 +8607,7 @@ msgstr "Hentar melding %d (%d%%)"
 
 #: camel/camel-filter-driver.c:1136
 msgid "Cannot open message"
-msgstr "Kan ikkje opne melding"
+msgstr "Kan ikkje opna melding"
 
 #: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
 #, c-format
@@ -8415,23 +8629,20 @@ msgid "Failed at message %d of %d"
 msgstr "Feila på melding %d av %d"
 
 #: camel/camel-filter-search.c:136
-#, fuzzy
 msgid "Failed to retrieve message"
-msgstr "Klarte ikkje å dekode melding."
+msgstr "Klarte ikkje henta meldinga."
 
 #: camel/camel-filter-search.c:386
-#, fuzzy
 msgid "Invalid arguments to (system-flag)"
-msgstr "Ugyldig(e) argument"
+msgstr "Ugyldige argument til (systemflagg)"
 
 #: camel/camel-filter-search.c:401
-#, fuzzy
 msgid "Invalid arguments to (user-tag)"
-msgstr "Ugyldig(e) argument"
+msgstr "Ugyldige argument til (brukar-tag)"
 
 # TRN: Kva er eit filtersøk? Skjønar eg dette rett?
 #: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
-#, fuzzy, c-format
+#, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Feil under køyring av filtersøk: %s: %s"
 
@@ -8468,27 +8679,22 @@ msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
 #: camel/camel-folder.c:1164
-#, fuzzy, c-format
+#, c-format
 msgid "Unsupported operation: search by expression: for %s"
-msgstr ""
-"Feil ved lesing av fil:\n"
-"%s"
+msgstr "Ikkje støtta operasjon: søk etter uttrykk: etter %s"
 
 #: camel/camel-folder.c:1204
-#, fuzzy, c-format
+#, c-format
 msgid "Unsupported operation: search by uids: for %s"
-msgstr ""
-"Feil ved lesing av fil:\n"
-"%s"
+msgstr "Ikkje støtta operasjon: søk etter UID: etter %s"
 
 #: camel/camel-folder.c:1322
 msgid "Moving messages"
-msgstr "Flyttar melding"
+msgstr "Flyttar meldingar"
 
 #: camel/camel-folder.c:1322
-#, fuzzy
 msgid "Copying messages"
-msgstr "Melding"
+msgstr "Kopierer meldingar"
 
 #: camel/camel-folder.c:1572
 msgid "Filtering new message(s)"
@@ -8501,6 +8707,9 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"Støtte på uventa GnuPG-statusmelding:\n"
+"\n"
+"%s"
 
 #: camel/camel-gpg-context.c:723
 msgid "Failed to parse gpg userid hint."
@@ -8519,7 +8728,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:579
 msgid "Cancelled."
 msgstr "Avbroten."
 
@@ -8528,14 +8737,13 @@ msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
 #: camel/camel-gpg-context.c:802
-#, fuzzy, c-format
+#, c-format
 msgid "Unexpected response from GnuPG: %s"
-msgstr "Uventa svar frå POP-tenaren: %s"
+msgstr "Uventa svar frå GnuPG: %s"
 
 #: camel/camel-gpg-context.c:814
-#, fuzzy
 msgid "No data provided"
-msgstr "Gå til side"
+msgstr "Ingen data gjevne"
 
 #: camel/camel-gpg-context.c:852
 msgid "Failed to encrypt: No valid recipients specified."
@@ -8543,28 +8751,26 @@ msgstr ""
 
 # TRN: Denne bør skrivast om.
 #: camel/camel-gpg-context.c:1129
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
 "\n"
 "%s"
 msgstr ""
-"Kan ikkje bruka GPG på %s: %s\n"
+"Feil under bruk av GPG på %s: %s\n"
 "\n"
 "%s"
 
 # TRN: Sjå førre.
 #: camel/camel-gpg-context.c:1134
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to GPG %s: %s\n"
-msgstr ""
-"Kan ikkje bruka GPG på %s: %s\n"
-"s"
+msgstr "Feil under bruk av GPG på %s: %s\n"
 
-#: camel/camel-gpg-context.c:1247 camel/camel-smime-context.c:410
-#, fuzzy, c-format
+#: camel/camel-gpg-context.c:1247 camel/camel-smime-context.c:419
+#, c-format
 msgid "Could not generate signing data: %s"
-msgstr "Klarte ikkje å skrive data: %s"
+msgstr ""
 
 #: camel/camel-gpg-context.c:1261 camel/camel-gpg-context.c:1663
 #: camel/camel-gpg-context.c:1714
@@ -8576,41 +8782,36 @@ msgstr "Kan ikkje køyra gpg: %s"
 #: camel/camel-gpg-context.c:1500 camel/camel-gpg-context.c:1523
 #: camel/camel-gpg-context.c:1607 camel/camel-gpg-context.c:1631
 #: camel/camel-gpg-context.c:1685 camel/camel-gpg-context.c:1736
-#, fuzzy
 msgid "Failed to execute gpg."
-msgstr "Klarte ikkje å dekode melding."
+msgstr "Feil under køyring av gpg."
 
 #: camel/camel-gpg-context.c:1304
 msgid "This is a digitally signed message part"
 msgstr ""
 
 #: 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
+#: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
+#: camel/camel-smime-context.c:735
 msgid "Cannot verify message signature: Incorrect message format"
-msgstr ""
-"Kan ikkje stadfesta signaturen på meldinga: Kan ikkje laga mellombels fil: %s"
+msgstr "Kan ikkje stadfesta signaturen på meldinga: Feil format på meldinga"
 
 #: camel/camel-gpg-context.c:1402
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
-msgstr ""
-"Kan ikkje stadfesta signaturen på meldinga: Kan ikkje laga mellombels fil: %s"
+msgstr "Kan ikkje stadfesta signaturen på meldinga: Kan ikkje laga mellombels fil: %s"
 
 #: camel/camel-gpg-context.c:1483
-#, fuzzy, c-format
+#, c-format
 msgid "Could not generate encrypting data: %s"
-msgstr "Klarte ikkje å skrive data: %s"
+msgstr "Klarte ikkje å laga krypteringsdata: %s"
 
 #: camel/camel-gpg-context.c:1541
 msgid "This is a digitally encrypted message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1638 camel/camel-smime-context.c:981
-#, fuzzy
+#: camel/camel-gpg-context.c:1638 camel/camel-smime-context.c:990
 msgid "Encrypted content"
-msgstr "Indekser innhaldet i meldingskroppane"
+msgstr "Kryptert innhald"
 
 #: camel/camel-gpg-context.c:1642
 #, fuzzy
@@ -8882,7 +9083,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 ""
 
@@ -8952,11 +9153,11 @@ msgstr ""
 msgid "POP Source URI"
 msgstr "Kjelder"
 
-#: camel/camel-sasl-popb4smtp.c:107
+#: camel/camel-sasl-popb4smtp.c:106
 msgid "POP Before SMTP auth using an unknown transport"
 msgstr ""
 
-#: camel/camel-sasl-popb4smtp.c:112
+#: camel/camel-sasl-popb4smtp.c:111
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr ""
 
@@ -9025,12 +9226,12 @@ msgstr ""
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:352 camel/camel-session.c:402
+#: camel/camel-session.c:351 camel/camel-session.c:401
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:525
+#: camel/camel-session.c:524
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -9039,59 +9240,58 @@ msgstr ""
 "Klarte ikkje å laga katalog %s:\n"
 "%s"
 
-#: camel/camel-smime-context.c:98
+#: camel/camel-smime-context.c:104
 #, fuzzy, c-format
 msgid "Enter security pass-phrase for `%s'"
 msgstr "Tast inn passord for %s"
 
-#: camel/camel-smime-context.c:505
+#: camel/camel-smime-context.c:514
 #, fuzzy
 msgid "Unverified"
 msgstr "Udefinert"
 
-#: camel/camel-smime-context.c:507
+#: camel/camel-smime-context.c:516
 #, fuzzy
 msgid "Good signature"
-msgstr "Legg til kriterium"
+msgstr "God signatur"
 
-#: camel/camel-smime-context.c:509
+#: camel/camel-smime-context.c:518
 #, fuzzy
 msgid "Bad signature"
 msgstr "Legg til kriterium"
 
-#: camel/camel-smime-context.c:511
+#: camel/camel-smime-context.c:520
 msgid "Content tampered with or altered in transit"
 msgstr ""
 
-#: camel/camel-smime-context.c:513
+#: camel/camel-smime-context.c:522
 #, fuzzy
 msgid "Signing certificate not found"
 msgstr "Oppsettsdatabasen ikkje funnen"
 
-#: camel/camel-smime-context.c:515
+#: camel/camel-smime-context.c:524
 #, fuzzy
 msgid "Signing certificate not trusted"
 msgstr "Sertifikatet kan ikkje stolast på"
 
-#: camel/camel-smime-context.c:517
+#: camel/camel-smime-context.c:526
 msgid "Signature algorithm unknown"
 msgstr ""
 
-#: camel/camel-smime-context.c:519
+#: camel/camel-smime-context.c:528
 msgid "Siganture algorithm unsupported"
 msgstr ""
 
-#: camel/camel-smime-context.c:521
-#, fuzzy
+#: camel/camel-smime-context.c:530
 msgid "Malformed signature"
-msgstr "Lagre signatur"
+msgstr "Feilforma signatur"
 
-#: camel/camel-smime-context.c:523
+#: camel/camel-smime-context.c:532
 #, fuzzy
 msgid "Processing error"
 msgstr "Anna feil"
 
-#: camel/camel-smime-context.c:638
+#: camel/camel-smime-context.c:647
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Tenar: %s, Type: %s"
@@ -9101,16 +9301,16 @@ msgstr "Tenar: %s, Type: %s"
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Leitar etter tilleggsmodular"
 
-#: camel/camel-store.c:273
+#: camel/camel-store.c:274
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Klarar ikkje å opprette mappe: Ugyldig operasjon på dette lageret"
 
-#: camel/camel-store.c:791 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1119
+#: camel/camel-store.c:792 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1129
 msgid "Trash"
 msgstr "Papirkorg"
 
-#: camel/camel-store.c:793 mail/mail-ops.c:1125
+#: camel/camel-store.c:794 filter/libfilter-i18n.h:35 mail/mail-ops.c:1133
 #: ui/evolution-mail-message.xml.h:46
 #, fuzzy
 msgid "Junk"
@@ -9168,7 +9368,7 @@ msgstr "Feil i CRL"
 #: camel/camel-tcp-stream-openssl.c:595
 #, fuzzy
 msgid "Out of memory"
-msgstr "Ute av kontoret"
+msgstr "Tom for minne"
 
 #: camel/camel-tcp-stream-openssl.c:597
 msgid "Zero-depth self-signed certificate"
@@ -9315,7 +9515,7 @@ msgid ""
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-url.c:290 mail/mail-tools.c:138
+#: camel/camel-url.c:290
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Klarter ikkje å tolke URL frå «%s»"
@@ -9335,35 +9535,102 @@ msgstr "Inga slik melding %s i %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Berre sjekk for ny e-post."
 
-#: camel/camel-vee-store.c:278
+#: camel/camel-vee-store.c:360
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kan ikkje sletta mappe: %s: Ugyldig operasjon"
 
-#: camel/camel-vee-store.c:299
+#: camel/camel-vee-store.c:381
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kan ikkje sletta mappa: %s: Mappa finst ikkje"
 
-#: camel/camel-vee-store.c:312
+#: camel/camel-vee-store.c:394
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kan ikkje byta namn på mappa: %s: Ugyldig operasjon"
 
-#: camel/camel-vee-store.c:320
+#: camel/camel-vee-store.c:402
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kan ikkje endra namn på mappa: %s: Mappa finst ikkje"
 
+#: camel/providers/groupwise/camel-groupwise-provider.c:53
+#: camel/providers/imap/camel-imap-provider.c:50
+msgid "Checking for new mail"
+msgstr "Ser etter ny e-post"
+
+#: 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 "Sjå etter ny e-post i alle mappene"
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:59
+#, fuzzy
+msgid "Apply filters to new messages in Inbox on this server"
+msgstr "Bruk filter på nye meldingar i INBOX på denne tenaren"
+
+# TRN: Kva betyr dette?
+#: camel/providers/groupwise/camel-groupwise-provider.c:62
+#: camel/providers/imap/camel-imap-provider.c:66
+#, fuzzy
+msgid "Automatically synchronize remote mail locally"
+msgstr "Automatisk synkroniser ekstern e-post med lokal"
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#, fuzzy
+msgid "Address Book"
+msgstr "Adressebok"
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:69
+#, fuzzy
+msgid "LDAP Server Name:"
+msgstr "Tenarnamn"
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:72
+#, fuzzy
+msgid "Search base:"
+msgstr "_Søkebase:"
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:83
+msgid "Novell GroupWise"
+msgstr ""
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:85
+msgid "For accesing Novell Groupwise servers"
+msgstr ""
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:100
+#: camel/providers/imap/camel-imap-provider.c:89
+#: camel/providers/imapp/camel-imapp-provider.c:65
+#: camel/providers/nntp/camel-nntp-provider.c:71
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:89
+msgid "Password"
+msgstr "Passord"
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:102
+#: 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 valet let deg kopla til ein IMAP-tenar med eit klartekst-passord."
+
+#. default charset used in mail view
+#: camel/providers/groupwise/camel-gw-listener.c:299
+#: camel/providers/groupwise/camel-gw-listener.c:300
+#: mail/em-folder-view.c:1542 mail/em-folder-view.c:1580
+#: mail/mail-config.glade.h:42
+msgid "Default"
+msgstr "Forvald"
+
 #: 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 "Operasjonen vart avbroten"
 
 #: 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 ""
@@ -9412,21 +9679,21 @@ msgstr "Kan ikkje laga mappa %s: %s"
 msgid "Could not load summary for %s"
 msgstr "Kan ikkje lasta samandrag for %s"
 
-#: camel/providers/imap/camel-imap-folder.c:308
+#: camel/providers/imap/camel-imap-folder.c:320
 msgid "Folder was destroyed and recreated on server."
 msgstr "Mappa vart øydelagt og laga på nytt på tenaren."
 
 #. 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:566
 msgid "Scanning for changed messages"
 msgstr "Leitar etter endra meldingar"
 
-#: camel/providers/imap/camel-imap-folder.c:1886
+#: camel/providers/imap/camel-imap-folder.c:1913
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Kan ikkje henta melding: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1923
+#: camel/providers/imap/camel-imap-folder.c:1944
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -9442,24 +9709,25 @@ msgstr ""
 "Klarar ikkje å hente melding: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1923
+#: camel/providers/imap/camel-imap-folder.c:1944
 #: 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:1967
+#: camel/providers/imap/camel-imap-folder.c:2569
+#: camel/providers/nntp/camel-nntp-folder.c:205
 msgid "This message is not currently available"
 msgstr "Denne meldinga er ikkje tilgjengeleg."
 
-#: camel/providers/imap/camel-imap-folder.c:2206
-#: camel/providers/imap/camel-imap-folder.c:2276
+#: camel/providers/imap/camel-imap-folder.c:2227
+#: camel/providers/imap/camel-imap-folder.c:2297
 msgid "Fetching summary information for new messages"
 msgstr "Hentar samandrag om nye meldingar"
 
-#: camel/providers/imap/camel-imap-folder.c:2580
+#: camel/providers/imap/camel-imap-folder.c:2607
 msgid "Could not find message body in FETCH response."
 msgstr "Fann ikkje meldingskropp i svar på FETCH."
 
@@ -9494,19 +9762,10 @@ msgstr "Klarte ikkje å kople til LDAP-tenar"
 #: camel/providers/imap/camel-imap-provider.c:47
 #, fuzzy
 msgid "Command:"
-msgstr ""
-"\n"
-"Merknad:"
-
-#: camel/providers/imap/camel-imap-provider.c:50
-msgid "Checking for new mail"
-msgstr "Ser etter ny e-post"
-
-#: camel/providers/imap/camel-imap-provider.c:52
-msgid "Check for new messages in all folders"
-msgstr "Sjå etter ny e-post i alle mappene"
+msgstr "Kommando:"
 
 #: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "Folders"
 msgstr "Mapper"
 
@@ -9526,12 +9785,6 @@ msgstr "Namnerom"
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Bruk filter på nye meldingar i INBOX på denne tenaren"
 
-# TRN: Kva betyr dette?
-#: camel/providers/imap/camel-imap-provider.c:66
-#, fuzzy
-msgid "Automatically synchronize remote mail locally"
-msgstr "Automatisk synkroniser ekstern e-post med lokal"
-
 #: camel/providers/imap/camel-imap-provider.c:72
 msgid "IMAP"
 msgstr "IMAP"
@@ -9540,19 +9793,6 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "For lesing og lagring av e-post på IMAP-tenarar."
 
-#: 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 valet let deg kopla til ein IMAP-tenar med eit klartekst-passord."
-
 #: camel/providers/imap/camel-imap-store.c:459
 #, c-format
 msgid "IMAP server %s"
@@ -9566,7 +9806,7 @@ msgstr "IMAP-teneste for %s på %s"
 #: camel/providers/imap/camel-imap-store.c:582
 #: camel/providers/imap/camel-imap-store.c:602
 #: camel/providers/imapp/camel-imapp-store.c:236
-#: camel/providers/nntp/camel-nntp-store.c:131
+#: camel/providers/nntp/camel-nntp-store.c:140
 #: camel/providers/pop3/camel-pop3-store.c:177
 #: camel/providers/smtp/camel-smtp-transport.c:269
 #: camel/providers/smtp/camel-smtp-transport.c:285
@@ -9584,8 +9824,8 @@ msgstr "TLS er ikkje tilgjengeleg"
 #: camel/providers/imap/camel-imap-store.c:599
 #: camel/providers/imap/camel-imap-store.c:831
 #: camel/providers/imapp/camel-imapp-store.c:233
-#: camel/providers/nntp/camel-nntp-store.c:128
-#: camel/providers/nntp/camel-nntp-store.c:146
+#: camel/providers/nntp/camel-nntp-store.c:137
+#: camel/providers/nntp/camel-nntp-store.c:155
 #: camel/providers/pop3/camel-pop3-store.c:194
 msgid "Connection cancelled"
 msgstr "Tilknytning avbroten"
@@ -9611,28 +9851,28 @@ msgstr "SSL forhandlinga feila"
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Kan ikkje kopla til med kommandoen «%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-tenaren %s søttar ikkje den ønska autentiseringstypa %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 "Autentiseringstype %s er ikkje støtta"
 
-#: 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 "%sSkriv inn IMAP-passordet 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 tasta ikkje inn eit 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"
@@ -9642,24 +9882,23 @@ msgstr ""
 "Ikkje i stand til å autentisere mot IMAP-tenar.\n"
 "%s\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 "Mappa «%s» finst ikkje"
 
-#: 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\""
+msgid "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "Mappenamnet «%s» er ugyldig, avdi det inneheld teiknet «%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 "Ukjend 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 "Foreldermappa kan ikkje ha undermapper"
 
@@ -9802,7 +10041,7 @@ msgid "Could not rename folder %s to %s: %s"
 msgstr "Kan ikkje endra namnet på mappa «%s» til «%s»: %s"
 
 #: camel/providers/local/camel-local-store.c:364
-#: camel/providers/local/camel-mbox-store.c:501
+#: camel/providers/local/camel-mbox-store.c:533
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Kan ikkje endra namnet på «%s»: %s"
@@ -10039,6 +10278,11 @@ msgstr "Kan ikkje endra namnet på «%s» til «%s»: %s"
 msgid "The new folder name is illegal."
 msgstr "Det nye mappenamnet er ikkje gyldig."
 
+#: camel/providers/local/camel-mbox-store.c:467
+#, fuzzy, c-format
+msgid "Could not rename `%s': `%s': %s"
+msgstr "Kan ikkje endra namnet på «%s»: %s"
+
 #: camel/providers/local/camel-mbox-summary.c:343
 #, c-format
 msgid "Could not open folder: %s: %s"
@@ -10078,7 +10322,7 @@ msgstr "Kan ikkje lukka kjeldamappa %s: %s"
 msgid "Could not close temp folder: %s"
 msgstr "Kan ikkje lukka mellombels mappe: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1286
+#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1520
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kan ikkje endra namnet på mappa: %s"
@@ -10198,6 +10442,7 @@ msgid ""
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-auth.c:44
+#: camel/providers/nntp/camel-nntp-store.c:998
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Skriv inn NNTP-passordet for %s@%s"
@@ -10216,13 +10461,19 @@ msgstr "Klarte ikkje å kople til LDAP-tenar"
 msgid "Server rejected username/password"
 msgstr "Tenaren avslo brukarnamnet"
 
-#: camel/providers/nntp/camel-nntp-folder.c:114
-#, c-format
-msgid "Internal error: uid in invalid format: %s"
-msgstr ""
+#: camel/providers/nntp/camel-nntp-folder.c:140
+#: camel/providers/nntp/camel-nntp-folder.c:230
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+#, fuzzy
+msgid "User cancelled"
+msgstr "Operasjonen vart avbroten"
 
-#: camel/providers/nntp/camel-nntp-folder.c:155
-#: camel/providers/nntp/camel-nntp-folder.c:161
+#: camel/providers/nntp/camel-nntp-folder.c:142
+#: camel/providers/nntp/camel-nntp-folder.c:226
+#: camel/providers/nntp/camel-nntp-folder.c:232
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -10231,14 +10482,51 @@ msgstr ""
 msgid "Cannot get message %s: %s"
 msgstr "Kan ikkje henta melding %s: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:159
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
+#: camel/providers/nntp/camel-nntp-folder.c:157
+#: camel/providers/nntp/camel-nntp-folder.c:195
+#, c-format
+msgid "Internal error: uid in invalid format: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-folder.c:170
+#, fuzzy, c-format
+msgid "Could not get article %s from NNTP server"
+msgstr "Kunne ikkje laga katalog\n"
+
+#: camel/providers/nntp/camel-nntp-folder.c:353
+msgid "Posting not allowed by news server"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-folder.c:364
+#, c-format
+msgid "Failed to send newsgroups header: %s: message not posted"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-folder.c:404
+#: camel/providers/nntp/camel-nntp-folder.c:417
+#, c-format
+msgid "Error posting to newsgroup: %s: message not posted"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-folder.c:429
+msgid "Error reading response to posted message: message not posted"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-folder.c:432
+#, fuzzy, c-format
+msgid "Error posting message: %s: message not posted"
+msgstr ""
+"Feil under automatisk lagring av meldinga: %s\n"
+" %s"
+
+#: camel/providers/nntp/camel-nntp-folder.c:448
+msgid "You cannot post NNTP messages while working offline!"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-folder.c:459
 #, fuzzy
-msgid "User cancelled"
-msgstr "Operasjonen vart avbroten"
+msgid "You cannot copy messages from a NNTP folder!"
+msgstr "Kan ikkje lukka mellombels mappe: %s"
 
 #: camel/providers/nntp/camel-nntp-grouplist.c:45
 #, fuzzy
@@ -10256,67 +10544,128 @@ msgstr "Kan ikkje lasta gruppeliste-fila for %s: %s"
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Kan ikkje lagra gruppeliste-fila for %s: %s"
 
-#: camel/providers/nntp/camel-nntp-provider.c:41
+#: camel/providers/nntp/camel-nntp-provider.c:43
+msgid "Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-provider.c:45
+msgid "In the subscription dialog, show relative folder names"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-provider.c:52
 msgid "USENET news"
 msgstr "USENET news"
 
-#: camel/providers/nntp/camel-nntp-provider.c:43
+#: camel/providers/nntp/camel-nntp-provider.c:54
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:149
+#: camel/providers/nntp/camel-nntp-provider.c:73
+msgid ""
+"This option will authenticate with the NNTP server using a plaintext "
+"password."
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:158
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Kan ikkje lesa helsing frå %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:161
+#: camel/providers/nntp/camel-nntp-store.c:170
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP-tenaren %s svarte med feilkode %d: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:260
+#: camel/providers/nntp/camel-nntp-store.c:326
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET News via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/nntp/camel-nntp-store.c:641
+#, fuzzy
+msgid "Stream error"
+msgstr "Anna feil"
+
+#: camel/providers/nntp/camel-nntp-store.c:644
+#, fuzzy, c-format
 msgid ""
-"This option will authenticate with the NNTP server using a plaintext "
-"password."
+"Error retrieving newsgroups:\n"
+"\n"
+"%s"
+msgstr ""
+"Feil ved lagring av meldingar til: %s\n"
+" %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:736
+msgid ""
+"You cannot subscribe to this newsgroup:\n"
+"\n"
+"No such newsgroup. The selected item is a probably a parent folder."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:237
+#: camel/providers/nntp/camel-nntp-store.c:768
+msgid ""
+"You cannot unsubscribe to this newsgroup:\n"
+"\n"
+"newsgroup does not exist!"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:793
+msgid "You cannot create a folder in a News store: subscribe instead."
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:801
+#, fuzzy
+msgid "You cannot rename a folder in a News store."
+msgstr "Kan ikkje endra namnet på mappa «%s» til «%s»: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:809
+#, fuzzy
+msgid "You cannot remove a folder in a News store: unsubscribe instead."
+msgstr "Kan ikkje flytta ei mappe inn i ei av undermappene sine."
+
+#: camel/providers/nntp/camel-nntp-summary.c:229
+#, fuzzy, c-format
+msgid "Connection error: %s"
+msgstr "Ukjend feil: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:240
 #, c-format
 msgid "No such folder: %s"
 msgstr "Mappa finst ikkje: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:241
+#: camel/providers/nntp/camel-nntp-summary.c:246
 #, c-format
 msgid "Could not get group: %s"
 msgstr "Kan ikkje henta gruppa: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:347
+#: camel/providers/nntp/camel-nntp-summary.c:311
+#, fuzzy
+msgid "Could not get messages: unspecificed error"
+msgstr "Kunne ikkje senda meldinga: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:356
 #, fuzzy, c-format
 msgid "NNTP Command failed: %s"
 msgstr "IMAP-kommando feila: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:407
-#: camel/providers/nntp/camel-nntp-summary.c:508
+#: camel/providers/nntp/camel-nntp-summary.c:416
+#: camel/providers/nntp/camel-nntp-summary.c:517
 #, fuzzy, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s Ser gjennom nye meldingar"
 
-#: camel/providers/nntp/camel-nntp-summary.c:523
+#: camel/providers/nntp/camel-nntp-summary.c:532
 #, c-format
 msgid "Unknown server response: %s"
 msgstr "Ukjent svar frå tenaren: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:569
+#: camel/providers/nntp/camel-nntp-summary.c:579
 #, fuzzy
 msgid "Use cancel"
 msgstr "Avbryt"
 
-#: camel/providers/nntp/camel-nntp-summary.c:571
+#: camel/providers/nntp/camel-nntp-summary.c:581
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Handlinga feila: %s"
@@ -10333,7 +10682,7 @@ msgstr "Kan ikkje henta POP-samandrag: %s"
 #: camel/providers/pop3/camel-pop3-folder.c:308
 #, fuzzy
 msgid "Expunging deleted messages"
-msgstr "Sentrer dei valte elementa"
+msgstr "Fjernar sletta meldingar"
 
 #: camel/providers/pop3/camel-pop3-folder.c:404
 #, c-format
@@ -10366,7 +10715,7 @@ msgstr "Slett etter %s dag(ar)"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:88
 msgid "POP"
 msgstr "POP"
 
@@ -10405,7 +10754,7 @@ msgid "Could not connect to POP server %s"
 msgstr "Kan ikkje kopla til POP-tenaren %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:409
-#: camel/providers/pop3/camel-pop3-store.c:519
+#: camel/providers/pop3/camel-pop3-store.c:523
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -10429,13 +10778,13 @@ msgstr ""
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Autentisering mot POP-tenaren «%s» feila: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:478
+#: camel/providers/pop3/camel-pop3-store.c:482
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sSkriv inn POP-passordet for %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:533
-#: camel/providers/pop3/camel-pop3-store.c:540
+#: camel/providers/pop3/camel-pop3-store.c:537
+#: camel/providers/pop3/camel-pop3-store.c:544
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -10444,13 +10793,13 @@ msgstr ""
 "Kan ikkje kopla til POP-tenaren «%s».\n"
 "Feil ved sending av passord: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:639
+#: camel/providers/pop3/camel-pop3-store.c:643
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Inga slik mappe «%s»."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:113
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10502,7 +10851,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:103
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:105
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -10612,7 +10961,7 @@ msgstr "Autentisering:"
 #: camel/providers/smtp/camel-smtp-transport.c:224
 #, fuzzy
 msgid "Authentication required"
-msgstr "Autentisering:"
+msgstr "Autentisering påkrevd"
 
 #: camel/providers/smtp/camel-smtp-transport.c:308
 msgid "Welcome response error"
@@ -10641,8 +10990,7 @@ msgstr "Feil i svar på STARTTLS"
 #: camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
-msgstr ""
-"SMTP-tenaren «%s» støttar ikkje den etterspurde autentiseringstypen %s."
+msgstr "SMTP-tenaren «%s» støttar ikkje den etterspurde autentiseringstypen %s."
 
 #: camel/providers/smtp/camel-smtp-transport.c:514
 #, c-format
@@ -10674,7 +11022,7 @@ msgstr ""
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: 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:614
 #, fuzzy
 msgid "Sending message"
 msgstr "Sen melding"
@@ -10799,7 +11147,7 @@ msgstr "%.1fM"
 msgid "%.0fG"
 msgstr "%.1fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1380
+#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1475
 msgid "attachment"
 msgstr "vedlegg"
 
@@ -10847,14 +11195,24 @@ msgstr "MIME-type:"
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:287
+#: composer/e-msg-composer-hdrs.c:304
 #, fuzzy
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 "Du må sette opp ein identitet\n"
 "før du skrive e-post."
 
-#: composer/e-msg-composer-hdrs.c:480
+#: composer/e-msg-composer-hdrs.c:507
+#, fuzzy
+msgid "Posting destination"
+msgstr "Ingen skildring"
+
+#: composer/e-msg-composer-hdrs.c:508
+#, fuzzy
+msgid "Choose folders to post the message to."
+msgstr "Kunne ikkje lagra melding(ar)."
+
+#: composer/e-msg-composer-hdrs.c:542
 #, fuzzy
 msgid "Click here for the address book"
 msgstr "Legg adresse til adresseboka"
@@ -10866,46 +11224,46 @@ msgstr "Legg adresse til adresseboka"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:510
+#: composer/e-msg-composer-hdrs.c:572
 msgid "Reply-To:"
 msgstr "Svar-til:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:516
+#: composer/e-msg-composer-hdrs.c:578
 msgid "From:"
 msgstr "Frå:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:522
+#: composer/e-msg-composer-hdrs.c:584
 msgid "Subject:"
 msgstr "Emne:"
 
-#: composer/e-msg-composer-hdrs.c:531
+#: composer/e-msg-composer-hdrs.c:593
 msgid "To:"
 msgstr "Til:"
 
-#: composer/e-msg-composer-hdrs.c:532
+#: composer/e-msg-composer-hdrs.c:594
 #, fuzzy
 msgid "Enter the recipients of the message"
 msgstr "Oppgi eit nytt namn på meldinga."
 
-#: composer/e-msg-composer-hdrs.c:535
+#: composer/e-msg-composer-hdrs.c:597
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:536
+#: composer/e-msg-composer-hdrs.c:598
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:539
+#: composer/e-msg-composer-hdrs.c:601
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:540
+#: composer/e-msg-composer-hdrs.c:602
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10914,38 +11272,32 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:547
+#: composer/e-msg-composer-hdrs.c:609
 #, fuzzy
 msgid "Post To:"
 msgstr "Porto"
 
-#: composer/e-msg-composer-hdrs.c:548
-#, fuzzy
-msgid "Posting destination"
-msgstr "Ingen skildring"
-
-#: composer/e-msg-composer-hdrs.c:548
+#: composer/e-msg-composer-hdrs.c:614
 #, fuzzy
-msgid "Choose a folder to post the message to."
-msgstr "Kunne ikkje lagra melding(ar)."
+msgid "Click here to select folders to post to"
+msgstr "<klikk her for å velje mappe>"
 
 #: composer/e-msg-composer-select-file.c:119
 #, fuzzy
 msgid "Attach file(s)"
 msgstr "Legg ved fil"
 
-#: composer/e-msg-composer.c:651
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for from account"
+#: composer/e-msg-composer.c:656
+msgid "Cannot sign outgoing message: No signing certificate set for from account"
 msgstr ""
 
-#: composer/e-msg-composer.c:657
+#: composer/e-msg-composer.c:662
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
 msgstr ""
 
-#: composer/e-msg-composer.c:788
+#: composer/e-msg-composer.c:793
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10954,31 +11306,31 @@ msgstr ""
 "Feil ved lesing av fil %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1153
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "Fila eksisterar, skriv over?"
 
-#: composer/e-msg-composer.c:1164 composer/e-msg-composer.c:1180
+#: composer/e-msg-composer.c:1172 composer/e-msg-composer.c:1188
 #, 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:1212
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Feil ved lasting av fil %s"
 
-#: composer/e-msg-composer.c:1242
+#: composer/e-msg-composer.c:1250
 #, 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:1258
 #, fuzzy
 msgid "Unable to retrieve message from editor"
 msgstr "Kunne ikkje motta fil"
 
-#: composer/e-msg-composer.c:1257
+#: composer/e-msg-composer.c:1265
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10987,7 +11339,7 @@ msgstr ""
 "Kan ikkje søka i fil: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1264
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10996,7 +11348,7 @@ msgstr ""
 "Kan ikkje kutta av fil: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1273
+#: composer/e-msg-composer.c:1281
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -11005,7 +11357,7 @@ msgstr ""
 "Kan ikkje kopiera fildeskriptor: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1282
+#: composer/e-msg-composer.c:1290
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -11014,16 +11366,16 @@ msgstr ""
 "Feil under automatisk lagring av meldinga: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1386
+#: composer/e-msg-composer.c:1394
 #, fuzzy
 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 ""
 "Evolution har funne Pine e-postfiler.\n"
 "Vil du importere desse inn i Evolution?"
 
-#: composer/e-msg-composer.c:1550
+#: composer/e-msg-composer.c:1558
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11034,35 +11386,50 @@ msgstr ""
 "\n"
 "Vil du lagra endringane?"
 
-#: composer/e-msg-composer.c:1559
+#: composer/e-msg-composer.c:1567
 msgid "Warning: Modified Message"
 msgstr "Åtvaring: Melding er endra"
 
-#: composer/e-msg-composer.c:1592
+#: composer/e-msg-composer.c:1600
 msgid "Open file"
 msgstr "Opna fil"
 
-#: composer/e-msg-composer.c:2011
+#: composer/e-msg-composer.c:2045
 #, fuzzy
 msgid "Signature:"
 msgstr "Signatur:"
 
-#: composer/e-msg-composer.c:2051 mail/mail-account-gui.c:1260
+#: composer/e-msg-composer.c:2085 mail/mail-account-gui.c:1259
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2231 composer/e-msg-composer.c:2929
-#: composer/e-msg-composer.c:2930
+#: composer/e-msg-composer.c:2263
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] ""
+msgstr[1] ""
+
+#: composer/e-msg-composer.c:2292
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2295 composer/e-msg-composer.c:3154
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2312 composer/e-msg-composer.c:3038
+#: composer/e-msg-composer.c:3039
 msgid "Compose a message"
 msgstr "Skriv ei melding"
 
-#: composer/e-msg-composer.c:2961
+#: composer/e-msg-composer.c:3070
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2991
+#: composer/e-msg-composer.c:3099
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -11071,14 +11438,14 @@ msgid ""
 "of gtkhtml and libgtkhtml installed.\n"
 msgstr "Kan ikkje laga nytt vindauge.\n"
 
-#: composer/e-msg-composer.c:3061
+#: composer/e-msg-composer.c:3199
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr "Kan ikkje laga nytt vindauge.\n"
 
-#: composer/e-msg-composer.c:4071
+#: composer/e-msg-composer.c:4220
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -11094,54 +11461,14 @@ msgstr "Gruppevareverktyet Evolution"
 msgid "Ximian Evolution (Unstable)"
 msgstr "Ximian Evolution"
 
-#: data/evolution.keys.in.h:1
+#: data/evolution.keys.in.in.h:1
 msgid "address card"
 msgstr "adressekort"
 
-#: data/evolution.keys.in.h:2
+#: data/evolution.keys.in.in.h:2
 msgid "calendar information"
 msgstr "kalenderinformasjon"
 
-#: default_user/searches.xml.h:1
-msgid "Body contains"
-msgstr "Kropp inneheld"
-
-#: default_user/searches.xml.h:2
-msgid "Body does not contain"
-msgstr "Kropp inneheld ikkje"
-
-#: default_user/searches.xml.h:3
-msgid "Body or subject contains"
-msgstr "Kropp eller emne inneheld"
-
-#: default_user/searches.xml.h:4
-msgid "Message contains"
-msgstr "Meldinga inneheld"
-
-#: default_user/searches.xml.h:5
-msgid "Recipients contain"
-msgstr "Mottakar inneheld"
-
-#: default_user/searches.xml.h:6
-msgid "Sender contains"
-msgstr "Avsendar inneheld"
-
-#: default_user/searches.xml.h:7
-msgid "Subject contains"
-msgstr "Emne inneheld"
-
-#: default_user/searches.xml.h:8
-msgid "Subject does not contain"
-msgstr "Emne inneheld ikkje"
-
-#: default_user/vfolders.xml.h:1
-msgid "Important mail (local)"
-msgstr ""
-
-#: default_user/vfolders.xml.h:2
-msgid "Unread mail (local)"
-msgstr ""
-
 #: designs/OOA/ooa.glade.h:1
 msgid ""
 "<b>Currently, your status is \"Out of the Office\". </b>\n"
@@ -11188,8 +11515,9 @@ msgid "Yes, Change Status"
 msgstr "Status"
 
 #: designs/read_receipts/read.glade.h:1
+#, fuzzy
 msgid "      "
-msgstr ""
+msgstr "      "
 
 #: designs/read_receipts/read.glade.h:2
 #, fuzzy
@@ -11478,8 +11806,8 @@ msgstr "Tiaren"
 msgid "You must specify a folder."
 msgstr "Stilnamn:"
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:459
-#: mail/mail-account-gui.c:1099
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:466
+#: mail/mail-account-gui.c:1098
 msgid "Select Folder"
 msgstr "Vel mappe"
 
@@ -11492,24 +11820,24 @@ msgstr ""
 "Feil i det regulære uttrykket «%s»:\n"
 "%s"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:63
-#: mail/mail-config.glade.h:66 shell/e-config-upgrade.c:1454
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923
+#: mail/mail-config.c:63 mail/mail-config.glade.h:68
 msgid "Important"
 msgstr "Viktig"
 
 #. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:66
-#: mail/mail-config.glade.h:125 shell/e-config-upgrade.c:1457
+#: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:66
+#: mail/mail-config.glade.h:127
 msgid "To Do"
 msgstr "Hugseliste"
 
 #. blue
-#: filter/filter-label.c:125 mail/mail-config.c:67 mail/mail-config.glade.h:70
-#: shell/e-config-upgrade.c:1458
+#: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:67
+#: mail/mail-config.glade.h:72
 msgid "Later"
 msgstr "Seinare"
 
-#: filter/filter-part.c:531
+#: filter/filter-part.c:531 shell/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "Test"
 
@@ -11605,7 +11933,7 @@ msgstr "sidan"
 msgid "months"
 msgstr "månader"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:185
 msgid "seconds"
 msgstr "sekund"
 
@@ -11668,233 +11996,244 @@ msgstr "Vedlegg"
 #: filter/libfilter-i18n.h:6
 #, fuzzy
 msgid "Beep"
-msgstr "Lyd"
+msgstr "Pipelyd"
 
 #: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "inneheld"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopier til mappe"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Dato motteke"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Dato sendt"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Sletta"
 
-#: filter/libfilter-i18n.h:12
-msgid "Do Not Exist"
-msgstr "Eksisterar ikkje"
-
 #: filter/libfilter-i18n.h:13
-msgid "Draft"
-msgstr "Kladd"
+msgid "does not contain"
+msgstr "inneheld ikkje"
 
 #: filter/libfilter-i18n.h:14
-msgid "Exist"
-msgstr "Eksisterar"
+msgid "does not end with"
+msgstr "sluttar ikkje med"
 
 #: filter/libfilter-i18n.h:15
-msgid "Expression"
-msgstr "Uttrykk"
+msgid "does not exist"
+msgstr "finst ikkje"
 
 #: filter/libfilter-i18n.h:16
-msgid "Follow Up"
-msgstr ""
+#, fuzzy
+msgid "does not return"
+msgstr "finst ikkje"
 
-#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:714
-msgid "Label"
-msgstr "Etikett"
+#: filter/libfilter-i18n.h:17
+msgid "does not sound like"
+msgstr "høyres ikkje ut som"
+
+#: filter/libfilter-i18n.h:18
+msgid "does not start with"
+msgstr "startar ikkje med"
 
 #: filter/libfilter-i18n.h:19
-msgid "Mailing list"
-msgstr "E-postliste"
+msgid "Do Not Exist"
+msgstr "Eksisterar ikkje"
 
 #: filter/libfilter-i18n.h:20
-msgid "Message Body"
-msgstr "Meldingskropp"
+msgid "Draft"
+msgstr "Kladd"
 
 #: filter/libfilter-i18n.h:21
-msgid "Message Header"
-msgstr "Meldingshovud"
+msgid "ends with"
+msgstr "sluttar med"
 
 #: filter/libfilter-i18n.h:22
-msgid "Move to Folder"
-msgstr "Flytt til mappe"
+msgid "Exist"
+msgstr "Eksisterar"
 
 #: filter/libfilter-i18n.h:23
-#, fuzzy
-msgid "Pipe Message to Shell Command"
-msgstr "Send melding til kontakt"
+msgid "exists"
+msgstr "eksisterar"
 
 #: filter/libfilter-i18n.h:24
-#, fuzzy
-msgid "Play Sound"
-msgstr "Spel lyd:"
-
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:68
-msgid "Read"
-msgstr "Lesen"
+msgid "Expression"
+msgstr "Uttrykk"
 
-#: filter/libfilter-i18n.h:26
-msgid "Recipients"
-msgstr "Mottakarar"
+#: filter/libfilter-i18n.h:25
+msgid "Follow Up"
+msgstr ""
 
 #: filter/libfilter-i18n.h:27
-msgid "Regex Match"
-msgstr "Treff på regulært uttrykk"
+#, fuzzy
+msgid "is"
+msgstr "Liste"
 
 #: filter/libfilter-i18n.h:28
-msgid "Replied to"
-msgstr "Svart til"
+#, fuzzy
+msgid "is after"
+msgstr "var etter"
 
-#: filter/libfilter-i18n.h:29 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Poengsum"
+#: filter/libfilter-i18n.h:29
+#, fuzzy
+msgid "is before"
+msgstr "var før"
 
 #: filter/libfilter-i18n.h:30
-msgid "Sender"
-msgstr "Avsendar"
+msgid "is Flagged"
+msgstr "er flagga"
 
 #: filter/libfilter-i18n.h:31
-msgid "Set Status"
-msgstr "Sett status"
+msgid "is greater than"
+msgstr "er større enn"
 
 #: filter/libfilter-i18n.h:32
-msgid "Shell Command"
-msgstr "Skal-kommando"
+msgid "is less than"
+msgstr "er mindre enn"
 
-# TRN: Det skal ikkje vera KiB?
 #: filter/libfilter-i18n.h:33
-msgid "Size (kB)"
-msgstr "Storleik (kB)"
+msgid "is not"
+msgstr "er ikkje"
 
 #: filter/libfilter-i18n.h:34
-msgid "Source Account"
-msgstr "Avsendarkonto"
+msgid "is not Flagged"
+msgstr "er ikkje flagga"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:36
 #, fuzzy
-msgid "Spam"
-msgstr "Lau"
+msgid "Junk Test"
+msgstr "Juni"
 
-#: filter/libfilter-i18n.h:36
-msgid "Specific header"
-msgstr "Spesifikk linje i hovud"
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:744
+#: widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Etikett"
 
 #: filter/libfilter-i18n.h:38
-msgid "Stop Processing"
-msgstr "Stopp prosessering"
+msgid "Mailing list"
+msgstr "E-postliste"
 
-#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1449 mail/em-format.c:678
-#: 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"
-msgstr "Emne"
+#: filter/libfilter-i18n.h:39
+msgid "Message Body"
+msgstr "Meldingskropp"
 
 #: filter/libfilter-i18n.h:40
-msgid "Unset Status"
-msgstr "Nullstill status"
+msgid "Message Header"
+msgstr "Meldingshovud"
 
 #: filter/libfilter-i18n.h:41
-msgid "contains"
-msgstr "inneheld"
+#, fuzzy
+msgid "Message is Junk"
+msgstr "Meldingar"
 
 #: filter/libfilter-i18n.h:42
-msgid "does not contain"
-msgstr "inneheld ikkje"
+#, fuzzy
+msgid "Message is not Junk"
+msgstr "Marker som v_iktig"
 
 #: filter/libfilter-i18n.h:43
-msgid "does not end with"
-msgstr "sluttar ikkje med"
+msgid "Move to Folder"
+msgstr "Flytt til mappe"
 
 #: filter/libfilter-i18n.h:44
-msgid "does not exist"
-msgstr "finst ikkje"
+#, fuzzy
+msgid "Pipe Message to Shell Command"
+msgstr "Send melding til kontakt"
 
 #: filter/libfilter-i18n.h:45
 #, fuzzy
-msgid "does not return"
-msgstr "finst ikkje"
+msgid "Play Sound"
+msgstr "Spel lyd:"
 
-#: filter/libfilter-i18n.h:46
-msgid "does not sound like"
-msgstr "høyres ikkje ut som"
+#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:68
+msgid "Read"
+msgstr "Lesen"
 
 #: filter/libfilter-i18n.h:47
-msgid "does not start with"
-msgstr "startar ikkje med"
+msgid "Recipients"
+msgstr "Mottakarar"
 
 #: filter/libfilter-i18n.h:48
-msgid "ends with"
-msgstr "sluttar med"
+msgid "Regex Match"
+msgstr "Treff på regulært uttrykk"
 
 #: filter/libfilter-i18n.h:49
-msgid "exists"
-msgstr "eksisterar"
+msgid "Replied to"
+msgstr "Svart til"
 
 #: filter/libfilter-i18n.h:50
-msgid "is Flagged"
-msgstr "er flagga"
+msgid "returns"
+msgstr "returnerer"
 
 #: filter/libfilter-i18n.h:51
-#, fuzzy
-msgid "is after"
-msgstr "var etter"
+msgid "returns greater than"
+msgstr "returnerer større enn"
 
 #: filter/libfilter-i18n.h:52
-#, fuzzy
-msgid "is before"
-msgstr "var før"
+msgid "returns less than"
+msgstr "returnerer mindre enn"
 
-#: filter/libfilter-i18n.h:53
-msgid "is greater than"
-msgstr "er større enn"
+#: filter/libfilter-i18n.h:53 filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Poengsum"
 
 #: filter/libfilter-i18n.h:54
-msgid "is less than"
-msgstr "er mindre enn"
+msgid "Sender"
+msgstr "Avsendar"
 
 #: filter/libfilter-i18n.h:55
-msgid "is not Flagged"
-msgstr "er ikkje flagga"
+msgid "Set Status"
+msgstr "Sett status"
 
 #: filter/libfilter-i18n.h:56
-msgid "is not"
-msgstr "er ikkje"
+msgid "Shell Command"
+msgstr "Skal-kommando"
 
+# TRN: Det skal ikkje vera KiB?
 #: filter/libfilter-i18n.h:57
-#, fuzzy
-msgid "is"
-msgstr "Liste"
+msgid "Size (kB)"
+msgstr "Storleik (kB)"
 
 #: filter/libfilter-i18n.h:58
-msgid "returns greater than"
-msgstr "returnerer større enn"
+msgid "sounds like"
+msgstr "høyres ut som"
 
 #: filter/libfilter-i18n.h:59
-msgid "returns less than"
-msgstr "returnerer mindre enn"
+msgid "Source Account"
+msgstr "Avsendarkonto"
 
 #: filter/libfilter-i18n.h:60
-msgid "returns"
-msgstr "returnerer"
+msgid "Specific header"
+msgstr "Spesifikk linje i hovud"
 
 #: filter/libfilter-i18n.h:61
-msgid "sounds like"
-msgstr "høyres ut som"
-
-#: filter/libfilter-i18n.h:62
 msgid "starts with"
 msgstr "byrjar med"
 
-#: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:915
+#: filter/libfilter-i18n.h:63
+msgid "Stop Processing"
+msgstr "Stopp prosessering"
+
+#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1562 mail/em-format.c:712
+#: 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"
+msgstr "Emne"
+
+#: filter/libfilter-i18n.h:65
+msgid "Unset Status"
+msgstr "Nullstill status"
+
+#: filter/rule-context.c:682 filter/rule-editor.c:241 filter/rule-editor.c:326
+#: mail/mail-vfolder.c:978
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Regelnamnet «%s» er ikkje unikt. Vel eit anna namn"
@@ -11919,6 +12258,38 @@ msgstr "Regelnamn"
 msgid "Score Rules"
 msgstr "Poengreglar"
 
+#: filter/searchtypes.xml.h:1
+msgid "Body contains"
+msgstr "Kropp inneheld"
+
+#: filter/searchtypes.xml.h:2
+msgid "Body does not contain"
+msgstr "Kropp inneheld ikkje"
+
+#: filter/searchtypes.xml.h:3
+msgid "Body or subject contains"
+msgstr "Kropp eller emne inneheld"
+
+#: filter/searchtypes.xml.h:4
+msgid "Message contains"
+msgstr "Meldinga inneheld"
+
+#: filter/searchtypes.xml.h:5
+msgid "Recipients contain"
+msgstr "Mottakar inneheld"
+
+#: filter/searchtypes.xml.h:6
+msgid "Sender contains"
+msgstr "Avsendar inneheld"
+
+#: filter/searchtypes.xml.h:7
+msgid "Subject contains"
+msgstr "Emne inneheld"
+
+#: filter/searchtypes.xml.h:8
+msgid "Subject does not contain"
+msgstr "Emne inneheld ikkje"
+
 #: filter/vfolder-rule.c:209
 msgid "You must name this vfolder."
 msgstr "Du må gje denne mappa eit namn."
@@ -11927,7 +12298,7 @@ msgstr "Du må gje denne mappa eit namn."
 msgid "You need to to specify at least one folder as a source."
 msgstr "Du må ha minst ei mappe som kjelde."
 
-#: filter/vfolder-rule.c:539
+#: filter/vfolder-rule.c:546
 msgid "VFolder source"
 msgstr "vMappe-kjelde"
 
@@ -11936,8 +12307,7 @@ msgid "Composer Preferences"
 msgstr "Redigerarinstillingar"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
+msgid "Configure mail preferences, including security and message display, here"
 msgstr "Set opp e-postinnstillingar, inkludert tryggleik og meldingsvising"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:3
@@ -11976,7 +12346,7 @@ msgstr "Evolution e-post-mappevisar"
 msgid "Evolution Mail preferences control"
 msgstr "Evolution e-postinnstillingskontroll"
 
-#: 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:805
 #: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
 #: mail/importers/pine-importer.c:572
 msgid "Mail"
@@ -11986,7 +12356,7 @@ msgstr "E-post"
 msgid "Mail Accounts"
 msgstr "E-postkontoar"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:75
 msgid "Mail Preferences"
 msgstr "E-postinnstillingar"
 
@@ -11998,31 +12368,12 @@ msgstr "Er du sikker på at du vil sletta denne kontoen?"
 msgid "Don't delete"
 msgstr "Ikkje slett"
 
-#: mail/em-account-prefs.c:315 mail/em-account-prefs.c:356
-#: mail/em-account-prefs.c:397 mail/em-composer-prefs.c:675
-#: mail/em-composer-prefs.c:693 mail/em-composer-prefs.c:717
-msgid "Disable"
-msgstr "Skru av"
-
-#: mail/em-account-prefs.c:315 mail/em-account-prefs.c:356
-#: mail/em-account-prefs.c:399 mail/em-composer-prefs.c:675
-#: mail/em-composer-prefs.c:693 mail/em-composer-prefs.c:717
-msgid "Enable"
-msgstr "Skru på"
-
 #. translators: default account indicator
 #: mail/em-account-prefs.c:439
 #, fuzzy
 msgid "[Default]"
 msgstr "[Forvald]"
 
-#. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
-#. has "activatable" set.
-#: mail/em-account-prefs.c:487 mail/em-composer-prefs.c:708
-#: mail/em-composer-prefs.c:854
-msgid "Enabled"
-msgstr "På"
-
 #: mail/em-account-prefs.c:493
 msgid "Account name"
 msgstr "Kontonamn"
@@ -12031,34 +12382,34 @@ msgstr "Kontonamn"
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:349
-#: mail/mail-config.c:1250
+#: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:353
+#: mail/mail-config.c:1252
 #, fuzzy
 msgid "Unnamed"
 msgstr "Namnlaus"
 
-#: mail/em-composer-prefs.c:334
+#: mail/em-composer-prefs.c:337
 msgid "You must specify a valid script name."
 msgstr "Du må oppgje eit gylig skriptnamn."
 
-#: mail/em-composer-prefs.c:392 mail/em-composer-prefs.c:454
+#: mail/em-composer-prefs.c:396 mail/em-composer-prefs.c:458
 #, fuzzy
 msgid "[script]"
 msgstr "[skript]"
 
-#: mail/em-composer-prefs.c:858
+#: mail/em-composer-prefs.c:862
 msgid "Language(s)"
 msgstr "Språk"
 
-#: mail/em-composer-prefs.c:900
+#: mail/em-composer-prefs.c:904
 msgid "Add script signature"
 msgstr "Legg till skriptsignatur"
 
-#: mail/em-composer-prefs.c:920
+#: mail/em-composer-prefs.c:924
 msgid "Signature(s)"
 msgstr "Signatur(ar)"
 
-#: mail/em-composer-utils.c:123
+#: mail/em-composer-utils.c:124
 #, fuzzy, c-format
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
@@ -12068,7 +12419,7 @@ msgstr ""
 "Du sender ei HTML-formatert melding. Pass på at dei følgjande mottakarane\n"
 "er i stand til å lesa HTML-e-post, og faktisk vil ha slik post:\n"
 
-#: mail/em-composer-utils.c:137
+#: mail/em-composer-utils.c:138
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -12098,11 +12449,11 @@ msgstr ""
 "«Apparently-To»-topptekst.\n"
 "Send likevel?"
 
-#: mail/em-composer-utils.c:301
+#: mail/em-composer-utils.c:305
 msgid "You must specify recipients in order to send this message."
 msgstr "Du må spesifisere mottakarar for å sende denne meldinga."
 
-#: mail/em-composer-utils.c:543
+#: mail/em-composer-utils.c:578
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -12110,11 +12461,11 @@ msgstr ""
 "Kan ikkje opna kladd-mappa til denne kontoen.\n"
 "Vil du bruka standard-kladdmappa?"
 
-#: mail/em-folder-browser.c:131
+#: mail/em-folder-browser.c:132
 msgid "Create _Virtual Folder From Search..."
 msgstr "Lag _virtuell mappe frå søk ..."
 
-#: mail/em-folder-selection-button.c:116
+#: mail/em-folder-selection-button.c:120
 #: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<klikk her for å velje mappe>"
@@ -12123,7 +12474,7 @@ msgstr "<klikk her for å velje mappe>"
 msgid "Create New Folder"
 msgstr "Lag ny mappe"
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1091
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1298
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Oppgje kor mappa skal lagast:"
@@ -12133,501 +12484,547 @@ msgstr "Oppgje kor mappa skal lagast:"
 msgid "Folder _name:"
 msgstr "Mappe_namn:"
 
-#: mail/em-folder-tree-model.c:559 mail/em-utils.c:1943
+#. On This Computer is always first and VFolders is always last
+#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
+#: mail/mail-component.c:164
+msgid "On this Computer"
+msgstr ""
+
+#: mail/em-folder-tree-model.c:203 mail/em-folder-tree-model.c:205
+#: mail/mail-vfolder.c:826
+msgid "VFolders"
+msgstr "vMapper"
+
+#: mail/em-folder-tree-model.c:213 mail/em-folder-tree-model.c:215
+msgid "UNMATCHED"
+msgstr ""
+
+#. Inbox is always first
+#: mail/em-folder-tree-model.c:241 mail/em-folder-tree-model.c:243
+#: shell/e-shortcuts.c:1085
+msgid "Inbox"
+msgstr "Innboks"
+
+#: mail/em-folder-tree-model.c:427 mail/em-folder-tree-model.c:705
+msgid "Loading..."
+msgstr "Lastar ..."
+
+#: mail/em-folder-tree-model.c:1274 mail/em-utils.c:2087
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Klarte ikkje å lage mellombels katalog: %s"
 
-#: mail/em-folder-tree-model.c:568
+#: mail/em-folder-tree-model.c:1283
 #, fuzzy, c-format
 msgid "Could not create temporary mbox store: %s"
 msgstr "Klarte ikkje å lage mellombels katalog: %s"
 
-#: mail/em-folder-tree-model.c:577
+#: mail/em-folder-tree-model.c:1292
 #, fuzzy, c-format
 msgid "Could not create temporary mbox folder: %s"
 msgstr "Klarte ikkje å lage mellombels katalog: %s"
 
-#: mail/em-folder-tree-model.c:592
+#: mail/em-folder-tree-model.c:1307
 #, fuzzy, c-format
 msgid "Could not copy messages to temporary mbox folder: %s"
 msgstr "Kan ikkje lukka mellombels mappe: %s"
 
-#: mail/em-folder-tree-model.c:771 mail/em-folder-tree-model.c:1001
-msgid "Loading..."
-msgstr "Lastar ..."
-
-#: mail/em-folder-tree.c:969 mail/em-folder-tree.c:1056
+#: mail/em-folder-tree.c:1176 mail/em-folder-tree.c:1263
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: 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-tree.c:1192 mail/em-folder-tree.c:1205
+#: mail/em-folder-view.c:621 mail/em-folder-view.c:635
 #: shell/e-shell-importer.c:1060
 msgid "Select folder"
 msgstr "Vel mappe"
 
-#: mail/em-folder-tree.c:1091
+#: mail/em-folder-tree.c:1298
 #, fuzzy
 msgid "Create folder"
 msgstr "Lag ei ny mappe"
 
-#: mail/em-folder-tree.c:1182
+#: mail/em-folder-tree.c:1416
 #, fuzzy, c-format
 msgid "Could not delete folder: %s"
 msgstr "Kan ikkje sletta mappa «%s»: %s"
 
-#: mail/em-folder-tree.c:1203
+#: mail/em-folder-tree.c:1437
 #, fuzzy, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr "Verkeleg sletta mappa «%s»?"
 
-#: mail/em-folder-tree.c:1213 shell/e-shell-folder-commands.c:416
+#: mail/em-folder-tree.c:1447 shell/e-shell-folder-commands.c:416
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Slett «%s»"
 
-#: mail/em-folder-tree.c:1247 shell/e-shell-folder-commands.c:534
+#: mail/em-folder-tree.c:1481 shell/e-shell-folder-commands.c:534
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Endra namn på mappa «%s» til:"
 
-#: mail/em-folder-tree.c:1249 shell/e-shell-folder-commands.c:541
+#: mail/em-folder-tree.c:1483 shell/e-shell-folder-commands.c:541
 msgid "Rename Folder"
 msgstr "Endra namn på mappa"
 
-#: mail/em-folder-tree.c:1273 shell/e-shell-folder-commands.c:554
+#: mail/em-folder-tree.c:1507 shell/e-shell-folder-commands.c:554
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr "Ei mappe som har namnet «%s» finst allereie. Bruk eit anna namn."
 
-#: mail/em-folder-tree.c:1371
+#: mail/em-folder-tree.c:1607
 #, fuzzy
 msgid "Folder properties"
 msgstr "Eigenskapar"
 
 #. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/em-folder-tree.c:1377
+#: mail/em-folder-tree.c:1613
 msgid "Properties"
 msgstr "Eigenskapar"
 
-#: mail/em-folder-tree.c:1385
+#. TODO: can this be done in a loop?
+#: mail/em-folder-tree.c:1622
 #, fuzzy
 msgid "Folder Name"
 msgstr "_Mappenamn:"
 
-#: mail/em-folder-tree.c:1492 ui/evolution-addressbook.xml.h:45
-#: ui/evolution-mail-global.xml.h:20 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:32
+#: mail/em-folder-tree.c:1633
+#, fuzzy
+msgid "Total messages"
+msgstr "Lagra melding"
+
+#: mail/em-folder-tree.c:1645
+#, fuzzy
+msgid "Unread messages"
+msgstr "Neste _ulesne melding"
+
+#: mail/em-folder-tree.c:1754 ui/evolution-addressbook.xml.h:45
+#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
 msgid "_View"
 msgstr "_Visning"
 
-#: mail/em-folder-tree.c:1493
-#, fuzzy
+#: mail/em-folder-tree.c:1755
 msgid "Open in _New Window"
-msgstr "Opne i eige vindauge"
+msgstr "Opna i _nytt vindauge"
 
-#: mail/em-folder-tree.c:1498
+#: mail/em-folder-tree.c:1760
 #, fuzzy
 msgid "_Move"
-msgstr "Flytt"
+msgstr "_Flytt"
 
-#: mail/em-folder-tree.c:1501
+#. FIXME: need to disable for nochildren folders
+#: mail/em-folder-tree.c:1764
 #, fuzzy
 msgid "_New Folder..."
 msgstr "_Ny mappe"
 
-#: mail/em-folder-tree.c:1503 shell/e-shortcuts-view.c:427
+#: mail/em-folder-tree.c:1767 shell/e-shortcuts-view.c:427
 msgid "_Rename"
 msgstr "_Gje nytt namn"
 
-#: mail/em-folder-tree.c:1506 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:1770 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "Ei_genskapar ..."
 
 #. { 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:589
+#: mail/em-folder-view.c:712 mail/em-popup.c:658
 msgid "_Edit as New Message..."
 msgstr "R_ediger som ny melding .."
 
-#: mail/em-folder-view.c:684
+#: mail/em-folder-view.c:714
 msgid "_Print"
 msgstr "S_kriv ut"
 
-#: mail/em-folder-view.c:687 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:717 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "Sva_r til avsendar"
 
-#: mail/em-folder-view.c:688 mail/em-popup.c:650
+#: mail/em-folder-view.c:718 mail/em-popup.c:778
 #: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Svar til _liste"
 
-#: mail/em-folder-view.c:689 mail/em-popup.c:651
+#: mail/em-folder-view.c:719 mail/em-popup.c:779
 #: 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:653
+#: mail/em-folder-view.c:720 mail/em-popup.c:781
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Forward"
 msgstr "_Vidaresend"
 
-#: mail/em-folder-view.c:693
+#: mail/em-folder-view.c:723
 msgid "Follo_w Up..."
 msgstr "_Følg opp ..."
 
-#: mail/em-folder-view.c:694
+#: mail/em-folder-view.c:724
 msgid "Fla_g Completed"
 msgstr "_Merk som ferdig"
 
-#: mail/em-folder-view.c:695
+#: mail/em-folder-view.c:725
 msgid "Cl_ear Flag"
 msgstr "_Fjern merke"
 
-#: mail/em-folder-view.c:698 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:728 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "Mar_ker som lesen"
 
-#: mail/em-folder-view.c:699
+#: mail/em-folder-view.c:729
 msgid "Mark as _Unread"
 msgstr "Marker som _ulesen"
 
-#: mail/em-folder-view.c:700
+#: mail/em-folder-view.c:730
 msgid "Mark as _Important"
 msgstr "Marker som v_iktig"
 
-#: mail/em-folder-view.c:701
+#: mail/em-folder-view.c:731
 msgid "_Mark as Unimportant"
 msgstr "Marker som ikkje vi_ktig"
 
-#: mail/em-folder-view.c:702 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:732 ui/evolution-mail-message.xml.h:52
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Marker som _ulesen"
 
-#: mail/em-folder-view.c:703 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:733 ui/evolution-mail-message.xml.h:53
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Marker som v_iktig"
 
-#: mail/em-folder-view.c:707
+#: mail/em-folder-view.c:737
 msgid "U_ndelete"
 msgstr "_Angra sletting"
 
-#: mail/em-folder-view.c:710
+#: mail/em-folder-view.c:740
 msgid "Mo_ve to Folder..."
 msgstr "Flytt til _mappe ..."
 
-#: mail/em-folder-view.c:711 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:741 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Kopier til mappe ..."
 
-#: mail/em-folder-view.c:719
+#: mail/em-folder-view.c:749
 msgid "Add Sender to Address_book"
 msgstr "_Legg til avsendar i adresseboka"
 
 # TRN: «Bruk» rett? Kva med «Køyr» eller «Filtrer»?
-#: mail/em-folder-view.c:722
+#: mail/em-folder-view.c:752
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "_Bruk filter"
 
-#: mail/em-folder-view.c:725
+#: mail/em-folder-view.c:755
 msgid "Crea_te Rule From Message"
 msgstr "_Lag regel frå melding"
 
-#: mail/em-folder-view.c:726
+#: mail/em-folder-view.c:756
 msgid "VFolder on _Subject"
 msgstr "vMappe på _emne"
 
-#: mail/em-folder-view.c:727
+#: mail/em-folder-view.c:757
 msgid "VFolder on Se_nder"
 msgstr "vMappe på avse_dar"
 
-#: mail/em-folder-view.c:728
+#: mail/em-folder-view.c:758
 msgid "VFolder on _Recipients"
 msgstr "vMappe på mottaka_r"
 
-#: mail/em-folder-view.c:729
+#: mail/em-folder-view.c:759
 msgid "VFolder on Mailing _List"
 msgstr "vMappe på e-post_liste"
 
-#: mail/em-folder-view.c:731
+#: mail/em-folder-view.c:761
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "vMappe på avse_dar"
 
-#: mail/em-folder-view.c:735
+#: mail/em-folder-view.c:765
 msgid "Filter on Sub_ject"
 msgstr "Filtrér på _emne"
 
-#: mail/em-folder-view.c:736
+#: mail/em-folder-view.c:766
 msgid "Filter on Sen_der"
 msgstr "Filtrér på avsen_dar:"
 
-#: mail/em-folder-view.c:737
+#: mail/em-folder-view.c:767
 msgid "Filter on Re_cipients"
 msgstr "Filtrer på _mottakarar"
 
-#: mail/em-folder-view.c:738
+#: mail/em-folder-view.c:768
 msgid "Filter on _Mailing List"
 msgstr "Filtrer på _e-postliste"
 
-#: mail/em-folder-view.c:740
+#: mail/em-folder-view.c:770
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "Filtrér på avsen_dar:"
 
-#. default charset used in mail view
-#: mail/em-folder-view.c:1512 mail/em-folder-view.c:1550
-#: mail/mail-config.glade.h:41
-msgid "Default"
-msgstr "Forvald"
-
-#: mail/em-folder-view.c:1584
+#: mail/em-folder-view.c:1616
 msgid "Print Message"
 msgstr "Skriv ut melding"
 
-#: mail/em-folder-view.c:1826
+#: mail/em-folder-view.c:1870
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Kopier lenkjeadresse"
 
+#: mail/em-folder-view.c:2132
+#, fuzzy, c-format
+msgid "Click to mail %s"
+msgstr "Trykk her for å leggje til ei oppgåve"
+
 #. message-search popup match count string
-#: mail/em-format-html-display.c:373
+#: mail/em-format-html-display.c:400
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Treff:"
 
-#: mail/em-format-html-display.c:603 mail/em-format-html.c:564
+#: mail/em-format-html-display.c:636 mail/em-format-html.c:563
 #, fuzzy
 msgid "Unsigned"
 msgstr "Tildelt"
 
-#: mail/em-format-html-display.c:603
+#: mail/em-format-html-display.c:636
 msgid ""
 "This message is not signed.  There is no guarantee the sender of the message "
 "is authentic."
 msgstr ""
 
-#: mail/em-format-html-display.c:604 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:637 mail/em-format-html.c:564
 #, fuzzy
 msgid "Valid signature"
 msgstr "Legg til kriterium"
 
-#: mail/em-format-html-display.c:604
+#: mail/em-format-html-display.c:637
 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:638 mail/em-format-html.c:565
 #, fuzzy
 msgid "Invalid signature"
 msgstr "Legg til kriterium"
 
-#: mail/em-format-html-display.c:605
+#: mail/em-format-html-display.c:638
 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:639 mail/em-format-html.c:566
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:606
+#: mail/em-format-html-display.c:639
 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:645 mail/em-format-html.c:572
 #, fuzzy
 msgid "Unencrypted"
 msgstr "Avbroten"
 
-#: mail/em-format-html-display.c:612
+#: mail/em-format-html-display.c:645
 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:646 mail/em-format-html.c:573
 msgid "Encrypted, weak"
 msgstr ""
 
-#: mail/em-format-html-display.c:613
+#: mail/em-format-html-display.c:646
 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:647 mail/em-format-html.c:574
 #, fuzzy
 msgid "Encrypted"
-msgstr "PGP-kryptér"
+msgstr "Kryptert"
 
-#: mail/em-format-html-display.c:614
+#: mail/em-format-html-display.c:647
 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:648 mail/em-format-html.c:575
 msgid "Encrypted, strong"
 msgstr ""
 
-#: mail/em-format-html-display.c:615
+#: mail/em-format-html-display.c:648
 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
+#: mail/em-format-html-display.c:732
 #, fuzzy
 msgid "_View Certificate"
 msgstr "_Sertifikat-ID:"
 
-#: mail/em-format-html-display.c:704
+#: mail/em-format-html-display.c:737
 #, fuzzy
 msgid "This certificate is not viewable"
 msgstr "Denne meldinga er ikkje tilgjengeleg."
 
-#: mail/em-format-html-display.c:866 mail/em-format-html.c:645
+#: mail/em-format-html-display.c:905 mail/em-format-html.c:650
 #, fuzzy
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Kunne ikkje senda meldinga: %s"
 
-#: mail/em-format-html-display.c:902 mail/em-format-html.c:1051
-#: mail/em-format.c:1198
+#: mail/em-format-html-display.c:941 mail/em-format-html.c:1075
+#: mail/em-format.c:1270
 #, fuzzy
 msgid "Unsupported signature format"
 msgstr "Ustøtta skjema"
 
-#: mail/em-format-html-display.c:910 mail/em-format-html.c:1059
+#: mail/em-format-html-display.c:949 mail/em-format-html.c:1083
 #, fuzzy
 msgid "Unknown error verifying signature"
 msgstr "Kan ikkje dekryptera sertifikatsignaturen."
 
-#: mail/em-format-html-display.c:1007
+#: mail/em-format-html-display.c:1064
+#, fuzzy
+msgid "Completed on %B %d, %Y, %l:%M %p"
+msgstr "%d. %b %k:%M"
+
+#: mail/em-format-html-display.c:1072
+#, fuzzy
+msgid "Overdue:"
+msgstr "&Syntaksmerkingsmodusar"
+
+#: mail/em-format-html-display.c:1075
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %p"
+msgstr "%d. %b %k:%M"
+
+#: mail/em-format-html-display.c:1145
 #, fuzzy
 msgid "_View Inline"
 msgstr "Vis innvevd"
 
-#: mail/em-format-html-display.c:1008
+#: mail/em-format-html-display.c:1146
 #, fuzzy
 msgid "_Hide"
-msgstr "Gøym"
+msgstr "_Gøym"
 
 #: mail/em-format-html-print.c:99
 #, c-format
 msgid "Page %d of %d"
 msgstr "Side %d av %d"
 
-#: mail/em-format-html.c:457 mail/em-format-html.c:459
+#: mail/em-format-html.c:456 mail/em-format-html.c:458
 #, fuzzy, c-format
 msgid "Retrieving `%s'"
 msgstr "Hentar melding %s"
 
-#: mail/em-format-html.c:834
+#: mail/em-format-html.c:844
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/em-format-html.c:864
+#: mail/em-format-html.c:874
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:875
+#: mail/em-format-html.c:885
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/em-format-html.c:877
+#: mail/em-format-html.c:887
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:898
+#: mail/em-format-html.c:908
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:909
+#: mail/em-format-html.c:919
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/em-format-html.c:1037
+#: mail/em-format-html.c:1061
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/em-format-html.c:1152
+#: mail/em-format-html.c:1177
 #, fuzzy
 msgid "Formatting message"
 msgstr "Flyttar melding"
 
-#: mail/em-format-html.c:1434 mail/em-format.c:673 mail/em-mailer-prefs.c:67
+#: mail/em-format-html.c:1453 mail/em-format.c:707 mail/em-mailer-prefs.c:67
 #: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
 msgid "From"
 msgstr "Frå"
 
-#: mail/em-format-html.c:1436 mail/em-format.c:674 mail/em-mailer-prefs.c:68
+#: mail/em-format-html.c:1453 mail/em-format.c:708 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:1453 mail/em-format.c:709 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:1453 mail/em-format.c:710 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:1453 mail/em-format.c:711 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:1569 mail/em-mailer-prefs.c:632
 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:1595
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1488
+#: mail/em-format-html.c:1598
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1499 mail/em-format.c:679 mail/em-mailer-prefs.c:73
+#: mail/em-format-html.c:1610 mail/em-format.c:713 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:929
 #, c-format
 msgid "%s attachment"
 msgstr "%s vedlegg"
 
-#: mail/em-format.c:1186
+#: mail/em-format.c:1258
 #, fuzzy
 msgid "Session not initialised"
 msgstr "Kunne ikkje initiere Bonobo"
 
-#: mail/em-format.c:1212
+#: mail/em-format.c:1284
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/em-format.c:1214
+#: mail/em-format.c:1286
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
@@ -12635,12 +13032,7 @@ msgstr ""
 msgid "Spamassassin (built-in)"
 msgstr ""
 
-#: mail/em-migrate.c:120
-#, fuzzy
-msgid "Migrating..."
-msgstr "Ventar ..."
-
-#: mail/em-migrate.c:128
+#: mail/em-migrate.c:1079
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -12648,88 +13040,94 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:161
+#: mail/em-migrate.c:1800 mail/em-migrate.c:1815
 #, fuzzy, c-format
-msgid "Migrating `%s':"
-msgstr "Pingar %s"
+msgid "Failed to migrate pop3 uid caches: %s"
+msgstr "Kan ikkje leggja %s i mellomlageret: %s"
 
-#: mail/em-migrate.c:775
+#: mail/em-migrate.c:1903 mail/em-migrate.c:2004
 #, fuzzy, c-format
-msgid "Failed to migrate `%s': %s"
+msgid "Failed to migrate folder expand state: %s"
 msgstr "Kan ikkje leggja %s i mellomlageret: %s"
 
-#: mail/em-migrate.c:801 mail/em-migrate.c:818
+#: mail/em-migrate.c:2128 mail/em-migrate.c:2300
 #, fuzzy, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr "Kan ikkje oppretta røyr til «%s»: %s"
 
-#: mail/em-migrate.c:830
+#: mail/em-migrate.c:2140
 #, fuzzy, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "Klarte ikkje å slå opp verten «%s»: %s"
 
-#: mail/em-popup.c:599
+#: mail/em-popup.c:668
 msgid "Save As..."
-msgstr "Lagre som ..."
+msgstr "Lagra som ..."
 
-#: mail/em-popup.c:647
-msgid "Set as _Background"
+#: mail/em-popup.c:686
+#, c-format
+msgid "untitled_image.%s"
 msgstr ""
 
-#: mail/em-popup.c:649
+#: mail/em-popup.c:775
+#, fuzzy
+msgid "Set as _Background"
+msgstr "Bruk til _bakgrunn"
+
+#: mail/em-popup.c:777
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "Sva_r til avsendar"
 
-#: mail/em-popup.c:697
+#: mail/em-popup.c:825
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Opna ved innsetjing"
 
-#: mail/em-popup.c:698
+#: mail/em-popup.c:826
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Sender ei melding til ein nettverksspelar"
 
-#: mail/em-popup.c:699
+#: mail/em-popup.c:827
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Legg til adressebok"
 
-#: mail/em-popup.c:805
+#: mail/em-popup.c:933
 #, c-format
 msgid "Open in %s..."
-msgstr "Opne i %s ..."
+msgstr "Opna i %s ..."
 
-#: mail/em-subscribe-editor.c:583
+#: mail/em-subscribe-editor.c:606
 #, fuzzy
-msgid "This store does not support subscriptions, or the are not enabled."
+msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Denne tenaren stør ikkje LDAPv3 skjemainformasjon"
 
-#: mail/em-subscribe-editor.c:612
+#: mail/em-subscribe-editor.c:635
 #, fuzzy
 msgid "Subscribed"
 msgstr "Abonnér"
 
-#: mail/em-subscribe-editor.c:616
+#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Mappe"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:803
+#: mail/em-subscribe-editor.c:827
 msgid "Please select a server."
 msgstr "Velj ein tenar"
 
-#: mail/em-subscribe-editor.c:824
+#: mail/em-subscribe-editor.c:848
 msgid "No server has been selected"
 msgstr "Ingen tenar har vorte vald"
 
-#: mail/em-utils.c:93
+#: mail/em-utils.c:97
 msgid "Don't show this message again."
 msgstr "Ikkje vis denne meldinga att"
 
 # TRN: Dårleg.
-#: mail/em-utils.c:275
+#: mail/em-utils.c:279
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12738,27 +13136,27 @@ msgstr ""
 "Feil ved lesing av filterinformasjon:\n"
 "%s"
 
-#: mail/em-utils.c:284
+#: mail/em-utils.c:288
 msgid "Filters"
 msgstr "Filter"
 
-#: mail/em-utils.c:491
+#: mail/em-utils.c:533
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "Vidaresendt melding"
 
-#: mail/em-utils.c:1044
+#: mail/em-utils.c:1138
 msgid "an unknown sender"
 msgstr "ein ukjend avsendar"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1054
+#: mail/em-utils.c:1148
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "På %a, %d/%m/%Y klokka %H:%M, skreiv %%s:"
 
-#: mail/em-utils.c:1330
+#: mail/em-utils.c:1425 mail/em-utils.c:1509 mail/em-utils.c:1518
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -12767,7 +13165,7 @@ msgstr ""
 "Klarte ikkje å lagra til «%s»\n"
 " %s"
 
-#: mail/em-utils.c:1335
+#: mail/em-utils.c:1430
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -12776,22 +13174,26 @@ msgstr ""
 "%s eksisterer allereide\n"
 "Vil du skriva over?"
 
-#: mail/em-utils.c:1378
+#: mail/em-utils.c:1473
 #, fuzzy
 msgid "message"
 msgstr "Melding"
 
-#: mail/em-utils.c:1435
-#, fuzzy
+#: mail/em-utils.c:1525
+#, fuzzy, c-format
+msgid "Error: '%s' exists and is not a regular file"
+msgstr "Fila «%s» finst ikkje, eller er ikkje ei vanleg fil."
+
+#: mail/em-utils.c:1579
 msgid "Save Message..."
-msgstr "Lagre melding som ..."
+msgstr "Lagra melding ..."
 
-#: mail/em-utils.c:1473
+#: mail/em-utils.c:1617
 #, fuzzy
 msgid "Add address"
 msgstr "Adresse"
 
-#: mail/em-utils.c:2262
+#: mail/em-utils.c:2405
 #, fuzzy, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -12804,7 +13206,7 @@ msgstr ""
 "\n"
 "Vil du fjerna desse meldingane?"
 
-#: mail/em-utils.c:2288
+#: mail/em-utils.c:2431
 #, fuzzy
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
@@ -12832,293 +13234,301 @@ msgid "Check incoming mail being junk"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Citation highlight colour"
+msgid "Check incoming mail being junk for IMAP accounts"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour."
+msgid "Citation highlight colour"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:6
+msgid "Citation highlight colour."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:7
 #, fuzzy
 msgid "Default charset in which to compose messages"
 msgstr "Standardemne for meldinga"
 
-#: mail/evolution-mail.schemas.in.in.h:7
+#: mail/evolution-mail.schemas.in.in.h:8
 #, fuzzy
 msgid "Default charset in which to compose messages."
 msgstr "Standardemne for meldinga"
 
-#: mail/evolution-mail.schemas.in.in.h:8
+#: mail/evolution-mail.schemas.in.in.h:9
 #, fuzzy
 msgid "Default charset in which to display messages"
 msgstr "Skriv tittelen på ruta her."
 
-#: mail/evolution-mail.schemas.in.in.h:9
+#: mail/evolution-mail.schemas.in.in.h:10
 #, fuzzy
 msgid "Default charset in which to display messages."
 msgstr "Skriv tittelen på ruta her."
 
-#: mail/evolution-mail.schemas.in.in.h:10
+#: mail/evolution-mail.schemas.in.in.h:11
 #, fuzzy
 msgid "Default forward style"
 msgstr "Standard vidaresendingsstil er: "
 
-#: mail/evolution-mail.schemas.in.in.h:11
+#: mail/evolution-mail.schemas.in.in.h:12
 #, fuzzy
 msgid "Default reply style"
 msgstr "Standard vidaresendingsstil er: "
 
-#: mail/evolution-mail.schemas.in.in.h:12
+#: mail/evolution-mail.schemas.in.in.h:13
 msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:13
+#: mail/evolution-mail.schemas.in.in.h:14
 #, fuzzy
 msgid "Empty Trash folders on exit"
 msgstr "_Tøm papirkorga ved avslutting"
 
-#: mail/evolution-mail.schemas.in.in.h:14
+#: mail/evolution-mail.schemas.in.in.h:15
 #, fuzzy
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "_Tøm papirkorga ved avslutting"
 
-#: mail/evolution-mail.schemas.in.in.h:15
+#: mail/evolution-mail.schemas.in.in.h:16
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:17
 msgid "Enable/disable caret mode"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:18
 #, fuzzy
 msgid "Height of the message-list pane"
 msgstr "Send meldinga seinare"
 
-#: mail/evolution-mail.schemas.in.in.h:18
+#: mail/evolution-mail.schemas.in.in.h:19
 msgid "Height of the message-list pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:20
 msgid ""
 "If there isn't a builtin viewer for a particular mime-type inside Evolution, "
 "any mime-types appearing in this list which map to a bonobo-component viewer "
 "in GNOME's mime-type database may be used for displaying content."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:20
+#: mail/evolution-mail.schemas.in.in.h:21
 msgid "List of Labels and their associated colours"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:21
+#: mail/evolution-mail.schemas.in.in.h:22
 #, fuzzy
 msgid "List of accounts"
 msgstr "E-postkontoar"
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:23
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:23
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:25
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:colour where colour uses the HTML hex encoding."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:25
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:26
+#: mail/evolution-mail.schemas.in.in.h:27
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:28
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
 "load images off the net 1 - Load images if sender is in the addressbook 2 - "
 "Always load images off the net"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:29
 #, fuzzy
 msgid "Log filter actions"
 msgstr "_Loggfør filterhandlingar til:"
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:30
 #, fuzzy
 msgid "Log filter actions to the specified log file."
 msgstr "_Loggfør filterhandlingar til:"
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:31
 #, fuzzy
 msgid "Logfile to log filter actions"
 msgstr "_Loggfør filterhandlingar til:"
 
-#: mail/evolution-mail.schemas.in.in.h:31
+#: mail/evolution-mail.schemas.in.in.h:32
 #, fuzzy
 msgid "Logfile to log filter actions."
 msgstr "_Loggfør filterhandlingar til:"
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:34
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:36
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:38
 #, fuzzy
 msgid "New Mail Notify sound file"
 msgstr "Påminning ved ny e-post"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:39
 #, fuzzy
 msgid "New Mail Notify type"
 msgstr "Påminning ved ny e-post"
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
-msgid ""
-"Prompt the user when he or she tries to send a message without a Subject."
+#: mail/evolution-mail.schemas.in.in.h:42
+msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:45
 #, fuzzy
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
-msgstr ""
-"S_pør ved sending av HTML-meldingar til kontaktar som ikkje vil ha slike"
+msgstr "S_pør ved sending av HTML-meldingar til kontaktar som ikkje vil ha slike"
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:46
 #, fuzzy
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Spø_r ved sending av melding som berre har mottakarar i Bcc-feltet"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Recognize links in text and replace them."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Run junk test on incoming mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:51
+msgid ""
+"Run junk test on incoming mail for IMAP accounts (only valid if "
+"check_incoming is set to true)"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid "S3kr3t 0pt10n"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "S3kr3t 0pt10n."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:54
 #, fuzzy
 msgid "Send HTML mail by default"
 msgstr "Send e-post i HTML-format?"
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:55
 #, fuzzy
 msgid "Send HTML mail by default."
 msgstr "Send e-post i HTML-format?"
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:56
 #, fuzzy
 msgid "Show Animations"
 msgstr "Vi_s animerte bilete"
 
-#: mail/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:57
 #, fuzzy
 msgid "Show animated images as animations."
 msgstr "Vi_s animerte bilete"
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:59
 #, fuzzy
 msgid "Show deleted messages in the message-list"
 msgstr "Vis melding på normal måte"
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 #, fuzzy
 msgid "Show the \"Preview\" pane"
 msgstr "Førehandsvis i"
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Show the \"Preview\" pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Sound file to play when new mail arrives."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Spell check inline"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:65
 #, fuzzy
 msgid "Terminal font"
 msgstr "_Terminalskrifttype:"
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:66
 msgid "The terminal font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "The variable width font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:68
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -13126,92 +13536,117 @@ msgid ""
 "mail view."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:69
 #, fuzzy
 msgid "Thread the message list."
 msgstr "Tråda meldingsliste"
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:70
 #, fuzzy
 msgid "Thread the message-list"
 msgstr "Tråda meldingsliste"
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:71
 msgid "Thread the message-list based on Subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "Timeout for marking message as Seen"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:73
 msgid "Timeout for marking message as Seen."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:74
 #, fuzzy
 msgid "UID string of the default account."
 msgstr "Gjer _denne til standardkonto"
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:75
+msgid "Use Spamasssassin daemon and client"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "Use Spamasssassin daemon and client (spamc/spamd)"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
 msgid "Use custom fonts"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Use custom fonts for displaying mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "Use only local spam tests."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
+msgid "Use only the local spam tests (no DNS)."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:81
 #, fuzzy
 msgid "Variable width font"
 msgstr "V_ariabel breidde:"
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid "View/Bcc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "View/Bcc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "View/Cc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "View/Cc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "View/From menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:87
 msgid "View/From menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "View/PostTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:89
 msgid "View/PostTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:90
 msgid "View/ReplyTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
 msgstr ""
 
+#: mail/evolution-mail.schemas.in.in.h:93
+msgid "port for starting user runned spamd"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:94
+#, fuzzy
+msgid "spamd port"
+msgstr "Importér"
+
 #: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
 msgid "Evolution Elm importer"
 msgstr "Evolution Elm-importerar"
@@ -13348,7 +13783,7 @@ msgstr "Søker gjennom e-postfilter"
 msgid "Scanning directory"
 msgstr "Søker gjennom 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 "Startar importering"
 
@@ -13427,56 +13862,56 @@ msgstr "Du har ikkje fyllt ut all den påkrevde informasjonen."
 msgid "Evolution Account Editor"
 msgstr "Evolutions kontohandtering"
 
-#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:155
+#: mail/mail-account-gui.c:755 mail/mail-config.glade.h:157
 msgid "_Host:"
 msgstr "_Vert:"
 
-#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:129
+#: mail/mail-account-gui.c:759 mail/mail-config.glade.h:131
 msgid "User_name:"
 msgstr "Br_ukarnamn:"
 
-#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:164
+#: mail/mail-account-gui.c:763 mail/mail-config.glade.h:166
 msgid "_Path:"
 msgstr "_Sti:"
 
-#: mail/mail-account-gui.c:1970
+#: mail/mail-account-gui.c:1969
 msgid "You may not create two accounts with the same name."
 msgstr "Du kan ikkje opprette to kontoar med det same namnet."
 
-#: mail/mail-autofilter.c:74
+#: mail/mail-autofilter.c:75
 #, c-format
 msgid "Mail to %s"
 msgstr "E-post til %s"
 
-#: mail/mail-autofilter.c:260
+#: mail/mail-autofilter.c:261
 #, c-format
 msgid "Subject is %s"
 msgstr "Emne er %s"
 
-#: mail/mail-autofilter.c:276
+#: mail/mail-autofilter.c:277
 #, c-format
 msgid "Mail from %s"
 msgstr "Melding frå %s"
 
-#: mail/mail-autofilter.c:293
+#: mail/mail-autofilter.c:294
 #, fuzzy, c-format
 msgid "%s mailing list"
 msgstr "%s e-postliste"
 
-#: mail/mail-autofilter.c:317
+#: mail/mail-autofilter.c:318
 #, fuzzy, c-format
 msgid "Replies to %s"
 msgstr "Svart til"
 
-#: mail/mail-autofilter.c:370
+#: mail/mail-autofilter.c:373
 msgid "Add Filter Rule"
 msgstr "Legg til filter-regel"
 
-#: mail/mail-autofilter.c:419
+#: mail/mail-autofilter.c:422
 msgid "The following filter rule(s):\n"
 msgstr "Dei følgjande filterreglane:\n"
 
-#: mail/mail-autofilter.c:425
+#: mail/mail-autofilter.c:428
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -13487,30 +13922,24 @@ msgstr ""
 "    «%s»\n"
 "og har blitt oppdaterte."
 
-#: mail/mail-component.c:214
-msgid "On this Computer"
-msgstr ""
-
-#: mail/mail-component.c:379
+#: mail/mail-component.c:448
 msgid "New Mail Message"
 msgstr "Ny e-postmelding"
 
-#: mail/mail-component.c:380
+#: mail/mail-component.c:449
 msgid "_Mail Message"
 msgstr "_E-post"
 
-#: mail/mail-component.c:381
+#: mail/mail-component.c:450
 msgid "Compose a new mail message"
 msgstr "Skriv ein e-post"
 
-#: mail/mail-component.c:496
-#, c-format
-msgid ""
-"The following error occured while migrating your mail data:\n"
-"%s"
-msgstr ""
+#: mail/mail-component.c:581
+#, fuzzy
+msgid "URI of the mail source that the view will display"
+msgstr "URI-en som kalenderen skal visa"
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:67
 msgid "Identity"
 msgstr "Identitet"
 
@@ -13547,7 +13976,7 @@ msgid ""
 "sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:12
 msgid "Account Management"
 msgstr ""
 
@@ -13560,132 +13989,136 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: mail/mail-config.c:1090
+#: mail/mail-config.c:1092
 msgid "Checking Service"
 msgstr "Sjekkar teneste"
 
-#: mail/mail-config.c:1168 mail/mail-config.c:1172
+#: mail/mail-config.c:1170 mail/mail-config.c:1174
 #, fuzzy
 msgid "Connecting to server..."
 msgstr " Koplar til tenar ..."
 
 #: mail/mail-config.glade.h:3
+#, fuzzy
+msgid "    "
+msgstr "    "
+
+#: mail/mail-config.glade.h:4
 msgid " _Check for supported types "
 msgstr " _Søk etter støtta typar "
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
 msgid "<b>_Displayed Mail Headers</b>"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:10
 msgid "Account Editor"
 msgstr "Kontoredigerar"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:11
 #, fuzzy
 msgid "Account Information"
 msgstr "Kontoinformasjon"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:13
 msgid "Add Sc_ript"
 msgstr "Legg til skript"
 
-#: mail/mail-config.glade.h:13
-#, fuzzy
+#: mail/mail-config.glade.h:14
 msgid "Add new signature..."
-msgstr "Lagre signatur"
+msgstr "Legg til ny signatur ..."
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:15
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:18
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:19
 msgid "Always _carbon-copy (Cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:20
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:21
 #, fuzzy
 msgid "Attach original message"
 msgstr "Kunne ikkje lagra melding(ar)."
 
-#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:22 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Vedlegg"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:23
 msgid "Authentication"
 msgstr "Autentisering"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:25
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:26
 msgid "C_haracter set:"
 msgstr "T_eiknsett:"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:27
 #, fuzzy
 msgid "C_olors"
-msgstr "_Lukk"
+msgstr "F_argar"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Check _Incoming Mail"
 msgstr "Ser etter ny e-post"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:30
 msgid "Checking for New Mail"
 msgstr "Ser etter ny e-post"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:31
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:32
 msgid "Color for _misspelled words:"
 msgstr "_Farge for feilstava ord:"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "Composing Messages"
 msgstr "Skriv ei melding"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:34
 msgid "Configuration"
 msgstr "Oppsett"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:35
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -13695,510 +14128,506 @@ msgid ""
 "Click \"Apply\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:41
 msgid "De_fault"
 msgstr "_Standard"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:43
 msgid "Default Behavior"
 msgstr "Standardåtferd"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "Standardt_eiknsett:"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Hentar e-post"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:47
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:47
-#, fuzzy
+#: mail/mail-config.glade.h:48
+msgid "Do _Not Check Incoming Mail For IMAP Accounts"
+msgstr ""
+
+#: mail/mail-config.glade.h:49
 msgid "Do not quote original message"
-msgstr "Kan ikkje opne melding"
+msgstr "Ikkje siter opprinneleg melding"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:49 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:51 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Ferdig"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Drafts _folder:"
 msgstr "Mappe for _utkast:"
 
-#: mail/mail-config.glade.h:51
-msgid "E_nable"
-msgstr "S_lå på"
-
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Email Accounts"
 msgstr "E-post inneheld"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 msgid "Email _address:"
 msgstr "E-post_adresse:"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Empty _trash folders on exit"
 msgstr "_Tøm papirkorga ved avslutting"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "_Sertifikat-ID:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 #, fuzzy
 msgid "Evolution Account Assistant"
 msgstr "KDeelop-installering"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Køyr autorun.sh"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 msgid "Fi_xed -width:"
 msgstr "Fast _breidd:"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 #, fuzzy
 msgid "Filter Options"
 msgstr "&lt;&lt; Ferre val"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:62
 #, fuzzy
 msgid "Font Properties"
 msgstr "Eigenskapar"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:63
 msgid "Format messages in _HTML"
 msgstr "Formater meldingar med _HTML"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:64
 #, fuzzy
 msgid "H_eaders"
 msgstr "Topptekst"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:65
 msgid "Highlight _quotations with"
 msgstr "_Merk sitering med"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:66
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 msgid "Inline"
 msgstr "Innvevd"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:69
-#, fuzzy
+#: mail/mail-config.glade.h:71
 msgid "Labels and Colors"
-msgstr "Lagre og lukk"
+msgstr "Merkelappar og fargar"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 msgid "Loading Images"
 msgstr "Lastar bilete"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:74
 msgid "Mail Configuration"
 msgstr "Oppsett for post"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:76
 msgid "Mailbox location"
 msgstr "Postkaseeplassering"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Message Composer"
 msgstr "Melding motteken"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Message Display"
 msgstr "Meldingsvising"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "Message Fonts"
 msgstr "Meldinga inneheld"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Påminning ved ny e-post"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:83
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 msgid "Optional Information"
 msgstr "Valfri informasjon"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:86
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organi_sasjon:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:87
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG-nø_kkel-ID:"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:91
 msgid "Pick a color"
 msgstr "Vel ein farge"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:92
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Spø_r ved sending av melding som berre har mottakarar i Bcc-feltet"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:93
 #, fuzzy
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:94
 msgid "Printed Fonts"
 msgstr "Skrifttypar til utskrift"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:95
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:94
-#, fuzzy
+#: mail/mail-config.glade.h:96
 msgid "Quote original message"
-msgstr "Kan ikkje opne melding"
+msgstr "Siter opprinneleg melding"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:97
 msgid "Quoted"
 msgstr "Sitert"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:98
 msgid "Re_member this password"
 msgstr "_Husk dette passordet"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:99
 msgid "Re_ply-To:"
 msgstr "S_var-til:"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:100
 msgid "Receiving Email"
 msgstr "Mottek e-post"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:101
 msgid "Receiving _Options"
 msgstr "Val for m_ottak"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:102
 msgid "Remember this _password"
 msgstr "Hugs dette _passordet"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:103
 #, fuzzy
 msgid "Required Information"
 msgstr "Tenarinformasjon"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:104
 #, fuzzy
 msgid "Restore Defaults"
 msgstr "Forvald"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:106
 msgid "S_ecurity"
 msgstr "Tryggl_eik"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:107
 #, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "Trygg MIME"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:108
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:109
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:110
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:111
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "Sending Email"
 msgstr "Send"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:114
 msgid "Sent _messages folder:"
 msgstr "Mappe for sendte _meldingar:"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "Send meldingar"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:116
 msgid "Ser_ver requires authentication"
 msgstr "Tenaren kre_v autentisering"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:117
 msgid "Server Configuration"
 msgstr "Tenar-oppsett"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:118
 msgid "Server _Type: "
 msgstr "Tenar-_type: "
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:119
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Oppsettsdatabasen ikkje funnen"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:120
 msgid "Specify _filename:"
 msgstr "Oppgje _filnamn:"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:121
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:122
 msgid "Standard Unix mbox"
 msgstr "Standard unix e-postkasse"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:123
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:126
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:128
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:130
 msgid "Use _Daemon"
 msgstr ""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:132
 msgid "V_ariable-width:"
 msgstr "V_ariabel breidde:"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:133
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Forward\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "_Add Signature"
 msgstr "_HTML-signatur:"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:139
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:140
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:141
 msgid "_Authentication Type: "
 msgstr "_Autentiseringtype: "
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "_Autentiseringtype: "
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:143
 msgid "_Automatically check for new mail every"
 msgstr "_Sjå etter nye meldingar kvart"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:144
 msgid "_Automatically insert smiley images"
 msgstr "Legg til smilefjes _automatisk"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:145
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:146
 msgid "_Confirm when expunging a folder"
 msgstr "_Stadfest ved tøming av mappe"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Default signature:"
 msgstr "_HTML-signatur:"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:148
 msgid "_Defaults"
 msgstr "_Standard"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:149
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:151
 msgid "_Enable"
 msgstr "_Skru på"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:152
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:153
 msgid "_Forward style:"
 msgstr "_Vidaresendingsstil:"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:154
 #, fuzzy
 msgid "_Full name:"
 msgstr "_Fullt namn:"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:156
 msgid "_HTML Mail"
 msgstr "_HTML-e-post"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:158
 msgid "_Identity"
 msgstr "_Identitet"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Junk"
 msgstr "Juni"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:160
 #, fuzzy
-msgid "_Load images if sender is in addressbook"
+msgid "_Load images if sender is in address book"
 msgstr "_Last bileta dersom sendaren står i adresseboka"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:161
 msgid "_Local Tests Only"
 msgstr ""
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:162
 msgid "_Make this my default account"
 msgstr "Gjer _denne til standardkonto"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:163
 msgid "_Mark messages as read after"
 msgstr "_Merk meldingar som lest etter"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 msgid "_Name:"
 msgstr "_Namn:"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:165
 msgid "_Never load images off the net"
 msgstr "Last aldri bilete frå _nettet"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:167
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:168
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
-msgstr ""
-"S_pør ved sending av HTML-meldingar til kontaktar som ikkje vil ha slike"
+msgstr "S_pør ved sending av HTML-meldingar til kontaktar som ikkje vil ha slike"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:169
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Spør ved sending av meldingar med eit tomt emnefelt"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:170
 msgid "_Receiving Mail"
 msgstr "_Mottak av e-post"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:171
 msgid "_Reply style:"
 msgstr "Sva_rstil:"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:172
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Script:"
 msgstr "_Tryggleik"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Select..."
-msgstr "_Slett ..."
+msgstr "_Vel ..."
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:175
 msgid "_Sending Mail"
 msgstr "_Sender e-post"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:176
 msgid "_Show animated images"
 msgstr "Vi_s animerte bilete"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_Signatures"
 msgstr "_HTML-signatur:"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:178
 msgid "_Standard Font:"
 msgstr "_Standard skrifttype:"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:179
 msgid "_Terminal Font:"
 msgstr "_Terminalskrifttype:"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:180
 msgid "_Use secure connection (SSL):"
 msgstr "Br_uk sikker tilknytning (SSL)"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:181
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:183
 msgid "description"
 msgstr "skildring"
 
-#: mail/mail-folder-cache.c:786
+#: mail/mail-folder-cache.c:787
 #, c-format
 msgid "Pinging %s"
 msgstr "Pingar %s"
@@ -14230,122 +14659,122 @@ msgstr "Arbeidar"
 msgid "Filtering Folder"
 msgstr "Les mapper"
 
-#: mail/mail-ops.c:264
+#: mail/mail-ops.c:243
 msgid "Fetching Mail"
 msgstr "Hentar e-post"
 
-#: mail/mail-ops.c:558
+#: mail/mail-ops.c:536
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr ""
 
-#: mail/mail-ops.c:579
+#: mail/mail-ops.c:561
 #, 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:570
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Kan ikkje leggja til i lokal «Sendt»-mappe: %s"
 
-#: mail/mail-ops.c:630
+#: mail/mail-ops.c:612
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Sender «%s»"
 
-#: mail/mail-ops.c:748
+#: mail/mail-ops.c:731
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sender melding %d av %d"
 
-#: mail/mail-ops.c:767
+#: mail/mail-ops.c:750
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Feila på melding %d av %d"
 
-#: mail/mail-ops.c:769
+#: mail/mail-ops.c:752
 msgid "Complete."
 msgstr "Ferdig."
 
-#: mail/mail-ops.c:863
+#: mail/mail-ops.c:846
 msgid "Saving message to folder"
 msgstr "Lagrar meldingar i mappe"
 
-#: mail/mail-ops.c:944
+#: mail/mail-ops.c:931
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flyttar meldingar til %s"
 
-#: mail/mail-ops.c:944
+#: mail/mail-ops.c:931
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopierer meldingar til %s"
 
-#: mail/mail-ops.c:1057
+#: mail/mail-ops.c:1044
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Leitar gjennom mapper i «%s»"
 
-#: mail/mail-ops.c:1260
+#: mail/mail-ops.c:1240
 msgid "Forwarded messages"
 msgstr "Vidaresendt melding"
 
-#: mail/mail-ops.c:1303
+#: mail/mail-ops.c:1283
 #, c-format
 msgid "Opening folder %s"
 msgstr "Opnar mappe %s"
 
-#: mail/mail-ops.c:1375
+#: mail/mail-ops.c:1355
 #, c-format
 msgid "Opening store %s"
 msgstr "Opnar lager %s"
 
-#: mail/mail-ops.c:1453
+#: mail/mail-ops.c:1433
 #, c-format
 msgid "Removing folder %s"
 msgstr "Fjernar mappe %s"
 
-#: mail/mail-ops.c:1547
+#: mail/mail-ops.c:1527
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Lagrar mappe «%s»"
 
-#: mail/mail-ops.c:1598
+#: mail/mail-ops.c:1578
 msgid "Refreshing folder"
 msgstr "Friskar opp mappe"
 
-#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
+#: mail/mail-ops.c:1614 mail/mail-ops.c:1665
 msgid "Expunging folder"
 msgstr "Tømer mappe"
 
-#: mail/mail-ops.c:1682
+#: mail/mail-ops.c:1662
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Tømer papirkorga i «%s»"
 
-#: mail/mail-ops.c:1683
+#: mail/mail-ops.c:1663
 msgid "Local Folders"
 msgstr "Lokale mapper"
 
-#: mail/mail-ops.c:1766
+#: mail/mail-ops.c:1746
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Hentar melding %s"
 
-#: mail/mail-ops.c:1838
+#: mail/mail-ops.c:1818
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Mottek %d melding(ar)"
 
-#: mail/mail-ops.c:1922
+#: mail/mail-ops.c:1902
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Lagrar %d melding(ar)"
 
-#: mail/mail-ops.c:1970
+#: mail/mail-ops.c:1950
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -14354,7 +14783,7 @@ msgstr ""
 "Kan ikkje laga utdatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1998
+#: mail/mail-ops.c:1978
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14363,11 +14792,11 @@ msgstr ""
 "Feil ved lagring av meldingar til: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2069
+#: mail/mail-ops.c:2049
 msgid "Saving attachment"
 msgstr "Lagrar vedlegg"
 
-#: mail/mail-ops.c:2086
+#: mail/mail-ops.c:2066
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14376,22 +14805,22 @@ msgstr ""
 "Kan ikkje laga utdatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2116
+#: mail/mail-ops.c:2096
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Klarte ikkje å skrive data: %s"
 
-#: mail/mail-ops.c:2264
+#: mail/mail-ops.c:2244
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Koplar frå %s"
 
-#: mail/mail-ops.c:2264
+#: mail/mail-ops.c:2244
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Koplar til %s på nytt"
 
-#: mail/mail-ops.c:2366
+#: mail/mail-ops.c:2346
 msgid "Changing junk status"
 msgstr ""
 
@@ -14419,68 +14848,68 @@ msgstr "Legg til kriterium"
 #: mail/mail-security.glade.h:3
 #, fuzzy
 msgid "Encryption"
-msgstr "Unntak"
+msgstr "Kryptering"
 
 #: mail/mail-security.glade.h:4
 #, fuzzy
 msgid "Security Information"
-msgstr "Kontoinformasjon"
+msgstr "Tryggleiksinformasjon"
 
-#: mail/mail-send-recv.c:146
+#: mail/mail-send-recv.c:147
 msgid "Cancelling..."
 msgstr "Avbryt ..."
 
-#: mail/mail-send-recv.c:253
+#: mail/mail-send-recv.c:254
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Tenar: %s, Type: %s"
 
-#: mail/mail-send-recv.c:255
+#: mail/mail-send-recv.c:256
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:257
+#: mail/mail-send-recv.c:258
 #, c-format
 msgid "Type: %s"
 msgstr "Type: %s"
 
-#: mail/mail-send-recv.c:306
+#: mail/mail-send-recv.c:311
 msgid "Send & Receive Mail"
 msgstr "Send og motta e-post"
 
-#: mail/mail-send-recv.c:307
+#: mail/mail-send-recv.c:314
 #, fuzzy
 msgid "Cancel _All"
 msgstr "Avbryt alle"
 
-#: mail/mail-send-recv.c:388
+#: mail/mail-send-recv.c:395
 msgid "Updating..."
 msgstr "Oppdaterar ..."
 
-#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
+#: mail/mail-send-recv.c:395 mail/mail-send-recv.c:447
 msgid "Waiting..."
 msgstr "Ventar ..."
 
-#: mail/mail-session.c:234
+#: mail/mail-session.c:240
 msgid "User canceled operation."
 msgstr "Brukar avbraut operasjonen."
 
-#: mail/mail-session.c:267
+#: mail/mail-session.c:273
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Tast inn passord for %s"
 
-#: mail/mail-session.c:269
+#: mail/mail-session.c:275
 msgid "Enter Password"
 msgstr "Tast inn passord"
 
-#: mail/mail-session.c:292
+#: mail/mail-session.c:301
 #, fuzzy
 msgid "_Remember this password"
 msgstr "Fjern denne oppføringa"
 
-#: mail/mail-session.c:293
+#: mail/mail-session.c:302
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
@@ -14505,7 +14934,7 @@ msgstr ""
 
 #: mail/mail-signature-editor.c:233
 msgid "Save signature"
-msgstr "Lagre signatur"
+msgstr "Lagra signatur"
 
 #: mail/mail-signature-editor.c:382
 #, fuzzy
@@ -14520,16 +14949,28 @@ msgstr ""
 msgid "Name:"
 msgstr "Namn:"
 
-#: mail/mail-tools.c:271
+#: mail/mail-tools.c:114
+#, fuzzy, c-format
+msgid "Could not create spool directory `%s': %s"
+msgstr ""
+"Klarte ikkje å laga katalogen «%s»:\n"
+"%s"
+
+#: mail/mail-tools.c:141
+#, c-format
+msgid "Trying to movemail a non-mbox source `%s'"
+msgstr ""
+
+#: mail/mail-tools.c:276
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Vidaresendt melding - %s"
 
-#: mail/mail-tools.c:273
+#: mail/mail-tools.c:278
 msgid "Forwarded message"
 msgstr "Vidaresendt melding"
 
-#: mail/mail-tools.c:313
+#: mail/mail-tools.c:318
 #, fuzzy, c-format
 msgid "Invalid folder: `%s'"
 msgstr "Opnar mappe %s"
@@ -14539,12 +14980,12 @@ msgstr "Opnar mappe %s"
 msgid "Setting up vfolder: %s"
 msgstr "Set opp vMappe: %s"
 
-#: mail/mail-vfolder.c:205
+#: mail/mail-vfolder.c:206
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr ""
 
-#: mail/mail-vfolder.c:463
+#: mail/mail-vfolder.c:497
 #, fuzzy, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -14553,88 +14994,84 @@ msgid ""
 "And have been updated."
 msgstr " s."
 
-#: mail/mail-vfolder.c:774
-msgid "VFolders"
-msgstr "vMapper"
-
-#: mail/mail-vfolder.c:833
+#: mail/mail-vfolder.c:896
 msgid "vFolders"
 msgstr "vMapper"
 
-#: mail/mail-vfolder.c:872
+#: mail/mail-vfolder.c:935
 msgid "Edit VFolder"
 msgstr "Rediger vMappe"
 
-#: mail/mail-vfolder.c:892
+#: mail/mail-vfolder.c:955
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Prøvar å redigere ei vmappe «%s» som ikkje finnest."
 
-#: mail/mail-vfolder.c:964
+#: mail/mail-vfolder.c:1027
 msgid "New VFolder"
 msgstr "Ny vMappe"
 
-#: mail/message-list.c:907
+#: mail/message-list.c:927
 msgid "Unseen"
 msgstr "Ulesen"
 
-#: mail/message-list.c:908
+#: mail/message-list.c:928
 msgid "Seen"
 msgstr "Lest"
 
-#: mail/message-list.c:909
+#: mail/message-list.c:929
 msgid "Answered"
 msgstr "Svara"
 
-#: mail/message-list.c:910
+#: mail/message-list.c:930
 msgid "Multiple Unseen Messages"
 msgstr "Fleire uleste meldingar"
 
-#: mail/message-list.c:911
+#: mail/message-list.c:931
 msgid "Multiple Messages"
 msgstr "Fleire meldingar"
 
-#: mail/message-list.c:915
+#: mail/message-list.c:935
 msgid "Lowest"
 msgstr "Lavast"
 
-#: mail/message-list.c:916
+#: mail/message-list.c:936
 msgid "Lower"
 msgstr "Senk"
 
-#: mail/message-list.c:920
+#: mail/message-list.c:940
 msgid "Higher"
 msgstr "Høgare"
 
-#: mail/message-list.c:921
+#: mail/message-list.c:941
 msgid "Highest"
 msgstr "Høgast"
 
-#: mail/message-list.c:1244
+#: mail/message-list.c:1262
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1251
+#: mail/message-list.c:1269
 msgid "Today %l:%M %p"
 msgstr "I dag, %l:%M:%p"
 
-#: mail/message-list.c:1260
+#: mail/message-list.c:1278
 msgid "Yesterday %l:%M %p"
 msgstr "I går, %l:%M:%p"
 
-#: mail/message-list.c:1272
+#: mail/message-list.c:1290
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1280
+#: mail/message-list.c:1298
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1282
+#: mail/message-list.c:1300
 msgid "%b %d %Y"
 msgstr "%d. %b %Y"
 
-#: mail/message-list.c:3085
+#: mail/message-list.c:3112
 msgid "Generating message list"
 msgstr "Opprettar meldingsliste"
 
@@ -14707,7 +15144,7 @@ msgstr "Svar til alle"
 #: mail/message-tag-followup.c:71
 #, fuzzy
 msgid "Review"
-msgstr "Førehandsvisning"
+msgstr "Førehandsvising"
 
 #: mail/message-tag-followup.c:281 mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
@@ -14732,7 +15169,7 @@ msgstr "Ferdig"
 #: mail/message-tags.glade.h:7
 #, fuzzy
 msgid "_Flag:"
-msgstr "Flagga"
+msgstr "_Flagg:"
 
 #: mail/subscribe-dialog.glade.h:1
 #, fuzzy
@@ -14761,6 +15198,16 @@ msgstr "_Fjern abbonnment"
 msgid "Evolution Shell"
 msgstr "Evolution skal"
 
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Test"
+msgstr "Evolution"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Test component"
+msgstr "Evolution testkomponent"
+
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 #, fuzzy
 msgid "480"
@@ -14813,8 +15260,7 @@ msgid ""
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:11
-msgid ""
-"List of paths for the folders to be synchronized to disk for offline usage"
+msgid "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:12
@@ -14874,43 +15320,7 @@ msgstr ""
 #: shell/apps_evolution_shell.schemas.in.in.h:24
 #, fuzzy
 msgid "mail"
-msgstr "E-post"
-
-#: shell/e-setup.c:144
-#, fuzzy
-msgid "Could not update files correctly"
-msgstr "Kan ikkje oppdatera objekt"
-
-#: shell/e-setup.c:165
-#, fuzzy, c-format
-msgid ""
-"Cannot create the directory\n"
-"%s\n"
-"Error: %s"
-msgstr "Kan ikkje laga katalogen «%s»: %s"
-
-#: shell/e-setup.c:176
-#, c-format
-msgid ""
-"An error occurred in copying files into\n"
-"`%s'."
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
+msgstr "e-post"
 
 #: shell/e-shell-about-box.c:45
 msgid "Brought to you by"
@@ -15049,7 +15459,7 @@ msgstr ""
 "Du kan velja «Automatisk» dersom du ikkje veit. Då vil Evolution prøva å "
 "finna ut kva slags fil det er sjølv."
 
-#: 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 "Vel informasjonen du vil importere:"
 
@@ -15153,7 +15563,7 @@ msgstr "Importér data _og innstillingar frå eldre program"
 msgid "Import a _single file"
 msgstr "Importer ei ein_skild 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"
@@ -15165,7 +15575,7 @@ msgstr ""
 msgid "Starting Intelligent Importers"
 msgstr "Startar 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 "Frå %s:"
@@ -15216,7 +15626,7 @@ msgstr "Kan ikkje opna delt mappe: %s"
 msgid "Cannot find the specified shared folder."
 msgstr "Kan ikkje finna den spesifiserte delte mappa."
 
-#: 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 "
@@ -15230,7 +15640,7 @@ msgstr ""
 "\n"
 "Vil du avslutta hjelparen?"
 
-#: shell/e-shell-startup-wizard.c:789
+#: shell/e-shell-startup-wizard.c:795
 msgid "Quit Assistant"
 msgstr "Avslutt hjelpar"
 
@@ -15254,88 +15664,91 @@ msgstr "Mappenamn kan ikkje innehalda teiknet «#»."
 msgid "'.' and '..' are reserved folder names."
 msgstr "«.» og «..» er resverte mappenamn."
 
-#: shell/e-shell-view-menu.c:89 shell/e-shell-window-commands.c:58
+#: shell/e-shell-view-menu.c:90 shell/e-shell-window-commands.c:59
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
-msgstr ""
-"GNOME Pilot-verktøya ser ikkje ut til å vera installerte på denne maskinen."
+msgstr "GNOME Pilot-verktøya ser ikkje ut til å vera installerte på denne maskinen."
 
-#: shell/e-shell-view-menu.c:97 shell/e-shell-window-commands.c:66
+#: shell/e-shell-view-menu.c:98 shell/e-shell-window-commands.c:67
 #, c-format
 msgid "Error executing %s."
 msgstr "Feil ved køyring av %s."
 
-#: shell/e-shell-view-menu.c:193 shell/e-shell-window-commands.c:120
+#: shell/e-shell-view-menu.c:194 shell/e-shell-window-commands.c:121
 msgid "Bug buddy is not installed."
 msgstr "Bug Buddy er ikkje installert."
 
-#: shell/e-shell-view-menu.c:201 shell/e-shell-window-commands.c:128
+#: shell/e-shell-view-menu.c:202 shell/e-shell-window-commands.c:129
 msgid "Bug buddy could not be run."
 msgstr "Bug Buddy kan ikkje køyrast."
 
-#: shell/e-shell-view-menu.c:247 shell/e-shell-window-commands.c:170
+#: shell/e-shell-view-menu.c:248 shell/e-shell-window-commands.c:171
 msgid "About Ximian Evolution"
 msgstr "Om Ximian Evolution"
 
-#: shell/e-shell-view-menu.c:502
+#: shell/e-shell-view-menu.c:511
 msgid "Go to folder..."
 msgstr "Gå til mappe ..."
 
-#: shell/e-shell-view-menu.c:503
+#: shell/e-shell-view-menu.c:512
 msgid "Select the folder that you want to open"
 msgstr "Vel mappa du vil opna"
 
-#: shell/e-shell-view-menu.c:617
+#: shell/e-shell-view-menu.c:626
 msgid "Create New Shortcut"
 msgstr "Lag ny snarveg"
 
-#: shell/e-shell-view-menu.c:618
+#: shell/e-shell-view-menu.c:627
 #, fuzzy
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Vel mappa som snarvegen skal peika på:"
 
-#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:314
+#: shell/e-shell-view-menu.c:779 shell/e-shell-window-commands.c:353
 msgid "_Work Online"
 msgstr "Arbeid _tilkopla"
 
-#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:327
-#: ui/evolution.xml.h:34
+#: shell/e-shell-view-menu.c:792 shell/e-shell-window-commands.c:366
+#: ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "Arbeid _fråkopla"
 
-#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:340
-#: ui/evolution.xml.h:20
+#: shell/e-shell-view-menu.c:805 shell/e-shell-window-commands.c:379
+#: ui/evolution.xml.h:22
 msgid "Work Offline"
 msgstr "Arbeid fråkopla"
 
-#: shell/e-shell-window.c:324
-msgid ""
-"Ximian Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"Ximian Evolution er tilkopla. Klikk på denne knappen for å arbeida fråkopla."
+#: shell/e-shell-window.c:327
+msgid "Ximian Evolution is currently online.  Click on this button to work offline."
+msgstr "Ximian Evolution er tilkopla. Klikk på denne knappen for å arbeida fråkopla."
 
-#: shell/e-shell-window.c:331
+#: shell/e-shell-window.c:334
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution held på å kopla frå."
 
-#: shell/e-shell-window.c:337
+#: shell/e-shell-window.c:340
+msgid "Ximian Evolution is currently offline.  Click on this button to work online."
+msgstr "Ximian Evolution er fråkopla. Klikk på denne knappen for å arbeida tilkopla."
+
+#: shell/e-shell.c:529
+#, c-format
 msgid ""
-"Ximian Evolution is currently offline.  Click on this button to work online."
+"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
+"The data hasn't been deleted, but it will not be seen by this version of "
+"Evolution.\n"
 msgstr ""
-"Ximian Evolution er fråkopla. Klikk på denne knappen for å arbeida tilkopla."
 
-#: shell/e-shell.c:1003
+#: shell/e-shell.c:1068
 msgid "Invalid arguments"
 msgstr "Ugyldige argument"
 
-#: shell/e-shell.c:1005
+#: shell/e-shell.c:1070
 msgid "Cannot register on OAF"
 msgstr "Kan ikkje registrera i OAF"
 
-#: shell/e-shell.c:1007
+#: shell/e-shell.c:1072
 msgid "Configuration Database not found"
 msgstr "Oppsettsdatabasen ikkje funnen"
 
-#: shell/e-shell.c:1009
+#: shell/e-shell.c:1074
 msgid "Generic error"
 msgstr "Generell feil"
 
@@ -15452,14 +15865,15 @@ msgstr "Fjern denne snarvegen frå snarvegstolpen"
 msgid "Error saving shortcuts."
 msgstr "Feil ved lagring av snavegar."
 
-#: shell/e-shortcuts.c:1085
-msgid "Inbox"
-msgstr "Innboks"
-
 #: shell/e-shortcuts.c:1097
 msgid "Shortcuts"
 msgstr "Snarvegar"
 
+#: shell/e-storage-set-view.etspec.h:1
+#, fuzzy
+msgid "Checkbox"
+msgstr "Avkryssingsboks"
+
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -15518,6 +15932,21 @@ msgstr ""
 "Feilen frå aktiveringssystemet er:\n"
 "%s"
 
+#: shell/evolution-test-component.c:140
+#, fuzzy
+msgid "New Test"
+msgstr "Ny oppgåve"
+
+#: shell/evolution-test-component.c:141
+#, fuzzy
+msgid "_Test"
+msgstr "_Test"
+
+#: shell/evolution-test-component.c:142
+#, fuzzy
+msgid "Create a new test item"
+msgstr "Opprett ei ny oppgåve"
+
 #: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Active Connections"
 msgstr "Aktive tilkoplingar"
@@ -15661,16 +16090,16 @@ msgstr "Ikkje spør meg igjen"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution kan importera data frå desse filene:"
 
-#: shell/main.c:114 shell/main.c:559
+#: shell/main.c:118 shell/main.c:582
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:120
+#: shell/main.c:124
 msgid "Evolution is now exiting ..."
 msgstr "Evolution avsluttar no ..."
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:270
+#: shell/main.c:275
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -15708,7 +16137,7 @@ msgstr ""
 "Me vonar at du nyt resultata av det harde arbeidet vårt, og me ventar\n"
 "i spenning på dine bidrag.\n"
 
-#: shell/main.c:294
+#: shell/main.c:299
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -15716,48 +16145,44 @@ msgstr ""
 "Takk frå\n"
 "Ximian Evolution-utviklarane\n"
 
-#: shell/main.c:302
+#: shell/main.c:307
 msgid "Don't tell me again"
 msgstr "Ikkje sei ifrå igjen"
 
-#: shell/main.c:352
-#, c-format
-msgid ""
-"Warning: Evolution could not upgrade all your data from version %s.\n"
-"The data hasn't been deleted, but it will not be seen by this version of "
-"Evolution.\n"
-msgstr ""
-
-#: shell/main.c:411
+#: shell/main.c:439
 msgid "Cannot access the Ximian Evolution shell."
 msgstr ""
 
-#: shell/main.c:420
+#: shell/main.c:448
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Kan ikkje starta Ximian Evolution-skalet: %s"
 
-#: shell/main.c:526
+#: shell/main.c:545
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:528
+#: shell/main.c:547
 msgid "Start in offline mode"
 msgstr "Startar i fråkopla modus"
 
-#: shell/main.c:530
+#: shell/main.c:549
 msgid "Start in online mode"
 msgstr "Startar i fråkopla modus"
 
-#: shell/main.c:533
+#: shell/main.c:552
 msgid "Forcibly shut down all evolution components"
 msgstr "Tving alle komponentane i Evolution til å avslutta"
 
-#: shell/main.c:536
+#: shell/main.c:556
+msgid "Forcibly re-migrate from Evolution 1.4"
+msgstr ""
+
+#: shell/main.c:559
 msgid "Send the debugging output of all components to a file."
 msgstr "Send feilsøkingsutskrift frå alle komponentane til ei fil."
 
-#: shell/main.c:563
+#: shell/main.c:586
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -15766,43 +16191,49 @@ msgstr ""
 "%s: «--online» og «--offline» kan ikkje brukast samstundes.\n"
 "  Bruk «%s --help» for å få meir 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
 #, fuzzy
 msgid "Select a cert to import..."
 msgstr "Vel importerar"
 
-#: 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
 #, fuzzy
 msgid "Certificate Name"
 msgstr "_Sertifikat-ID:"
 
-#: smime/gui/certificate-manager.c:162 smime/gui/certificate-manager.c:329
+#: smime/gui/certificate-manager.c:241 smime/gui/certificate-manager.c:411
 #, fuzzy
 msgid "Purposes"
 msgstr "Framgang"
 
-#: 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
+#, fuzzy
 msgid "Serial Number"
-msgstr ""
+msgstr "Serienummer"
 
-#: smime/gui/certificate-manager.c:174
+#: smime/gui/certificate-manager.c:257
 #, fuzzy
 msgid "Expires"
 msgstr "Uttrykk"
 
-#: smime/gui/certificate-manager.c:323
+#: smime/gui/certificate-manager.c:403
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "E-postadresse:"
 
-#: smime/gui/certificate-viewer.c:281
+#: smime/gui/certificate-viewer.c:326
 #, fuzzy, c-format
 msgid "Certificate Viewer: %s"
 msgstr "_Sertifikat-ID:"
 
+#: smime/gui/component.c:36
+#, fuzzy, c-format
+msgid "Enter the password for `%s'"
+msgstr "Tast inn passord for %s"
+
 #. FIXME: add serial no, validity date, uses
 #: smime/gui/e-cert-selector.c:116
 #, c-format
@@ -15867,7 +16298,7 @@ msgstr "Poitiers"
 #: smime/gui/smime-ui.glade.h:11
 #, fuzzy
 msgid "Backup"
-msgstr "Blackpool"
+msgstr "Reservekopi"
 
 #: smime/gui/smime-ui.glade.h:12
 #, fuzzy
@@ -15883,7 +16314,7 @@ msgstr ""
 #: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
 #, fuzzy
 msgid "Certificate"
-msgstr "_Sertifikat-ID:"
+msgstr "Sertifikat"
 
 #: smime/gui/smime-ui.glade.h:15
 #, fuzzy
@@ -15917,7 +16348,7 @@ msgstr ""
 #: smime/gui/smime-ui.glade.h:23
 #, fuzzy
 msgid "Edit"
-msgstr "R_edigér"
+msgstr "Rediger"
 
 #: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
@@ -15978,7 +16409,7 @@ msgstr ""
 #: smime/gui/smime-ui.glade.h:40
 #, fuzzy
 msgid "View"
-msgstr "_Visning"
+msgstr "Vis"
 
 #: smime/gui/smime-ui.glade.h:41
 #, fuzzy
@@ -15994,8 +16425,7 @@ msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:44
-msgid ""
-"You have certificates on file that identify these certificate authorities:"
+msgid "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:45
@@ -16005,9 +16435,9 @@ msgstr ""
 #: smime/gui/smime-ui.glade.h:46
 #, fuzzy
 msgid "Your Certificates"
-msgstr "_Sertifikat-ID:"
+msgstr "Dine sertifikat"
 
-#: smime/lib/e-cert-db.c:494
+#: smime/lib/e-cert-db.c:566
 #, fuzzy
 msgid "Certificate already exists"
 msgstr "Kort-id eksisterar allereide"
@@ -16020,7 +16450,7 @@ msgstr "%d/%m/%Y"
 #: smime/lib/e-cert.c:473
 #, fuzzy
 msgid "Version"
-msgstr "Vermont"
+msgstr "Versjon"
 
 #: smime/lib/e-cert.c:488
 #, fuzzy
@@ -16052,7 +16482,7 @@ msgstr ""
 #: smime/lib/e-cert.c:585
 #, fuzzy
 msgid "C"
-msgstr " C"
+msgstr "C"
 
 #: smime/lib/e-cert.c:588
 #, fuzzy
@@ -16066,11 +16496,12 @@ msgstr ""
 #: smime/lib/e-cert.c:594
 #, fuzzy
 msgid "O"
-msgstr "OK"
+msgstr "O"
 
 #: smime/lib/e-cert.c:597
+#, fuzzy
 msgid "L"
-msgstr ""
+msgstr "L"
 
 #: smime/lib/e-cert.c:600
 #, fuzzy
@@ -16108,7 +16539,7 @@ msgstr "Sertifikatet kan ikkje stolast på"
 #: smime/lib/e-cert.c:621
 #, fuzzy
 msgid "UID"
-msgstr "ID"
+msgstr "UID"
 
 #: smime/lib/e-cert.c:630
 #, c-format
@@ -16193,7 +16624,7 @@ msgstr ""
 #: smime/lib/e-cert.c:881
 #, fuzzy
 msgid "Critical"
-msgstr "Curitiba"
+msgstr "Kritisk"
 
 #: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
 #, fuzzy
@@ -16203,7 +16634,7 @@ msgstr "North Carolina"
 #: smime/lib/e-cert.c:907
 #, fuzzy
 msgid "Extensions"
-msgstr "Uttrykk"
+msgstr "Utvidingar"
 
 #: smime/lib/e-cert.c:978
 #, fuzzy, c-format
@@ -16218,7 +16649,7 @@ msgstr "Signaturfil:"
 #: smime/lib/e-cert.c:1043
 #, fuzzy
 msgid "Issuer"
-msgstr "Set _inn"
+msgstr "Utferdar"
 
 #: smime/lib/e-cert.c:1097
 msgid "Issuer Unique ID"
@@ -16234,16 +16665,16 @@ msgstr "Emne er %s"
 msgid "Certificate Signature Value"
 msgstr "Signaturfil:"
 
-#: smime/lib/e-pkcs12.c:246
+#: smime/lib/e-pkcs12.c:261
 msgid "PKCS12 File Password"
 msgstr ""
 
-#: smime/lib/e-pkcs12.c:246
+#: smime/lib/e-pkcs12.c:261
 #, fuzzy
 msgid "Enter password for PKCS12 file:"
 msgstr "Tast inn passord for %s"
 
-#: smime/lib/e-pkcs12.c:379
+#: smime/lib/e-pkcs12.c:359
 #, fuzzy
 msgid "Imported Certificate"
 msgstr "_Sertifikat-ID:"
@@ -16359,7 +16790,7 @@ msgstr "Send dei valde kontaktane til ein annan person"
 #: ui/evolution-addressbook.xml.h:26
 #, fuzzy
 msgid "Show contact preview window"
-msgstr "Vis meldings-førehandsvisningsvindauge"
+msgstr "Vis meldings-førehandsvisingsvindauge"
 
 #: ui/evolution-addressbook.xml.h:27
 msgid "Stop"
@@ -16373,13 +16804,13 @@ msgstr "Stopp lasting"
 msgid "View the current contact"
 msgstr "Vis den valde kontakten"
 
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:32
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:33
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
 #: 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:25
 msgid "_Actions"
 msgstr "H_andlingar"
 
@@ -16391,7 +16822,7 @@ msgstr "_Vidaresend kontakt ..."
 msgid "_Move to Folder..."
 msgstr "Flytt til _mappe ..."
 
-#: ui/evolution-addressbook.xml.h:39 ui/evolution-mail-global.xml.h:19
+#: ui/evolution-addressbook.xml.h:39 ui/evolution-mail-global.xml.h:17
 #, fuzzy
 msgid "_Preview Pane"
 msgstr "Førehandsvis i"
@@ -16507,9 +16938,19 @@ msgid "Show the working week"
 msgstr "Vis arbeidsveka"
 
 #: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "View the current appointment"
+msgstr "Vis den valde kontakten"
+
+#: ui/evolution-calendar.xml.h:31
 msgid "Week"
 msgstr "Veke"
 
+#: ui/evolution-calendar.xml.h:37
+#, fuzzy
+msgid "_Open Appointment"
+msgstr "A_vtale"
+
 #: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
@@ -16527,7 +16968,7 @@ msgid "Delete this item"
 msgstr "Slett dette elementet"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:9
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:11
 msgid "Main toolbar"
 msgstr "Hovudverktylinje"
 
@@ -16543,13 +16984,13 @@ msgstr "Skriv ut dette elementet"
 #: ui/evolution-contact-list-editor.xml.h:5
 #: ui/evolution-message-composer.xml.h:18
 msgid "Save _As..."
-msgstr "L_agre som ..."
+msgstr "L_agra som ..."
 
 #: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:9
 #: ui/evolution-contact-list-editor.xml.h:6
 #: ui/evolution-signature-editor.xml.h:7
 msgid "Save and Close"
-msgstr "Lagre og lukk"
+msgstr "Lagra og lukk"
 
 #: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:10
 #: ui/evolution-contact-list-editor.xml.h:7
@@ -16563,23 +17004,23 @@ msgstr "Lagra oppføringa og lukk dialogboksen"
 
 #: ui/evolution-comp-editor.xml.h:15
 msgid "Save this item to disk"
-msgstr "Lagre dette elementet til disk"
+msgstr "Lagra dette elementet til disk"
 
 #: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:13
 #: ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:44
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
 msgid "_File"
 msgstr "_Fil"
 
 #: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:18
 #: ui/evolution-contact-list-editor.xml.h:14
-#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-message-composer.xml.h:50
 #: ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
-msgstr "_Lagre"
+msgstr "_Lagra"
 
 #: ui/evolution-composer-entries.xml.h:1
 msgid "Copy selected text to the clipboard"
@@ -16695,46 +17136,38 @@ msgid "Empty _Trash"
 msgstr "Tøm _papirkorga"
 
 #: ui/evolution-mail-global.xml.h:7
-msgid "Forget _Passwords"
-msgstr "Gløym passor_d"
-
-#: ui/evolution-mail-global.xml.h:8
-msgid "Forget remembered passwords so you will be prompted for them again"
-msgstr "Fjernar passorda frå minnet, slik at du vil bli spurd om dei på nytt"
-
-#: ui/evolution-mail-global.xml.h:9
 msgid "Open a window for composing a mail message"
-msgstr "Opne eit vindauge for skriving av ei e-postmelding"
+msgstr "Opna eit vindauge for å skriva ei e-postmelding"
 
-#: ui/evolution-mail-global.xml.h:10
+#: ui/evolution-mail-global.xml.h:8
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "Fjern alle sletta meldingar frå alle mapper"
 
-#: ui/evolution-mail-global.xml.h:11
+#: ui/evolution-mail-global.xml.h:9
 msgid "Post Ne_w Message"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:10
 msgid "Post a message to a Public folder"
 msgstr "Post ei melding til ei offentleg mappe"
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:11
 msgid "S_ubscribe to Folders..."
 msgstr "_Abbonner på mapper ..."
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:12
 msgid "Show message preview window"
-msgstr "Vis meldings-førehandsvisningsvindauge"
+msgstr "Vis meldings-førehandsvisingsvindauge"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:13
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Abbonner eller fjern abbonnement på mapper på eksterne tenarar"
 
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:14
 msgid "Virtual Folder _Editor..."
 msgstr "R_edigering av virtuelle mapper .."
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:16
 msgid "_Filters..."
 msgstr "_Filter ..."
 
@@ -16769,8 +17202,7 @@ msgid "Hide _Read Messages"
 msgstr "Skjul _lesne meldingar"
 
 #: ui/evolution-mail-list.xml.h:8
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
+msgid "Hide deleted messages rather than displaying them with a line through them"
 msgstr "Gøym dei sletta meldingane i staden for å visa dei gjennomstreka"
 
 #: ui/evolution-mail-list.xml.h:9
@@ -17099,11 +17531,11 @@ msgstr "Ikkje funnen"
 
 #: ui/evolution-mail-message.xml.h:68
 msgid "Open the selected message in a new window"
-msgstr "Opne vald melding i eit eige vindauge"
+msgstr "Opna vald melding i eit nytt vindauge"
 
 #: ui/evolution-mail-message.xml.h:69
 msgid "Open the selected message in the composer to re-send it"
-msgstr "Opne vald melding for sending på nytt"
+msgstr "Opna vald melding i redigeringsvindauget for å senda henne på nytt"
 
 #: ui/evolution-mail-message.xml.h:70
 msgid "Original Si_ze"
@@ -17163,7 +17595,7 @@ msgstr "M_indre"
 
 #: ui/evolution-mail-message.xml.h:90
 msgid "Save the message as a text file"
-msgstr "Lagre melding som tekstfil"
+msgstr "Lagra meldinga som tekstfil"
 
 #: ui/evolution-mail-message.xml.h:91
 #, fuzzy
@@ -17255,7 +17687,7 @@ msgstr "_Større"
 
 #: ui/evolution-mail-message.xml.h:115
 msgid "_Message Display"
-msgstr "_Meldingsvisning"
+msgstr "_Meldingsvising"
 
 #: ui/evolution-mail-message.xml.h:116
 msgid "_Move to Folder"
@@ -17267,11 +17699,11 @@ msgstr "_Neste melding"
 
 #: ui/evolution-mail-message.xml.h:118
 msgid "_Normal Display"
-msgstr "_Normal visning"
+msgstr "_Normal vising"
 
 #: ui/evolution-mail-message.xml.h:119
 msgid "_Open Message"
-msgstr "_Opne melding"
+msgstr "_Opna melding"
 
 #: ui/evolution-mail-message.xml.h:121
 msgid "_Previous Message"
@@ -17286,22 +17718,22 @@ msgstr "_Sitert"
 msgid "_Resend..."
 msgstr "_Omdøyp ..."
 
-#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:31
+#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "Verk_tøy"
 
 #: ui/evolution-mail-message.xml.h:128
 #, fuzzy
 msgid "_Undelete"
-msgstr "Slett"
+msgstr "_Angra slett"
 
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "Lukk vindauge"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:24
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:26
 msgid "_Close"
 msgstr "L_ukk"
 
@@ -17339,11 +17771,11 @@ msgstr "HT_ML"
 
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
-msgstr "Opne"
+msgstr "Opna"
 
 #: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
-msgstr "Opne ei fil"
+msgstr "Opna ei fil"
 
 #: ui/evolution-message-composer.xml.h:12
 msgid "PGP Encrypt"
@@ -17364,32 +17796,32 @@ msgstr "S/MIME-signér"
 #: ui/evolution-message-composer.xml.h:16
 #: ui/evolution-signature-editor.xml.h:6
 msgid "Save"
-msgstr "Lagre"
+msgstr "Lagra"
 
 #: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
-msgstr "Lagre som"
+msgstr "Lagra som"
 
 #: ui/evolution-message-composer.xml.h:19
 msgid "Save _Draft"
-msgstr "Lagre _kladd"
+msgstr "Lagra _kladd"
 
 #: ui/evolution-message-composer.xml.h:20
 msgid "Save in folder..."
-msgstr "Lagre i mappe ..."
+msgstr "Lagra i mappe ..."
 
 #: ui/evolution-message-composer.xml.h:21
 #: ui/evolution-signature-editor.xml.h:9
 msgid "Save the current file"
-msgstr "Lagre aktiv fil"
+msgstr "Lagra aktiv fil"
 
 #: ui/evolution-message-composer.xml.h:22
 msgid "Save the current file with a different name"
-msgstr "Lagre fila med eit anna namn"
+msgstr "Lagra fila med eit anna namn"
 
 #: ui/evolution-message-composer.xml.h:23
 msgid "Save the message in a specified folder"
-msgstr "Lagre meldinga i spesifisert mappe"
+msgstr "Lagra meldinga i spesifisert mappe"
 
 #: ui/evolution-message-composer.xml.h:24
 msgid "Send"
@@ -17437,54 +17869,73 @@ msgid "Toggles whether the From chooser is displayed"
 msgstr "Avgjer om Frå-veljaren vert vist"
 
 #: ui/evolution-message-composer.xml.h:35
-msgid "Toggles whether the Reply-To field is displayed"
+#, fuzzy
+msgid "Toggles whether the Post-To field is displayed"
 msgstr "Avgjer om Svar-Til-feltet vert vist"
 
 #: ui/evolution-message-composer.xml.h:36
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr "Avgjer om Svar-Til-feltet vert vist"
+
+#: ui/evolution-message-composer.xml.h:37
+#, fuzzy
+msgid "Toggles whether the To field is displayed"
+msgstr "Avgjer om CC-feltet vert vist"
+
+#: ui/evolution-message-composer.xml.h:38
 msgid "_Attachment..."
 msgstr "_Vedlegg ..."
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:39
 msgid "_Bcc Field"
 msgstr "_Bcc-felt"
 
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:40
 msgid "_Cc Field"
 msgstr "_Cc-felt"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:42
 msgid "_Delete all"
 msgstr "S_lett alle"
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:45
 msgid "_From Field"
 msgstr "_Frå felt"
 
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:46
 #: ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr "Set _inn"
 
-#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-message-composer.xml.h:47
 msgid "_Open..."
-msgstr "_Opne ..."
+msgstr "_Opna ..."
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:48
+#, fuzzy
+msgid "_Post-To Field"
+msgstr "_Reply-To felt"
+
+#: ui/evolution-message-composer.xml.h:49
 msgid "_Reply-To Field"
 msgstr "_Reply-To felt"
 
-#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-message-composer.xml.h:51
 msgid "_Security"
 msgstr "_Tryggleik"
 
+#: ui/evolution-message-composer.xml.h:52
+#, fuzzy
+msgid "_To Field"
+msgstr "_Frå felt"
+
 #: ui/evolution-signature-editor.xml.h:5
 msgid "H_TML"
 msgstr "H_TML"
 
 #: ui/evolution-signature-editor.xml.h:10
-#, fuzzy
 msgid "Save the current file and close the window"
-msgstr "Lagre aktiv fil"
+msgstr "Lagra aktiv fil og lukk vindauget"
 
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
@@ -17576,6 +18027,16 @@ msgstr "Førehandsvis oppgåveliste før utskrift"
 msgid "Print the list of tasks"
 msgstr "Skriv ut oppgåveliste"
 
+#: ui/evolution-tasks.xml.h:16
+#, fuzzy
+msgid "View the selected task"
+msgstr "Slett valde oppgåver"
+
+#: ui/evolution-tasks.xml.h:21
+#, fuzzy
+msgid "_Open Task"
+msgstr "_Oppgåve"
+
 #: ui/evolution.xml.h:1
 msgid "About Ximian Evolution..."
 msgstr "Om Ximian Evolution ..."
@@ -17587,7 +18048,7 @@ msgstr "Endre innstillingar for Evolution"
 #: ui/evolution.xml.h:5
 #, fuzzy
 msgid "Create a new window"
-msgstr "Lag eit nytt notat"
+msgstr "Lag eit nytt vindauge"
 
 #: ui/evolution.xml.h:6
 msgid "E_xit"
@@ -17598,75 +18059,87 @@ msgid "Exit the program"
 msgstr "Avslutt programmet"
 
 #: ui/evolution.xml.h:8
+msgid "Forget _Passwords"
+msgstr "Gløym passor_d"
+
+#: ui/evolution.xml.h:9
+msgid "Forget remembered passwords so you will be prompted for them again"
+msgstr "Fjernar passorda frå minnet, slik at du vil bli spurd om dei på nytt"
+
+#: ui/evolution.xml.h:10
 msgid "Import data from other programs"
 msgstr ""
 
-#: ui/evolution.xml.h:10
-#, fuzzy
+#: ui/evolution.xml.h:12
 msgid "Open a new window"
-msgstr "Opne i eige vindauge"
+msgstr "Opna eit nytt vindauge"
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:13
 msgid "Pi_lot Settings..."
 msgstr "Pi_lot-innstillingar ..."
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:14
 msgid "Send / Receive"
 msgstr "Send / Motta"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Send queued items and retrieve new items"
 msgstr "Send køa meldingar og motta ny meldingar"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Set up Pilot configuration"
 msgstr "Oppsett for pilot"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Show information about Ximian Evolution"
 msgstr "Vis informasjon om Ximian Evolution"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Submit Bug Report"
 msgstr "Send inn feilrapport"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:19
 msgid "Submit _Bug Report"
 msgstr "Send inn _feilrapport"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:20
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Send inn ei feilmelding ved hjelp av Bug Buddy"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:21
 msgid "Toggle whether we are working offline."
 msgstr ""
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:23
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _FAQ"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
 msgid "_About Ximian Evolution..."
 msgstr "_Om Ximian Evolution ..."
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "_Import..."
 msgstr "_Importér ..."
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "_New"
 msgstr "_Ny"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
+#, fuzzy
+msgid "_Quick Reference"
+msgstr "E-postinnstillingar"
+
+#: ui/evolution.xml.h:32
 msgid "_Send / Receive"
 msgstr "_Sende / Motta"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:36
 #, fuzzy
 msgid "_Window"
 msgstr "_Finn no"
@@ -17685,7 +18158,7 @@ msgstr "Last om att"
 
 #: ui/my-evolution.xml.h:5
 msgid "Reload the view"
-msgstr "Last om att visning"
+msgstr "Last om att vising"
 
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
@@ -17701,11 +18174,11 @@ msgstr "_Telefonliste"
 
 #: views/calendar/galview.xml.h:1
 msgid "W_eek View"
-msgstr "V_ekesvisning"
+msgstr "V_ekesvising"
 
 #: views/calendar/galview.xml.h:2
 msgid "_Day View"
-msgstr "_Dagsvisning"
+msgstr "_Dagsvising"
 
 #: views/calendar/galview.xml.h:3
 msgid "_Month View"
@@ -17713,7 +18186,7 @@ msgstr "_Månadsvising"
 
 #: views/calendar/galview.xml.h:4
 msgid "_Work Week View"
-msgstr "_Arbeidsvekevisning"
+msgstr "_Arbeidsvekevising"
 
 #: views/mail/galview.xml.h:1
 #, fuzzy
@@ -17780,22 +18253,20 @@ msgstr "Utval:"
 
 #: widgets/menus/gal-view-menus.c:292
 msgid "_Current View"
-msgstr "_Aktiv visning"
+msgstr "_Aktiv vising"
 
 #. bonobo displays this string so it must be in locale
 #: widgets/menus/gal-view-menus.c:351
 msgid "Custom View"
-msgstr "Tilpassa visning"
+msgstr "Tilpassa vising"
 
 #: widgets/menus/gal-view-menus.c:360
-#, fuzzy
 msgid "Save Custom View..."
-msgstr "Lagre tilpassa visning"
+msgstr "Lagra tilpassa framvising ..."
 
 #: widgets/menus/gal-view-menus.c:373
-#, fuzzy
 msgid "Define Views..."
-msgstr "Definer visningar"
+msgstr "Definer framvisingar ..."
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
@@ -17909,24 +18380,90 @@ msgstr "Andre ..."
 msgid "..."
 msgstr "... "
 
-#: widgets/misc/e-filter-bar.c:185
+#: widgets/misc/e-expander.c:181
+#, fuzzy
+msgid "Expanded"
+msgstr "Utvida"
+
+#: widgets/misc/e-expander.c:182
+msgid "Whether or not the expander is expanded"
+msgstr ""
+
+#: widgets/misc/e-expander.c:190
+#, fuzzy
+msgid "Text of the expander's label"
+msgstr "Tekst på merkelappen til utvidaren"
+
+#: widgets/misc/e-expander.c:197
+msgid "Use underline"
+msgstr "Bruk understreking"
+
+#: widgets/misc/e-expander.c:198
+#, fuzzy
+msgid ""
+"If set, an underline in the text indicates the next character should be used "
+"for the mnemonic accelerator key"
+msgstr ""
+"Dersom denne er satt, skal ei understreking i teksten visa at det neste "
+"teiknet skal brukast som snøggtast"
+
+#: widgets/misc/e-expander.c:205
+#, fuzzy
+msgid "Spacing"
+msgstr "Mellomrom"
+
+#: widgets/misc/e-expander.c:206
+#, fuzzy
+msgid "Space to put between the label and the child"
+msgstr "Ekstra mellomrom å setja mellom barnet og merkelappen"
+
+#: widgets/misc/e-expander.c:215
+msgid "Label widget"
+msgstr ""
+
+#: widgets/misc/e-expander.c:216
+#, fuzzy
+msgid "A widget to display in place of the usual expander label"
+msgstr "Eit skjermelement å visa i staden for den vanlege utvidarmerkelappen"
+
+#: widgets/misc/e-expander.c:222
+#, fuzzy
+msgid "Expander Size"
+msgstr "Storleik på utvidar"
+
+#: widgets/misc/e-expander.c:223
+#, fuzzy
+msgid "Size of the expander arrow"
+msgstr "Storleiken på utvidarpil"
+
+#: widgets/misc/e-expander.c:231
+#, fuzzy
+msgid "Indicator Spacing"
+msgstr "Mellomrom rundt indikator"
+
+#: widgets/misc/e-expander.c:232
+#, fuzzy
+msgid "Spacing around expander arrow"
+msgstr "Plass rundt utvidarpila"
+
+#: widgets/misc/e-filter-bar.c:191
 msgid "Search Editor"
 msgstr "Redigering av søk"
 
 #. FIXME: get the toplevel window...
-#: widgets/misc/e-filter-bar.c:206
+#: widgets/misc/e-filter-bar.c:212
 msgid "Save Search"
-msgstr "Lagre søk"
+msgstr "Lagra søk"
 
-#: widgets/misc/e-filter-bar.h:91 widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
 msgid "_Save Search..."
-msgstr "_Lagre søk ..."
+msgstr "_Lagra søk ..."
 
-#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
+#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
 msgid "_Edit Saved Searches..."
 msgstr "Redigér lagra søk ..."
 
-#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
+#: widgets/misc/e-filter-bar.h:94 widgets/misc/e-filter-bar.h:101
 msgid "_Advanced..."
 msgstr "_Avansert ..."
 
@@ -17944,142 +18481,122 @@ msgstr "_Tøm"
 
 #: widgets/misc/e-search-bar.c:836
 msgid "Item ID"
-msgstr ""
+msgstr "Element-ID"
 
 #: widgets/misc/e-search-bar.c:843
 msgid "Subitem ID"
-msgstr ""
+msgstr "Underelement-ID"
 
 #: widgets/misc/e-search-bar.c:850
-#, fuzzy
 msgid "Text"
 msgstr "Tekst"
 
 #: widgets/misc/e-search-bar.c:930
-#, fuzzy
 msgid "Find _Now"
-msgstr "Finn no"
+msgstr "Finn _no"
 
 #, fuzzy
-#~ msgid ""
-#~ "If this person has the ability to participate in a video conference, "
-#~ "enter their address here."
-#~ msgstr ""
-#~ "Dersom denne personen offentleggjer ledig/oppteken-informasjon eller "
-#~ "annan kalenderinformasjon på internett, skriv inn adresa til denne "
-#~ "informasjonen her."
+#~ msgid "Rename"
+#~ msgstr "_Gje nytt namn"
 
-# TRN: «Send» betre enn «post»?
 #, fuzzy
-#~ msgid "AOL Instant Messenger"
-#~ msgstr "_Post meldinga"
+#~ msgid "Could not create a directory for the new addressbook."
+#~ msgstr "Kan ikkje laga mappa %s: %s"
 
 #, fuzzy
-#~ msgid "Jabber"
-#~ msgstr "Liste utan namn"
+#~ msgid "Edit LDAP Server"
+#~ msgstr "LDAP-tenar"
 
 #, fuzzy
-#~ msgid "MSN Messenger"
-#~ msgstr "_E-post"
+#~ msgid "Select Names"
+#~ msgstr "Vel ei fil"
 
 #, fuzzy
-#~ msgid "Service"
-#~ msgstr "Teneste klar"
+#~ msgid "Selected Contacts:"
+#~ msgstr "Vel alle kontatene"
 
 #, fuzzy
-#~ msgid "Location"
-#~ msgstr "Plassering:"
+#~ msgid "_Folder:"
+#~ msgstr "_Mapper:"
 
-#, fuzzy
-#~ msgid "Username"
-#~ msgstr "Br_ukarnamn:"
+#~ msgid "East Timor"
+#~ msgstr "Aust-Timor"
 
-#~ msgid "Account Name"
-#~ msgstr "Kontonamn"
+#~ msgid "Yugoslavia"
+#~ msgstr "Jugoslavia"
 
 #, fuzzy
-#~ msgid "Yahoo"
-#~ msgstr "Yoro"
+#~ msgid "Rename this calendar to"
+#~ msgstr "Skriv ut denne kalenderen"
 
 #, fuzzy
-#~ msgid "Unable to use current version!"
-#~ msgstr "Ikkje stand til å få tak i noverande versjon!"
-
-#~ msgid "Opening tasks at %s"
-#~ msgstr "Opnar oppgåver på %s"
+#~ msgid "Could not create cache for new calendar"
+#~ msgstr "Lag ei ny mappe"
 
 #, fuzzy
-#~ msgid ""
-#~ "Error opening %s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Feil på %s:\n"
-#~ " %s"
+#~ msgid "Could not create directory for new calendar"
+#~ msgstr "Kan ikkje laga mappa %s: %s"
 
 #, fuzzy
-#~ msgid "Loading tasks"
-#~ msgstr "Lastar bilete"
+#~ msgid "A group must be selected"
+#~ msgstr "Det må vera ein organisator."
 
 #, fuzzy
-#~ msgid "Opening %s"
-#~ msgstr "Opne i %s ..."
+#~ msgid "Could not create directory for new task list"
+#~ msgstr "Kan ikkje laga mappa %s: %s"
 
 #, fuzzy
-#~ msgid "Enter the password for %s"
-#~ msgstr "Tast inn passord for %s"
+#~ msgid "Select Calendar Folder"
+#~ msgstr "Vel standardmappe"
 
 #, fuzzy
-#~ msgid "Apply filters to new messages in Inbox on this server"
-#~ msgstr "Bruk filter på nye meldingar i INBOX på denne tenaren"
+#~ msgid "Select Tasks Folder"
+#~ msgstr "Vel mappe"
 
 #, fuzzy
-#~ msgid "Address Book"
-#~ msgstr "Adressebok"
+#~ msgid "The method required to load `%s' is not supported"
+#~ msgstr "Metoden som krevst for å opna «%s» er ikkje støtta"
 
 #, fuzzy
-#~ msgid "LDAP Server Name:"
-#~ msgstr "Tenarnamn"
+#~ msgid "You don't have permission to open the folder in `%s'"
+#~ msgstr "Kan ikkje opna mappa i «%s»"
 
-#, fuzzy
-#~ msgid "Search base:"
-#~ msgstr "_Søkebase:"
+#~ msgid "Could not open the folder in `%s'"
+#~ msgstr "Kan ikkje opna mappa i «%s»"
 
-#, fuzzy
-#~ msgid "Junk Test"
-#~ msgstr "Juni"
-
-#, fuzzy
-#~ msgid "Total messages"
-#~ msgstr "Lagra melding"
-
-#, fuzzy
-#~ msgid "Unread messages"
-#~ msgstr "Neste _ulesne melding"
+#~ msgid "The method required to open `%s' is not supported"
+#~ msgstr "Metoden som krevst for å opna «%s» er ikkje støtta"
 
 #, fuzzy
-#~ msgid "Completed on %B %d, %Y, %l:%M %p"
-#~ msgstr "%d. %b %k:%M"
+#~ msgid "Adding %s"
+#~ msgstr "Sender «%s»"
 
 #, fuzzy
-#~ msgid "Overdue:"
-#~ msgstr "&Syntaksmerkingsmodusar"
+#~ msgid ""
+#~ "The calendar backend for\n"
+#~ "%s\n"
+#~ " has crashed. You will have to restart Evolution in order to use it again"
+#~ msgstr ""
+#~ "Adressebok-bakdelen for\n"
+#~ "%s\n"
+#~ "har krasja. Du må starta Evolution på nytt for å bruka han igjen."
 
 #, fuzzy
-#~ msgid "by %B %d, %Y, %l:%M %p"
-#~ msgstr "%d. %b %k:%M"
+#~ msgid "Rename this task list to"
+#~ msgstr "Gi denne snarvegen nytt namn"
 
 #, fuzzy
-#~ msgid "URI of the mail source that the view will display"
-#~ msgstr "URI-en som kalenderen skal visa"
+#~ msgid "Spam"
+#~ msgstr "Lau"
 
 #, fuzzy
-#~ msgid "Evolution Test"
-#~ msgstr "Evolution"
+#~ msgid "Could not update files correctly"
+#~ msgstr "Kan ikkje oppdatera objekt"
 
 #, fuzzy
-#~ msgid "Evolution Test component"
-#~ msgstr "Evolution testkomponent"
+#~ msgid ""
+#~ "Cannot create the directory\n"
+#~ "%s\n"
+#~ "Error: %s"
+#~ msgstr "Kan ikkje laga katalogen «%s»: %s"
 
-#, fuzzy
-#~ msgid "View the current appointment"
-#~ msgstr "Vis den valde kontakten"
author	Ãsmund SkjÃ¦veland <aasmunds@fys.uio.no>	2004-01-29 18:58:23 +0800
committer	Åsmund Skjæveland <aasmunds@src.gnome.org>	2004-01-29 18:58:23 +0800
commit	2f04af5ec0ce21850e346bf08f294ecb416b7431 (patch)
tree	f829c4b9b5d38b401baec24fe34346406cef6d25 /po/nn.po
parent	cd7969810436f5f4074736e72e6f68fac9469074 (diff)
download	gsoc2013-evolution-2f04af5ec0ce21850e346bf08f294ecb416b7431.tar gsoc2013-evolution-2f04af5ec0ce21850e346bf08f294ecb416b7431.tar.gz gsoc2013-evolution-2f04af5ec0ce21850e346bf08f294ecb416b7431.tar.bz2 gsoc2013-evolution-2f04af5ec0ce21850e346bf08f294ecb416b7431.tar.lz gsoc2013-evolution-2f04af5ec0ce21850e346bf08f294ecb416b7431.tar.xz gsoc2013-evolution-2f04af5ec0ce21850e346bf08f294ecb416b7431.tar.zst gsoc2013-evolution-2f04af5ec0ce21850e346bf08f294ecb416b7431.zip