Roughly two hundred strings translated or defuzzed. Still a long way to go

2003-09-16  Åsmund Skjæveland  <aasmunds@fys.uio.no>

        * nn.po: Roughly two hundred strings translated or defuzzed. Still
        a long way to go (25% left), but every little bit helps.

svn path=/trunk/; revision=22589

1 files changed, 1986 insertions, 1755 deletions

diff --git a/po/nn.po b/po/nn.po
index fc8c9ab4fc..5a56fbc79a 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -1,40 +1,65 @@
+# translation of nn.po to Norwegian (nynorsk)
+# translation of nn.po to Norwegian (nynorsk)
+# translation of nn.po to Norwegian (nynorsk)
+# translation of nn.po to Norwegian (nynorsk)
+# translation of nn.po to Norwegian (nynorsk)
+# translation of nn.po to Norwegian (nynorsk)
+# translation of nn.po to Norwegian (nynorsk)
+# translation of nn.po to Norwegian (nynorsk)
+# translation of nn.po to Norwegian (nynorsk)
+# translation of nn.po to Norwegian (nynorsk)
+# translation of nn.po to Norwegian (nynorsk)
+# translation of nn.po to Norwegian (nynorsk)
+# translation of nn.po to Norwegian (nynorsk)
+# translation of nn.po to Norwegian (nynorsk)
+# translation of nn.po to Norwegian (nynorsk)
+# translation of nn.po to Norwegian (nynorsk)
+# translation of nn.po to Norwegian (nynorsk)
+# translation of nn.po to Norwegian (nynorsk)
+# translation of nn.po to Norwegian (nynorsk)
+# translation of nn.po to Norwegian (nynorsk)
+# translation of nn.po to Norwegian (nynorsk)
+# translation of nn.po to Norwegian (nynorsk)
+# translation of nn.po to Norwegian (nynorsk)
+# translation of nn.po to Norwegian (nynorsk)
+# translation of nn.po to Norwegian (nynorsk)
 # Norwegian (Nynorsk) translation of Evolution
-# Copyright (C) 2001-2002 Roy-Magne Mo
-# Roy-Magne Mo <rmo@sunnmore.net>, 2001-2002
-# 
+# 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.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution-1.01\n"
-"POT-Creation-Date: 2003-06-25 13:24-0400\n"
-"PO-Revision-Date: 2002-01-30 06:10+0100\n"
-"Last-Translator: Roy-Magne Mo <rmo@sunnmore.net>\n"
-"Language-Team: \n"
+"Project-Id-Version: nn\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-09-04 19:47+0200\n"
+"PO-Revision-Date: 2003-09-16 19:30+0200\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"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.0.2\n"
 
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
-#, fuzzy
 msgid "Evolution LDIF importer"
-msgstr "KDeelop-installering"
+msgstr "LDIF-import for Evolution"
 
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
 msgid "LDAP Data Interchange Format (.ldif)"
-msgstr ""
+msgstr "LDAP data interchange format (.ldif)"
 
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
-#, fuzzy
 msgid "Evolution VCard Importer"
-msgstr "Kan ikkje initialisera lokale variablar"
+msgstr "VCard-import for Evolution"
 
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
-#, fuzzy
 msgid "Evolution VCard importer"
-msgstr "Kan ikkje initialisera lokale variablar"
+msgstr "Import av VCard for Evolution"
 
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
 msgid "VCard (.vcf, .gcrd)"
-msgstr ""
+msgstr "VCard (.vcf, .gcrd)"
 
 #: addressbook/backend/ebook/e-card-simple.c:60
 #: addressbook/backend/ebook/e-card.c:1306
@@ -295,16 +320,16 @@ msgstr "Merknad"
 #: addressbook/backend/ebook/e-card-simple.c:98
 #: addressbook/backend/ebook/e-card.c:1443
 msgid "Calendar URI"
-msgstr "Kalendar URI"
+msgstr "Kalender-URI"
 
 #: addressbook/backend/ebook/e-card-simple.c:98
 msgid "CALUri"
-msgstr "CALUri"
+msgstr "KALUri"
 
 #: addressbook/backend/ebook/e-card-simple.c:99
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Free-busy URL"
-msgstr "Ledit-oppteke URL"
+msgstr "Ledig-oppteken-URL"
 
 #: addressbook/backend/ebook/e-card-simple.c:99
 msgid "FBUrl"
@@ -312,12 +337,11 @@ msgstr "LOUrl"
 
 #: addressbook/backend/ebook/e-card-simple.c:100
 msgid "Default server calendar"
-msgstr ""
+msgstr "Standard tenar-kalender"
 
 #: addressbook/backend/ebook/e-card-simple.c:100
-#, fuzzy
 msgid "icsCalendar"
-msgstr "Kalender"
+msgstr ""
 
 #: addressbook/backend/ebook/e-card-simple.c:101
 #: addressbook/backend/ebook/e-card.c:1430
@@ -343,9 +367,8 @@ msgid "Family Name"
 msgstr "Etternamn"
 
 #: addressbook/backend/ebook/e-card-simple.c:335
-#, fuzzy
 msgid "ECard"
-msgstr "Bil"
+msgstr "ECard"
 
 #: addressbook/backend/ebook/e-card-simple.c:842
 #, c-format
@@ -353,10 +376,9 @@ msgid "%x"
 msgstr "%x"
 
 #: addressbook/backend/ebook/e-card-simple.c:912
-#: addressbook/backend/ebook/e-destination.c:706
-#, fuzzy
+#: addressbook/backend/ebook/e-destination.c:709
 msgid "Unnamed List"
-msgstr "Kontaktliste utan namn"
+msgstr "Liste utan namn"
 
 #: addressbook/backend/ebook/e-card.c:1313
 #: addressbook/gui/contact-editor/fullname.glade.h:4
@@ -366,34 +388,29 @@ msgstr "Fullt namn"
 
 #: addressbook/backend/ebook/e-card.c:1326
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#, fuzzy
 msgid "Address"
 msgstr "_Adresse:"
 
 #: addressbook/backend/ebook/e-card.c:1333
-#, fuzzy
 msgid "Address Label"
-msgstr "_Adressekort"
+msgstr "Adresseetikett"
 
 #: addressbook/backend/ebook/e-card.c:1340
-#, fuzzy
 msgid "Phone"
-msgstr "Ponce"
+msgstr "Telefon"
 
 #: addressbook/backend/ebook/e-card.c:1354
-#, fuzzy
 msgid "Birth date"
 msgstr "Fødselsdag"
 
 #: addressbook/backend/ebook/e-card.c:1360
-#: calendar/gui/e-calendar-table.etspec.h:19
+#: calendar/gui/e-calendar-table.etspec.h:18
 msgid "URL"
 msgstr "URL"
 
 #: addressbook/backend/ebook/e-card.c:1374
-#, fuzzy
 msgid "Organizational Unit"
-msgstr "Organisasjon"
+msgstr "Organisasjonseining"
 
 #: addressbook/backend/ebook/e-card.c:1395
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
@@ -401,74 +418,64 @@ msgstr "Organisasjon"
 msgid "Role"
 msgstr "Rolle"
 
-#: addressbook/backend/ebook/e-card.c:1436 mail/mail-format.c:963
-#, fuzzy
+#: addressbook/backend/ebook/e-card.c:1436 mail/mail-format.c:998
 msgid "Mailer"
-msgstr "E-post"
+msgstr "E-postprogram"
 
 #: addressbook/backend/ebook/e-card.c:1450
-#, fuzzy
 msgid "Free/Busy URL"
-msgstr "_Ledig/Oppteken URL:"
+msgstr "_Ledig/Oppteken-URL:"
 
 #: addressbook/backend/ebook/e-card.c:1457
-#, fuzzy
 msgid "ICS Calendar"
-msgstr "Kalender"
+msgstr "ICS-kalender"
 
 #: addressbook/backend/ebook/e-card.c:1471
-#, fuzzy
 msgid "Related Contacts"
-msgstr "Slett kontakt?"
+msgstr ""
 
 #: addressbook/backend/ebook/e-card.c:1485
-#, fuzzy
 msgid "Category List"
-msgstr "Kategori er"
+msgstr "Kategoriliste"
 
 #: addressbook/backend/ebook/e-card.c:1492
 msgid "Wants HTML"
-msgstr ""
+msgstr "Vil ha HTML"
 
 #: addressbook/backend/ebook/e-card.c:1499
 msgid "Wants HTML set"
-msgstr ""
+msgstr "Vil ha HTML slått på"
 
 #: addressbook/backend/ebook/e-card.c:1506
-#, fuzzy
 msgid "List"
-msgstr "Lista"
+msgstr "Liste"
 
 #: addressbook/backend/ebook/e-card.c:1513
 #, fuzzy
 msgid "List Show Addresses"
-msgstr "Alternativ adresse"
+msgstr ""
 
 #: addressbook/backend/ebook/e-card.c:1520
-#, fuzzy
 msgid "Arbitrary"
-msgstr "Amritsar"
+msgstr "Vilkårleg"
 
 #: addressbook/backend/ebook/e-card.c:1527
-#, fuzzy
 msgid "ID"
-msgstr "I"
+msgstr "ID"
 
 #: addressbook/backend/ebook/e-card.c:1534
-#, fuzzy
 msgid "Last Use"
-msgstr "Lim inn"
+msgstr "Sist brukt"
 
 #: addressbook/backend/ebook/e-card.c:1545
-#, fuzzy
 msgid "Use Score"
-msgstr "Poengsum"
+msgstr "Bruk poeng"
 
 #: addressbook/backend/ebook/test-client-list.c:15
 #: addressbook/backend/ebook/test-client.c:33
-#: calendar/gui/alarm-notify/notify-main.c:171
+#: calendar/gui/alarm-notify/notify-main.c:173
 msgid "Could not initialize Bonobo"
-msgstr "Kunne ikkje initialisere Bonobo"
+msgstr "Kunne ikkje initialisera Bonobo"
 
 #: addressbook/backend/pas/pas-backend-file.c:464
 #: addressbook/backend/pas/pas-backend-ldap.c:3050
@@ -482,12 +489,11 @@ msgstr "Lastar ..."
 #: addressbook/backend/pas/pas-backend-ldap.c:598
 #, fuzzy
 msgid "Using Distinguished Name (DN)"
-msgstr "Liste_namn:"
+msgstr "Bruker distinguished name (DN)"
 
 #: addressbook/backend/pas/pas-backend-ldap.c:602
-#, fuzzy
 msgid "Using Email Address"
-msgstr "E-postadresse:"
+msgstr "Brukar e-postadresse"
 
 #: addressbook/backend/pas/pas-backend-ldap.c:748
 msgid "Reconnecting to LDAP server..."
@@ -527,14 +533,14 @@ msgid "EBook not loaded\n"
 msgstr "EBook vart ikkje lasta\n"
 
 #: addressbook/conduit/address-conduit.c:1376
-#: calendar/conduits/calendar/calendar-conduit.c:1342
-#: calendar/conduits/todo/todo-conduit.c:884
+#: calendar/conduits/calendar/calendar-conduit.c:1351
+#: calendar/conduits/todo/todo-conduit.c:893
 msgid "Could not start wombat server"
 msgstr "Klarte ikkje å starte wombat-tenar."
 
 #: addressbook/conduit/address-conduit.c:1377
-#: calendar/conduits/calendar/calendar-conduit.c:1343
-#: calendar/conduits/todo/todo-conduit.c:885
+#: calendar/conduits/calendar/calendar-conduit.c:1352
+#: calendar/conduits/todo/todo-conduit.c:894
 msgid "Could not start wombat"
 msgstr "Klarte ikkje å starte wombat."
 
@@ -545,49 +551,42 @@ msgstr "Klarte ikkje å lese addresseblokka i programmet til piloten"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
 msgid "Configure access to LDAP directory servers here"
-msgstr ""
+msgstr "Set opp tilgang til LDAP-katalogtenar her"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "Directory Servers"
 msgstr "Katalogtenarar"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
 msgid "Evolution Addressbook"
-msgstr "Rediger adressebok"
+msgstr "Evolution adressebok"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-#, fuzzy
 msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Gpilotd adressekomponent"
+msgstr "Kontroll for LDAP-konfigurasjon for Evolution adressebok"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#, fuzzy
 msgid "Evolution Addressbook address pop-up"
-msgstr "Fabrikke for sprettopp-vindauget til addresseboka"
+msgstr "Evolution adressebok adressedialog"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#, fuzzy
 msgid "Evolution Addressbook address viewer"
-msgstr "Evolutions addressebok minikortlesar"
+msgstr "Evolution adressebok adressevisar"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-#, fuzzy
 msgid "Evolution Addressbook card viewer"
-msgstr "Evolutions addressebok minikortlesar"
+msgstr "Evolution adressebok kortvisar"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-#, fuzzy
 msgid "Evolution Addressbook component"
-msgstr "Evolutions addressebok minikortlesar"
+msgstr "Evolution adressebok-komponent"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-#, fuzzy
 msgid "Evolution Addressbook folder viewer"
-msgstr "Evolutions addressebok minikortlesar"
+msgstr "Evolution adressebok mappevisar"
 
 #: addressbook/gui/component/addressbook-component.c:76
-#: addressbook/gui/component/addressbook-component.c:620
+#: addressbook/gui/component/addressbook-component.c:625
 #: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
 #: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
 msgid "Contacts"
@@ -606,36 +605,34 @@ msgid "LDAP server containing contact information"
 msgstr "LDAP-tenar som inneheld kontaktinformasjon"
 
 #: addressbook/gui/component/addressbook-component.c:80
-#, fuzzy
 msgid "Public Contacts"
-msgstr "Kontakter"
+msgstr "Offentlege kontaktar"
 
 #: addressbook/gui/component/addressbook-component.c:80
-#, fuzzy
 msgid "Public folder containing contact information"
-msgstr "Mappe som inneheld kontaktinformasjon"
+msgstr "Offentleg mappe som inneheld kontaktinformasjon"
 
-#: addressbook/gui/component/addressbook-component.c:574
+#: addressbook/gui/component/addressbook-component.c:579
 msgid "New Contact"
 msgstr "Ny kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:574
+#: addressbook/gui/component/addressbook-component.c:579
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:575
+#: addressbook/gui/component/addressbook-component.c:580
 msgid "Create a new contact"
 msgstr "Opprett ny kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:583
 msgid "New Contact List"
 msgstr "Ny kontaktliste"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:583
 msgid "Contact _List"
 msgstr "Kontakt_liste"
 
-#: addressbook/gui/component/addressbook-component.c:579
+#: addressbook/gui/component/addressbook-component.c:584
 msgid "Create a new contact list"
 msgstr "Opprett ny kontaktliste"
 
@@ -649,11 +646,11 @@ msgstr "Ikkje i stand til å autentisere mot IMAP-tenar"
 
 #: addressbook/gui/component/addressbook-config.c:259
 msgid "Could not perform query on Root DSE"
-msgstr ""
+msgstr "Kunne ikke utføra spørjing på Root DSE"
 
 #: addressbook/gui/component/addressbook-config.c:682
 msgid "The server responded with no supported search bases"
-msgstr ""
+msgstr "Tenaren svarte ikkje med nokon støtta basisar for søk"
 
 #: addressbook/gui/component/addressbook-config.c:1193
 msgid "This server does not support LDAPv3 schema information"
@@ -665,7 +662,7 @@ msgstr "Feil ved henting av skjemainformasjon"
 
 #: addressbook/gui/component/addressbook-config.c:1223
 msgid "Server did not respond with valid schema information"
-msgstr ""
+msgstr "Tenaren svarte ikkje med gyldig skjema-informasjon"
 
 #: addressbook/gui/component/addressbook-config.c:1637
 msgid "Account Name"
@@ -684,10 +681,13 @@ msgid "Other Contacts"
 msgstr "Andre kontakter"
 
 #: addressbook/gui/component/addressbook.c:502
+# TRN. «Aksessera». Blæ.
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
 msgstr ""
+"Kunne ikkje opna denne adresseboka. Sjå etter at stien\n"
+"finst og at du har løyve til å aksessera han."
 
 #: addressbook/gui/component/addressbook.c:512
 msgid ""
@@ -695,6 +695,9 @@ msgid ""
 "means you have entered an incorrect URI, or the LDAP server\n"
 "is unreachable."
 msgstr ""
+"Kunne ikkje opna denne adresseboka. Det betyr anten at\n"
+"du har skrive inn ein ugyldig URI, eller at LDAP-tenaren\n"
+"ikkje kan nåast."
 
 #: addressbook/gui/component/addressbook.c:517
 msgid ""
@@ -703,6 +706,10 @@ msgid ""
 "you must compile the program from the CVS sources after\n"
 "retrieving OpenLDAP from the link below.\n"
 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"
 
 #: addressbook/gui/component/addressbook.c:527
 msgid ""
@@ -710,25 +717,28 @@ msgid ""
 "means you have entered an incorrect URI, or the server\n"
 "is unreachable."
 msgstr ""
+"Kunne ikkje opna denne adresseboka. Det betyr anten at\n"
+"du har skrive inn ein ugyldig URI, eller at tenaren\n"
+"ikkje kan nåast."
 
 #: addressbook/gui/component/addressbook.c:547
 msgid "Unable to open addressbook"
 msgstr "Ikkje i stand å opne adresseboka"
 
 #: addressbook/gui/component/addressbook.c:607
+# TRN: Må finna betre ord for «aksessera». Kanskje dette duger?
 msgid "Accessing LDAP Server anonymously"
-msgstr ""
+msgstr "Hentar data frå LDAP-tenar anonymt"
 
 #: addressbook/gui/component/addressbook.c:652
-#, fuzzy
 msgid "Failed to authenticate.\n"
-msgstr "Ikkje i stand til å autentisere mot IMAP-tenar"
+msgstr "Kunne ikkje autentisera.\n"
 
 #: addressbook/gui/component/addressbook.c:660
 #: addressbook/gui/component/addressbook.c:663
-#, fuzzy, c-format
+#, c-format
 msgid "%sEnter password for %s (user %s)"
-msgstr "Oppgi passord for %s (brukar %s)"
+msgstr "%sSkriv inn passord for %s (brukar %s)"
 
 #: addressbook/gui/component/addressbook.c:794
 msgid "Name begins with"
@@ -768,18 +778,22 @@ msgid ""
 "more specific or raise the time limit in the directory server\n"
 "preferences for this addressbook."
 msgstr ""
+"Dette søket tok lengre tid å utføra enn tenaren tillet eller tidsgrensa\n"
+"du har satt for denne adresseboka. Gjer søket ditt meir presist eller\n"
+"auk grensa for kor lang tid eit søk kan ta i katalogtenar-innstillingane\n"
+"for denne adresseboka."
 
 #: addressbook/gui/component/addressbook.c:967
 msgid "The backend for this addressbook was unable to parse this query."
-msgstr ""
+msgstr "Bakenden for denne adresseboka kunne ikkje tolka spørjinga."
 
 #: addressbook/gui/component/addressbook.c:970
 msgid "The backend for this addressbook refused to perform this query."
-msgstr ""
+msgstr "Bakenden for denne adresseboka nekta å utføra denne spørjinga."
 
 #: addressbook/gui/component/addressbook.c:974
 msgid "This query did not complete successfully."
-msgstr ""
+msgstr "Spørjinga vart ikkje fullført."
 
 #. All, unmatched, separator
 #: addressbook/gui/component/addressbook.c:1059
@@ -789,7 +803,7 @@ msgstr "Nokon kategori"
 
 #: addressbook/gui/component/addressbook.c:1145
 msgid "The URI that the Folder Browser will display"
-msgstr ""
+msgstr "URI-en som mappeurforskaren vil visa"
 
 #.
 #. * This is the code for the UI thingie that lets you manipulate the e-mail
@@ -819,30 +833,30 @@ msgstr "Lag ny kontakt «%s»"
 msgid "Add address to existing contact \"%s\""
 msgstr "Legg til addresser for eksisterande kontakt «%s»"
 
-#: addressbook/gui/component/e-address-popup.c:914
+#: addressbook/gui/component/e-address-popup.c:917
 msgid "Querying Addressbook..."
 msgstr "Spør adresseboka ..."
 
-#: addressbook/gui/component/e-address-popup.c:998
-#: addressbook/gui/component/e-address-widget.c:392
+#: addressbook/gui/component/e-address-popup.c:1001
+#: addressbook/gui/component/e-address-widget.c:401
 msgid "Edit Contact Info"
 msgstr "Rediger kontaktinformasjon"
 
-#: addressbook/gui/component/e-address-popup.c:1028
-#: addressbook/gui/component/e-address-widget.c:428
+#: addressbook/gui/component/e-address-popup.c:1031
+#: addressbook/gui/component/e-address-widget.c:437
 #: addressbook/gui/component/select-names/e-select-names-popup.c:324
 msgid "Add to Contacts"
 msgstr "Legg til kontakter"
 
-#: addressbook/gui/component/e-address-popup.c:1053
+#: addressbook/gui/component/e-address-popup.c:1056
 msgid "Merge E-Mail Address"
 msgstr "Flett e-postadresser"
 
-#: addressbook/gui/component/e-address-widget.c:369
+#: addressbook/gui/component/e-address-widget.c:378
 msgid "Disable Queries"
 msgstr "Slå av spørjingar"
 
-#: addressbook/gui/component/e-address-widget.c:369
+#: addressbook/gui/component/e-address-widget.c:378
 msgid "Enable Queries (Dangerous!)"
 msgstr "Slå på spørjingar (Farleg!)"
 
@@ -850,12 +864,11 @@ msgstr "Slå på spørjingar (Farleg!)"
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 #: mail/mail-config.glade.h:1
 msgid "\n"
-msgstr ""
+msgstr "\n"
 
 #: addressbook/gui/component/ldap-config.glade.h:3
-#, fuzzy
 msgid "  S_how Supported Bases "
-msgstr "Vel modemtype ..."
+msgstr "V_is støtta basar"
 
 #: addressbook/gui/component/ldap-config.glade.h:4
 #: addressbook/gui/component/select-names/select-names.glade.h:1
@@ -872,7 +885,7 @@ msgstr "Vel modemtype ..."
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
-msgstr ""
+msgstr "*"
 
 #: addressbook/gui/component/ldap-config.glade.h:5
 msgid "1:00"
@@ -899,9 +912,8 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-#, fuzzy
 msgid "Add LDAP Server"
-msgstr "LDAP-tenar"
+msgstr "Legg til LDAP-tenar"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 msgid "Addressbook Sources"
@@ -924,36 +936,34 @@ msgid ""
 "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"
+"\n"
+"Trykk på «Fullfør»-knappen for å lagra innstillingane du har\n"
+"skrive inn her."
 
 #: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Connecting"
 msgstr "Koplar til"
 
 #: addressbook/gui/component/ldap-config.glade.h:20
-#, fuzzy
 msgid "Distinguished _name:"
-msgstr "Liste_namn:"
+msgstr "Distinguished _name:"
 
 #: addressbook/gui/component/ldap-config.glade.h:21
-#, fuzzy
 msgid "Edit LDAP Server"
-msgstr "LDAP-tenar"
+msgstr "Rediger LDAP-tenar"
 
 #: addressbook/gui/component/ldap-config.glade.h:22
-#, fuzzy
 msgid "Email address:"
 msgstr "E-postadresse:"
 
 #: addressbook/gui/component/ldap-config.glade.h:23
-#, fuzzy
 msgid "Evolution will use this DN to authenticate you with the server"
-msgstr ""
-"Evolution kjem til å bruke denne e-postaddressa for å autentisere deg "
-"ovanfor tenaren"
+msgstr "Evolution vil bruka DN til å autentisera deg mot tenaren"
 
 #: addressbook/gui/component/ldap-config.glade.h:24
-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"
@@ -977,6 +987,7 @@ msgid "Never"
 msgstr "Aldri"
 
 #: addressbook/gui/component/ldap-config.glade.h:29
+# TRN: «Kryptografisk». For eit vakkert ord.
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -985,20 +996,22 @@ msgid ""
 "your connection. Ask your system administrator if your LDAP server uses "
 "these protocols."
 msgstr ""
+"No må du spesifisera korleis du vil kopla til LDAP-tenaren. "
+"SSL- (Secure Sockets Layer) og TLS- (Transport Layer Security) protokollane "
+"vert brukte av nokre tenarar for å verna tilkoplinga di kryptografisk. "
+"Spør systemadministratoren din om LDAP-tenaren din bruker desse protokollane.Å"
 
 #: addressbook/gui/component/ldap-config.glade.h:32
 msgid "One"
 msgstr "Ein"
 
 #: addressbook/gui/component/ldap-config.glade.h:33
-#, fuzzy
 msgid "S_earch scope: "
-msgstr "Søkes_kop:"
+msgstr "Sø_keområde: "
 
-#. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/calendar-model.c:1983 calendar/gui/e-day-view.c:1712
-#: calendar/gui/e-week-view.c:1256
+#: calendar/gui/e-day-view.c:3261 calendar/gui/e-week-view.c:1150
+#: calendar/gui/gnome-cal.c:611 calendar/gui/e-cal-view.c:541
 msgid "Searching"
 msgstr "Søker"
 
@@ -1012,6 +1025,8 @@ msgid ""
 "server if\n"
 "your LDAP server supports SSL or TLS."
 msgstr ""
+"Dette valet gjer at Evolution berre vil kopla til LDAP-tenaren dersom\n"
+"denne støttar SSL eller TLS."
 
 #: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
@@ -1023,6 +1038,10 @@ msgid ""
 "is already\n"
 "secure."
 msgstr ""
+"Dersom du vel dette, vil Evolution berre prøva å bruka SSL/TLS dersom "
+"du er i eit utrygt miljø. Til dømes treng ikkje Evolution å bruka "
+"SSL/TLS dersom du og LDAP-tenaren står bak den same brannveggen, fordi "
+"tilkoplinga då er trygg frå før."
 
 #: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
@@ -1032,6 +1051,9 @@ msgid ""
 "to security\n"
 "exploits. "
 msgstr ""
+"Dette alternativet betyr at tenaren din ikkje støttar SSL eller TLS:\n"
+"Det tyder at tilkoplinga di ikkje er trygg, og du vil vera sårbar\n"
+"for eventuelle trygglekshol."
 
 #: addressbook/gui/component/ldap-config.glade.h:45
 msgid ""
@@ -1039,39 +1061,38 @@ msgid ""
 "LDAP\n"
 "searches, and for creating and editing contacts. "
 msgstr ""
+"Dette valet let deg endra Evolution sine standardinnstillingar \n"
+"for LDAP-søk, og for å oppretta og redigera kontaktar."
 
 #: addressbook/gui/component/ldap-config.glade.h:47
 msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
-msgstr ""
+msgstr "Det siste steget i å setja opp ein LDAP-tenar er å setja eit visingsnamn."
 
 #: addressbook/gui/component/ldap-config.glade.h:48
-#, fuzzy
 msgid "Step 1: Server Information"
-msgstr "Tenarinformasjon"
+msgstr "Steg 1: Tenarinformasjon"
 
 #: addressbook/gui/component/ldap-config.glade.h:49
-#, fuzzy
 msgid "Step 2: Connecting to Server"
-msgstr " Koplar til tenar ..."
+msgstr "Steg 2: Koplar til tenar"
 
 #: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Step 3: Searching the Directory"
-msgstr ""
+msgstr "Steg 3: Søker gjennom katalogen"
 
 #: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Step 4: Display Name"
-msgstr ""
+msgstr "Steg 4: Vis namn"
 
 #: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Sub"
 msgstr "Sub"
 
 #: addressbook/gui/component/ldap-config.glade.h:53
-#, fuzzy
 msgid "Supported Search Bases"
-msgstr "Ustøtta skjema"
+msgstr "Støtta søkebasar"
 
 #: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
@@ -1080,6 +1101,10 @@ msgid ""
 "information. Please ask your system administrator if you are unsure 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 "
+"dersom du er usikker på kva denne informasjonen er."
 
 #: addressbook/gui/component/ldap-config.glade.h:56
 msgid ""
@@ -1089,6 +1114,9 @@ msgid ""
 "if you\n"
 "need to change these options."
 msgstr ""
+"Vala på denne sida kontrollerer kor mange oppføringar som skal takast med "
+"i søka dine, og kor lang tid eit søk skal ta. Spør systemadministratoren "
+"din dersom du treng å endra desse vala."
 
 #: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
@@ -1097,6 +1125,9 @@ msgid ""
 "begin. If you leave this blank, the search will begin at the root of the "
 "directory tree."
 msgstr ""
+"Søkebasen er det distingverte namnet (DN) på oppføringa der søka dine "
+"vil starta. Dersom du let denne stå blank, vil søka byrja ved rota "
+"på katalogtreet."
 
 #: addressbook/gui/component/ldap-config.glade.h:61
 msgid ""
@@ -1107,6 +1138,10 @@ msgid ""
 "A search scope of \"one\" will only include the entries one level beneath "
 "your base.\n"
 msgstr ""
+"Søkeskopet definerer kor djupt du vil at søket skal gå ned i katalogtreet.\n"
+"Dersom du vel «sub», vert alle oppføringane under søkebasen inkluderte. \n"
+"Dersom du vel «one», vil berre oppføringane eitt nivå under søkebasen din "
+"brukast.\n"
 
 #: addressbook/gui/component/ldap-config.glade.h:65
 msgid ""
@@ -1117,12 +1152,17 @@ msgid ""
 "server. Please contact your system 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."
 
 #: addressbook/gui/component/ldap-config.glade.h:69
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
-msgstr ""
+msgstr "Dette er det fulle namnet på LDAP-tenaren. T.d. «ldap.mittfirma.no»."
 
 #: addressbook/gui/component/ldap-config.glade.h:70
 msgid ""
@@ -1130,6 +1170,9 @@ msgid ""
 "be \n"
 "too large will slow down your addressbook."
 msgstr ""
+"Dette er øvre grense for kor mange oppføringar som skal lastast ned. Å setja "
+"dette talet\n"
+"for høgt vil få adresseboka di til å gå sakte."
 
 #: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
@@ -1137,16 +1180,18 @@ msgid ""
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
 msgstr ""
+"Dette er metoden Evolution vil bruka for å autentisera deg. Legg merke "
+"til at å setja dette til «e-post-adresse» krev at anonym tilgang til "
+"LDAP-tenaren."
 
 #: addressbook/gui/component/ldap-config.glade.h:73
-#, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
 "It is for display purposes only. "
 msgstr ""
-"Namnet blir brukt til å identifisere kontoen din. Det er kun til for "
-"visningsføremål."
+"Dette er det namnet på tenaren som vert vist i Evolution si mappeliste.\n"
+"Det vert berre brukt til å visast på skjermen."
 
 #: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
@@ -1155,95 +1200,88 @@ msgid ""
 "list of standard ports has been provided. Ask your system administrator\n"
 "what port you should specify."
 msgstr ""
+"Dette er den porten på LDAP-tenaren som Evolution vil prøva å kopla til.\n"
+"Ei liste over standardportar er gitt. Spør systemadministratoren din kva\n"
+"for ein port du skal bruka."
 
 #: addressbook/gui/component/ldap-config.glade.h:78
 msgid "This option controls how long a search will be run."
-msgstr ""
+msgstr "Dette valet kontrollerer kor lenge eit søk vil køyra."
 
 #: addressbook/gui/component/ldap-config.glade.h:79
 msgid "U_se SSL/TLS:"
-msgstr ""
+msgstr "B_ruk SSL/TLS:"
 
 #: addressbook/gui/component/ldap-config.glade.h:80
 msgid "Using distinguished name (DN)"
-msgstr ""
+msgstr "Bruker distinguished name (DN)"
 
 #: addressbook/gui/component/ldap-config.glade.h:81
-#, fuzzy
 msgid "Using email address"
-msgstr "E-postadresse:"
+msgstr "Brukar e-post adresse"
 
 #: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:63
 #: mail/mail-config.glade.h:128
 msgid "Whenever Possible"
-msgstr ""
+msgstr "Når det er mogleg"
 
 #: addressbook/gui/component/ldap-config.glade.h:83
-#, fuzzy
 msgid "_Display name:"
-msgstr "_Vis"
+msgstr "_Vist namn:"
 
 #: addressbook/gui/component/ldap-config.glade.h:84
 msgid "_Download limit:"
-msgstr ""
+msgstr "Grense for ne_dlasting:"
 
 #: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
 #: mail/mail-config.glade.h:143 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:31 ui/evolution-composer-entries.xml.h:8
+#: ui/evolution-calendar.xml.h:33 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
 #: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:17
+#: ui/evolution-tasks.xml.h:19
 msgid "_Edit"
 msgstr "R_edigér"
 
 #: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Log in method:"
-msgstr ""
+msgstr "Metode for å logga inn:"
 
 #: addressbook/gui/component/ldap-config.glade.h:87
-#, fuzzy
 msgid "_Port number:"
-msgstr "_Port:"
+msgstr "_Portnummer:"
 
 #: addressbook/gui/component/ldap-config.glade.h:88
-#, fuzzy
 msgid "_Search base:"
-msgstr "Søke_base:"
+msgstr "_Søkebase:"
 
 #: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Server name:"
 msgstr "_Tenarnamn:"
 
 #: addressbook/gui/component/ldap-config.glade.h:90
-#, fuzzy
 msgid "_Timeout (minutes):"
-msgstr "Låg grense (minutt):"
+msgstr "_Tid før avbrot (minutt):"
 
 #: addressbook/gui/component/ldap-config.glade.h:91
-#, fuzzy
 msgid "cards"
-msgstr "Ingen kort"
+msgstr "kort"
 
 #: addressbook/gui/component/ldap-config.glade.h:92
-#, fuzzy
 msgid "connecting-tab"
-msgstr "Koplar til %s på nytt"
+msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:93
-#, fuzzy
 msgid "general-tab"
-msgstr "Allment"
+msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:94
-#, fuzzy
 msgid "searching-tab"
-msgstr "Søker"
+msgstr ""
 
 #: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-#, fuzzy
 msgid "Evolution Addressbook name selection interface"
-msgstr "Gpilotd adressekomponent"
+msgstr "Grensesnitt for val av namn i Evolution adressebok"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:204
 msgid "Remove All"
@@ -1251,24 +1289,22 @@ msgstr "Fjern alle"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:211
 #: addressbook/gui/component/select-names/e-select-names.c:694
-#: composer/e-msg-composer-attachment-bar.c:507
+#: composer/e-msg-composer-attachment-bar.c:430
 msgid "Remove"
 msgstr "Fjern"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:218
-#, fuzzy
 msgid "View Contact List"
-msgstr "Ny kontaktliste"
+msgstr "Vis kontaktliste"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:218
-#, fuzzy
 msgid "View Contact Info"
-msgstr "Rediger kontaktinformasjon"
+msgstr "Vis kontaktinformasjon"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:225
 #: addressbook/gui/component/select-names/e-select-names-popup.c:332
 msgid "Send HTML Mail?"
-msgstr "Sende HTML e-post?"
+msgstr "Send e-post i HTML-format?"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:350
 msgid "Unnamed Contact"
@@ -1281,36 +1317,35 @@ msgstr "Kjelde"
 
 #: addressbook/gui/component/select-names/e-select-names.c:509
 msgid "Select Contacts from Addressbook"
-msgstr ""
+msgstr "Vel kontaktar frå adresseboka"
 
 #: addressbook/gui/component/select-names/e-select-names.c:650
-#, fuzzy
 msgid "Find contact in"
-msgstr "Avsendar inneheld"
+msgstr "Finn kontakt i"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-#, fuzzy
 msgid "Find"
-msgstr "Finn:"
+msgstr "Finn"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
 msgid "Select Names"
 msgstr "Vel namn"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
-#, fuzzy
 msgid "Selected Contacts:"
-msgstr "Slett kontakt?"
+msgstr "Valde kontaktar:"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:5
 msgid "Show Contacts"
-msgstr "Vis kontakter"
+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 ""
+"Skriv eit namn i feltet,\n"
+"eller vel eit frå lista under"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "_Category:"
@@ -1326,9 +1361,8 @@ msgid " B_usiness:"
 msgstr "Firma"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:3
-#, fuzzy
 msgid "A_ddress..."
-msgstr "Ad_resse ..."
+msgstr "A_dresse ..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:4
 msgid "A_ssistant's name:"
@@ -1362,7 +1396,7 @@ msgid "D_epartment:"
 msgstr "Avd_eling:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: calendar/gui/dialogs/task-editor.c:197
+#: calendar/gui/dialogs/task-editor.c:199
 msgid "Details"
 msgstr "Detaljar"
 
@@ -1371,9 +1405,8 @@ msgid "F_ree/Busy URL:"
 msgstr "_Ledig/Oppteken URL:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#, fuzzy
 msgid "File a_s:"
-msgstr "Arkiver _som:"
+msgstr "Lagra _som:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Full _Name..."
@@ -1385,6 +1418,9 @@ msgid ""
 "Internet, enter the address\n"
 "of that information here."
 msgstr ""
+"Dersom denne personen offentleggjer ledig/opptatt-informasjon eller annan "
+"kalenderinformasjon på internett, skriv inn adresa til denne informasjonen "
+"her."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "New phone type"
@@ -1403,13 +1439,12 @@ msgid "P_rofession:"
 msgstr "Y_rke:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:22
-#, fuzzy
 msgid "Primary _email:"
-msgstr "Primær e-post"
+msgstr "Primær _e-post:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "S_pouse:"
-msgstr "E_ktefelle"
+msgstr "E_ktefelle:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "Wants to receive _HTML mail"
@@ -1425,37 +1460,35 @@ msgid "_Business:"
 msgstr "Firma"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:27
-#, fuzzy
 msgid "_Categories..."
-msgstr "Ka_tegoriar ..."
+msgstr "_Kategoriar ..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/dialogs/meeting-page.c:717 calendar/gui/e-calendar-table.c:977
-#: calendar/gui/e-day-view.c:3755 calendar/gui/e-week-view.c:3631
-#: mail/folder-browser.c:1790 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:30 ui/evolution-mail-message.xml.h:97
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
+#: calendar/gui/dialogs/meeting-page.c:717
+#: calendar/gui/e-calendar-table.c:1008 calendar/gui/e-calendar-table.c:1026
+#: mail/folder-browser.c:1829 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:32 ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-mail-message.xml.h:99 ui/evolution-tasks.xml.h:18
+#: ui/evolution.xml.h:45 calendar/gui/e-cal-view.c:1144
+#: calendar/gui/e-cal-view.c:1176
 msgid "_Delete"
 msgstr "_Slett"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-#, fuzzy
 msgid "_Home:"
-msgstr "_Heim"
+msgstr "_Heime:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Job title:"
 msgstr "_Jobb-tittel:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
-#, fuzzy
 msgid "_Manager's name:"
-msgstr "Na_mn på sjef:"
+msgstr "Na_mn på leiar:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:32
-#, fuzzy
 msgid "_Mobile:"
-msgstr "_Mobil"
+msgstr "_Mobil:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Nickname:"
@@ -1470,9 +1503,8 @@ msgid "_Public Calendar URL:"
 msgstr "_Offentleg kalendar-URL:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:36
-#, fuzzy
 msgid "_This is the mailing address"
-msgstr "E-postadresse:"
+msgstr "De_tte er postadressa"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Web page address:"
@@ -1483,14 +1515,13 @@ msgstr "_Nettsideaddresse"
 #: addressbook/gui/contact-editor/e-contact-editor.c:184
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: addressbook/gui/widgets/e-addressbook-model.c:318
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:393
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:408
 #: addressbook/gui/widgets/e-minicard-label.c:164
 #: addressbook/gui/widgets/e-minicard-view-widget.c:120
 #: addressbook/gui/widgets/e-minicard-view.c:478
 #: addressbook/gui/widgets/e-minicard.c:183
-#, fuzzy
 msgid "Editable"
-msgstr "Skru på"
+msgstr "Kan redigerast"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:135
 #: my-evolution/Locations.h:2340
@@ -2092,9 +2123,8 @@ msgid "Micronesia"
 msgstr "Mikronesia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:272
-#, fuzzy
 msgid "Moldova, Republic Of"
-msgstr "Korea, Republic of"
+msgstr "Moldova"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Monaco"
@@ -2391,7 +2421,6 @@ msgid "Tajikistan"
 msgstr "Tajikistan"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:340
-#, fuzzy
 msgid "Tanzania, United Republic Of"
 msgstr "Tanzania"
 
@@ -2482,14 +2511,12 @@ msgid "Viet Nam"
 msgstr "Vietnam"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:361
-#, fuzzy
 msgid "Virgin Islands, British"
-msgstr "U.S. Virgin Islands"
+msgstr "Jomfruøyane (Storbritannia)"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:362
-#, fuzzy
 msgid "Virgin Islands, U.S."
-msgstr "U.S. Virgin Islands"
+msgstr "Jomfruøyane (USA)"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Wallis And Futuna Islands"
@@ -2520,35 +2547,31 @@ msgstr "Zimbabwe"
 #: addressbook/gui/contact-editor/e-contact-editor.c:156
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:142
 #: addressbook/gui/widgets/e-addressbook-model.c:304
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:379
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:394
 #: addressbook/gui/widgets/e-addressbook-view.c:180
 #: addressbook/gui/widgets/e-minicard-view-widget.c:106
 #: addressbook/gui/widgets/e-minicard-view.c:464
-#, fuzzy
 msgid "Book"
-msgstr "Bodø"
+msgstr "Bok"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:163
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
 #: addressbook/gui/widgets/e-minicard-widget.c:93
 #: addressbook/gui/widgets/e-minicard.c:190
-#, fuzzy
 msgid "Card"
-msgstr "Bil"
+msgstr "Kort"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:170
 msgid "Is New Card"
-msgstr ""
+msgstr "Er nytt kort"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:177
-#, fuzzy
 msgid "Writable Fields"
-msgstr "Merril Field"
+msgstr "Skrivbare felt"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:191
-#, fuzzy
 msgid "Changed"
-msgstr "Tjad"
+msgstr "Endra"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:827
 msgid "Category editor not available."
@@ -2556,20 +2579,19 @@ msgstr "Kategoriredigering ikkje tilgjengeleg."
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:835
 msgid "This contact belongs to these categories:"
-msgstr ""
+msgstr "Denne kontakten høyrer til desse kategoriane:"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:1009
 msgid "Save Contact as VCard"
 msgstr "Lagre kontakt som VKort"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:1055
-#, fuzzy
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
 msgstr ""
 "Er du sikker på at du vil\n"
-" slette denne kontakta?"
+"sletta desse kontaktane?"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:1058
 msgid ""
@@ -2586,35 +2608,28 @@ msgstr "TTY/TDD"
 #: addressbook/gui/contact-editor/e-contact-editor.c:2376
 #, c-format
 msgid "Could not find widget for a field: `%s'"
-msgstr ""
+msgstr "Kunne ikkje finna skjermelement for felt: «%s»"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:298
 msgid "Contact Quick-Add"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
-#, fuzzy
 msgid "_Edit Full"
-msgstr "Rediger full"
+msgstr "R_ediger alt"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:319
-#, fuzzy
 msgid "_Full Name:"
 msgstr "_Fullt namn:"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:325
-#, fuzzy
 msgid "E-_mail:"
-msgstr ""
-"\n"
-"E-post:"
+msgstr "E-post:"
 
 #: addressbook/gui/contact-editor/e-contact-save-as.c:66
-#, fuzzy, c-format
+#, c-format
 msgid "Error saving %s: %s"
-msgstr ""
-"Feil ved lesing a fil:\n"
-"%1"
+msgstr "Feil ved lagring av %s: %s"
 
 #. This is a filename. Translators take note.
 #: addressbook/gui/contact-editor/e-contact-save-as.c:103
@@ -2635,9 +2650,8 @@ msgstr ""
 "Vil du skrive over?"
 
 #: addressbook/gui/contact-editor/e-contact-save-as.c:212
-#, fuzzy
 msgid "Overwrite"
-msgstr "Skriv over fil?"
+msgstr "Skriv over"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
@@ -2653,9 +2667,8 @@ msgid "Countr_y:"
 msgstr "_Land:"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:5
-#, fuzzy
 msgid "Full Address"
-msgstr "_Adresse:"
+msgstr "Full adresse"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_Address:"
@@ -2679,7 +2692,7 @@ msgstr "Dr."
 
 #: addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Esq."
-msgstr ""
+msgstr "Esq."
 
 #: addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "I"
@@ -2743,39 +2756,37 @@ msgstr "Medlemar"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
 msgid "_Hide addresses when sending mail to this list"
-msgstr ""
+msgstr "_Gøym adresser når du sender e-post til denne lista"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#, fuzzy
 msgid "_List name:"
-msgstr "Liste_namn:"
+msgstr "_Listenamn:"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "_Type an email address or drag a contact into the list below:"
-msgstr ""
+msgstr "_Skriv ei e-post-adresse eller dra ein kontakt til lista under:"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "contact-list-editor"
 msgstr "contact-list-editor"
 
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:156
-#, fuzzy
 msgid "Is New List"
-msgstr "Ny liste"
+msgstr "Er ny liste"
 
 #. Construct the app
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:242
 msgid "Contact List Editor"
 msgstr "Redigering av kontakter"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:456
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:457
 msgid "Save List as VCard"
 msgstr "Lagre liste som VCard"
 
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #, fuzzy
 msgid "Contact"
-msgstr "Kontakter"
+msgstr ""
 
 #: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
@@ -2795,25 +2806,28 @@ msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder.  Would you like to add it anyway?"
 msgstr ""
+"Namnet eller e-post-adressa til denne kontakten finst\n"
+"alt i denne mappa. Vil du leggja han til likevel?"
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
-#, fuzzy
 msgid "Changed Contact:"
-msgstr "Endra skrift"
+msgstr "Endra kontakt:"
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
-#, fuzzy
 msgid "Conflicting Contact:"
-msgstr "Koplar til: "
+msgstr "Kontakt i konflikt:"
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
 msgid ""
 "The changed email or name of this contact already\n"
 "exists in this folder.  Would you like to add it anyway?"
 msgstr ""
+"Den nye e-post-adressa eller det nye namnet til denne\n"
+"kontakten finst allereie i denne mappa. Vil du leggja "
+"han til likevel?"
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:117
+#: addressbook/gui/search/e-addressbook-search-dialog.c:116
 #: widgets/misc/e-filter-bar.c:148
 msgid "Advanced Search"
 msgstr "Avansert søk"
@@ -2832,266 +2846,263 @@ msgid "%d cards"
 msgstr "%d kort"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:311
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:386
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:401
 #: addressbook/gui/widgets/e-addressbook-view.c:187
 #: addressbook/gui/widgets/e-minicard-view-widget.c:113
 #: addressbook/gui/widgets/e-minicard-view.c:471
-#, fuzzy
 msgid "Query"
-msgstr "Quimper"
+msgstr "Spør"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:457
-#, fuzzy
 msgid "Error getting book view"
-msgstr ""
-"Feil ved nedlasting av fil:\n"
-"%1"
+msgstr "Feil ved henting av bokvising"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:400
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:415
 #, fuzzy
 msgid "Model"
 msgstr "Molde"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:145
-#: addressbook/gui/widgets/e-addressbook-util.c:105
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:148
+#: addressbook/gui/widgets/e-addressbook-util.c:106
 #: addressbook/gui/widgets/e-minicard.c:531
 msgid "Error modifying card"
 msgstr "Feil ved endringa av kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
-#: shell/evolution-shell-component.c:1180
+#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: shell/evolution-shell-component.c:1183
 msgid "Success"
 msgstr "Vellukka"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:526
 #: camel/providers/pop3/camel-pop3-store.c:533 shell/e-shell.c:2077
-#: shell/e-storage.c:598 shell/evolution-shell-component.c:1219
+#: shell/e-storage.c:598 shell/evolution-shell-component.c:1222
+#: camel/providers/imapp/camel-imapp-store.c:468
 msgid "Unknown error"
 msgstr "Ukjend feil"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:39
 #, fuzzy
 msgid "Repository offline"
 msgstr "depot i vcs"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39 shell/e-storage.c:584
-#: shell/evolution-shell-component.c:1210
+#: addressbook/gui/widgets/e-addressbook-util.c:40 shell/e-storage.c:584
+#: shell/evolution-shell-component.c:1213
 msgid "Permission denied"
 msgstr "Nekta tilgang"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Card not found"
 msgstr "Fann ikkje kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 msgid "Card ID already exists"
 msgstr "Kort-id eksisterar allereide"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: addressbook/gui/widgets/e-addressbook-util.c:43
 msgid "Protocol not supported"
 msgstr "Protokollen er ikkje støtta"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:43
-#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1184
+#: addressbook/gui/widgets/e-addressbook-util.c:44
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:477 calendar/gui/print.c:2307
-#: camel/camel-service.c:745 camel/camel-service.c:785
-#: camel/camel-service.c:875 camel/camel-service.c:917
-#: camel/providers/pop3/camel-pop3-store.c:443
+#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-tasks.c:253
+#: calendar/gui/print.c:2314 camel/camel-service.c:733
+#: camel/camel-service.c:771 camel/camel-service.c:855
+#: camel/camel-service.c:895 camel/providers/pop3/camel-pop3-store.c:443
 #: camel/providers/pop3/camel-pop3-store.c:520
+#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:604
 msgid "Cancelled"
 msgstr "Avbroten"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:44
+#: addressbook/gui/widgets/e-addressbook-util.c:45
 msgid "Authentication Failed"
 msgstr "Autentisering feila"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:45
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "Authentication Required"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:46
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "TLS not Available"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:47
+#: addressbook/gui/widgets/e-addressbook-util.c:48
 msgid "Addressbook does not exist"
 msgstr "Adresseboka finst ikkje"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:48
+#: addressbook/gui/widgets/e-addressbook-util.c:49
 msgid "Other error"
 msgstr "Anna feil"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:75
+#: addressbook/gui/widgets/e-addressbook-util.c:76
 msgid "Do you want to save changes?"
 msgstr "Vil du lagre endringar?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:77
+#: addressbook/gui/widgets/e-addressbook-util.c:78
 #, fuzzy
 msgid "_Discard"
 msgstr "Dinard"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:96
+#: addressbook/gui/widgets/e-addressbook-util.c:97
 msgid "Error adding list"
 msgstr "Feil ved tillegging av liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:96
-#: addressbook/gui/widgets/e-addressbook-util.c:272
+#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:273
 msgid "Error adding card"
 msgstr "Feil ved tilleggjing av kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:105
+#: addressbook/gui/widgets/e-addressbook-util.c:106
 msgid "Error modifying list"
 msgstr "Feil ved endring av liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:115
+#: addressbook/gui/widgets/e-addressbook-util.c:116
 msgid "Error removing list"
 msgstr "Feil ved fjerning av liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:115
-#: addressbook/gui/widgets/e-addressbook-util.c:230
+#: addressbook/gui/widgets/e-addressbook-util.c:116
+#: addressbook/gui/widgets/e-addressbook-util.c:231
 msgid "Error removing card"
 msgstr "Feil ved fjerning av kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:197
+#: addressbook/gui/widgets/e-addressbook-util.c:198
 #, c-format
 msgid ""
 "Opening %d cards will open %d new windows as well.\n"
 "Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:328
+#: addressbook/gui/widgets/e-addressbook-util.c:329
 msgid "Move card to"
 msgstr "Flytt kort til"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:330
+#: addressbook/gui/widgets/e-addressbook-util.c:331
 msgid "Copy card to"
 msgstr "Kopiér kort til"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:333
+#: addressbook/gui/widgets/e-addressbook-util.c:334
 msgid "Move cards to"
 msgstr "Flytt kort til"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:335
+#: addressbook/gui/widgets/e-addressbook-util.c:336
 msgid "Copy cards to"
 msgstr "Kopiér kort til"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:517
+#: addressbook/gui/widgets/e-addressbook-util.c:518
 msgid "Multiple VCards"
 msgstr "Fleire VKort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:525
+#: addressbook/gui/widgets/e-addressbook-util.c:526
 #, c-format
 msgid "VCard for %s"
 msgstr "VKort for %s"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:194
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-calendar-table.etspec.h:17
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Type"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:394
+#: addressbook/gui/widgets/e-addressbook-view.c:398
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 #: mail/importers/pine-importer.c:577
 msgid "Addressbook"
 msgstr "Adressebok"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:676
-#: addressbook/gui/widgets/e-addressbook-view.c:895
-#: addressbook/gui/widgets/e-addressbook-view.c:1879
+#: addressbook/gui/widgets/e-addressbook-view.c:680
+#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/gui/widgets/e-addressbook-view.c:1883
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Lagre som VKort"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "New Contact..."
 msgstr "Ny kontakt ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 msgid "New Contact List..."
 msgstr "Ny kontaktliste ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:886
+#: addressbook/gui/widgets/e-addressbook-view.c:890
 msgid "Go to Folder..."
 msgstr "Gå til mappe ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:887
+#: addressbook/gui/widgets/e-addressbook-view.c:891
 msgid "Import..."
 msgstr "Importér ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 msgid "Search for Contacts..."
 msgstr "Søk etter kontakter ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:894
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "Kjelde:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:892
+#: addressbook/gui/widgets/e-addressbook-view.c:896
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "_Pilot-innstillingar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:896
+#: addressbook/gui/widgets/e-addressbook-view.c:900
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Vidaresend kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/gui/widgets/e-addressbook-view.c:901
 msgid "Send Message to Contact"
 msgstr "Send melding til kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:898 calendar/gui/print.c:2439
+#: addressbook/gui/widgets/e-addressbook-view.c:902 calendar/gui/print.c:2446
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:68
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Skriv ut"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:900
+#: addressbook/gui/widgets/e-addressbook-view.c:904
 msgid "Print Envelope"
 msgstr "Skriv ut konvolutt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: addressbook/gui/widgets/e-addressbook-view.c:908
 #, fuzzy
 msgid "Copy to folder..."
 msgstr "_Kopier til mappe ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/gui/widgets/e-addressbook-view.c:909
 msgid "Move to folder..."
 msgstr "Flytt til mappe ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:912
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Klipp ut"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:909
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
+#: addressbook/gui/widgets/e-addressbook-view.c:913
+#: 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:910
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
+#: addressbook/gui/widgets/e-addressbook-view.c:914
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
 msgid "Paste"
 msgstr "Lim inn"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:911 filter/libfilter-i18n.h:11
+#: addressbook/gui/widgets/e-addressbook-view.c:915 filter/libfilter-i18n.h:11
 #: mail/mail-accounts.c:234 ui/evolution-addressbook.xml.h:8
 #: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
-#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
+#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:21
 msgid "Delete"
 msgstr "Slett"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:915
-#: calendar/gui/e-day-view.c:3715 calendar/gui/e-week-view.c:3596
+#: addressbook/gui/widgets/e-addressbook-view.c:919
+#: calendar/gui/e-cal-view.c:1109
 #, fuzzy
 msgid "Current View"
 msgstr "_Aktiv visning"
@@ -3100,7 +3111,7 @@ msgstr "_Aktiv visning"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:949
+#: addressbook/gui/widgets/e-addressbook-view.c:953
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,æ,ø,å"
 
@@ -3108,11 +3119,11 @@ msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,æ,ø,å"
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:954
+#: addressbook/gui/widgets/e-addressbook-view.c:958
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,æ,ø,å"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1352
+#: addressbook/gui/widgets/e-addressbook-view.c:1356
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3279,12 +3290,12 @@ msgstr "Vekesvisning"
 msgid "Print envelope"
 msgstr "Skriv ut konvolutt"
 
-#: addressbook/printing/e-contact-print.c:1139
+#: addressbook/printing/e-contact-print.c:1158
 msgid "Print cards"
 msgstr "Skriv ut kort"
 
-#: addressbook/printing/e-contact-print.c:1204
-#: addressbook/printing/e-contact-print.c:1226
+#: addressbook/printing/e-contact-print.c:1224
+#: addressbook/printing/e-contact-print.c:1250
 msgid "Print card"
 msgstr "Skriv ut kort"
 
@@ -3586,28 +3597,30 @@ msgid "31st"
 msgstr "31."
 
 #: calendar/cal-util/cal-util.c:550 calendar/cal-util/cal-util.c:572
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:401 mail/message-list.c:753
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:271
+#: mail/message-list.c:753
 msgid "High"
 msgstr "Høg"
 
 #: calendar/cal-util/cal-util.c:552 calendar/cal-util/cal-util.c:574
-#: calendar/gui/calendar-model.c:1709
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:402 mail/message-list.c:752
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-tasks.c:273
+#: mail/message-list.c:752 calendar/gui/e-cal-model.c:795
 msgid "Normal"
 msgstr "Vanleg"
 
 #: calendar/cal-util/cal-util.c:554 calendar/cal-util/cal-util.c:576
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:403 mail/message-list.c:751
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:275
+#: mail/message-list.c:751
 msgid "Low"
 msgstr "Lav"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:570
-#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:404
+#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:406
 msgid "Undefined"
 msgstr "Udefinert"
 
@@ -3615,13 +3628,13 @@ msgstr "Udefinert"
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1289
-#: calendar/conduits/todo/todo-conduit.c:830
+#: calendar/conduits/calendar/calendar-conduit.c:1297
+#: calendar/conduits/todo/todo-conduit.c:838
 msgid "Error while communicating with calendar server"
 msgstr "Feil ved kommunikasjon mot kalendartenaren"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1440
-#: calendar/conduits/calendar/calendar-conduit.c:1443
+#: calendar/conduits/calendar/calendar-conduit.c:1456
+#: calendar/conduits/calendar/calendar-conduit.c:1459
 #, fuzzy
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
@@ -3631,8 +3644,8 @@ msgstr "Kunne ikkje lasta kalender '%1'.\n"
 msgid "Default Priority:"
 msgstr "_Prioritet:"
 
-#: calendar/conduits/todo/todo-conduit.c:954
-#: calendar/conduits/todo/todo-conduit.c:957
+#: calendar/conduits/todo/todo-conduit.c:970
+#: calendar/conduits/todo/todo-conduit.c:973
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
@@ -3685,24 +3698,20 @@ msgstr "Evolution"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Tilgjengelege lenkjer:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 msgid "Starting:"
 msgstr "Startar:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
 msgid "Ending:"
 msgstr "Slutt:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:227
-msgid "invalid time"
-msgstr "ugyldig tid"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:272
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
 #, fuzzy
 msgid "Evolution Alarm"
 msgstr "Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:365
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
 #, c-format
 msgid "Alarm on %s"
 msgstr "Alarm på %s"
@@ -3726,16 +3735,25 @@ msgstr "Låg grense (minutt):"
 msgid "_Edit appointment"
 msgstr "R_edigér avtale"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:770
+#: calendar/gui/alarm-notify/alarm-queue.c:874
 msgid "No description available."
 msgstr "Inga skildring tilgjengeleg"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:843
-#: calendar/gui/alarm-notify/alarm-queue.c:867 widgets/misc/e-messagebox.c:161
+#: calendar/gui/alarm-notify/alarm-queue.c:892
+#, c-format
+msgid ""
+"Alarm on %s\n"
+"%s\n"
+"Starting at %s\n"
+"Ending at %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:979
+#: calendar/gui/alarm-notify/alarm-queue.c:1003
 msgid "Warning"
 msgstr "Åtvaring"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:847
+#: calendar/gui/alarm-notify/alarm-queue.c:983
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3743,7 +3761,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: calendar/gui/alarm-notify/alarm-queue.c:1009
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3754,16 +3772,16 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:887
+#: calendar/gui/alarm-notify/alarm-queue.c:1023
 #, fuzzy
 msgid "Do not ask me about this program again."
 msgstr "Ikkje spør igjen"
 
-#: calendar/gui/alarm-notify/notify-main.c:174
+#: calendar/gui/alarm-notify/notify-main.c:176
 msgid "Could not initialize gnome-vfs"
 msgstr "Klarte ikkje å initialisere gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:183
+#: calendar/gui/alarm-notify/notify-main.c:185
 #, fuzzy
 msgid "Could not create the alarm notify service factory"
 msgstr ""
@@ -3783,46 +3801,62 @@ msgstr "Skildring inneheld"
 msgid "Comment contains"
 msgstr "Merknad inneheld"
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1106
+#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1130
 msgid "Unmatched"
 msgstr "Ikkje truffe"
 
-#: calendar/gui/calendar-commands.c:419
+#: calendar/gui/calendar-commands.c:366
+msgid ""
+"This operation will permanently erase all events older than the selected "
+"amount of time. If you continue, you will not be able to recover these "
+"events."
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:372
+#, fuzzy
+msgid "Purge events older than"
+msgstr "er mindre enn"
+
+#: calendar/gui/calendar-commands.c:377
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
+msgid "days"
+msgstr "dagar"
+
+#: calendar/gui/calendar-commands.c:475
 #, fuzzy
 msgid "%A %d %B %Y"
 msgstr "%1 bit %2 %3"
 
 #. 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:422 calendar/gui/e-day-view-top-item.c:265
-#: calendar/gui/e-day-view.c:1438 calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/calendar-commands.c:478 calendar/gui/e-day-view-top-item.c:266
+#: calendar/gui/e-day-view.c:1364 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%d. %a %b"
 
-#: calendar/gui/calendar-commands.c:424 calendar/gui/calendar-commands.c:429
-#: calendar/gui/calendar-commands.c:431
+#: calendar/gui/calendar-commands.c:480 calendar/gui/calendar-commands.c:485
+#: calendar/gui/calendar-commands.c:487
 msgid "%a %d %b %Y"
 msgstr "%d. %a %b %Y"
 
-#: calendar/gui/calendar-commands.c:442 calendar/gui/calendar-commands.c:449
-#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:457
+#: calendar/gui/calendar-commands.c:498 calendar/gui/calendar-commands.c:505
+#: calendar/gui/calendar-commands.c:511 calendar/gui/calendar-commands.c:513
 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:447
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1509
+#: calendar/gui/calendar-commands.c:503
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1508
 msgid "%d %B"
 msgstr "%d. %b"
 
-#: calendar/gui/calendar-commands.c:849
-msgid ""
-"Could not create the calendar view.  Please check your ORBit and OAF setup."
+#: calendar/gui/calendar-commands.c:901
+msgid "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1353
+#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1527
 #: importers/netscape-importer.c:1873 mail/importers/netscape-importer.c:1843
 #: my-evolution/my-evolution.glade.h:2 shell/e-local-storage.c:177
 #: shell/e-shortcuts.c:1085
@@ -3843,11 +3877,11 @@ msgstr "_Offentleg kalendar-URL:"
 msgid "Public folder containing appointments and events"
 msgstr "Mappe inneheld avtaler og hendingar"
 
-#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:738
-#: calendar/gui/print.c:1789 calendar/gui/tasks-control.c:504
+#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:1080
+#: calendar/gui/print.c:1787 calendar/gui/tasks-control.c:487
 #: calendar/importers/icalendar-importer.c:644
 #: importers/netscape-importer.c:1875 mail/importers/netscape-importer.c:1845
-#: my-evolution/e-summary-tasks.c:329 my-evolution/e-summary-tasks.c:338
+#: my-evolution/e-summary-tasks.c:348 my-evolution/e-summary-tasks.c:357
 #: shell/e-local-storage.c:183 shell/e-shortcuts.c:1086
 msgid "Tasks"
 msgstr "Oppgåver"
@@ -3923,104 +3957,6 @@ msgstr "Ny _avtale"
 msgid "Create a new all-day appointment"
 msgstr "Lag ein ny avtale"
 
-#: calendar/gui/calendar-model.c:405 calendar/gui/calendar-model.c:964
-#: calendar/gui/e-calendar-table.c:380
-msgid "Private"
-msgstr "Privat"
-
-#: calendar/gui/calendar-model.c:408 calendar/gui/calendar-model.c:966
-#: calendar/gui/e-calendar-table.c:381
-msgid "Confidential"
-msgstr "Konfidensiell"
-
-#: calendar/gui/calendar-model.c:411 calendar/gui/e-calendar-table.c:379
-msgid "Public"
-msgstr "Offentleg"
-
-#: calendar/gui/calendar-model.c:523
-msgid "N"
-msgstr "N"
-
-#: calendar/gui/calendar-model.c:523
-msgid "S"
-msgstr "S"
-
-#: calendar/gui/calendar-model.c:525
-msgid "E"
-msgstr "E"
-
-#: calendar/gui/calendar-model.c:525
-msgid "W"
-msgstr "V"
-
-#: calendar/gui/calendar-model.c:590 calendar/gui/calendar-model.c:1134
-#: calendar/gui/e-calendar-table.c:453
-msgid "Free"
-msgstr "Ledig"
-
-#: calendar/gui/calendar-model.c:592 calendar/gui/e-calendar-table.c:454
-#: calendar/gui/e-meeting-time-sel.c:406
-#: shell/evolution-shell-component.c:1204
-msgid "Busy"
-msgstr "Oppteke"
-
-#: calendar/gui/calendar-model.c:750 calendar/gui/calendar-model.c:1178
-#: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:474 calendar/gui/print.c:2298
-msgid "Not Started"
-msgstr "Ikkje starta"
-
-#: calendar/gui/calendar-model.c:753 calendar/gui/calendar-model.c:1180
-#: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:475 calendar/gui/print.c:2301
-msgid "In Progress"
-msgstr "Under arbeid"
-
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1182
-#: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-meeting-model.c:294
-#: calendar/gui/e-meeting-model.c:317 calendar/gui/print.c:2304
-msgid "Completed"
-msgstr "Ferdig"
-
-#: calendar/gui/calendar-model.c:1036
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-
-#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1176 calendar/gui/dialogs/meeting-page.c:330
-#: calendar/gui/dialogs/meeting-page.glade.h:2 composer/e-msg-composer.c:2056
-#: mail/folder-browser.c:1752 mail/mail-account-gui.c:1260
-#: mail/mail-account-gui.c:1692 mail/mail-accounts.c:442
-#: mail/mail-config.glade.h:76
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
-#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:442
-#: widgets/misc/e-dateedit.c:1458 widgets/misc/e-dateedit.c:1573
-msgid "None"
-msgstr "Ingen"
-
-#: calendar/gui/calendar-model.c:1711
-msgid "Recurring"
-msgstr "Repeterande"
-
-#: calendar/gui/calendar-model.c:1713
-msgid "Assigned"
-msgstr "Tildelt"
-
-#: calendar/gui/calendar-model.c:1719 calendar/gui/e-meeting-model.c:266
-#: calendar/gui/e-meeting-model.c:276 calendar/gui/e-meeting-model.c:534
-#: calendar/gui/e-meeting-model.c:784
-msgid "Yes"
-msgstr "Ja"
-
-#: calendar/gui/calendar-model.c:1719 calendar/gui/e-meeting-model.c:278
-#: calendar/gui/e-meeting-model.c:785
-msgid "No"
-msgstr "Nei"
-
 #: calendar/gui/calendar-view-factory.c:118
 msgid "Day View"
 msgstr "Dagsvisning"
@@ -4037,21 +3973,21 @@ msgstr "Vekesvisning"
 msgid "Month View"
 msgstr "Månadsvising"
 
-#: calendar/gui/comp-editor-factory.c:456
+#: calendar/gui/comp-editor-factory.c:462
 #, fuzzy
 msgid "Error while opening the calendar"
 msgstr "Feil ved kommunikasjon mot kalendartenaren"
 
-#: calendar/gui/comp-editor-factory.c:467
+#: calendar/gui/comp-editor-factory.c:473
 msgid "Method not supported when opening the calendar"
 msgstr ""
 
-#: calendar/gui/comp-editor-factory.c:473
+#: calendar/gui/comp-editor-factory.c:479
 #, fuzzy
 msgid "Permission denied to open the calendar"
 msgstr "Nekta tilgang"
 
-#: calendar/gui/control-factory.c:119
+#: calendar/gui/control-factory.c:122
 #, fuzzy, c-format
 msgid "Could not open the folder in '%s'"
 msgstr ""
@@ -4059,35 +3995,35 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: calendar/gui/control-factory.c:165
+#: calendar/gui/control-factory.c:168
 #, fuzzy
 msgid "The URI that the calendar will display"
 msgstr "Viser korleis datoverdiar vert viste."
 
-#: calendar/gui/control-factory.c:172
+#: calendar/gui/control-factory.c:175
 #, fuzzy
 msgid "The type of view to show"
 msgstr "Endra namnet på denne mappa"
 
-#: calendar/gui/dialogs/alarm-options.c:420
+#: calendar/gui/dialogs/alarm-options.c:466
 msgid "Audio Alarm Options"
 msgstr "Val for lydlarm"
 
-#: calendar/gui/dialogs/alarm-options.c:429
+#: calendar/gui/dialogs/alarm-options.c:475
 msgid "Message Alarm Options"
 msgstr "Eigenskapar meldingsalarm"
 
-#: calendar/gui/dialogs/alarm-options.c:438
+#: calendar/gui/dialogs/alarm-options.c:484
 #, fuzzy
 msgid "Email Alarm Options"
 msgstr "Eigenskapar for e-postalam"
 
-#: calendar/gui/dialogs/alarm-options.c:447
+#: calendar/gui/dialogs/alarm-options.c:493
 #, fuzzy
 msgid "Program Alarm Options"
 msgstr "Programplasseringar"
 
-#: calendar/gui/dialogs/alarm-options.c:456
+#: calendar/gui/dialogs/alarm-options.c:509
 #, fuzzy
 msgid "Unknown Alarm Options"
 msgstr "Kjende program"
@@ -4127,10 +4063,6 @@ msgstr "Send"
 msgid "With these arguments:"
 msgstr "Med desse argumenta:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
-msgid "days"
-msgstr "dagar"
-
 #: calendar/gui/dialogs/alarm-options.glade.h:11
 msgid "dialog1"
 msgstr ""
@@ -4158,11 +4090,11 @@ msgstr "Enkel"
 msgid "Date/Time:"
 msgstr "Dato/tid:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:461
+#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:465
 msgid "Display a message"
 msgstr "Vis ei melding"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:457
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:461
 msgid "Play a sound"
 msgstr "Spel ein lyd"
 
@@ -4170,7 +4102,7 @@ msgstr "Spel ein lyd"
 msgid "Reminders"
 msgstr "Påminning"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:469
+#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:473
 msgid "Run a program"
 msgstr "Køyr eit program"
 
@@ -4181,7 +4113,8 @@ 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:1052 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-tasks.c:208
 msgid "Summary:"
 msgstr "Samandrag:"
 
@@ -4266,7 +4199,7 @@ msgstr "Dagar"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1040
-#: calendar/gui/e-itip-control.c:677
+#: calendar/gui/e-itip-control.c:647
 msgid "Friday"
 msgstr "Fredag"
 
@@ -4280,7 +4213,7 @@ msgstr "Minutt"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1036
-#: calendar/gui/e-itip-control.c:673
+#: calendar/gui/e-itip-control.c:643
 msgid "Monday"
 msgstr "Måndag"
 
@@ -4291,7 +4224,7 @@ msgstr "Su_n"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1041
-#: calendar/gui/e-itip-control.c:678
+#: calendar/gui/e-itip-control.c:648
 msgid "Saturday"
 msgstr "Laurdag"
 
@@ -4305,7 +4238,7 @@ msgstr "Vis veke_nummer i datonavigatøren"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1042
-#: calendar/gui/e-itip-control.c:672
+#: calendar/gui/e-itip-control.c:642
 msgid "Sunday"
 msgstr "Søndag"
 
@@ -4325,7 +4258,7 @@ msgstr "_Oppgåveliste"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1039
-#: calendar/gui/e-itip-control.c:676
+#: calendar/gui/e-itip-control.c:646
 msgid "Thursday"
 msgstr "Torsdag"
 
@@ -4343,7 +4276,7 @@ msgstr "Tidsformat:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1037
-#: calendar/gui/e-itip-control.c:674
+#: calendar/gui/e-itip-control.c:644
 msgid "Tuesday"
 msgstr "Tysdag"
 
@@ -4353,12 +4286,12 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1038
-#: calendar/gui/e-itip-control.c:675
+#: calendar/gui/e-itip-control.c:645
 msgid "Wednesday"
 msgstr "Onsdag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:29
 msgid "Work Week"
 msgstr "Arbeidsveke"
 
@@ -4475,51 +4408,51 @@ msgstr ""
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Er du sikker på at du vil sletta denne klassen?"
 
-#: calendar/gui/dialogs/changed-comp.c:58
+#: calendar/gui/dialogs/changed-comp.c:59
 #, fuzzy
 msgid "This event has been deleted."
 msgstr "Inga hending valt."
 
-#: calendar/gui/dialogs/changed-comp.c:62
+#: calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr "Denn oppgåva har vorte sletta."
 
-#: calendar/gui/dialogs/changed-comp.c:66
+#: calendar/gui/dialogs/changed-comp.c:67
 #, fuzzy
 msgid "This journal entry has been deleted."
 msgstr "Denne mappa kan ikkje slettast."
 
-#: calendar/gui/dialogs/changed-comp.c:75
+#: calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:82
+#: calendar/gui/dialogs/changed-comp.c:83
 #, fuzzy
 msgid "This event has been changed."
 msgstr "Passordet ditt er endra."
 
-#: calendar/gui/dialogs/changed-comp.c:86
+#: calendar/gui/dialogs/changed-comp.c:87
 #, fuzzy
 msgid "This task has been changed."
 msgstr "Passordet ditt er endra."
 
-#: calendar/gui/dialogs/changed-comp.c:90
+#: calendar/gui/dialogs/changed-comp.c:91
 #, fuzzy
 msgid "This journal entry has been changed."
 msgstr "Passordet ditt er endra."
 
-#: calendar/gui/dialogs/changed-comp.c:99
+#: calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
@@ -4529,23 +4462,23 @@ msgstr ""
 msgid "Validation error: %s"
 msgstr "Ukjend feil"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2216
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2223
 msgid " to "
 msgstr " til "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2220
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2227
 msgid " (Completed "
 msgstr " (Ferdig "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2222
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2229
 msgid "Completed "
 msgstr "Ferdig "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2227
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2234
 msgid " (Due "
 msgstr " (Ferdig"
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2229
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2236
 msgid "Due "
 msgstr "Ferdig"
 
@@ -4596,18 +4529,19 @@ msgid "No summary"
 msgstr "Ikkje noko samandrag"
 
 #: calendar/gui/dialogs/comp-editor.c:1281
-#: calendar/gui/e-calendar-table.c:1068 calendar/gui/e-day-view.c:3993
-#: calendar/gui/e-week-view.c:3840 composer/e-msg-composer.c:1164
+#: calendar/gui/e-calendar-table.c:1138 composer/e-msg-composer.c:1186
+#: calendar/gui/e-cal-view.c:878
 msgid "Save as..."
 msgstr "Lagre som ..."
 
-#: calendar/gui/dialogs/comp-editor.c:1382
-#: calendar/gui/dialogs/comp-editor.c:1406
-#: calendar/gui/dialogs/comp-editor.c:1432
+#: calendar/gui/dialogs/comp-editor.c:1384
+#: calendar/gui/dialogs/comp-editor.c:1408
+#: calendar/gui/dialogs/comp-editor.c:1434
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1459
+#: calendar/gui/dialogs/comp-editor.c:1464
+#: calendar/gui/dialogs/comp-editor.c:1473
 msgid "Unable to obtain current version!"
 msgstr "Ikkje stand til å få tak i noverande versjon!"
 
@@ -4716,7 +4650,7 @@ msgstr "Delegér til:"
 msgid "Enter Delegate"
 msgstr "Tast inn delegat"
 
-#: calendar/gui/dialogs/event-editor.c:199 calendar/gui/print.c:2253
+#: calendar/gui/dialogs/event-editor.c:199 calendar/gui/print.c:2260
 msgid "Appointment"
 msgstr "Avtale"
 
@@ -4741,7 +4675,7 @@ msgstr "Køyreplan ..."
 msgid "Meeting"
 msgstr "Møte"
 
-#: calendar/gui/dialogs/event-page.c:603 calendar/gui/dialogs/task-page.c:507
+#: calendar/gui/dialogs/event-page.c:603 calendar/gui/dialogs/task-page.c:509
 #, fuzzy
 msgid "Start date is wrong"
 msgstr "Start-dato"
@@ -4779,9 +4713,9 @@ msgid "Classification"
 msgstr "Klassifisering"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "Kon_fidensielt"
+#, fuzzy
+msgid "Co_nfidential"
+msgstr "Konfidensiell"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
 #: calendar/gui/dialogs/task-page.glade.h:5
@@ -4807,7 +4741,6 @@ msgid "Pu_blic"
 msgstr "_Offentleg"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr "Vis tid som"
 
@@ -4824,6 +4757,19 @@ msgstr "_Slutt-tid:"
 msgid "_Start time:"
 msgstr "_Start-tid:"
 
+#. add a "None" option to the stores menu
+#: calendar/gui/dialogs/meeting-page.c:330
+#: calendar/gui/dialogs/meeting-page.glade.h:2 composer/e-msg-composer.c:2082
+#: mail/folder-browser.c:1791 mail/mail-account-gui.c:1260
+#: mail/mail-account-gui.c:1692 mail/mail-accounts.c:442
+#: mail/mail-config.glade.h:76
+#: 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:1481 widgets/misc/e-dateedit.c:1596
+#: calendar/gui/e-cal-model-tasks.c:596
+msgid "None"
+msgstr "Ingen"
+
 #: calendar/gui/dialogs/meeting-page.c:437
 msgid "The organizer selected no longer has an account."
 msgstr ""
@@ -4880,13 +4826,13 @@ msgid "Member"
 msgstr "Medlem"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1179
+#: calendar/gui/e-itip-control.c:1149
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-calendar-table.etspec.h:14
 #: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
@@ -4915,8 +4861,7 @@ msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr ""
 
 #: calendar/gui/dialogs/recur-comp.c:58
-msgid ""
-"You are modifying a recurring journal entry, what would you like to modify?"
+msgid "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr ""
 
 #: calendar/gui/dialogs/recur-comp.c:72
@@ -5067,7 +5012,7 @@ msgstr ""
 "Dette er siste trekk.\n"
 "Vil du leggja til fleire trekk?"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1557
+#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1583
 msgid "_Discard Changes"
 msgstr ""
 
@@ -5092,53 +5037,84 @@ msgstr ""
 msgid "The task information has changed. Send an updated version?"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.c:401
+#: calendar/gui/dialogs/task-details-page.c:405
 #, fuzzy
 msgid "Completed date is wrong"
 msgstr "Ferdig "
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#: calendar/gui/e-calendar-table.etspec.h:2
-#, no-c-format
-msgid "% Complete"
+#, fuzzy, no-c-format
+msgid "% _Complete"
 msgstr "prosent ferdig"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:5
-msgid "Date Completed:"
-msgstr "Dato ferdig"
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-meeting-model.c:294
+#: calendar/gui/e-meeting-model.c:317 calendar/gui/e-tasks.c:250
+#: calendar/gui/print.c:2311 calendar/gui/e-cal-model-tasks.c:323
+#: calendar/gui/e-cal-model-tasks.c:602
+msgid "Completed"
+msgstr "Ferdig"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-tasks.c:247
+#: calendar/gui/print.c:2308 calendar/gui/e-cal-model-tasks.c:321
+#: calendar/gui/e-cal-model-tasks.c:600 calendar/gui/e-cal-model-tasks.c:662
+msgid "In Progress"
+msgstr "Under arbeid"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-tasks.c:257
+#: calendar/gui/print.c:2305 calendar/gui/e-cal-model-tasks.c:319
+#: calendar/gui/e-cal-model-tasks.c:598
+msgid "Not Started"
+msgstr "Ikkje starta"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:10
 msgid "Progress"
 msgstr "Framgang"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-msgid "URL:"
-msgstr "URL:"
+#, fuzzy
+msgid "_Date Completed:"
+msgstr "Dato ferdig"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:13
 msgid "_Priority:"
 msgstr "_Prioritet:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 msgid "_Status:"
 msgstr "_Status:"
 
-#: calendar/gui/dialogs/task-editor.c:190
+#: calendar/gui/dialogs/task-details-page.glade.h:15
+#, fuzzy
+msgid "_Web Page:"
+msgstr "_Nettsideaddresse"
+
+#: calendar/gui/dialogs/task-editor.c:192
 msgid "Basic"
 msgstr "Enkel"
 
-#: calendar/gui/dialogs/task-editor.c:204
-#: calendar/gui/dialogs/task-editor.c:252
-#: calendar/gui/dialogs/task-editor.c:387
+#: calendar/gui/dialogs/task-editor.c:206
+#: calendar/gui/dialogs/task-editor.c:269
+#: calendar/gui/dialogs/task-editor.c:406
 msgid "Assignment"
 msgstr "Tildeling"
 
-#: calendar/gui/dialogs/task-page.c:480
+#: calendar/gui/dialogs/task-page.c:482
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1107
-#: calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/dialogs/task-page.c:542
+msgid "Due date is before start date!"
+msgstr ""
+
+#: 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:1077
+#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:287
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:43
 msgid "Description:"
 msgstr "Skildring:"
@@ -5151,227 +5127,262 @@ msgstr "Sta_rt-dato:"
 msgid "_Due Date:"
 msgstr "Forfalls_dato:"
 
-#: calendar/gui/e-alarm-list.c:393
+#: calendar/gui/e-alarm-list.c:397
 #, c-format
 msgid "%d days"
 msgstr "%d dagar"
 
-#: calendar/gui/e-alarm-list.c:396
+#: calendar/gui/e-alarm-list.c:400
 msgid "1 day"
 msgstr "1 dag"
 
-#: calendar/gui/e-alarm-list.c:401
+#: calendar/gui/e-alarm-list.c:405
 #, c-format
 msgid "%d weeks"
 msgstr "%d veker"
 
-#: calendar/gui/e-alarm-list.c:404
+#: calendar/gui/e-alarm-list.c:408
 msgid "1 week"
 msgstr "1 veke"
 
-#: calendar/gui/e-alarm-list.c:409
+#: calendar/gui/e-alarm-list.c:413
 #, c-format
 msgid "%d hours"
 msgstr "%d timar"
 
-#: calendar/gui/e-alarm-list.c:412
+#: calendar/gui/e-alarm-list.c:416
 msgid "1 hour"
 msgstr "1 time"
 
-#: calendar/gui/e-alarm-list.c:417
+#: calendar/gui/e-alarm-list.c:421
 #, c-format
 msgid "%d minutes"
 msgstr "%d minutt"
 
-#: calendar/gui/e-alarm-list.c:420
+#: calendar/gui/e-alarm-list.c:424
 msgid "1 minute"
 msgstr "1 minutt"
 
-#: calendar/gui/e-alarm-list.c:425
+#: calendar/gui/e-alarm-list.c:429
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekund"
 
-#: calendar/gui/e-alarm-list.c:428
+#: calendar/gui/e-alarm-list.c:432
 msgid "1 second"
 msgstr "1 sekund"
 
-#: calendar/gui/e-alarm-list.c:465
+#: calendar/gui/e-alarm-list.c:469
 msgid "Send an email"
 msgstr "Send ein e-post"
 
-#: calendar/gui/e-alarm-list.c:475
+#: calendar/gui/e-alarm-list.c:479
 msgid "Unknown action to be performed"
 msgstr "Ukjent handling som skal utførast"
 
-#: calendar/gui/e-alarm-list.c:487
+#: calendar/gui/e-alarm-list.c:491
 #, 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:490
+#: calendar/gui/e-alarm-list.c:494
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s etter byrjinga på avtalen"
 
-#: calendar/gui/e-alarm-list.c:495
+#: calendar/gui/e-alarm-list.c:499
 #, fuzzy, c-format
 msgid "%s at the start of the appointment"
 msgstr "&Slett avtale"
 
-#: calendar/gui/e-alarm-list.c:504
+#: calendar/gui/e-alarm-list.c:508
 #, fuzzy, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "&Slett avtale"
 
-#: calendar/gui/e-alarm-list.c:507
+#: calendar/gui/e-alarm-list.c:511
 #, fuzzy, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "&Slett avtale"
 
-#: calendar/gui/e-alarm-list.c:512
+#: calendar/gui/e-alarm-list.c:516
 #, fuzzy, c-format
 msgid "%s at the end of the appointment"
 msgstr "&Slett avtale"
 
-#: calendar/gui/e-alarm-list.c:536
+#: calendar/gui/e-alarm-list.c:540
 #, c-format
 msgid "%s at %s"
 msgstr "%s %s"
 
-#: calendar/gui/e-alarm-list.c:542
+#: calendar/gui/e-alarm-list.c:546
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:423
+#: calendar/gui/e-calendar-table.c:381 calendar/gui/e-cal-model.c:281
+msgid "Public"
+msgstr "Offentleg"
+
+#: calendar/gui/e-calendar-table.c:382
+msgid "Private"
+msgstr "Privat"
+
+#: calendar/gui/e-calendar-table.c:383
+msgid "Confidential"
+msgstr "Konfidensiell"
+
+#: calendar/gui/e-calendar-table.c:425
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:424
+#: calendar/gui/e-calendar-table.c:426
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-calendar-table.c:427
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:428
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:429
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:430
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:431
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:432
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:433
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:434
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:435
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:726 calendar/gui/e-day-view.c:2867
-#: calendar/gui/e-week-view.c:1933
+#: calendar/gui/e-calendar-table.c:455 calendar/gui/e-cal-model-calendar.c:162
+msgid "Free"
+msgstr "Ledig"
+
+#: calendar/gui/e-calendar-table.c:456 calendar/gui/e-meeting-time-sel.c:406
+#: shell/evolution-shell-component.c:1207
+#: calendar/gui/e-cal-model-calendar.c:164
+msgid "Busy"
+msgstr "Oppteke"
+
+#: calendar/gui/e-calendar-table.c:724 calendar/gui/e-cal-view.c:562
 msgid "Deleting selected objects"
 msgstr "Slettar valde objekt"
 
-#: calendar/gui/e-calendar-table.c:958 calendar/gui/e-day-view.c:3737
-#: calendar/gui/e-week-view.c:3613 mail/folder-browser.c:1763
-#: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:988 calendar/gui/e-calendar-table.c:1029
+#: mail/folder-browser.c:1802 shell/e-shortcuts-view.c:422
+#: ui/evolution-addressbook.xml.h:36 calendar/gui/e-cal-view.c:1126
+#: calendar/gui/e-cal-view.c:1192
 msgid "_Open"
 msgstr "_Opne"
 
-#: calendar/gui/e-calendar-table.c:959
+#: calendar/gui/e-calendar-table.c:989
 #, fuzzy
-msgid "_Save as..."
-msgstr "Lagre som ..."
+msgid "Open _Web Page"
+msgstr "_Opne melding"
 
-#: calendar/gui/e-calendar-table.c:960 calendar/gui/e-day-view.c:3739
-#: calendar/gui/e-week-view.c:3588 calendar/gui/e-week-view.c:3615
-#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:33
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
-#: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
+#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1035
+#: mail/folder-browser.c:1804 ui/evolution-mail-message.xml.h:114
+#: calendar/gui/e-cal-view.c:1127 calendar/gui/e-cal-view.c:1198
+msgid "_Save As..."
+msgstr "_Lagre som ..."
+
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1033
+#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:35
+#: ui/evolution-comp-editor.xml.h:19 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:110 ui/evolution-tasks.xml.h:21
+#: ui/my-evolution.xml.h:6 calendar/gui/e-cal-view.c:1101
+#: calendar/gui/e-cal-view.c:1128 calendar/gui/e-cal-view.c:1196
 msgid "_Print..."
 msgstr "S_kriv ut"
 
-#: calendar/gui/e-calendar-table.c:964 calendar/gui/e-day-view.c:3744
-#: calendar/gui/e-week-view.c:3620 ui/evolution-addressbook.xml.h:1
-#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-calendar-table.c:1024
+#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
+#: ui/evolution-tasks.xml.h:1 calendar/gui/e-cal-view.c:1133
+#: calendar/gui/e-cal-view.c:1174
 msgid "C_ut"
 msgstr "Kl_ipp ut"
 
-#: calendar/gui/e-calendar-table.c:965 calendar/gui/e-day-view.c:3745
-#: calendar/gui/e-week-view.c:3621 ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:29 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-list.xml.h:24 ui/evolution-tasks.xml.h:15
+#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1022
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:31
+#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-list.xml.h:24
+#: ui/evolution-tasks.xml.h:17 calendar/gui/e-cal-view.c:1134
+#: calendar/gui/e-cal-view.c:1172
 msgid "_Copy"
 msgstr "_Kopier"
 
-#: calendar/gui/e-calendar-table.c:966 calendar/gui/e-day-view.c:3710
-#: calendar/gui/e-day-view.c:3746 calendar/gui/e-week-view.c:3592
-#: calendar/gui/e-week-view.c:3622 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:32 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-list.xml.h:29 ui/evolution-tasks.xml.h:19
+#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1031
+#: ui/evolution-addressbook.xml.h:37 ui/evolution-calendar.xml.h:34
+#: ui/evolution-composer-entries.xml.h:9 ui/evolution-mail-list.xml.h:29
+#: ui/evolution-tasks.xml.h:20 calendar/gui/e-cal-view.c:1105
+#: calendar/gui/e-cal-view.c:1135 calendar/gui/e-cal-view.c:1194
 msgid "_Paste"
 msgstr "_Lim inn"
 
-#: calendar/gui/e-calendar-table.c:970
+#: calendar/gui/e-calendar-table.c:1001
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Tildel oppgåve"
 
-#: calendar/gui/e-calendar-table.c:971
+#: calendar/gui/e-calendar-table.c:1002
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Fort framover"
 
-#: calendar/gui/e-calendar-table.c:972
+#: calendar/gui/e-calendar-table.c:1003
 msgid "_Mark as Complete"
 msgstr "_Merk som komplett"
 
-#: calendar/gui/e-calendar-table.c:973
+#: calendar/gui/e-calendar-table.c:1004
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Merk oppgåver som ferdig"
 
-#: calendar/gui/e-calendar-table.c:978
+#: calendar/gui/e-calendar-table.c:1009 calendar/gui/e-calendar-table.c:1027
 msgid "_Delete Selected Tasks"
 msgstr "Slett _den valde oppgåver"
 
-#: calendar/gui/e-calendar-table.c:1265 calendar/gui/e-day-view.c:7929
-#: calendar/gui/e-week-view.c:4335
+#: calendar/gui/e-calendar-table.c:1341 calendar/gui/e-cal-view.c:253
 msgid "Updating objects"
 msgstr "Oppdaterar objekt"
 
-#: calendar/gui/e-calendar-table.c:1348
+#: calendar/gui/e-calendar-table.c:1424
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Trykk her for å leggje til ei oppgåve"
 
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, no-c-format
+msgid "% Complete"
+msgstr "prosent ferdig"
+
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr "Alarmar"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1156
-#: camel/camel-filter-driver.c:1251
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
+#: camel/camel-filter-driver.c:1268
 msgid "Complete"
 msgstr "Ferdig"
 
@@ -5380,12 +5391,13 @@ msgid "Completion Date"
 msgstr "Fullføringsdato"
 
 #: calendar/gui/e-calendar-table.etspec.h:9
-msgid "Due Date"
-msgstr "Forfallsdato"
+#, fuzzy
+msgid "Description"
+msgstr "Skildring:"
 
 #: calendar/gui/e-calendar-table.etspec.h:10
-msgid "End Date"
-msgstr "Sluttdato"
+msgid "Due Date"
+msgstr "Forfallsdato"
 
 #: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
@@ -5395,29 +5407,39 @@ msgstr "Geografisk plassering"
 msgid "Priority"
 msgstr "Prioritet"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Start Date"
 msgstr "Start-dato"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:15
 #: my-evolution/component-factory.c:56 shell/e-shell.c:750
 #: shell/e-shortcuts.c:1082
 msgid "Summary"
 msgstr "Samandrag"
 
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-calendar-table.etspec.h:16
 msgid "Task sort"
 msgstr "Sortér oppgåver"
 
+#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:171
+#, fuzzy
+msgid "color"
+msgstr "farge"
+
+#: calendar/gui/e-calendar-table.etspec.h:20
+#, fuzzy
+msgid "component"
+msgstr "Avtale"
+
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:167
-#: e-util/e-time-utils.c:380
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
+#: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr ""
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:162
-#: e-util/e-time-utils.c:389
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
+#: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr ""
 
@@ -5439,217 +5461,145 @@ 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:261 calendar/gui/e-day-view.c:1421
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1525
+#: calendar/gui/e-day-view-top-item.c:262 calendar/gui/e-day-view.c:1347
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1524
 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:269 calendar/gui/e-day-view.c:1454
+#: calendar/gui/e-day-view-top-item.c:270 calendar/gui/e-day-view.c:1380
 #: calendar/gui/e-week-view-main-item.c:339
 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:636 calendar/gui/e-week-view.c:350
+#: calendar/gui/e-day-view.c:600 calendar/gui/e-week-view.c:324
 #: calendar/gui/print.c:809
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:639 calendar/gui/e-week-view.c:353
+#: calendar/gui/e-day-view.c:603 calendar/gui/e-week-view.c:327
 #: calendar/gui/print.c:811
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3694
-msgid "New _Appointment"
-msgstr "Ny _avtale"
-
-#: calendar/gui/e-day-view.c:3696 calendar/gui/e-week-view.c:3582
-msgid "New All Day _Event"
-msgstr "Ny h_eildagshending"
-
-#: calendar/gui/e-day-view.c:3698 calendar/gui/e-week-view.c:3583
-#, fuzzy
-msgid "New Meeting"
-msgstr "Møte"
-
-#: calendar/gui/e-day-view.c:3700 calendar/gui/e-week-view.c:3584
-msgid "New Task"
-msgstr "Ny oppgåve"
-
-#: calendar/gui/e-day-view.c:3705 ui/evolution-comp-editor.xml.h:11
-msgid "Print..."
-msgstr "Skriv ut ..."
-
-#: calendar/gui/e-day-view.c:3717 calendar/gui/e-week-view.c:3598
-#: ui/evolution-calendar.xml.h:13
-msgid "Go to _Today"
-msgstr "Gå _til idag"
-
-#: calendar/gui/e-day-view.c:3719 calendar/gui/e-week-view.c:3599
-msgid "_Go to Date..."
-msgstr "_Gå til dato ..."
-
-#: calendar/gui/e-day-view.c:3724 calendar/gui/e-week-view.c:3603
-#: ui/evolution-calendar.xml.h:34
-#, fuzzy
-msgid "_Publish Free/Busy Information"
-msgstr "Informasjon"
-
-#: calendar/gui/e-day-view.c:3729 calendar/gui/e-week-view.c:3607
-#: ui/evolution.xml.h:60
-#, fuzzy
-msgid "_Settings..."
-msgstr "_Innstillingar for e-post ..."
-
-#: calendar/gui/e-day-view.c:3738 calendar/gui/e-week-view.c:3614
-#: mail/folder-browser.c:1765 ui/evolution-mail-message.xml.h:112
-msgid "_Save As..."
-msgstr "_Lagre som ..."
-
-#: calendar/gui/e-day-view.c:3750 calendar/gui/e-week-view.c:3626
-#, fuzzy
-msgid "_Schedule Meeting..."
-msgstr "Køyreplan ..."
-
-#: calendar/gui/e-day-view.c:3751 calendar/gui/e-week-view.c:3627
-#, fuzzy
-msgid "_Forward as iCalendar..."
-msgstr "Fort framover"
-
-#: calendar/gui/e-day-view.c:3756 calendar/gui/e-week-view.c:3632
-#, fuzzy
-msgid "Make this Occurrence _Movable"
-msgstr "Se&nd avtale"
-
-#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3633
-#, fuzzy
-msgid "Delete this _Occurrence"
-msgstr "Erstatt denne førekomsten?"
-
-#: calendar/gui/e-day-view.c:3758 calendar/gui/e-week-view.c:3634
-#, fuzzy
-msgid "Delete _All Occurrences"
-msgstr "Slettar klassen"
-
-#: calendar/gui/e-itip-control.c:706
+#: calendar/gui/e-itip-control.c:676
 #, fuzzy
 msgid "Yes. (Complex Recurrence)"
 msgstr "Repetering"
 
-#: calendar/gui/e-itip-control.c:718
+#: calendar/gui/e-itip-control.c:688
 #, fuzzy
 msgid "Every day"
 msgstr "Kvar"
 
-#: calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-itip-control.c:690
 #, fuzzy, c-format
 msgid "Every %d days"
 msgstr "%d dagar"
 
-#: calendar/gui/e-itip-control.c:726
+#: calendar/gui/e-itip-control.c:696
 #, fuzzy
 msgid "Every week"
 msgstr "Kvar"
 
-#: calendar/gui/e-itip-control.c:728
+#: calendar/gui/e-itip-control.c:698
 #, fuzzy, c-format
 msgid "Every %d weeks"
 msgstr "%d veker"
 
-#: calendar/gui/e-itip-control.c:731
+#: calendar/gui/e-itip-control.c:701
 #, fuzzy
 msgid "Every week on "
 msgstr "Evergreen"
 
-#: calendar/gui/e-itip-control.c:733
+#: calendar/gui/e-itip-control.c:703
 #, fuzzy, c-format
 msgid "Every %d weeks on "
 msgstr "%d veker"
 
-#: calendar/gui/e-itip-control.c:741
+#: calendar/gui/e-itip-control.c:711
 #, fuzzy
 msgid " and "
 msgstr "Sand"
 
-#: calendar/gui/e-itip-control.c:748
+#: calendar/gui/e-itip-control.c:718
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:761
+#: calendar/gui/e-itip-control.c:731
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:736
 #, fuzzy
 msgid "every month"
 msgstr "Ein _månad"
 
-#: calendar/gui/e-itip-control.c:771
+#: calendar/gui/e-itip-control.c:741
 #, c-format
 msgid "every %d months"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:777
+#: calendar/gui/e-itip-control.c:747
 #, fuzzy
 msgid "Every year"
 msgstr "Kvar"
 
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:749
 #, c-format
 msgid "Every %d years"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:791
+#: calendar/gui/e-itip-control.c:761
 #, c-format
 msgid " a total of %d times"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:799
+#: calendar/gui/e-itip-control.c:769
 msgid ", ending on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:793
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:833
+#: calendar/gui/e-itip-control.c:803
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "Sluttar: <b>"
 
-#: calendar/gui/e-itip-control.c:853
+#: calendar/gui/e-itip-control.c:823
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Ferdig "
 
-#: calendar/gui/e-itip-control.c:863
+#: calendar/gui/e-itip-control.c:833
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:900 calendar/gui/e-itip-control.c:953
+#: calendar/gui/e-itip-control.c:870 calendar/gui/e-itip-control.c:923
 #, fuzzy
 msgid "iCalendar Information"
 msgstr "Informasjon"
 
 #. Title
-#: calendar/gui/e-itip-control.c:915
+#: calendar/gui/e-itip-control.c:885
 #, fuzzy
 msgid "iCalendar Error"
 msgstr "Skriv ut alle"
 
-#: calendar/gui/e-itip-control.c:984 calendar/gui/e-itip-control.c:1000
-#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-itip-control.c:1028
+#: calendar/gui/e-itip-control.c:954 calendar/gui/e-itip-control.c:970
+#: calendar/gui/e-itip-control.c:981 calendar/gui/e-itip-control.c:998
 msgid "An unknown person"
 msgstr "Ein ukjent person"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:1035
+#: calendar/gui/e-itip-control.c:1005
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5657,299 +5607,301 @@ msgstr ""
 "<br> Sjå gjennom den følgjande informasjon, og velj ei handling frå menyen "
 "under."
 
-#: calendar/gui/e-itip-control.c:1050
+#: calendar/gui/e-itip-control.c:1020
 msgid "<i>None</i>"
 msgstr "<i>Ingen</i>"
 
-#: calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1031
 #, fuzzy
 msgid "Location:"
 msgstr "_Plassering:"
 
-#: calendar/gui/e-itip-control.c:1075
+#. write status
+#: calendar/gui/e-itip-control.c:1045 calendar/gui/e-tasks.c:243
 #, fuzzy
 msgid "Status:"
 msgstr "_Status:"
 
-#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-meeting-model.c:286
-#: calendar/gui/e-meeting-model.c:309 calendar/gui/e-meeting-model.c:798
+#: calendar/gui/e-itip-control.c:1050 calendar/gui/e-meeting-model.c:286
+#: calendar/gui/e-meeting-model.c:309 calendar/gui/e-meeting-model.c:801
 #: calendar/gui/itip-utils.c:414
 msgid "Accepted"
 msgstr "Akseptert"
 
-#: calendar/gui/e-itip-control.c:1084 calendar/gui/itip-utils.c:417
+#: calendar/gui/e-itip-control.c:1054 calendar/gui/itip-utils.c:417
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "Mellombels"
 
-#: calendar/gui/e-itip-control.c:1088 calendar/gui/e-meeting-model.c:288
-#: calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:799
+#: calendar/gui/e-itip-control.c:1058 calendar/gui/e-meeting-model.c:288
+#: calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:802
 #: calendar/gui/itip-utils.c:420 calendar/gui/itip-utils.c:446
 msgid "Declined"
 msgstr "Avslått"
 
-#: calendar/gui/e-itip-control.c:1092 calendar/gui/e-itip-control.c:1300
+#: calendar/gui/e-itip-control.c:1062 calendar/gui/e-itip-control.c:1278
 #: calendar/gui/e-meeting-model.c:222 calendar/gui/e-meeting-model.c:257
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:756
-#: calendar/gui/e-meeting-model.c:772 camel/camel-gpg-context.c:1574
-#: camel/camel-gpg-context.c:1625 camel/camel-tcp-stream-openssl.c:634
-#: camel/providers/smtp/camel-smtp-transport.c:173
-#: camel/providers/smtp/camel-smtp-transport.c:228 mail/folder-browser.c:345
-#: mail/mail-display.c:953 widgets/misc/e-charset-picker.c:60
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:759
+#: calendar/gui/e-meeting-model.c:775 camel/camel-gpg-context.c:1574
+#: camel/camel-gpg-context.c:1625 camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:347
+#: mail/mail-display.c:1044 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Ukjend"
 
-#: calendar/gui/e-itip-control.c:1147 calendar/gui/e-itip-control.c:1175
-#: calendar/gui/e-itip-control.c:1201 calendar/gui/e-itip-control.c:1214
-#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1117 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1171 calendar/gui/e-itip-control.c:1184
+#: calendar/gui/e-itip-control.c:1197 calendar/gui/e-itip-control.c:1210
 msgid "Choose an action:"
 msgstr "Vel ei handling:"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1118
 msgid "Update"
 msgstr "Oppdater"
 
-#: calendar/gui/e-itip-control.c:1149 calendar/gui/e-itip-control.c:1180
-#: calendar/gui/e-itip-control.c:1203 calendar/gui/e-itip-control.c:1216
-#: calendar/gui/e-itip-control.c:1229 calendar/gui/e-itip-control.c:1242
+#: calendar/gui/e-itip-control.c:1119 calendar/gui/e-itip-control.c:1150
+#: calendar/gui/e-itip-control.c:1173 calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1199 calendar/gui/e-itip-control.c:1212
 #: shell/e-shell.c:2067 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1176
+#: calendar/gui/e-itip-control.c:1146
 msgid "Accept"
 msgstr "Godta"
 
-#: calendar/gui/e-itip-control.c:1177
+#: calendar/gui/e-itip-control.c:1147
 #, fuzzy
 msgid "Tentatively accept"
 msgstr "Mellombels"
 
-#: calendar/gui/e-itip-control.c:1178
+#: calendar/gui/e-itip-control.c:1148
 msgid "Decline"
 msgstr "Avslå"
 
-#: calendar/gui/e-itip-control.c:1202
+#: calendar/gui/e-itip-control.c:1172
 #, fuzzy
 msgid "Send Free/Busy Information"
 msgstr "Informasjon"
 
-#: calendar/gui/e-itip-control.c:1215
+#: calendar/gui/e-itip-control.c:1185
 msgid "Update respondent status"
 msgstr "Opdatér status på svar"
 
-#: calendar/gui/e-itip-control.c:1228
+#: calendar/gui/e-itip-control.c:1198
 #, fuzzy
 msgid "Send Latest Information"
 msgstr "Informasjon"
 
-#: calendar/gui/e-itip-control.c:1241 calendar/gui/itip-utils.c:434
+#: calendar/gui/e-itip-control.c:1211 calendar/gui/itip-utils.c:434
 #: mail/mail-send-recv.c:387 mail/mail-send-recv.c:444
-#: shell/evolution-shell-component.c:1182 ui/evolution-mail-global.xml.h:1
+#: shell/evolution-shell-component.c:1185 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1300
 #, fuzzy, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "generer avlusingsinformasjon"
 
-#: calendar/gui/e-itip-control.c:1323
+#: calendar/gui/e-itip-control.c:1301
 #, fuzzy
 msgid "Meeting Information"
 msgstr "Personleg informasjon"
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1306
 #, fuzzy, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> spør etter deg for å stille opp på eit møte."
 
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1308
 #, 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:1331
+#: calendar/gui/e-itip-control.c:1309
 msgid "Meeting Proposal"
 msgstr "Møteframlegg"
 
-#: calendar/gui/e-itip-control.c:1335
+#: calendar/gui/e-itip-control.c:1313
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> ønskjar å leggje til ei eksisterande oppgåve."
 
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1314
 msgid "Meeting Update"
 msgstr "Møteoppdatering"
 
-#: calendar/gui/e-itip-control.c:1340
+#: calendar/gui/e-itip-control.c:1318
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "generer avlusingsinformasjon"
 
-#: calendar/gui/e-itip-control.c:1341
+#: calendar/gui/e-itip-control.c:1319
 #, fuzzy
 msgid "Meeting Update Request"
 msgstr "Møteoppdatering"
 
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1326
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "Dette er ei repeterande hending."
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1327
 msgid "Meeting Reply"
 msgstr "Møtesvar"
 
-#: calendar/gui/e-itip-control.c:1356
+#: calendar/gui/e-itip-control.c:1334
 #, fuzzy, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> har kansellert ei oppgåve."
 
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1335
 msgid "Meeting Cancellation"
 msgstr "Møtekansellering"
 
-#: calendar/gui/e-itip-control.c:1364 calendar/gui/e-itip-control.c:1431
-#: calendar/gui/e-itip-control.c:1466
+#: calendar/gui/e-itip-control.c:1342 calendar/gui/e-itip-control.c:1409
+#: calendar/gui/e-itip-control.c:1444
 #, fuzzy, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> har kansellert ei oppgåve."
 
-#: calendar/gui/e-itip-control.c:1365
+#: calendar/gui/e-itip-control.c:1343
 #, fuzzy
 msgid "Bad Meeting Message"
 msgstr "&Finn i melding ..."
 
-#: calendar/gui/e-itip-control.c:1389
+#: calendar/gui/e-itip-control.c:1367
 #, fuzzy, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "generer avlusingsinformasjon"
 
-#: calendar/gui/e-itip-control.c:1390
+#: calendar/gui/e-itip-control.c:1368
 msgid "Task Information"
 msgstr "Oppgåveinformasjon"
 
-#: calendar/gui/e-itip-control.c:1395
+#: calendar/gui/e-itip-control.c:1373
 #, fuzzy, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "Prøv «%s --help» for meir informasjon\n"
 
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1375
 #, fuzzy, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "Prøv «%s --help» for meir informasjon\n"
 
-#: calendar/gui/e-itip-control.c:1398
+#: calendar/gui/e-itip-control.c:1376
 msgid "Task Proposal"
 msgstr "Oppgåveframlegg"
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1380
 #, 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:1403
+#: calendar/gui/e-itip-control.c:1381
 msgid "Task Update"
 msgstr "Oppgåveoppdatering"
 
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1385
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "Dette er ei førehandsvising av det valte bakgrunnsbiletet."
 
-#: calendar/gui/e-itip-control.c:1408
+#: calendar/gui/e-itip-control.c:1386
 msgid "Task Update Request"
 msgstr "Oppgåveoppdateringsforepørjing"
 
-#: calendar/gui/e-itip-control.c:1415
+#: calendar/gui/e-itip-control.c:1393
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "Dette er ei repeterande hending."
 
-#: calendar/gui/e-itip-control.c:1416
+#: calendar/gui/e-itip-control.c:1394
 msgid "Task Reply"
 msgstr "Oppgåvesvar"
 
-#: calendar/gui/e-itip-control.c:1423
+#: calendar/gui/e-itip-control.c:1401
 #, 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:1424
+#: calendar/gui/e-itip-control.c:1402
 msgid "Task Cancellation"
 msgstr "Oppgåvekansellering"
 
-#: calendar/gui/e-itip-control.c:1432
+#: calendar/gui/e-itip-control.c:1410
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "Skriv ut alle"
 
-#: calendar/gui/e-itip-control.c:1451
+#: calendar/gui/e-itip-control.c:1429
 #, fuzzy, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "Skriv avlusingsinformasjon"
 
-#: calendar/gui/e-itip-control.c:1452
+#: calendar/gui/e-itip-control.c:1430
 msgid "Free/Busy Information"
 msgstr "Fri/ledig-informasjon"
 
-#: calendar/gui/e-itip-control.c:1456
+#: calendar/gui/e-itip-control.c:1434
 #, fuzzy, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "Prøv «%s --help» for meir informasjon\n"
 
-#: calendar/gui/e-itip-control.c:1457
+#: calendar/gui/e-itip-control.c:1435
 msgid "Free/Busy Request"
 msgstr "Fri/ledig forespørsel"
 
-#: calendar/gui/e-itip-control.c:1461
+#: calendar/gui/e-itip-control.c:1439
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "Dette er ei repeterande hending."
 
-#: calendar/gui/e-itip-control.c:1462
+#: calendar/gui/e-itip-control.c:1440
 msgid "Free/Busy Reply"
 msgstr "Fri/Oppteke svar"
 
-#: calendar/gui/e-itip-control.c:1467
+#: calendar/gui/e-itip-control.c:1445
 #, fuzzy
 msgid "Bad Free/Busy Message"
 msgstr "Private meldingar"
 
-#: calendar/gui/e-itip-control.c:1543
+#: calendar/gui/e-itip-control.c:1521
 #, fuzzy
 msgid "The message does not appear to be properly formed"
 msgstr "Meldinga ser ikkje ut til å vere skikkeleg forma"
 
-#: calendar/gui/e-itip-control.c:1606
+#: calendar/gui/e-itip-control.c:1584
 #, fuzzy
 msgid "The message contains only unsupported requests."
 msgstr "Meldinga har ingen sendar"
 
-#: calendar/gui/e-itip-control.c:1637 calendar/gui/e-itip-control.c:1643
+#: calendar/gui/e-itip-control.c:1615 calendar/gui/e-itip-control.c:1621
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Vedlegg inneheld ikkje ei gyldig kalendarmelding."
 
-#: calendar/gui/e-itip-control.c:1668
+#: calendar/gui/e-itip-control.c:1646
 #, fuzzy
 msgid "The attachment has no viewable calendar items"
 msgstr "Vedlegg inneheld ikkje ei gyldig kalendarmelding."
 
-#: calendar/gui/e-itip-control.c:1909 calendar/gui/e-itip-control.c:2001
+#: calendar/gui/e-itip-control.c:1887 calendar/gui/e-itip-control.c:1948
+#: calendar/gui/e-itip-control.c:1986
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1912 calendar/gui/e-itip-control.c:2004
+#: calendar/gui/e-itip-control.c:1890 calendar/gui/e-itip-control.c:1989
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:2007
+#: calendar/gui/e-itip-control.c:1893 calendar/gui/e-itip-control.c:1992
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Kunne ikkje lagra adresseboka."
 
-#: calendar/gui/e-itip-control.c:1918
+#: calendar/gui/e-itip-control.c:1896
 #, fuzzy
 msgid "You do not have the right permissions to update the calendar\n"
 msgstr ""
@@ -5957,28 +5909,28 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: calendar/gui/e-itip-control.c:1921
+#: calendar/gui/e-itip-control.c:1899
 #, fuzzy
 msgid "Update complete\n"
 msgstr "Ferdig"
 
-#: calendar/gui/e-itip-control.c:1924
+#: calendar/gui/e-itip-control.c:1902
 msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1953 calendar/gui/e-itip-control.c:2019
+#: calendar/gui/e-itip-control.c:1932 calendar/gui/e-itip-control.c:2004
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1974
+#: calendar/gui/e-itip-control.c:1958
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1986
+#: calendar/gui/e-itip-control.c:1970
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:2010
+#: calendar/gui/e-itip-control.c:1995
 #, fuzzy
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr ""
@@ -5986,34 +5938,34 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: calendar/gui/e-itip-control.c:2013
+#: calendar/gui/e-itip-control.c:1998
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:2016
+#: calendar/gui/e-itip-control.c:2001
 msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:2053
+#: calendar/gui/e-itip-control.c:2038
 #, fuzzy
 msgid "Removal Complete"
 msgstr "Ferdig"
 
-#: calendar/gui/e-itip-control.c:2085 calendar/gui/e-itip-control.c:2135
+#: calendar/gui/e-itip-control.c:2070 calendar/gui/e-itip-control.c:2120
 #, fuzzy
 msgid "Item sent!\n"
 msgstr "Dato"
 
-#: calendar/gui/e-itip-control.c:2087 calendar/gui/e-itip-control.c:2139
+#: calendar/gui/e-itip-control.c:2072 calendar/gui/e-itip-control.c:2124
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:2212
+#: calendar/gui/e-itip-control.c:2215
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Vel mappe"
 
-#: calendar/gui/e-itip-control.c:2219
+#: calendar/gui/e-itip-control.c:2221
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Vel mappe"
@@ -6060,7 +6012,7 @@ msgstr "start-dato"
 msgid "Chair Persons"
 msgstr "Bil-telefon"
 
-#: calendar/gui/e-meeting-model.c:80 calendar/gui/e-meeting-model.c:1636
+#: calendar/gui/e-meeting-model.c:80 calendar/gui/e-meeting-model.c:1639
 #, fuzzy
 msgid "Required Participants"
 msgstr "Tenarinformasjon"
@@ -6076,61 +6028,72 @@ msgid "Resources"
 msgstr "Ressurs"
 
 #: calendar/gui/e-meeting-model.c:197 calendar/gui/e-meeting-model.c:214
-#: calendar/gui/e-meeting-model.c:530 calendar/gui/e-meeting-model.c:752
+#: calendar/gui/e-meeting-model.c:530 calendar/gui/e-meeting-model.c:755
 msgid "Individual"
 msgstr "Individuell"
 
 #: calendar/gui/e-meeting-model.c:199 calendar/gui/e-meeting-model.c:216
-#: calendar/gui/e-meeting-model.c:753
+#: calendar/gui/e-meeting-model.c:756
 msgid "Group"
 msgstr "Gruppe"
 
 #: calendar/gui/e-meeting-model.c:201 calendar/gui/e-meeting-model.c:218
-#: calendar/gui/e-meeting-model.c:754
+#: calendar/gui/e-meeting-model.c:757
 msgid "Resource"
 msgstr "Ressurs"
 
 #: calendar/gui/e-meeting-model.c:203 calendar/gui/e-meeting-model.c:220
-#: calendar/gui/e-meeting-model.c:755
+#: calendar/gui/e-meeting-model.c:758
 msgid "Room"
 msgstr "Rom"
 
 #: calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:249
-#: calendar/gui/e-meeting-model.c:768
+#: calendar/gui/e-meeting-model.c:771
 #, fuzzy
 msgid "Chair"
 msgstr "Teikn"
 
 #: calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
-#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:769
+#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:772
 #, fuzzy
 msgid "Required Participant"
 msgstr "Tenarinformasjon"
 
 #: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
-#: calendar/gui/e-meeting-model.c:770
+#: calendar/gui/e-meeting-model.c:773
 #, fuzzy
 msgid "Optional Participant"
 msgstr "Personleg informasjon"
 
 #: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
-#: calendar/gui/e-meeting-model.c:771
+#: calendar/gui/e-meeting-model.c:774
 msgid "Non-Participant"
 msgstr "Ikkje-deltakar"
 
+#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:276
+#: calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:787
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:801
+msgid "Yes"
+msgstr "Ja"
+
+#: calendar/gui/e-meeting-model.c:278 calendar/gui/e-meeting-model.c:788
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:801
+msgid "No"
+msgstr "Nei"
+
 #: calendar/gui/e-meeting-model.c:284 calendar/gui/e-meeting-model.c:307
-#: calendar/gui/e-meeting-model.c:540 calendar/gui/e-meeting-model.c:797
+#: calendar/gui/e-meeting-model.c:540 calendar/gui/e-meeting-model.c:800
 #, fuzzy
 msgid "Needs Action"
 msgstr "Vel ikon"
 
 #: calendar/gui/e-meeting-model.c:290 calendar/gui/e-meeting-model.c:313
-#: calendar/gui/e-meeting-model.c:800 calendar/gui/e-meeting-time-sel.c:405
+#: calendar/gui/e-meeting-model.c:803 calendar/gui/e-meeting-time-sel.c:405
 msgid "Tentative"
 msgstr "Mellombels"
 
 #: calendar/gui/e-meeting-model.c:292 calendar/gui/e-meeting-model.c:315
-#: calendar/gui/e-meeting-model.c:801
+#: calendar/gui/e-meeting-model.c:804
 msgid "Delegated"
 msgstr "Delegert"
 
@@ -6148,15 +6111,15 @@ msgstr "%A, %d. %B, %Y"
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:462
-#: calendar/gui/e-meeting-time-sel.c:2131 e-util/e-time-utils.c:190
-#: e-util/e-time-utils.c:283 e-util/e-time-utils.c:371
+#: calendar/gui/e-meeting-time-sel.c:2131 e-util/e-time-utils.c:203
+#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:466 e-util/e-time-utils.c:225
-#: e-util/e-time-utils.c:286 widgets/misc/e-dateedit.c:1582
+#: calendar/gui/e-meeting-time-sel-item.c:466 e-util/e-time-utils.c:238
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1605
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
@@ -6224,23 +6187,48 @@ msgstr "&Helsingstekst:"
 msgid "Meeting _end time:"
 msgstr "Møt_e slutttid:"
 
-#: calendar/gui/e-tasks.c:360 calendar/gui/gnome-cal.c:2006
-#: calendar/gui/gnome-cal.c:2017
+#: calendar/gui/e-tasks.c:151 calendar/gui/alarm-notify/util.c:37
+msgid "invalid time"
+msgstr "ugyldig tid"
+
+#: calendar/gui/e-tasks.c:221
+#, fuzzy
+msgid "Start Date:"
+msgstr "Sta_rt-dato:"
+
+#: calendar/gui/e-tasks.c:237
+#, fuzzy
+msgid "Due Date:"
+msgstr "Forfalls_dato:"
+
+#. write priority
+#: calendar/gui/e-tasks.c:265
+#, fuzzy
+msgid "Priority:"
+msgstr "_Prioritet:"
+
+#. URL
+#: calendar/gui/e-tasks.c:321
+#, fuzzy
+msgid "Web Page:"
+msgstr "Side"
+
+#: calendar/gui/e-tasks.c:702
 #, fuzzy, c-format
 msgid "Opening tasks at %s"
 msgstr "Leitar etter tilleggsmodular"
 
-#: calendar/gui/e-tasks.c:389 calendar/gui/tasks-control.c:201
+#: calendar/gui/e-tasks.c:731 calendar/gui/tasks-control.c:201
 #, fuzzy, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: calendar/gui/e-tasks.c:404
+#: calendar/gui/e-tasks.c:746
 #, fuzzy, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoden %1 er ikkje støtta."
 
-#: calendar/gui/e-tasks.c:418 calendar/gui/gnome-cal.c:1509
+#: calendar/gui/e-tasks.c:760 calendar/gui/gnome-cal.c:1684
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr ""
@@ -6248,7 +6236,7 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: calendar/gui/e-tasks.c:486 calendar/gui/gnome-cal.c:1728
+#: calendar/gui/e-tasks.c:828 calendar/gui/gnome-cal.c:1898
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
@@ -6257,26 +6245,22 @@ msgstr ""
 "Feil ved nedlasting av fil:\n"
 "%1"
 
-#: calendar/gui/e-tasks.c:557
+#: calendar/gui/e-tasks.c:899
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Fullføringsdato"
 
-#: calendar/gui/e-tasks.c:580
+#: calendar/gui/e-tasks.c:922
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Slettar valde objekt"
 
-#: calendar/gui/e-tasks.c:675
+#: calendar/gui/e-tasks.c:1017
 #, fuzzy
 msgid "Expunging"
 msgstr "Forventar %1"
 
-#: calendar/gui/e-week-view.c:3581
-msgid "New _Appointment..."
-msgstr "Ny _avtale ..."
-
-#: calendar/gui/gnome-cal.c:1481
+#: calendar/gui/gnome-cal.c:1656
 #, fuzzy, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
@@ -6284,42 +6268,52 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: calendar/gui/gnome-cal.c:1495
+#: calendar/gui/gnome-cal.c:1670
 #, fuzzy, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metoden %1 er ikkje støtta."
 
-#: calendar/gui/gnome-cal.c:1556
+#: calendar/gui/gnome-cal.c:1726
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "Alarm på %s"
 
-#: calendar/gui/gnome-cal.c:1748
+#: calendar/gui/gnome-cal.c:1918
 #, c-format
 msgid ""
-"The calendar backend for\n"
+"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:1757
+#: calendar/gui/gnome-cal.c:1924
 #, c-format
 msgid ""
-"The task backend for\n"
+"The calendar 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:1988
+#: calendar/gui/gnome-cal.c:2130
 #, fuzzy, c-format
 msgid "Opening calendar at %s"
 msgstr "Feil ved opning"
 
-#: calendar/gui/gnome-cal.c:2028
+#: calendar/gui/gnome-cal.c:2151
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "Leitar etter tilleggsmodular"
 
+#: calendar/gui/gnome-cal.c:3035
+#, fuzzy, c-format
+msgid "Purging event %s"
+msgstr "Sender %1"
+
+#: calendar/gui/gnome-cal.c:3119
+#, fuzzy
+msgid "Purging"
+msgstr "Turin"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "April"
@@ -6433,7 +6427,7 @@ msgstr "Informasjon"
 msgid "iCalendar information"
 msgstr "Informasjon"
 
-#: calendar/gui/itip-utils.c:667
+#: calendar/gui/itip-utils.c:668
 msgid "You must be an attendee of the event."
 msgstr ""
 
@@ -6466,82 +6460,82 @@ msgid "Sa"
 msgstr "Lau"
 
 #. Day
-#: calendar/gui/print.c:1875
+#: calendar/gui/print.c:1882
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Vald dag (%a %d %b %Y)"
 
-#: calendar/gui/print.c:1900 calendar/gui/print.c:1904
+#: calendar/gui/print.c:1907 calendar/gui/print.c:1911
 msgid "%a %b %d"
 msgstr "%a %d. %b"
 
-#: calendar/gui/print.c:1901
+#: calendar/gui/print.c:1908
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1905 calendar/gui/print.c:1907
-#: calendar/gui/print.c:1908
+#: calendar/gui/print.c:1912 calendar/gui/print.c:1914
+#: calendar/gui/print.c:1915
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/print.c:1912
+#: calendar/gui/print.c:1919
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Vald veke (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1920
+#: calendar/gui/print.c:1927
 msgid "Selected month (%b %Y)"
 msgstr "Vald månad (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1927
+#: calendar/gui/print.c:1934
 msgid "Selected year (%Y)"
 msgstr "Vald år (%Y)"
 
-#: calendar/gui/print.c:2255
+#: calendar/gui/print.c:2262
 msgid "Task"
 msgstr "Oppgåve"
 
-#: calendar/gui/print.c:2314
+#: calendar/gui/print.c:2321
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: calendar/gui/print.c:2331
+#: calendar/gui/print.c:2338
 #, fuzzy, c-format
 msgid "Priority: %s"
 msgstr "_Prioritet:"
 
-#: calendar/gui/print.c:2343
+#: calendar/gui/print.c:2350
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Prosent ferdig: %i"
 
-#: calendar/gui/print.c:2355
+#: calendar/gui/print.c:2362
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2369
+#: calendar/gui/print.c:2376
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategoriar %s"
 
-#: calendar/gui/print.c:2380
+#: calendar/gui/print.c:2387
 msgid "Contacts: "
 msgstr "Kontaktar: "
 
-#: calendar/gui/print.c:2518 calendar/gui/print.c:2604
-#: calendar/gui/tasks-control.c:581 mail/mail-callbacks.c:2948
+#: calendar/gui/print.c:2525 calendar/gui/print.c:2611
+#: calendar/gui/tasks-control.c:564 mail/mail-callbacks.c:2954
 #: my-evolution/e-summary.c:649
 msgid "Print Preview"
 msgstr "Førehandsvising av utskrift"
 
-#: calendar/gui/print.c:2552
+#: calendar/gui/print.c:2559
 msgid "Print Item"
 msgstr "Skriv ut element"
 
-#: calendar/gui/print.c:2625
+#: calendar/gui/print.c:2632
 msgid "Print Setup"
 msgstr "Utskriftoppsett"
 
@@ -6550,7 +6544,7 @@ msgstr "Utskriftoppsett"
 msgid "The URI of the tasks folder to display"
 msgstr "Viser korleis datoverdiar vert viste."
 
-#: calendar/gui/tasks-control.c:465
+#: calendar/gui/tasks-control.c:448
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6558,11 +6552,11 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:468
+#: calendar/gui/tasks-control.c:451
 msgid "Do not ask me again."
 msgstr "Ikkje spør igjen"
 
-#: calendar/gui/tasks-control.c:610
+#: calendar/gui/tasks-control.c:593
 #, fuzzy
 msgid "Print Tasks"
 msgstr "Skriv ut kort"
@@ -8276,32 +8270,32 @@ msgstr "Stillehavet/Wallis"
 msgid "Pacific/Yap"
 msgstr "Stillehavet/Yap"
 
-#: camel/camel-cipher-context.c:178
+#: camel/camel-cipher-context.c:167
 #, fuzzy
 msgid "Signing is not supported by this cipher"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: camel/camel-cipher-context.c:218
+#: camel/camel-cipher-context.c:207
 #, fuzzy
 msgid "Verifying is not supported by this cipher"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: camel/camel-cipher-context.c:262
+#: camel/camel-cipher-context.c:251
 #, fuzzy
 msgid "Encryption is not supported by this cipher"
 msgstr "Knapp (ikkje støtta av KControl)"
 
-#: camel/camel-cipher-context.c:304
+#: camel/camel-cipher-context.c:293
 #, fuzzy
 msgid "Decryption is not supported by this cipher"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: camel/camel-cipher-context.c:342
+#: camel/camel-cipher-context.c:331
 #, fuzzy
 msgid "You may not import keys with this cipher"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: camel/camel-cipher-context.c:374
+#: camel/camel-cipher-context.c:363
 #, fuzzy
 msgid "You may not export keys with this cipher"
 msgstr "Den oppgitte fila finst ikkje"
@@ -8364,65 +8358,65 @@ msgstr "Kunne ikkje leggja til melding:\n"
 msgid "Failed to create create child process '%s': %s"
 msgstr "Kunne ikkje leggja til melding:\n"
 
-#: camel/camel-filter-driver.c:744
+#: camel/camel-filter-driver.c:759
 #, fuzzy, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr ""
 "Kan ikkje laga heimekatalog\n"
 "Feil: %1"
 
-#: camel/camel-filter-driver.c:923 camel/camel-filter-driver.c:932
+#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
 msgid "Syncing folders"
 msgstr "Synkroniserar mapper"
 
-#: camel/camel-filter-driver.c:1021 camel/camel-filter-driver.c:1394
+#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
 #, fuzzy, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: camel/camel-filter-driver.c:1030 camel/camel-filter-driver.c:1400
+#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
 #, fuzzy, c-format
 msgid "Error executing filter: %s: %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: camel/camel-filter-driver.c:1097
+#: camel/camel-filter-driver.c:1114
 #, fuzzy
 msgid "Unable to open spool folder"
 msgstr "Kan ikkje 'chown' 'spool'-katalogen"
 
-#: camel/camel-filter-driver.c:1106
+#: camel/camel-filter-driver.c:1123
 #, fuzzy
 msgid "Unable to process spool folder"
 msgstr "Kan ikkje laga 'spool'-katalog"
 
-#: camel/camel-filter-driver.c:1121
+#: camel/camel-filter-driver.c:1138
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Hentar melding %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1125
+#: camel/camel-filter-driver.c:1142
 msgid "Cannot open message"
 msgstr "Kan ikkje opne melding"
 
-#: camel/camel-filter-driver.c:1126 camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
 #, fuzzy, c-format
 msgid "Failed on message %d"
 msgstr "Kunne ikkje leggja til melding:\n"
 
-#: camel/camel-filter-driver.c:1152 camel/camel-filter-driver.c:1246
+#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
 msgid "Syncing folder"
 msgstr "Synkroniser mapper"
 
-#: camel/camel-filter-driver.c:1213
+#: camel/camel-filter-driver.c:1230
 #, fuzzy, c-format
 msgid "Getting message %d of %d"
 msgstr "Mottek meldingar frå %1"
 
-#: camel/camel-filter-driver.c:1228
+#: camel/camel-filter-driver.c:1245
 #, fuzzy, c-format
 msgid "Failed at message %d of %d"
 msgstr "Mottek meldingar frå %1"
@@ -8449,7 +8443,7 @@ msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: camel/camel-folder-search.c:346
+#: camel/camel-folder-search.c:347
 #, fuzzy, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -8458,7 +8452,7 @@ msgstr ""
 "Feil ved lesing av fil:\n"
 "%s"
 
-#: camel/camel-folder-search.c:356
+#: camel/camel-folder-search.c:357
 #, fuzzy, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -8467,39 +8461,39 @@ msgstr ""
 "Feil ved lesing av fil:\n"
 "%s"
 
-#: camel/camel-folder-search.c:573 camel/camel-folder-search.c:601
+#: camel/camel-folder-search.c:568 camel/camel-folder-search.c:597
 msgid "(match-all) requires a single bool result"
 msgstr ""
 
-#: camel/camel-folder-search.c:653
+#: camel/camel-folder-search.c:649
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder.c:583
+#: camel/camel-folder.c:585
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1161
+#: camel/camel-folder.c:1163
 #, fuzzy, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 "Feil ved lesing av fil:\n"
 "%s"
 
-#: camel/camel-folder.c:1201
+#: camel/camel-folder.c:1203
 #, fuzzy, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 "Feil ved lesing av fil:\n"
 "%s"
 
-#: camel/camel-folder.c:1319
+#: camel/camel-folder.c:1321
 msgid "Moving messages"
 msgstr "Flyttar melding"
 
-#: camel/camel-folder.c:1319
+#: camel/camel-folder.c:1321
 #, fuzzy
 msgid "Copying messages"
 msgstr "Melding"
@@ -8583,12 +8577,12 @@ msgstr "Klarte ikkje å dekode melding."
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "Kunne ikkje laga katalog\n"
 
-#: camel/camel-lock-client.c:111
+#: camel/camel-lock-client.c:100
 #, fuzzy, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "Kunne ikkje laga katalog\n"
 
-#: camel/camel-lock-client.c:124
+#: camel/camel-lock-client.c:113
 #, fuzzy, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr ""
@@ -8596,12 +8590,12 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
+#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr ""
 
-#: camel/camel-lock-client.c:215
+#: camel/camel-lock-client.c:204
 #, fuzzy, c-format
 msgid "Could not lock '%s'"
 msgstr "Kunne ikkje starta %1."
@@ -8701,11 +8695,11 @@ msgstr ""
 msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
 
-#: camel/camel-multipart-signed.c:644
+#: camel/camel-multipart-signed.c:646
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-multipart-signed.c:698
+#: camel/camel-multipart-signed.c:700
 #, fuzzy
 msgid "parse error"
 msgstr "Anna feil"
@@ -8768,11 +8762,11 @@ msgid ""
 "the server supports it."
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:46
+#: camel/camel-sasl-digest-md5.c:48
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: camel/camel-sasl-digest-md5.c:48
+#: camel/camel-sasl-digest-md5.c:50
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -8863,7 +8857,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:1052
+#: camel/providers/imap/camel-imap-store.c:1053
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -8920,24 +8914,24 @@ msgstr ""
 msgid "PLAIN"
 msgstr "Enkel"
 
-#: camel/camel-sasl-popb4smtp.c:34
+#: camel/camel-sasl-popb4smtp.c:36
 msgid "POP before SMTP"
 msgstr "POP før SMTP"
 
-#: camel/camel-sasl-popb4smtp.c:36
+#: camel/camel-sasl-popb4smtp.c:38
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr ""
 
-#: camel/camel-sasl-popb4smtp.c:107
+#: camel/camel-sasl-popb4smtp.c:103
 #, fuzzy
 msgid "POP Source URI"
 msgstr "Kjelder"
 
-#: camel/camel-sasl-popb4smtp.c:111
+#: camel/camel-sasl-popb4smtp.c:107
 msgid "POP Before SMTP auth using an unknown transport"
 msgstr ""
 
-#: camel/camel-sasl-popb4smtp.c:116
+#: camel/camel-sasl-popb4smtp.c:112
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr ""
 
@@ -8946,72 +8940,72 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:282
+#: camel/camel-service.c:277
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URLen «%s» treng ein bruknamn-komponent"
 
-#: camel/camel-service.c:290
+#: camel/camel-service.c:285
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:298
+#: camel/camel-service.c:293
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:750
+#: camel/camel-service.c:738
 #, c-format
 msgid "Resolving: %s"
 msgstr "Slår opp: %s"
 
-#: camel/camel-service.c:783 camel/camel-service.c:915
+#: camel/camel-service.c:769 camel/camel-service.c:893
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Feil i namneoppslag: %s"
 
-#: camel/camel-service.c:804
+#: camel/camel-service.c:790 camel/camel-service.c:914
 #, fuzzy, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr "Namneoppslag feila: ukjend grunn"
 
-#: camel/camel-service.c:818
+#: camel/camel-service.c:803
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:821
+#: camel/camel-service.c:806
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-service.c:880
+#: camel/camel-service.c:860
 msgid "Resolving address"
 msgstr "Slår opp addresse"
 
-#: camel/camel-service.c:949
+#: camel/camel-service.c:929
 msgid "Host lookup failed: host not found"
 msgstr "Namneoppslag feila: vert ikkje funnen"
 
-#: camel/camel-service.c:952
+#: camel/camel-service.c:932
 msgid "Host lookup failed: unknown reason"
 msgstr "Namneoppslag feila: ukjend grunn"
 
-#: camel/camel-session.c:75
+#: camel/camel-session.c:74
 msgid "Virtual folder email provider"
 msgstr ""
 
-#: camel/camel-session.c:77
+#: camel/camel-session.c:76
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:355 camel/camel-session.c:405
+#: camel/camel-session.c:348 camel/camel-session.c:398
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:528
+#: camel/camel-session.c:521
 #, fuzzy, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -9058,143 +9052,143 @@ msgstr "Klarte ikkje å dekode melding."
 msgid "Failed to verify certificates."
 msgstr "Åtvaring ved &tilbaketrekte sertifikat"
 
-#: camel/camel-store.c:215
+#: camel/camel-store.c:212
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Leitar etter tilleggsmodular"
 
-#: camel/camel-store.c:269
+#: camel/camel-store.c:266
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Klarar ikkje å opprette mappe: Ugyldig operasjon på dette lageret"
 
-#: camel/camel-tcp-stream-openssl.c:571
+#: camel/camel-tcp-stream-openssl.c:568
 #, fuzzy
 msgid "Unable to get issuer's certificate"
 msgstr "Åtvaring ved &tilbaketrekte sertifikat"
 
-#: camel/camel-tcp-stream-openssl.c:573
+#: camel/camel-tcp-stream-openssl.c:570
 msgid "Unable to get Certificate Revocation List"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:575
+#: camel/camel-tcp-stream-openssl.c:572
 #, fuzzy
 msgid "Unable to decrypt certificate signature"
 msgstr "Åtvaring ved &tilbaketrekte sertifikat"
 
-#: camel/camel-tcp-stream-openssl.c:577
+#: camel/camel-tcp-stream-openssl.c:574
 msgid "Unable to decrypt Certificate Revocation List signature"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:579
+#: camel/camel-tcp-stream-openssl.c:576
 msgid "Unable to decode issuer's public key"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:581
+#: camel/camel-tcp-stream-openssl.c:578
 #, fuzzy
 msgid "Certificate signature failure"
 msgstr "Signaturfil:"
 
-#: camel/camel-tcp-stream-openssl.c:583
+#: camel/camel-tcp-stream-openssl.c:580
 msgid "Certificate Revocation List signature failure"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:585
+#: camel/camel-tcp-stream-openssl.c:582
 msgid "Certificate not yet valid"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:587
+#: camel/camel-tcp-stream-openssl.c:584
 #, fuzzy
 msgid "Certificate has expired"
 msgstr "_Sertifikat-ID:"
 
-#: camel/camel-tcp-stream-openssl.c:589
+#: camel/camel-tcp-stream-openssl.c:586
 msgid "CRL not yet valid"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:591
+#: camel/camel-tcp-stream-openssl.c:588
 msgid "CRL has expired"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:596
+#: camel/camel-tcp-stream-openssl.c:593
 #, fuzzy
 msgid "Error in CRL"
 msgstr "Feil ved asting av %s"
 
-#: camel/camel-tcp-stream-openssl.c:598
+#: camel/camel-tcp-stream-openssl.c:595
 #, fuzzy
 msgid "Out of memory"
 msgstr "Ute av kontoret"
 
-#: camel/camel-tcp-stream-openssl.c:600
+#: camel/camel-tcp-stream-openssl.c:597
 msgid "Zero-depth self-signed certificate"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:602
+#: camel/camel-tcp-stream-openssl.c:599
 msgid "Self-signed certificate in chain"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:604
+#: camel/camel-tcp-stream-openssl.c:601
 msgid "Unable to get issuer's certificate locally"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:606
+#: camel/camel-tcp-stream-openssl.c:603
 #, fuzzy
 msgid "Unable to verify leaf signature"
 msgstr "Åtvaring ved &tilbaketrekte sertifikat"
 
-#: camel/camel-tcp-stream-openssl.c:608
+#: camel/camel-tcp-stream-openssl.c:605
 msgid "Certificate chain too long"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:610
+#: camel/camel-tcp-stream-openssl.c:607
 #, fuzzy
 msgid "Certificate Revoked"
 msgstr "_Sertifikat-ID:"
 
-#: camel/camel-tcp-stream-openssl.c:612
+#: camel/camel-tcp-stream-openssl.c:609
 msgid "Invalid Certificate Authority (CA)"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:614
+#: camel/camel-tcp-stream-openssl.c:611
 msgid "Path length exceeded"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:616
+#: camel/camel-tcp-stream-openssl.c:613
 #, fuzzy
 msgid "Invalid purpose"
 msgstr "Ugyldig argument"
 
-#: camel/camel-tcp-stream-openssl.c:618
+#: camel/camel-tcp-stream-openssl.c:615
 #, fuzzy
 msgid "Certificate untrusted"
 msgstr "_Sertifikat-ID:"
 
-#: camel/camel-tcp-stream-openssl.c:620
+#: camel/camel-tcp-stream-openssl.c:617
 #, fuzzy
 msgid "Certificate rejected"
 msgstr "_Sertifikat-ID:"
 
-#: camel/camel-tcp-stream-openssl.c:623
+#: camel/camel-tcp-stream-openssl.c:620
 msgid "Subject/Issuer mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:625
+#: camel/camel-tcp-stream-openssl.c:622
 msgid "AKID/SKID mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:627
+#: camel/camel-tcp-stream-openssl.c:624
 msgid "AKID/Issuer serial mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:629
+#: camel/camel-tcp-stream-openssl.c:626
 msgid "Key usage does not support certificate signing"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:632
+#: camel/camel-tcp-stream-openssl.c:629
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:699 camel/camel-tcp-stream-ssl.c:823
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9203,15 +9197,15 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
 msgid "BAD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:707
+#: camel/camel-tcp-stream-openssl.c:704
 #, fuzzy, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -9229,7 +9223,7 @@ msgstr ""
 "Vil du akseptere likevel?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:833
+#: camel/camel-tcp-stream-ssl.c:841
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9244,28 +9238,28 @@ msgstr ""
 "\n"
 "Vil du akseptere likevel?"
 
-#: camel/camel-tcp-stream-ssl.c:877
+#: camel/camel-tcp-stream-ssl.c:885
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:929
+#: camel/camel-tcp-stream-ssl.c:937
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:947
+#: camel/camel-tcp-stream-ssl.c:955
 #, fuzzy, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 msgstr "_Sertifikat-ID:"
 
-#: camel/camel-tcp-stream-ssl.c:964
+#: camel/camel-tcp-stream-ssl.c:972
 #, fuzzy, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9277,19 +9271,19 @@ msgstr "_Sertifikat-ID:"
 msgid "Could not parse URL `%s'"
 msgstr "Klarter ikkje å tolke URL frå «%s»"
 
-#: camel/camel-vee-folder.c:618
+#: camel/camel-vee-folder.c:611
 #, fuzzy, c-format
 msgid "Error storing `%s': %s"
 msgstr ""
 "Feil ved nedlasting av fil:\n"
 "%1"
 
-#: camel/camel-vee-folder.c:656
+#: camel/camel-vee-folder.c:649
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Inga slik melding %s i %s"
 
-#: camel/camel-vee-folder.c:819 camel/camel-vee-folder.c:825
+#: camel/camel-vee-folder.c:812 camel/camel-vee-folder.c:818
 #, fuzzy
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Berre sjekk for ny e-post."
@@ -9317,12 +9311,12 @@ msgstr "Leitar etter tilleggsmodular"
 #: 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:2644
+#: camel/providers/imap/camel-imap-store.c:2645
 msgid "Operation cancelled"
 msgstr "Operasjonen vart avbroten"
 
 #: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2647
+#: camel/providers/imap/camel-imap-store.c:2648
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
@@ -9359,40 +9353,40 @@ msgstr ""
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:222
+#: camel/providers/imap/camel-imap-folder.c:223
 #, fuzzy, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
 "Kan ikkje laga heimekatalog\n"
 "Feil: %1"
 
-#: camel/providers/imap/camel-imap-folder.c:241
+#: camel/providers/imap/camel-imap-folder.c:242
 #, fuzzy, c-format
 msgid "Could not load summary for %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/imap/camel-imap-folder.c:307
+#: camel/providers/imap/camel-imap-folder.c:308
 msgid "Folder was destroyed and recreated on server."
 msgstr ""
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:549
+#: camel/providers/imap/camel-imap-folder.c:550
 msgid "Scanning for changed messages"
 msgstr "Leitar etter endra meldingar"
 
-#: camel/providers/imap/camel-imap-folder.c:1883
+#: camel/providers/imap/camel-imap-folder.c:1886
 #, fuzzy, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Klarte ikkje å dekode melding."
 
-#: camel/providers/imap/camel-imap-folder.c:1920
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:225
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mbox-folder.c:351
-#: camel/providers/local/camel-mh-folder.c:201
-#: camel/providers/local/camel-mh-folder.c:211
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/imap/camel-imap-folder.c:1923
+#: camel/providers/local/camel-maildir-folder.c:211
+#: camel/providers/local/camel-maildir-folder.c:224
+#: camel/providers/local/camel-maildir-folder.c:233
+#: camel/providers/local/camel-mbox-folder.c:350
+#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-mh-folder.c:210
+#: camel/providers/local/camel-mh-folder.c:219
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -9401,24 +9395,24 @@ msgstr ""
 "Klarar ikkje å hente melding: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1920
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-mbox-folder.c:351
-#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/imap/camel-imap-folder.c:1923
+#: camel/providers/local/camel-maildir-folder.c:211
+#: camel/providers/local/camel-mbox-folder.c:350
+#: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "Ingen slik melding"
 
-#: camel/providers/imap/camel-imap-folder.c:1943
-#: camel/providers/imap/camel-imap-folder.c:2539
+#: camel/providers/imap/camel-imap-folder.c:1946
+#: camel/providers/imap/camel-imap-folder.c:2542
 msgid "This message is not currently available"
 msgstr "Denne meldinga er ikkje tilgjengeleg."
 
-#: camel/providers/imap/camel-imap-folder.c:2203
-#: camel/providers/imap/camel-imap-folder.c:2273
+#: camel/providers/imap/camel-imap-folder.c:2206
+#: camel/providers/imap/camel-imap-folder.c:2276
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2577
+#: camel/providers/imap/camel-imap-folder.c:2580
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -9480,12 +9474,14 @@ msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
 #: camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/nntp/camel-nntp-store.c:265
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:83
+#: camel/providers/imapp/camel-imapp-provider.c:65
 msgid "Password"
 msgstr "Passord"
 
 #: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
@@ -9500,57 +9496,61 @@ msgid "IMAP service for %s on %s"
 msgstr "IMAP-teneste for %s på %s"
 
 #: camel/providers/imap/camel-imap-store.c:587
-#: camel/providers/nntp/camel-nntp-store.c:130
-#: camel/providers/nntp/camel-nntp-store.c:148
+#: camel/providers/nntp/camel-nntp-store.c:128
+#: camel/providers/nntp/camel-nntp-store.c:146
 #: camel/providers/pop3/camel-pop3-store.c:184
+#: camel/providers/imapp/camel-imapp-store.c:233
 msgid "Connection cancelled"
 msgstr "Tilknytning avbroten"
 
 #: camel/providers/imap/camel-imap-store.c:590
-#: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/smtp/camel-smtp-transport.c:276
+#: camel/providers/nntp/camel-nntp-store.c:131
+#: camel/providers/smtp/camel-smtp-transport.c:275
+#: camel/providers/imapp/camel-imapp-store.c:236
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Klarte ikkje å kople til %s (port %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:649
-#: camel/providers/imap/camel-imap-store.c:680
+#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/imap/camel-imap-store.c:681
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/imap/camel-imap-store.c:651
 #: camel/providers/pop3/camel-pop3-store.c:220
 #, fuzzy
 msgid "SSL/TLS extension not supported."
 msgstr "Operasjonen vart stoppa"
 
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:682
 #: camel/providers/pop3/camel-pop3-store.c:261
 msgid "SSL negotiations failed"
 msgstr "SSL forhandlinga feila"
 
-#: camel/providers/imap/camel-imap-store.c:1075
+#: camel/providers/imap/camel-imap-store.c:1076
 #, 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:1085
-#: camel/providers/smtp/camel-smtp-transport.c:486
+#: camel/providers/imap/camel-imap-store.c:1086
+#: camel/providers/smtp/camel-smtp-transport.c:485
 #, fuzzy, c-format
 msgid "No support for authentication type %s"
 msgstr "Autentisering:"
 
-#: camel/providers/imap/camel-imap-store.c:1108
+#: camel/providers/imap/camel-imap-store.c:1109
+#: camel/providers/imapp/camel-imapp-store.c:498
+#: camel/providers/imapp/camel-imapp-store.c:546
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1122
+#: camel/providers/imap/camel-imap-store.c:1123
 msgid "You didn't enter a password."
 msgstr "Du tasta ikkje inn eit passord."
 
-#: camel/providers/imap/camel-imap-store.c:1151
+#: camel/providers/imap/camel-imap-store.c:1152
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9560,38 +9560,42 @@ msgstr ""
 "Ikkje i stand til å autentisere mot IMAP-tenar.\n"
 "%s\n"
 
-#: camel/providers/imap/camel-imap-store.c:1498
-#: camel/providers/imap/camel-imap-store.c:1640
+#: camel/providers/imap/camel-imap-store.c:1499
+#: camel/providers/imap/camel-imap-store.c:1641
 #, fuzzy, c-format
 msgid "No such folder %s"
 msgstr "Vidaresendt melding"
 
-#: camel/providers/imap/camel-imap-store.c:1841
+#: camel/providers/imap/camel-imap-store.c:1842
 #, fuzzy, 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 ""
 "Kan ikkje laga heimekatalog\n"
 "Feil: %1"
 
-#: camel/providers/imap/camel-imap-store.c:1853
+#: camel/providers/imap/camel-imap-store.c:1854
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Ukjend feil"
 
-#: camel/providers/imap/camel-imap-store.c:1889
+#: camel/providers/imap/camel-imap-store.c:1890
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
+#: camel/providers/local/camel-local-folder.c:173
+#, fuzzy
+msgid "Index message body data"
+msgstr "Sender ei melding til ein nettverksspelar"
+
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:354
+#: camel/providers/local/camel-local-folder.c:373
 #, fuzzy, c-format
 msgid "~%s (%s)"
 msgstr "%s (%d)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:358
-#: camel/providers/local/camel-local-folder.c:361
+#: camel/providers/local/camel-local-folder.c:377
+#: camel/providers/local/camel-local-folder.c:380
 #, fuzzy, c-format
 msgid "mailbox:%s (%s)"
 msgstr ""
@@ -9600,7 +9604,7 @@ msgstr ""
 "%2"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:365
+#: camel/providers/local/camel-local-folder.c:384
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -9724,18 +9728,18 @@ msgstr "Kunne ikkje lasta kalender '%1'.\n"
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:184
+#: camel/providers/local/camel-maildir-folder.c:183
 #, fuzzy
 msgid "Maildir append message cancelled"
 msgstr "Kunne ikkje leggja til melding:\n"
 
-#: camel/providers/local/camel-maildir-folder.c:187
+#: camel/providers/local/camel-maildir-folder.c:186
 #, fuzzy, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Mottek meldingar frå %1"
 
-#: camel/providers/local/camel-maildir-folder.c:235
-#: camel/providers/local/camel-mh-folder.c:221
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mh-folder.c:220
 msgid "Invalid message contents"
 msgstr ""
 
@@ -9818,13 +9822,13 @@ msgstr "Melding"
 msgid "Storing folder"
 msgstr "Lagrar mappe"
 
-#: camel/providers/local/camel-mbox-folder.c:159
-#: camel/providers/local/camel-spool-folder.c:149
+#: camel/providers/local/camel-mbox-folder.c:158
+#: camel/providers/local/camel-spool-folder.c:148
 #, fuzzy, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Leitar etter tilleggsmodular"
 
-#: camel/providers/local/camel-mbox-folder.c:218
+#: camel/providers/local/camel-mbox-folder.c:217
 #, fuzzy, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
@@ -9832,30 +9836,30 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: camel/providers/local/camel-mbox-folder.c:278
+#: camel/providers/local/camel-mbox-folder.c:277
 #, fuzzy
 msgid "Mail append cancelled"
 msgstr "Feil ved opning"
 
-#: camel/providers/local/camel-mbox-folder.c:281
+#: camel/providers/local/camel-mbox-folder.c:280
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:369
-#: camel/providers/local/camel-mbox-folder.c:400
-#: camel/providers/local/camel-mbox-folder.c:408
+#: camel/providers/local/camel-mbox-folder.c:368
+#: camel/providers/local/camel-mbox-folder.c:399
+#: camel/providers/local/camel-mbox-folder.c:407
 #, fuzzy, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
 "  %s"
 msgstr "Mottek meldingar frå %1"
 
-#: camel/providers/local/camel-mbox-folder.c:401
+#: camel/providers/local/camel-mbox-folder.c:400
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:409
+#: camel/providers/local/camel-mbox-folder.c:408
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
@@ -9933,7 +9937,7 @@ msgstr ""
 "%2"
 
 #: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:702
+#: camel/providers/local/camel-mbox-summary.c:704
 #, fuzzy, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
@@ -9950,39 +9954,39 @@ msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
 #: camel/providers/local/camel-mbox-summary.c:644
 #: camel/providers/local/camel-mbox-summary.c:652
-#: camel/providers/local/camel-mbox-summary.c:843
-#: camel/providers/local/camel-mbox-summary.c:851
+#: camel/providers/local/camel-mbox-summary.c:845
+#: camel/providers/local/camel-mbox-summary.c:853
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:777
+#: camel/providers/local/camel-mbox-summary.c:779
 #: camel/providers/local/camel-spool-summary.c:334
 #, fuzzy, c-format
 msgid "Unknown error: %s"
 msgstr "Ukjend feil"
 
-#: camel/providers/local/camel-mbox-summary.c:812
+#: camel/providers/local/camel-mbox-summary.c:814
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/local/camel-mbox-summary.c:906
-#: camel/providers/local/camel-mbox-summary.c:932
+#: camel/providers/local/camel-mbox-summary.c:908
+#: camel/providers/local/camel-mbox-summary.c:934
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:923
+#: camel/providers/local/camel-mbox-summary.c:925
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mh-folder.c:175
+#: camel/providers/local/camel-mh-folder.c:174
 #, fuzzy
 msgid "MH append message cancelled"
 msgstr "Sender ei melding til ein nettverksspelar"
 
-#: camel/providers/local/camel-mh-folder.c:178
+#: camel/providers/local/camel-mh-folder.c:177
 #, fuzzy, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Mottek meldingar frå %1"
@@ -10075,24 +10079,24 @@ msgstr "USENET news"
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:151
+#: camel/providers/nntp/camel-nntp-store.c:149
 #, fuzzy, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr ""
 "Kan ikkje laga heimekatalog\n"
 "Feil: %1"
 
-#: camel/providers/nntp/camel-nntp-store.c:163
+#: camel/providers/nntp/camel-nntp-store.c:161
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:262
+#: camel/providers/nntp/camel-nntp-store.c:260
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET News via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:269
+#: camel/providers/nntp/camel-nntp-store.c:267
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -10183,6 +10187,7 @@ msgid "Unknown reason"
 msgstr "Kjende program"
 
 #: camel/providers/pop3/camel-pop3-provider.c:38
+#: camel/providers/imapp/camel-imapp-provider.c:39
 #, fuzzy
 msgid "Message storage"
 msgstr "Meldingsliste"
@@ -10263,6 +10268,7 @@ msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Kunne ikkje starta underprosess."
 
 #: camel/providers/pop3/camel-pop3-store.c:468
+#: camel/providers/imapp/camel-imapp-store.c:415
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "Oppgi ditt OpenPGP-passord"
@@ -10342,147 +10348,147 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:184
 #, fuzzy
 msgid "Help message"
 msgstr "Lagra melding"
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service ready"
 msgstr "Teneste klar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:205
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:210
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:216
 #, fuzzy
 msgid "A password transition is needed"
 msgstr "Ingen passord oppgitt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:221
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:223
+#: camel/providers/smtp/camel-smtp-transport.c:222
 #, fuzzy
 msgid "Temporary authentication failure"
 msgstr "Autentisering:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:225
+#: camel/providers/smtp/camel-smtp-transport.c:224
 #, fuzzy
 msgid "Authentication required"
 msgstr "Autentisering:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:299
+#: camel/providers/smtp/camel-smtp-transport.c:298
 #, fuzzy
 msgid "Welcome response error"
 msgstr "Feil svar på RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:343
-#: camel/providers/smtp/camel-smtp-transport.c:382
+#: camel/providers/smtp/camel-smtp-transport.c:342
+#: camel/providers/smtp/camel-smtp-transport.c:381
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:344
+#: camel/providers/smtp/camel-smtp-transport.c:343
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "Meldinga ser ikkje ut til å vere skikkeleg forma"
 
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/smtp/camel-smtp-transport.c:357
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:373
+#: camel/providers/smtp/camel-smtp-transport.c:372
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "Feil svar på RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:476
+#: camel/providers/smtp/camel-smtp-transport.c:475
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "Autentisering:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:514
+#: camel/providers/smtp/camel-smtp-transport.c:513
 #, fuzzy, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "Oppgi ditt OpenPGP-passord"
 
-#: camel/providers/smtp/camel-smtp-transport.c:533
+#: camel/providers/smtp/camel-smtp-transport.c:532
 #, fuzzy, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -10490,94 +10496,94 @@ msgid ""
 "\n"
 msgstr "Kunne ikkje starta underprosess."
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:665
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-tenar %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:668
+#: camel/providers/smtp/camel-smtp-transport.c:667
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:685
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:613
+#: camel/providers/smtp/camel-smtp-transport.c:690 mail/mail-ops.c:637
 #, fuzzy
 msgid "Sending message"
 msgstr "Sen melding"
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:705
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:715
+#: camel/providers/smtp/camel-smtp-transport.c:714
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Meldinga har ingen sendar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:880
+#: camel/providers/smtp/camel-smtp-transport.c:879
 #, fuzzy
 msgid "SMTP Greeting"
 msgstr "Møte"
 
-#: camel/providers/smtp/camel-smtp-transport.c:927
+#: camel/providers/smtp/camel-smtp-transport.c:926
 #, fuzzy, c-format
 msgid "HELO request timed out: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:949
+#: camel/providers/smtp/camel-smtp-transport.c:948
 #, fuzzy
 msgid "HELO response error"
 msgstr "Feil svar på RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1015
+#: camel/providers/smtp/camel-smtp-transport.c:1014
 #, fuzzy
 msgid "SMTP Authentication"
 msgstr "Autentisering:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1021
+#: camel/providers/smtp/camel-smtp-transport.c:1020
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1038
-#: camel/providers/smtp/camel-smtp-transport.c:1050
+#: camel/providers/smtp/camel-smtp-transport.c:1037
+#: camel/providers/smtp/camel-smtp-transport.c:1049
 #, fuzzy, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1059
+#: camel/providers/smtp/camel-smtp-transport.c:1058
 #, fuzzy
 msgid "AUTH request failed."
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1120
+#: camel/providers/smtp/camel-smtp-transport.c:1119
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1145
+#: camel/providers/smtp/camel-smtp-transport.c:1144
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1165
+#: camel/providers/smtp/camel-smtp-transport.c:1164
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "Feil svar på RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1189
+#: camel/providers/smtp/camel-smtp-transport.c:1188
 #, fuzzy, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1210
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1250
+#: camel/providers/smtp/camel-smtp-transport.c:1249
 #, fuzzy, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
@@ -10585,72 +10591,72 @@ msgstr "Kunne ikkje lasta kalender '%1'.\n"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1270
+#: camel/providers/smtp/camel-smtp-transport.c:1269
 #, fuzzy
 msgid "DATA response error"
 msgstr "Feil svar på RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1311
-#: camel/providers/smtp/camel-smtp-transport.c:1334
+#: camel/providers/smtp/camel-smtp-transport.c:1310
+#: camel/providers/smtp/camel-smtp-transport.c:1333
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1354
+#: camel/providers/smtp/camel-smtp-transport.c:1353
 msgid "DATA termination response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1377
+#: camel/providers/smtp/camel-smtp-transport.c:1376
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1397
+#: camel/providers/smtp/camel-smtp-transport.c:1396
 #, fuzzy
 msgid "RSET response error"
 msgstr "Feil svar på RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1420
+#: camel/providers/smtp/camel-smtp-transport.c:1419
 #, fuzzy, c-format
 msgid "QUIT request timed out: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1440
+#: camel/providers/smtp/camel-smtp-transport.c:1439
 #, fuzzy
 msgid "QUIT response error"
 msgstr "Feil svar på RSET: %s"
 
-#: composer/e-msg-composer-attachment-bar.c:102
+#: composer/e-msg-composer-attachment-bar.c:103
 #, fuzzy, c-format
 msgid "%.0fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:105
+#: composer/e-msg-composer-attachment-bar.c:106
 #, fuzzy, c-format
 msgid "%.0fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:109
 #, fuzzy, c-format
 msgid "%.0fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:370 mail/mail-display.c:227
+#: composer/e-msg-composer-attachment-bar.c:293 mail/mail-display.c:227
 msgid "attachment"
 msgstr "vedlegg"
 
-#: composer/e-msg-composer-attachment-bar.c:508
+#: composer/e-msg-composer-attachment-bar.c:431
 #, fuzzy
 msgid "Remove selected items from the attachment list"
 msgstr "Fjern det valte programmet frå lista"
 
-#: composer/e-msg-composer-attachment-bar.c:538
+#: composer/e-msg-composer-attachment-bar.c:461
 #, fuzzy
 msgid "Add attachment..."
 msgstr "Vedlegg"
 
-#: composer/e-msg-composer-attachment-bar.c:539
+#: composer/e-msg-composer-attachment-bar.c:462
 #, fuzzy
 msgid "Attach a file to the message"
 msgstr "Kunne ikkje lagra melding(ar)."
@@ -10685,8 +10691,11 @@ msgid "Suggest automatic display of attachment"
 msgstr ""
 
 #: composer/e-msg-composer-hdrs.c:290
-msgid "Hey you, dunce. You need an account to send mail doncha know."
+#, 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:483
 #, fuzzy
@@ -10764,12 +10773,12 @@ msgstr "Ingen skildring"
 msgid "Attach file(s)"
 msgstr "Legg ved fil"
 
-#: composer/e-msg-composer.c:535
+#: composer/e-msg-composer.c:557
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "Kunne ikkje laga kio-jobb.\n"
 
-#: composer/e-msg-composer.c:814
+#: composer/e-msg-composer.c:836
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10778,56 +10787,56 @@ msgstr ""
 "Feil ved lesing av fil %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1177
+#: composer/e-msg-composer.c:1199
 msgid "File exists, overwrite?"
 msgstr "Fila eksisterar, skriv over?"
 
-#: composer/e-msg-composer.c:1195
+#: composer/e-msg-composer.c:1217
 #, fuzzy, c-format
 msgid "Error saving file: %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: composer/e-msg-composer.c:1218
+#: composer/e-msg-composer.c:1240
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Feil ved lasting av fil %s"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1278
 #, fuzzy, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: composer/e-msg-composer.c:1264
+#: composer/e-msg-composer.c:1286
 #, fuzzy
 msgid "Unable to retrieve message from editor"
 msgstr "Kunne ikkje motta fil"
 
-#: composer/e-msg-composer.c:1271
+#: composer/e-msg-composer.c:1293
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: composer/e-msg-composer.c:1278
+#: composer/e-msg-composer.c:1300
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: composer/e-msg-composer.c:1287
+#: composer/e-msg-composer.c:1309
 #, fuzzy, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
 "%s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: composer/e-msg-composer.c:1296
+#: composer/e-msg-composer.c:1318
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10836,13 +10845,13 @@ msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: composer/e-msg-composer.c:1390
+#: composer/e-msg-composer.c:1415
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1552
+#: composer/e-msg-composer.c:1578
 #, fuzzy, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10852,35 +10861,35 @@ msgstr ""
 "Dette er siste trekk.\n"
 "Vil du leggja til fleire trekk?"
 
-#: composer/e-msg-composer.c:1561
+#: composer/e-msg-composer.c:1587
 msgid "Warning: Modified Message"
 msgstr "Åtvaring: Melding er endra"
 
-#: composer/e-msg-composer.c:1593
+#: composer/e-msg-composer.c:1619
 msgid "Open file"
 msgstr "Opna fil"
 
-#: composer/e-msg-composer.c:2017
+#: composer/e-msg-composer.c:2043
 #, fuzzy
 msgid "Signature:"
 msgstr "Lagre signatur"
 
-#: composer/e-msg-composer.c:2057 mail/mail-account-gui.c:1261
+#: composer/e-msg-composer.c:2083 mail/mail-account-gui.c:1261
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2233 composer/e-msg-composer.c:2902
-#: composer/e-msg-composer.c:2903
+#: composer/e-msg-composer.c:2259 composer/e-msg-composer.c:2926
+#: composer/e-msg-composer.c:2927
 msgid "Compose a message"
 msgstr "Skriv ei melding"
 
-#: composer/e-msg-composer.c:2934
+#: composer/e-msg-composer.c:2958
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2962
+#: composer/e-msg-composer.c:2986
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -10889,24 +10898,24 @@ msgid ""
 "of gtkhtml and libgtkhtml installed.\n"
 msgstr "Kan ikkje laga nytt vindauge.\n"
 
-#: composer/e-msg-composer.c:3029
+#: composer/e-msg-composer.c:3053
 #, 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:4045
+#: composer/e-msg-composer.c:4088
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
-#: data/evolution.desktop.in.h:1
+#: data/evolution.desktop.in.h:1 data/evolution.desktop.in.in.h:1
 msgid "The Evolution groupware suite"
 msgstr "Gruppevareverktyet Evolution"
 
-#: data/evolution.desktop.in.h:2
+#: data/evolution.desktop.in.h:2 data/evolution.desktop.in.in.h:2
 msgid "Ximian Evolution"
 msgstr "Ximian Evolution"
 
@@ -11088,87 +11097,87 @@ msgstr "Kategoriar"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:172 e-util/e-time-utils.c:385
+#: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:177 e-util/e-time-utils.c:376
+#: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
 msgid "%a %m/%d/%Y %H:%M"
 msgstr ""
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:182
+#: e-util/e-time-utils.c:195
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %m/%d/%Y %I %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:187
+#: e-util/e-time-utils.c:200
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %d/%m/%Y %H"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: e-util/e-time-utils.c:198
+#: e-util/e-time-utils.c:211
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%m/%d/%Y %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: e-util/e-time-utils.c:202
+#: e-util/e-time-utils.c:215
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%d/%m/%Y %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:207
+#: e-util/e-time-utils.c:220
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%m/%d/%Y %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:212
+#: e-util/e-time-utils.c:225
 msgid "%m/%d/%Y %H:%M"
 msgstr "%d/%m/%Y %H:%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:217
+#: e-util/e-time-utils.c:230
 msgid "%m/%d/%Y %I %p"
 msgstr "%m/%d/%Y %I %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:222
+#: e-util/e-time-utils.c:235
 msgid "%m/%d/%Y %H"
 msgstr "%m/%d/%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:326 e-util/e-time-utils.c:425
+#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:330 e-util/e-time-utils.c:417
+#: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#: e-util/e-time-utils.c:335 e-util/e-time-utils.c:422
-#: widgets/misc/e-dateedit.c:1404 widgets/misc/e-dateedit.c:1617
+#: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
+#: widgets/misc/e-dateedit.c:1415 widgets/misc/e-dateedit.c:1640
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:414
-#: widgets/misc/e-dateedit.c:1401 widgets/misc/e-dateedit.c:1614
+#: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
+#: widgets/misc/e-dateedit.c:1412 widgets/misc/e-dateedit.c:1637
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:343
+#: e-util/e-time-utils.c:356
 msgid "%I %p"
 msgstr "%I %p"
 
@@ -11611,7 +11620,7 @@ msgstr "er ikkje"
 msgid "is not Flagged"
 msgstr "er ikkje flagga"
 
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1800
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1839
 msgid "Label"
 msgstr "Etikett"
 
@@ -11677,7 +11686,7 @@ msgstr "er mindre enn"
 msgid "Score"
 msgstr "Poengsum"
 
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1820
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1826
 msgid "Sender"
 msgstr "Avsendar"
 
@@ -11715,7 +11724,7 @@ msgstr "byrjar med"
 msgid "Stop Processing"
 msgstr "Stopp prosessering"
 
-#: filter/libfilter-i18n.h:60 mail/mail-format.c:934
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:969
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
 msgid "Subject"
 msgstr "Emne"
@@ -11780,7 +11789,7 @@ msgstr "Importerar ..."
 #: importers/pine-importer.c:103 mail/importers/elm-importer.c:108
 #: mail/importers/netscape-importer.c:1240 mail/importers/pine-importer.c:117
 msgid "Please wait"
-msgstr "Venlegast vent"
+msgstr "Vent litt"
 
 #: importers/elm-importer.c:169 importers/netscape-importer.c:1808
 #: importers/pine-importer.c:365 mail/importers/elm-importer.c:157
@@ -11792,13 +11801,13 @@ msgstr "Importerar %s som %s"
 #: importers/elm-importer.c:375 importers/netscape-importer.c:1917
 #: importers/pine-importer.c:471 mail/importers/elm-importer.c:392
 #: mail/importers/netscape-importer.c:1887 mail/importers/pine-importer.c:425
-#, fuzzy, c-format
+#, c-format
 msgid "Scanning %s"
-msgstr "Sender %1"
+msgstr "Søker gjennom %s"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2128
 #: importers/pine-importer.c:637 mail/component-factory.c:117
-#: mail/folder-browser-ui.c:360 mail/importers/elm-importer.c:526
+#: mail/folder-browser-ui.c:362 mail/importers/elm-importer.c:526
 #: mail/importers/netscape-importer.c:2085 mail/importers/pine-importer.c:572
 #: my-evolution/my-evolution.glade.h:4
 msgid "Mail"
@@ -11809,6 +11818,8 @@ msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
 msgstr ""
+"Evolution har funne e-post-filer frå Elm.\n"
+"Vil du importera desse filene til Evolution?"
 
 #: importers/elm-importer.c:574 mail/importers/elm-importer.c:568
 msgid "Elm"
@@ -11819,11 +11830,13 @@ msgid ""
 "Evolution has found GnomeCard files.\n"
 "Would you like them to be imported into Evolution?"
 msgstr ""
+"Evolution har funne GnomeCard-filer.\n"
+"Vil du importera dei til Evolution?"
 
 #: importers/netscape-importer.c:70 mail/importers/netscape-importer.c:75
-#, fuzzy, c-format
+#, c-format
 msgid "Priority Filter \"%s\""
-msgstr "Prioritet: %s"
+msgstr "Prioritetsfilter: «%s»"
 
 #: importers/netscape-importer.c:653 mail/importers/netscape-importer.c:663
 msgid ""
@@ -11839,6 +11852,17 @@ msgid ""
 "of priorities. Check the imported filters to make sure\n"
 "everything still works as intended."
 msgstr ""
+"Ein del av e-postfiltera du har i Netscape er tufta på\n"
+"e-postprioritetar, som Evolution ikkje bruker. I staden\n"
+"brukar Evolution poeng frå -3 til 3, som kan tildelast\n"
+"e-postar og få filtrerast.\n"
+"\n"
+"For å koma utanom dette problemet, finst det eit sett med\n"
+"filter som heiter «prioritetsfilter». Dei kan rekna om Netscape\n"
+"sine e-postprioritetar til Evolution sine poeng, og dei\n"
+"Netscape-filtera det gjeld, kan dermed bruka poeng i staden for\n"
+"prioritetar. Kontroller dei importerte filtera for å vera\n"
+"sikker på at alt virkar som før."
 
 #: importers/netscape-importer.c:677 mail/importers/netscape-importer.c:687
 msgid ""
@@ -11847,6 +11871,10 @@ msgid ""
 "feature, which is not supported in Evolution.\n"
 "These filters will be dropped."
 msgstr ""
+"Nokon av Netscape-e-postfilter dine bruker\n"
+"«Ignorer tråd» eller «Følg med på tråd»-eigenskapene,\n"
+"som ikkje er støtta i Evolution. Desse filtera\n"
+"vil bli forkasta."
 
 #: importers/netscape-importer.c:694 mail/importers/netscape-importer.c:704
 msgid ""
@@ -11856,32 +11884,34 @@ msgid ""
 "were modified to test whether that string is or is not\n"
 "contained in the message body."
 msgstr ""
+"Nokon av Netscape-e-postfiltera dine testar\n"
+"meldingskroppen i e-postane dine om dei er lik\n"
+"eller ulik ein gjeven streng. Evolution støttar\n"
+"ikkje slik testing, så desse filtera er endra til\n"
+"å testa om den gjevne strengen er ein del av\n"
+"meldingskroppen eller ikkje."
 
 #: importers/netscape-importer.c:1227 mail/importers/netscape-importer.c:1237
 msgid "Evolution is importing your old Netscape data"
-msgstr ""
+msgstr "Evolution importerer gamle Netscape-data"
 
 #. Fill in the new fields
 #: importers/netscape-importer.c:1872 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1092 shell/e-local-storage.c:184
+#: mail/mail-ops.c:1116 shell/e-local-storage.c:184
 msgid "Trash"
 msgstr "Papirkorg"
 
 #: importers/netscape-importer.c:2028 mail/importers/netscape-importer.c:1995
-#, fuzzy
 msgid "Scanning mail filters"
-msgstr ""
-"Feil ved lesing a fil:\n"
-"%1"
+msgstr "Søker gjennom e-postfilter"
 
 #: importers/netscape-importer.c:2038 importers/pine-importer.c:570
 #: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
-#, fuzzy
 msgid "Scanning directory"
-msgstr "Leitar etter tilleggsmodular"
+msgstr "Søker gjennom katalog"
 
 #: importers/netscape-importer.c:2047 mail/importers/netscape-importer.c:2015
-#: shell/e-shell-startup-wizard.c:541
+#: shell/e-shell-startup-wizard.c:556
 msgid "Starting import"
 msgstr "Startar importering"
 
@@ -11890,15 +11920,16 @@ msgid "Settings"
 msgstr "Innstillingar"
 
 #: importers/netscape-importer.c:2138 mail/importers/netscape-importer.c:2095
-#, fuzzy
 msgid "Mail Filters"
-msgstr "Rediger filter"
+msgstr "E-postfilter"
 
 #: importers/netscape-importer.c:2161 mail/importers/netscape-importer.c:2119
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
 msgstr ""
+"Evolution har funne Netscape-e-postfilter.\n"
+"Vil du importera dei til Evolution?"
 
 #: importers/pine-importer.c:100 mail/importers/pine-importer.c:114
 msgid "Evolution is importing your old Pine data"
@@ -11918,108 +11949,95 @@ msgstr "Pine"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:1
 msgid "Composer Preferences"
-msgstr ""
+msgstr "Redigerarinstillingar"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
+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
 msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
+msgstr "Set opp stavekontroll, signaturar og meldingsredigeraren"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:4
 msgid "Configure your email accounts here"
-msgstr ""
+msgstr "Set opp e-postkontoar"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:5
-#, fuzzy
 msgid "Evolution Mail"
-msgstr "Evolution"
+msgstr "Evolution e-post"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:6
-#, fuzzy
 msgid "Evolution Mail accounts configuration control"
-msgstr "Øydelagd oppsettfil."
+msgstr "Evolution oppsettkontroll for e-postkontoar"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:7
-#, fuzzy
 msgid "Evolution Mail component"
-msgstr "Kan ikkje initialisera lokale variablar"
+msgstr "Evolution e-postkomponent"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:8
-#, fuzzy
 msgid "Evolution Mail composer"
-msgstr "Kan ikkje initialisera lokale variablar"
+msgstr "Evolution e-postredigerar"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:9
-#, fuzzy
 msgid "Evolution Mail composer configuration control"
-msgstr "Øydelagd oppsettfil."
+msgstr "Evolution oppsettkontroll for e-postredigerar"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:10
-#, fuzzy
 msgid "Evolution Mail configuration interface"
-msgstr "Oppsett"
+msgstr "Evolution grensesnitt for oppsett av e-post"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:11
 #, fuzzy
 msgid "Evolution Mail folder viewer"
-msgstr "Kan ikkje initialisera lokale variablar"
+msgstr "Evolution epostmappevisar"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:12
-#, fuzzy
 msgid "Evolution Mail preferences control"
-msgstr "Kan ikkje initialisera lokale variablar"
+msgstr "Evolution e-postinnstillingskontroll"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:13
-#, fuzzy
 msgid "Mail Accounts"
-msgstr "Kontoar"
+msgstr "E-postkontoar"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:69
 msgid "Mail Preferences"
-msgstr ""
+msgstr "E-postinnstillingar"
 
 #: mail/component-factory.c:117
-#, fuzzy
 msgid "Folder containing mail"
-msgstr "Fil alt i liste"
+msgstr "Mappe som inneheld e-post"
 
 #: mail/component-factory.c:118
-#, fuzzy
 msgid "Public Mail"
-msgstr "Offentleg"
+msgstr "Offentleg tilgjengeleg e-post"
 
 #: mail/component-factory.c:118
 #, fuzzy
 msgid "Public folder containing mail"
-msgstr "Fil alt i liste"
+msgstr "Offentleg mappe som inneheld e-post"
 
 #: mail/component-factory.c:119
 msgid "Virtual Trash"
 msgstr "Virtuell papirkorg"
 
 #: mail/component-factory.c:119
-#, fuzzy
 msgid "Virtual Trash folder"
-msgstr "Mapper"
+msgstr "Virtuell papirkorgmappe"
 
 #: mail/component-factory.c:147
 msgid "This folder cannot contain messages."
-msgstr "Denne mappe kan ikkje innehalde meldingar."
+msgstr "Denne mappa kan ikkje innehalda meldingar."
 
 #: mail/component-factory.c:441
 msgid "Properties..."
 msgstr "Eigenskapar ..."
 
 #: mail/component-factory.c:441
-#, fuzzy
 msgid "Change this folder's properties"
-msgstr "Endra namnet på spelarane"
+msgstr "Endra eigenskapane til mappa"
 
-#: mail/component-factory.c:819
+#: mail/component-factory.c:823
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -12027,244 +12045,233 @@ msgstr ""
 "Nokre av e-postinstillingane dine ser ut til å vere øydelagde, sjekk at alt "
 "er i orden."
 
-#: mail/component-factory.c:1000
+#: mail/component-factory.c:1004
 msgid "You have not set a mail transport method"
 msgstr "Du har ikkje sett opp ein transportmetode for e-post"
 
-#: mail/component-factory.c:1023
+#: mail/component-factory.c:1027
 msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr ""
+msgstr "Du har usendte meldingar, vil du avslutta likevel?"
 
-#: mail/component-factory.c:1063
+#: mail/component-factory.c:1067
 msgid "New Mail Message"
 msgstr "Ny e-postmelding"
 
-#: mail/component-factory.c:1063
+#: mail/component-factory.c:1067
 msgid "_Mail Message"
-msgstr ""
+msgstr "_E-post"
 
-#: mail/component-factory.c:1064
-#, fuzzy
+#: mail/component-factory.c:1068
 msgid "Compose a new mail message"
-msgstr "Skriv ei melding"
+msgstr "Skriv ein e-post"
 
-#: mail/component-factory.c:1072
+#: mail/component-factory.c:1076
 #, fuzzy
 msgid "New Message Post"
 msgstr "Ny melding"
 
-#: mail/component-factory.c:1072
+#: mail/component-factory.c:1076
 #, fuzzy
+# TRN: «Send» betre enn «post»?
 msgid "_Post Message"
-msgstr "Forrige melding"
+msgstr "_Post meldinga"
 
-#: mail/component-factory.c:1073
+#: mail/component-factory.c:1077
 #, fuzzy
 msgid "Post a new mail message"
-msgstr "Ny e-postmelding"
+msgstr "Post ein ny e-post"
 
-#: mail/component-factory.c:1365
-#, fuzzy
+#: mail/component-factory.c:1369
 msgid "Connecting..."
-msgstr " Koplar til tenar ..."
+msgstr "Koplar til tenar ..."
 
-#: mail/component-factory.c:1376
+#: mail/component-factory.c:1380
 msgid "Cannot register storage with shell"
 msgstr "Klarar ikkje å registrer lager med skal"
 
-#: mail/folder-browser-ui.c:486
+#: mail/folder-browser-ui.c:475
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Eigenskapar for «%s»"
 
-#: mail/folder-browser-ui.c:488
+#: mail/folder-browser-ui.c:477
 msgid "Properties"
 msgstr "Eigenskapar"
 
-#: mail/folder-browser.c:327 mail/mail-display.c:394 mail/mail-display.c:942
+#: mail/folder-browser.c:329 mail/mail-display.c:396 mail/mail-display.c:1033
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Klarte ikkje å lage mellombels katalog: %s"
 
-#: mail/folder-browser.c:782
+#: mail/folder-browser.c:804
 #, c-format
 msgid "%d new"
 msgstr "%d nye"
 
-#: mail/folder-browser.c:785 mail/folder-browser.c:793
-#: mail/folder-browser.c:796
+#: mail/folder-browser.c:807 mail/folder-browser.c:815
+#: mail/folder-browser.c:818
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:787
+#: mail/folder-browser.c:809
 #, c-format
 msgid "%d hidden"
 msgstr "%d gøymde"
 
-#: mail/folder-browser.c:789
+#: mail/folder-browser.c:811
 #, c-format
 msgid "%d visible"
-msgstr ""
+msgstr "%d synlege"
 
-#: mail/folder-browser.c:794
+#: mail/folder-browser.c:816
 #, c-format
 msgid "%d selected"
 msgstr "%d valde"
 
-#: mail/folder-browser.c:799
+#: mail/folder-browser.c:821
 #, c-format
 msgid "%d unsent"
 msgstr "%d usendt"
 
-#: mail/folder-browser.c:801
+#: mail/folder-browser.c:823
 #, c-format
 msgid "%d sent"
 msgstr "%d sendt"
 
-#: mail/folder-browser.c:803
+#: mail/folder-browser.c:825
 #, c-format
 msgid "%d total"
 msgstr "%d totalt"
 
-#: mail/folder-browser.c:1182
-#, fuzzy
+#: mail/folder-browser.c:1204
 msgid "Create _Virtual Folder From Search..."
-msgstr "Mapper"
+msgstr "Lag _virtuell mappe frå søk ..."
 
-#: mail/folder-browser.c:1736
+#: mail/folder-browser.c:1775
 msgid "VFolder on _Subject"
 msgstr "vMappe på _emne"
 
-#: mail/folder-browser.c:1737
+#: mail/folder-browser.c:1776
 msgid "VFolder on Se_nder"
 msgstr "vMappe på avse_dar"
 
-#: mail/folder-browser.c:1738
+#: mail/folder-browser.c:1777
 msgid "VFolder on _Recipients"
 msgstr "vMappe på mottaka_r"
 
-#: mail/folder-browser.c:1739
+#: mail/folder-browser.c:1778
 msgid "VFolder on Mailing _List"
 msgstr "vMappe på e-post_liste"
 
-#: mail/folder-browser.c:1743
+#: mail/folder-browser.c:1782
 msgid "Filter on Sub_ject"
 msgstr "Filtrér på _emne"
 
-#: mail/folder-browser.c:1744
+#: mail/folder-browser.c:1783
 msgid "Filter on Sen_der"
 msgstr "Filtrér på avsen_dar:"
 
-#: mail/folder-browser.c:1745
-#, fuzzy
+#: mail/folder-browser.c:1784
 msgid "Filter on Re_cipients"
-msgstr "Skriv ut filer"
+msgstr "Filtrer på _mottakarar"
 
-#: mail/folder-browser.c:1746 mail/folder-browser.c:2070
-#, fuzzy
+#: mail/folder-browser.c:1785 mail/folder-browser.c:2109
 msgid "Filter on _Mailing List"
-msgstr "Fil alt i liste"
+msgstr "Filtrer på _e-postliste"
 
-#: mail/folder-browser.c:1764
+#: mail/folder-browser.c:1803
 msgid "_Edit as New Message..."
 msgstr "R_ediger som ny melding .."
 
-#: mail/folder-browser.c:1766
+#: mail/folder-browser.c:1805
 msgid "_Print"
 msgstr "S_kriv ut"
 
-#: mail/folder-browser.c:1770 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1809 ui/evolution-mail-message.xml.h:112
 msgid "_Reply to Sender"
 msgstr "Sva_r til avsendar"
 
-#: mail/folder-browser.c:1771 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1810 ui/evolution-mail-message.xml.h:76
 msgid "Reply to _List"
 msgstr "Svar til _liste"
 
-#: mail/folder-browser.c:1772 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1811 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: mail/folder-browser.c:1773
+#: mail/folder-browser.c:1812
 msgid "_Forward"
 msgstr "_Vidaresend"
 
-#: mail/folder-browser.c:1777
+#: mail/folder-browser.c:1816
 msgid "Follo_w Up..."
-msgstr ""
+msgstr "_Følg opp ..."
 
-#: mail/folder-browser.c:1778
-#, fuzzy
+#: mail/folder-browser.c:1817
 msgid "Fla_g Completed"
-msgstr "Ferdig"
+msgstr "_Merk som ferdig"
 
-#: mail/folder-browser.c:1779
-#, fuzzy
+#: mail/folder-browser.c:1818
 msgid "Cl_ear Flag"
-msgstr "Tøm"
+msgstr "_Fjern merke"
 
 #. separator here?
-#: mail/folder-browser.c:1783 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1822 ui/evolution-mail-message.xml.h:44
 msgid "Mar_k as Read"
 msgstr "Mar_ker som lesen"
 
-#: mail/folder-browser.c:1784
-#, fuzzy
+#: mail/folder-browser.c:1823
 msgid "Mark as _Unread"
 msgstr "Marker som _ulesen"
 
-#: mail/folder-browser.c:1785
+#: mail/folder-browser.c:1824
 msgid "Mark as _Important"
 msgstr "Marker som v_iktig"
 
-#: mail/folder-browser.c:1786
-#, fuzzy
+#: mail/folder-browser.c:1825
 msgid "_Mark as Unimportant"
-msgstr "Marker som uvi_ktig"
+msgstr "Marker som ikkje vi_ktig"
 
-#: mail/folder-browser.c:1791
-#, fuzzy
+#: mail/folder-browser.c:1830
 msgid "U_ndelete"
-msgstr "Slett"
+msgstr "_Angra sletting"
 
-#: mail/folder-browser.c:1795
-#, fuzzy
+#: mail/folder-browser.c:1834
 msgid "Mo_ve to Folder..."
 msgstr "Flytt til _mappe ..."
 
-#: mail/folder-browser.c:1796 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1835 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Kopier til mappe ..."
 
-#: mail/folder-browser.c:1804
-#, fuzzy
+#: mail/folder-browser.c:1843
 msgid "Add Sender to Address_book"
-msgstr "Legg til avsendar i adresseboka"
+msgstr "_Legg til avsendar i adresseboka"
 
-#: mail/folder-browser.c:1808
+#: mail/folder-browser.c:1847
 #, fuzzy
+# TRN: «Bruk» rett? Kva med «Køyr» eller «Filtrer»?
 msgid "Appl_y Filters"
-msgstr "Bruk filter"
+msgstr "_Bruk filter"
 
-#: mail/folder-browser.c:1812
-#, fuzzy
+#: mail/folder-browser.c:1851
 msgid "Crea_te Rule From Message"
-msgstr "Mapper"
+msgstr "_Lag regel frå melding"
 
-#: mail/folder-browser.c:2071
+#: mail/folder-browser.c:2110
 #, fuzzy
 msgid "VFolder on M_ailing List"
-msgstr "Fil alt i liste"
+msgstr "Vmappe på e-post_liste"
 
-#: mail/folder-browser.c:2073
-#, fuzzy, c-format
+#: mail/folder-browser.c:2112
+#, c-format
 msgid "Filter on _Mailing List (%s)"
-msgstr "Filtrér på e-postliste (%s)"
+msgstr "_Filtrér på e-postliste (%s)"
 
-#: mail/folder-browser.c:2074
+#: mail/folder-browser.c:2113
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
-msgstr "Fil alt i liste"
+msgstr "Vmappe på e-post_liste (%s)"
 
 #: mail/folder-browser.h:26 mail/mail-config.glade.h:39
 msgid "Default"
@@ -12277,49 +12284,45 @@ msgstr "Hentar informasjon om mapper"
 #: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
 #, fuzzy
 msgid "Evolution Elm importer"
-msgstr "Kan ikkje initialisera lokale variablar"
+msgstr "Evolution Elm-importør"
 
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
 #, fuzzy
 msgid "Evolution mbox importer"
-msgstr "Kan ikkje initialisera lokale variablar"
+msgstr "Evolution mbox-importør"
 
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
 msgid "MBox (mbox)"
-msgstr ""
+msgstr "MBox (mbox)"
 
 #: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
 #, fuzzy
 msgid "Evolution Netscape Mail importer"
-msgstr "Kan ikkje initialisera lokale variablar"
+msgstr "Evolution Netscape Mail-importør"
 
 #: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
 msgid "Evolution Outlook Express 4 importer"
-msgstr ""
+msgstr "Evolution Outlook Express 4-importør"
 
 #: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
 msgid "Outlook Express 4 (.mbx)"
-msgstr ""
+msgstr "Outlook Express 4 (.mbx)"
 
 #: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
-#, fuzzy
 msgid "Evolution Pine importer"
-msgstr "Kan ikkje initialisera lokale variablar"
+msgstr "Evolution Pine-importør"
 
 #: mail/local-config.glade.h:1
-#, fuzzy
 msgid "Current store format:"
-msgstr "Kunne ikkje starta %1."
+msgstr "Noverande lagringsformat:"
 
 #: mail/local-config.glade.h:2
-#, fuzzy
 msgid "Index body contents"
-msgstr "Kroppsinnhald"
+msgstr "Indekser innhaldet i meldingskroppane"
 
 #: mail/local-config.glade.h:3
-#, fuzzy
 msgid "New store format:"
-msgstr "&Ny type"
+msgstr "Nytt lagringsformat:"
 
 #: mail/local-config.glade.h:4
 msgid ""
@@ -12357,7 +12360,6 @@ msgid "_Host:"
 msgstr "_Vert:"
 
 #: mail/mail-account-gui.c:756 mail/mail-config.glade.h:123
-#, fuzzy
 msgid "User_name:"
 msgstr "Br_ukarnamn:"
 
@@ -12370,9 +12372,8 @@ msgid "You may not create two accounts with the same name."
 msgstr "Du kan ikkje opprette to kontoar med det same namnet."
 
 #: mail/mail-accounts.c:231
-#, fuzzy
 msgid "Are you sure you want to delete this account?"
-msgstr "Er du sikker på at du vil sletta denne klassen?"
+msgstr "Er du sikker på at du vil sletta denne kontoen?"
 
 #: mail/mail-accounts.c:239
 msgid "Don't delete"
@@ -12394,7 +12395,7 @@ msgstr "Skru på"
 #: mail/mail-accounts.c:433
 #, fuzzy
 msgid "[Default]"
-msgstr "Forvald"
+msgstr "[Forvald]"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
@@ -12404,19 +12405,17 @@ msgid "Enabled"
 msgstr "På"
 
 #: mail/mail-accounts.c:487 mail/mail-accounts.etspec.h:1
-#, fuzzy
 msgid "Account name"
-msgstr "Konton_amn:"
+msgstr "Konton_amn"
 
 #: mail/mail-accounts.c:489 mail/mail-accounts.etspec.h:3
-#, fuzzy
 msgid "Protocol"
-msgstr "Puerto Rico"
+msgstr "Protokoll"
 
 #: mail/mail-autofilter.c:74
-#, fuzzy, c-format
+#, c-format
 msgid "Mail to %s"
-msgstr "Melding til %s"
+msgstr "E-post til %s"
 
 #: mail/mail-autofilter.c:238
 #, c-format
@@ -12431,16 +12430,15 @@ msgstr "Melding frå %s"
 #: mail/mail-autofilter.c:271
 #, fuzzy, c-format
 msgid "%s mailing list"
-msgstr "E-post&liste for språket:"
+msgstr "%s e-postliste"
 
 #: mail/mail-autofilter.c:323
-#, fuzzy
 msgid "Add Filter Rule"
-msgstr "Filter-reglar"
+msgstr "Legg til filter-regel"
 
 #: mail/mail-autofilter.c:372
 msgid "The following filter rule(s):\n"
-msgstr ""
+msgstr "Dei følgjande filterreglane:\n"
 
 #: mail/mail-autofilter.c:378
 #, c-format
@@ -12449,9 +12447,11 @@ msgid ""
 "    '%s'\n"
 "And have been updated."
 msgstr ""
+"Brukte den fjerna mappa:\n"
+"    «%s»\n"
+"og har blitt oppdaterte."
 
-#. Add the "Don't show this message again." checkbox
-#: mail/mail-callbacks.c:101 widgets/misc/e-messagebox.c:226
+#: mail/mail-callbacks.c:101
 msgid "Don't show this message again."
 msgstr "Ikkje vis denne meldinga att"
 
@@ -12463,18 +12463,17 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 "Du har ikkje sett opp denne e-postklienten.\n"
-"Dette må du gjere dør du kan sende, motta\n"
-"eller skrive e-post.\n"
-"Vil du sette opp dette no?"
+"Dette må du gjera før du kan senda, motta\n"
+"eller skriva e-post.\n"
+"Vil du setja opp dette no?"
 
 #: mail/mail-callbacks.c:212
-#, fuzzy
 msgid ""
 "You need to configure an account\n"
 "before you can compose mail."
 msgstr ""
-"Du må sette opp ein identitet\n"
-"før du skrive e-post."
+"Du må setja opp ein identitet\n"
+"før du skriva e-post."
 
 #: mail/mail-callbacks.c:226
 msgid ""
@@ -12494,24 +12493,24 @@ msgstr ""
 
 #. FIXME: this wording sucks
 #: mail/mail-callbacks.c:255
-#, fuzzy
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
 msgstr ""
-"Du sender ei HTML-formattert melding, men den følgjande mottakeren vil ikkje "
-"ha HTML-formatter e-post:\n"
+"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/mail-callbacks.c:267
 msgid "Send anyway?"
 msgstr "Send likevel?"
 
 #: mail/mail-callbacks.c:288
-#, fuzzy
 msgid ""
 "This message has no subject.\n"
 "Really send?"
-msgstr "Meldinga har ingen sendar"
+msgstr ""
+"Meldinga har ikkje noko emne.\n"
+"Send likevel?"
 
 #: mail/mail-callbacks.c:314
 msgid ""
@@ -12544,115 +12543,126 @@ msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
+"Kan ikkje opna kladd-mappa til denne kontoen.\n"
+"Vil du bruka standard-kladdmappa?"
 
-#: mail/mail-callbacks.c:1189
+#: mail/mail-callbacks.c:1190
 msgid "an unknown sender"
 msgstr "ein ukjend avsendar"
 
-#: mail/mail-callbacks.c:1193
-msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
+#. translators: attribution string used when quoting messages
+#: mail/mail-callbacks.c:1199
+#, 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/mail-callbacks.c:1700 mail/message-browser.c:132
-#, fuzzy
+#: mail/mail-callbacks.c:1706 mail/message-browser.c:132
 msgid "Move message(s) to"
-msgstr "Flytta alle meldingar til papirkorga"
+msgstr "Flytt melding(ane) til"
 
-#: mail/mail-callbacks.c:1702 mail/message-browser.c:134
-#, fuzzy
+#: mail/mail-callbacks.c:1708 mail/message-browser.c:134
 msgid "Copy message(s) to"
-msgstr "&Kopier bileteplassering"
+msgstr "kopier melding(ane) til"
 
-#: mail/mail-callbacks.c:2344
-#, fuzzy, c-format
+#: mail/mail-callbacks.c:2350
+#, c-format
 msgid "Are you sure you want to edit all %d messages?"
-msgstr "Er du sikker på at du vil sletta %1?"
+msgstr "Er du sikker på at du vil redigera alle %d meldingane?"
 
-#: mail/mail-callbacks.c:2360
-#, fuzzy
+#: mail/mail-callbacks.c:2366
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
-msgstr "Vil du lagra denne artikkelen i Kladd-mappa?"
+msgstr ""
+"Du kan berre redigera meldingar som ern"
+"lagra i kladd-mappa."
 
-#: mail/mail-callbacks.c:2393
-#, fuzzy
+#: mail/mail-callbacks.c:2399
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
-msgstr "Vil du lagra denne artikkelen i Kladd-mappa?"
+msgstr ""
+"Det er berre meldingar lagra i\n"
+"sendt-mappa som kan sendast på nytt."
 
-#: mail/mail-callbacks.c:2403
-#, fuzzy, c-format
+#: mail/mail-callbacks.c:2409
+#, c-format
 msgid "Are you sure you want to resend all %d messages?"
-msgstr "Er du sikker på at du vil fjerna %1?"
+msgstr "Er du sikker på at du vil senda alle %d meldingane på nytt?"
 
-#: mail/mail-callbacks.c:2424
+#: mail/mail-callbacks.c:2430
 msgid "No Message Selected"
 msgstr "Ingen meldingar vald!"
 
-#: mail/mail-callbacks.c:2465
-#, fuzzy, c-format
+#: mail/mail-callbacks.c:2471
+#, c-format
 msgid ""
 "Cannot save to `%s'\n"
 " %s"
 msgstr ""
-"Klarar ikkje å hente melding: %s\n"
-"  %s"
+"Klarte ikkje å lagra til «%s»\n"
+" %s"
 
-#: mail/mail-callbacks.c:2470
-#, fuzzy, c-format
+#: mail/mail-callbacks.c:2476
+#, c-format
 msgid ""
 "`%s' already exists.\n"
 "Overwrite it?"
 msgstr ""
-"%s eksisterar allereide\n"
-"Vil du skrive over?"
+"%s eksisterer allereide\n"
+"Vil du skriva over?"
 
-#: mail/mail-callbacks.c:2511
+#: mail/mail-callbacks.c:2517
 msgid "Save Message As..."
 msgstr "Lagre melding som ..."
 
-#: mail/mail-callbacks.c:2513
+#: mail/mail-callbacks.c:2519
 msgid "Save Messages As..."
 msgstr "Lagre meldingar som ..."
 
-#: mail/mail-callbacks.c:2686
+#: mail/mail-callbacks.c:2692
 msgid ""
 "This operation will permanently erase all messages marked as\n"
 "deleted. If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
+"Dette vil fjerna for godt alle meldingane som er merka som sletta.\n"
+"Dersom du held fram, vil du ikkje kunna gjenoppretta desse meldingane.\n"
+"\n"
+"Vil du fjerna desse meldingane?"
 
-#: mail/mail-callbacks.c:2781
-#, fuzzy, c-format
+#: mail/mail-callbacks.c:2787
+#, c-format
+# TRN: Dårleg.
 msgid ""
 "Error loading filter information:\n"
 "%s"
-msgstr "Les filinformasjon"
+msgstr ""
+"Feil ved lesing av filterinformasjon:\n"
+"%s"
 
-#: mail/mail-callbacks.c:2789
+#: mail/mail-callbacks.c:2795
 msgid "Filters"
 msgstr "Filter"
 
-#: mail/mail-callbacks.c:2830
-#, fuzzy, c-format
+#: mail/mail-callbacks.c:2836
+#, c-format
 msgid "Page %d of %d"
-msgstr "Mottek meldingar frå %1"
+msgstr "Side %d av %d"
 
-#: mail/mail-callbacks.c:2886
+#: mail/mail-callbacks.c:2892
 msgid "Print Message"
 msgstr "Skriv ut melding"
 
-#: mail/mail-callbacks.c:2954
+#: mail/mail-callbacks.c:2960
 msgid "Printing of message failed"
 msgstr "Utskrift av melding feila"
 
-#: mail/mail-callbacks.c:3147
-#, fuzzy, c-format
+#: mail/mail-callbacks.c:3155
+#, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
-msgstr "Er du sikker på at du vil sletta denne overføringa?"
+msgstr "Er du sikker på at du vil opna alle %d meldingane i eigne vindauge?"
 
 #: mail/mail-composer-prefs.c:226 mail/mail-composer-prefs.c:349
 #: mail/mail-config.c:1376
@@ -12661,29 +12671,25 @@ msgid "Unnamed"
 msgstr "Kontakt utan namn"
 
 #: mail/mail-composer-prefs.c:334
-#, fuzzy
 msgid "You must specify a valid script name."
-msgstr "Stilnamn:"
+msgstr "Du må oppgje eit gylig skriptnamn."
 
 #: mail/mail-composer-prefs.c:392 mail/mail-composer-prefs.c:454
 #, fuzzy
 msgid "[script]"
-msgstr "Ingen skildring"
+msgstr "[skript]"
 
 #: mail/mail-composer-prefs.c:858
-#, fuzzy
 msgid "Language(s)"
 msgstr "Språk"
 
 #: mail/mail-composer-prefs.c:900
-#, fuzzy
 msgid "Add script signature"
-msgstr "Legg til kriterium"
+msgstr "Legg till skriptsignatur"
 
 #: mail/mail-composer-prefs.c:920
-#, fuzzy
 msgid "Signature(s)"
-msgstr "_HTML-signatur:"
+msgstr "Signatur(ar)"
 
 #: mail/mail-config-druid.c:380 mail/mail-config.glade.h:61
 msgid "Identity"
@@ -13369,40 +13375,10 @@ msgstr "Bruk sikker tilknytning (SSL)"
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:171
-#, fuzzy
-msgid "color"
-msgstr "farge"
-
 #: mail/mail-config.glade.h:172
 msgid "description"
 msgstr "skildring"
 
-#: mail/mail-crypto.c:84
-#, fuzzy
-msgid "Could not create a S/MIME signature context."
-msgstr "Kunne ikkje laga kio-jobb.\n"
-
-#: mail/mail-crypto.c:116
-#, fuzzy
-msgid "Could not create a S/MIME certsonly context."
-msgstr "Kunne ikkje laga kio-jobb.\n"
-
-#: mail/mail-crypto.c:148
-#, fuzzy
-msgid "Could not create a S/MIME encryption context."
-msgstr "Kunne ikkje laga kio-jobb.\n"
-
-#: mail/mail-crypto.c:180
-#, fuzzy
-msgid "Could not create a S/MIME envelope context."
-msgstr "Kunne ikkje laga kio-jobb.\n"
-
-#: mail/mail-crypto.c:211
-#, fuzzy
-msgid "Could not create a S/MIME decode context."
-msgstr "Kunne ikkje laga kio-jobb.\n"
-
 #: mail/mail-display.c:197
 #, fuzzy, c-format
 msgid ""
@@ -13416,163 +13392,186 @@ msgstr ""
 msgid "Save Attachment"
 msgstr "Lagre vedlegg"
 
-#: mail/mail-display.c:409
+#: mail/mail-display.c:411
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Klarte ikkje å lage mellombels katalog: %s"
 
-#: mail/mail-display.c:457
+#: mail/mail-display.c:461
+#, fuzzy, c-format
+msgid "%s is not a valid directory name."
+msgstr "«%s» er ikkje ein katalog"
+
+#: mail/mail-display.c:508
+msgid "Select Directory for Attachments"
+msgstr ""
+
+#: mail/mail-display.c:582
 #, fuzzy
 msgid "Save Attachment..."
 msgstr "Lagre vedlegg"
 
-#: mail/mail-display.c:458
+#: mail/mail-display.c:583
+#, fuzzy
+msgid "Save all attachments..."
+msgstr "Lagre vedlegg"
+
+#: mail/mail-display.c:584
 msgid "View Inline"
 msgstr "Vis innvevd"
 
-#: mail/mail-display.c:459
+#: mail/mail-display.c:585
 #, c-format
 msgid "Open in %s..."
 msgstr "Opne i %s ..."
 
-#: mail/mail-display.c:515
+#: mail/mail-display.c:652
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:519
+#: mail/mail-display.c:656
 msgid "Hide"
 msgstr "Gøym"
 
-#: mail/mail-display.c:539
+#: mail/mail-display.c:678
 msgid "External Viewer"
 msgstr "Ekstern visar"
 
-#: mail/mail-display.c:1368
+#: mail/mail-display.c:1484
 #, fuzzy
 msgid "Downloading images"
 msgstr "Last b_ileter"
 
-#: mail/mail-display.c:1545
+#: mail/mail-display.c:1661
 #, fuzzy
 msgid "Loading message content"
 msgstr "Markerer meldingar"
 
-#: mail/mail-display.c:1887
+#: mail/mail-display.c:2003
 #, fuzzy
 msgid "Overdue:"
 msgstr "&Syntaksmerkingsmodusar"
 
-#: mail/mail-display.c:1891
+#: mail/mail-display.c:2007
 #, fuzzy
-msgid "by %B %d, %Y, %l:%M %P"
+msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%d. %b %k:%M"
 
-#: mail/mail-display.c:2255
+#: mail/mail-display.c:2371
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "Opna ved innsetjing"
 
-#: mail/mail-display.c:2256
+#: mail/mail-display.c:2372
 msgid "Copy Link Location"
 msgstr "Kopier lenkjeadresse"
 
-#: mail/mail-display.c:2258
+#: mail/mail-display.c:2374
 msgid "Save Link as (FIXME)"
 msgstr "Lagre lenkje som "
 
-#: mail/mail-display.c:2260
+#: mail/mail-display.c:2376
 msgid "Save Image as..."
 msgstr "Lagre  bilete som ..."
 
-#: mail/mail-folder-cache.c:745
+#: mail/mail-folder-cache.c:831
 #, fuzzy, c-format
 msgid "Pinging %s"
 msgstr "Sender %1"
 
-#: mail/mail-format.c:665
+#: mail/mail-format.c:666
 #, c-format
 msgid "%s attachment"
 msgstr "%s vedlegg"
 
-#: mail/mail-format.c:707 mail/mail-format.c:1370 mail/mail-format.c:1439
-#: mail/mail-format.c:1559 mail/mail-format.c:1683 mail/mail-format.c:1708
+#: mail/mail-format.c:708 mail/mail-format.c:1412 mail/mail-format.c:1483
+#: mail/mail-format.c:1603 mail/mail-format.c:1727 mail/mail-format.c:1752
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:785 mail/message-list.etspec.h:2
+#: mail/mail-format.c:794 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Dato"
 
-#: mail/mail-format.c:871
+#. Timezone conversion crossed midnight. Show day
+#. translators: strftime format for local time equivalent in Date header display
+#: mail/mail-format.c:811
+msgid "<I> (%a, %R %Z)</I>"
+msgstr ""
+
+#: mail/mail-format.c:813
+msgid "<I> (%R %Z)</I>"
+msgstr ""
+
+#: mail/mail-format.c:906
 msgid "Bad Address"
 msgstr "Ugyldig addresse"
 
-#: mail/mail-format.c:912 mail/message-list.etspec.h:7
+#: mail/mail-format.c:947 mail/message-list.etspec.h:7
 #: mail/message-tag-followup.c:301
 msgid "From"
 msgstr "Frå"
 
-#: mail/mail-format.c:916
+#: mail/mail-format.c:951
 msgid "Reply-To"
 msgstr "Svar-til"
 
-#: mail/mail-format.c:921 mail/message-list.etspec.h:14
+#: mail/mail-format.c:956 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Til"
 
-#: mail/mail-format.c:926
+#: mail/mail-format.c:961
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:931
+#: mail/mail-format.c:966
 msgid "Bcc"
 msgstr "Bcc:"
 
-#: mail/mail-format.c:1482
-msgid ""
-"This message is digitally signed. Click the lock icon for more information."
+#: mail/mail-format.c:1526
+msgid "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 
-#: mail/mail-format.c:1510
+#: mail/mail-format.c:1554
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Kunne ikkje laga kio-jobb.\n"
 
-#: mail/mail-format.c:1518
+#: mail/mail-format.c:1562
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1525
+#: mail/mail-format.c:1569
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1789
+#: mail/mail-format.c:1833
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1800
+#: mail/mail-format.c:1844
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1803
+#: mail/mail-format.c:1847
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1830
+#: mail/mail-format.c:1874
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1836
+#: mail/mail-format.c:1880
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1838
+#: mail/mail-format.c:1882
 msgid "Malformed external-body part."
 msgstr ""
 
@@ -13655,115 +13654,128 @@ msgstr "Les mapper"
 msgid "Fetching Mail"
 msgstr "Hentar e-post"
 
-#: mail/mail-ops.c:550 mail/mail-ops.c:579
-msgid "However, the message was successfully sent."
+#: mail/mail-ops.c:563
+#, fuzzy, c-format
+msgid "Failed to apply outgoing filters: %s"
+msgstr "Kunne ikkje leggja til melding:\n"
+
+#: mail/mail-ops.c:584
+#, c-format
+msgid ""
+"Failed to append to %s: %s\n"
+"Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:611
+#: mail/mail-ops.c:593
+#, fuzzy, c-format
+msgid "Failed to append to local `Sent' folder: %s"
+msgstr "Kunne ikkje lasta biletet '%1'\n"
+
+#: mail/mail-ops.c:635
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Sender «%s»"
 
-#: mail/mail-ops.c:729
+#: mail/mail-ops.c:753
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sender melding %d av %d"
 
-#: mail/mail-ops.c:748
+#: mail/mail-ops.c:772
 #, fuzzy, c-format
 msgid "Failed on message %d of %d"
 msgstr "Markerer meldingar"
 
-#: mail/mail-ops.c:750 mail/mail-send-recv.c:581
+#: mail/mail-ops.c:774 mail/mail-send-recv.c:581
 msgid "Complete."
 msgstr "Ferdig."
 
-#: mail/mail-ops.c:844
+#: mail/mail-ops.c:868
 #, fuzzy
 msgid "Saving message to folder"
 msgstr "Mottek meldingar frå %1"
 
-#: mail/mail-ops.c:925
+#: mail/mail-ops.c:949
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flyttar meldingar til %s"
 
-#: mail/mail-ops.c:925
+#: mail/mail-ops.c:949
 #, fuzzy, c-format
 msgid "Copying messages to %s"
 msgstr "Melding"
 
-#: mail/mail-ops.c:1042
+#: mail/mail-ops.c:1066
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Leitar gjennom mapper i «%s»"
 
-#: mail/mail-ops.c:1225
+#: mail/mail-ops.c:1254
 msgid "Forwarded messages"
 msgstr "Vidaresendt melding"
 
-#: mail/mail-ops.c:1268
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Opening folder %s"
 msgstr "Opnar mappe %s"
 
-#: mail/mail-ops.c:1340
+#: mail/mail-ops.c:1369
 #, fuzzy, c-format
 msgid "Opening store %s"
 msgstr "Leitar etter tilleggsmodular"
 
-#: mail/mail-ops.c:1413
+#: mail/mail-ops.c:1447
 #, c-format
 msgid "Removing folder %s"
 msgstr "Fjernar mappe %s"
 
-#: mail/mail-ops.c:1507
+#: mail/mail-ops.c:1541
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Lagrar mappe «%s»"
 
-#: mail/mail-ops.c:1558
+#: mail/mail-ops.c:1592
 msgid "Refreshing folder"
 msgstr "Friskar opp mappe"
 
-#: mail/mail-ops.c:1594 mail/mail-ops.c:1645
+#: mail/mail-ops.c:1628 mail/mail-ops.c:1679
 #, fuzzy
 msgid "Expunging folder"
 msgstr "Forventar %1"
 
-#: mail/mail-ops.c:1642
+#: mail/mail-ops.c:1676
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Importerar %s som %s"
 
-#: mail/mail-ops.c:1643 my-evolution/e-summary-mail.c:483
+#: mail/mail-ops.c:1677 my-evolution/e-summary-mail.c:483
 #: shell/e-local-storage.c:1151
 msgid "Local Folders"
 msgstr "Lokale mapper"
 
-#: mail/mail-ops.c:1718
+#: mail/mail-ops.c:1752
 #, c-format
 msgid "Retrieving message %s"
-msgstr "Hentat melding %s"
+msgstr "Hentar melding %s"
 
-#: mail/mail-ops.c:1790
+#: mail/mail-ops.c:1824
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Mottek %d melding(ar)"
 
-#: mail/mail-ops.c:1876
+#: mail/mail-ops.c:1910
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Lagrar %d melding(ar)"
 
-#: mail/mail-ops.c:1924
+#: mail/mail-ops.c:1958
 #, fuzzy, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: mail/mail-ops.c:1952
+#: mail/mail-ops.c:1986
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13772,28 +13784,28 @@ msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: mail/mail-ops.c:2026
+#: mail/mail-ops.c:2060
 msgid "Saving attachment"
 msgstr "Lagrar vedlegg"
 
-#: mail/mail-ops.c:2043
+#: mail/mail-ops.c:2077
 #, fuzzy, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: mail/mail-ops.c:2073
+#: mail/mail-ops.c:2107
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Klarte ikkje å skrive data: %s"
 
-#: mail/mail-ops.c:2221
+#: mail/mail-ops.c:2255
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Koplar frå %s"
 
-#: mail/mail-ops.c:2221
+#: mail/mail-ops.c:2255
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Koplar til %s på nytt"
@@ -13866,25 +13878,25 @@ msgstr "Oppdaterar ..."
 msgid "Waiting..."
 msgstr "Ventar ..."
 
-#: mail/mail-session.c:226
+#: mail/mail-session.c:218
 msgid "User canceled operation."
 msgstr "Brukar avbraut operasjonen."
 
-#: mail/mail-session.c:259
+#: mail/mail-session.c:251
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Tast inn passord for %s"
 
-#: mail/mail-session.c:261
+#: mail/mail-session.c:253
 msgid "Enter Password"
 msgstr "Tast inn passord"
 
-#: mail/mail-session.c:284
+#: mail/mail-session.c:276
 #, fuzzy
 msgid "_Remember this password"
 msgstr "Fjern denne oppføringa"
 
-#: mail/mail-session.c:285
+#: mail/mail-session.c:277
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
@@ -13933,7 +13945,7 @@ msgstr "Vidaresendt melding - %s"
 msgid "Forwarded message"
 msgstr "Vidaresendt melding"
 
-#: mail/mail-tools.c:438
+#: mail/mail-tools.c:459 mail/mail-tools.c:466
 msgid "Forwarded Message"
 msgstr "Vidaresendt melding"
 
@@ -14101,7 +14113,7 @@ msgstr ""
 msgid "For Your Information"
 msgstr "Tenarinformasjon"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:37
 msgid "Forward"
 msgstr "Vidaresend"
 
@@ -14109,11 +14121,11 @@ msgstr "Vidaresend"
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:72
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:73
 msgid "Reply"
 msgstr "Svar"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:73
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:74
 msgid "Reply to All"
 msgstr "Svar til alle"
 
@@ -24029,25 +24041,25 @@ msgstr "Zürich"
 msgid "Folder containing the Evolution Summary"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:381
+#: my-evolution/e-summary-calendar.c:384
 msgid "Appointments"
 msgstr "Avtalar"
 
-#: my-evolution/e-summary-calendar.c:389
+#: my-evolution/e-summary-calendar.c:392
 #, fuzzy
 msgid "No appointments."
 msgstr "Ingen avtalar"
 
-#: my-evolution/e-summary-calendar.c:406
+#: my-evolution/e-summary-calendar.c:409
 msgid "%k:%M %d %B"
 msgstr "%k:%M %d. %B"
 
-#: my-evolution/e-summary-calendar.c:408
+#: my-evolution/e-summary-calendar.c:411
 #, fuzzy
-msgid "%l:%M%P %d %B"
+msgid "%l:%M%p %d %B"
 msgstr "%l:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:426
+#: my-evolution/e-summary-calendar.c:429
 msgid "No description"
 msgstr "Ingen skildring"
 
@@ -24091,23 +24103,23 @@ msgstr "McAllen"
 msgid "Shown"
 msgstr "Shannon"
 
-#: my-evolution/e-summary-tasks.c:330
+#: my-evolution/e-summary-tasks.c:349
 msgid "No tasks"
 msgstr "Ingen oppgåver"
 
-#: my-evolution/e-summary-tasks.c:364
+#: my-evolution/e-summary-tasks.c:387
 msgid "(No Description)"
 msgstr "(Ingen skildring)"
 
-#: my-evolution/e-summary-weather.c:73
+#: my-evolution/e-summary-weather.c:72
 msgid "My Weather"
 msgstr "Mitt vêr"
 
-#: my-evolution/e-summary-weather.c:262
+#: my-evolution/e-summary-weather.c:261
 msgid "There was an error downloading data for"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:479 my-evolution/my-evolution.glade.h:16
+#: my-evolution/e-summary-weather.c:478 my-evolution/my-evolution.glade.h:16
 msgid "Weather"
 msgstr "Vêr"
 
@@ -24115,7 +24127,7 @@ msgstr "Vêr"
 #. see in My Evolution by default. You can find the list of all
 #. stations and their codes in Evolution sources
 #. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:583
+#: my-evolution/e-summary-weather.c:582
 msgid "KBOS"
 msgstr "ENOV:ENGM"
 
@@ -25705,27 +25717,32 @@ msgid ""
 "%s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: shell/e-shell-folder-commands.c:538
+#: shell/e-shell-folder-commands.c:534
 #, fuzzy, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Endra namn på profil '%1'"
 
-#: shell/e-shell-folder-commands.c:544
+#: shell/e-shell-folder-commands.c:541
 #, fuzzy
 msgid "Rename Folder"
 msgstr "Endra namn på profil '%1'"
 
-#: shell/e-shell-folder-commands.c:553
+#: shell/e-shell-folder-commands.c:547
 #: shell/e-shell-folder-creation-dialog.c:180
 #, fuzzy, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "Arkivfilnamnet er ikkje gyldig.\n"
 
-#: shell/e-shell-folder-commands.c:587
+#: shell/e-shell-folder-commands.c:554
+#, c-format
+msgid "A folder named \"%s\" already exists. Please use a different name."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:584
 msgid "Selected folder does not belong to another user"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:590
+#: shell/e-shell-folder-commands.c:587
 #, fuzzy, c-format
 msgid ""
 "Cannot remove folder:\n"
@@ -25763,11 +25780,19 @@ msgid ""
 "to work it out."
 msgstr ""
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:709
+#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
 msgid "Please select the information that you would like to import:"
 msgstr "Vel informasjonen du vil importere:"
 
-#: shell/e-shell-importer.c:213 shell/e-shell-importer.c:244
+#: shell/e-shell-importer.c:151
+msgid ""
+"Evolution checked for settings to import from the following\n"
+"applications: Pine, Netscape, Elm, iCalendar. No settings\n"
+"that could be imported where found. If you would like to\n"
+"try again, please click the \"Back\" button.\n"
+msgstr ""
+
+#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25776,33 +25801,33 @@ msgstr ""
 "Importerar %s\n"
 "Importerar element %d."
 
-#: shell/e-shell-importer.c:317
+#: shell/e-shell-importer.c:323
 #, fuzzy
 msgid "Select importer"
 msgstr "Vel mappe"
 
-#: shell/e-shell-importer.c:458
+#: shell/e-shell-importer.c:464
 #, c-format
 msgid "File %s does not exist"
 msgstr "Fila %s finst ikkje"
 
-#: shell/e-shell-importer.c:459 shell/e-shell-importer.c:476
-#: shell/e-shell-importer.c:518
+#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
+#: shell/e-shell-importer.c:524
 msgid "Evolution Error"
 msgstr "Evolution feil"
 
-#: shell/e-shell-importer.c:475
+#: shell/e-shell-importer.c:481
 #, fuzzy, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr "Det er ikkje band i stasjonen."
 
-#: shell/e-shell-importer.c:484
+#: shell/e-shell-importer.c:490
 msgid "Importing"
 msgstr "Importerar"
 
-#: shell/e-shell-importer.c:491
+#: shell/e-shell-importer.c:497
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -25811,74 +25836,74 @@ msgstr ""
 "Importerar %s.\n"
 "Startar %s"
 
-#: shell/e-shell-importer.c:503
+#: shell/e-shell-importer.c:509
 #, fuzzy, c-format
 msgid "Error starting %s"
 msgstr ""
 "Feil ved nedlasting av fil:\n"
 "%1"
 
-#: shell/e-shell-importer.c:517
+#: shell/e-shell-importer.c:523
 #, c-format
 msgid "Error loading %s"
 msgstr "Feil ved asting av %s"
 
-#: shell/e-shell-importer.c:534
+#: shell/e-shell-importer.c:540
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:588
+#: shell/e-shell-importer.c:594
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: shell/e-shell-importer.c:637
+#: shell/e-shell-importer.c:643
 msgid "Filename:"
 msgstr "Filnamn:"
 
-#: shell/e-shell-importer.c:642
+#: shell/e-shell-importer.c:648
 msgid "Select a file"
 msgstr "Vel ei fil"
 
-#: shell/e-shell-importer.c:651
+#: shell/e-shell-importer.c:657
 msgid "File type:"
 msgstr "Filtype:"
 
-#: shell/e-shell-importer.c:676
+#: shell/e-shell-importer.c:682
 msgid "Import data and settings from older programs"
 msgstr "Importér data og innstillinga frå eldre program"
 
-#: shell/e-shell-importer.c:680
+#: shell/e-shell-importer.c:686
 #, fuzzy
 msgid "Import a single file"
 msgstr "Flyttar"
 
-#: shell/e-shell-importer.c:746 shell/e-shell-startup-wizard.c:538
+#: shell/e-shell-importer.c:754 shell/e-shell-startup-wizard.c:553
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:749
+#: shell/e-shell-importer.c:757
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:873 shell/e-shell-startup-wizard.c:664
+#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:679
 #, c-format
 msgid "From %s:"
 msgstr "Frå %s:"
 
-#: shell/e-shell-importer.c:1047
+#: shell/e-shell-importer.c:1060
 msgid "Select folder"
 msgstr "Vel mappe"
 
-#: shell/e-shell-importer.c:1048
+#: shell/e-shell-importer.c:1061
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:1178 shell/importer/intelligent.c:191
+#: shell/e-shell-importer.c:1191 shell/importer/intelligent.c:191
 msgid "Import"
 msgstr "Importér"
 
@@ -25947,8 +25972,8 @@ msgstr ""
 "Kan ikkje laga fila\n"
 "\""
 
-#: shell/e-shell-user-creatable-items-handler.c:586
-#: shell/e-shell-user-creatable-items-handler.c:642
+#: shell/e-shell-user-creatable-items-handler.c:587
+#: shell/e-shell-user-creatable-items-handler.c:643
 #: widgets/misc/e-charset-picker.c:109
 msgid "New"
 msgstr "Ny"
@@ -26055,8 +26080,7 @@ msgid "(None)"
 msgstr "(Ingen)"
 
 #: shell/e-shell-view.c:2083
-msgid ""
-"Ximian Evolution is currently online.  Click on this button to work offline."
+msgid "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
 #: shell/e-shell-view.c:2090
@@ -26064,8 +26088,7 @@ msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
 #: shell/e-shell-view.c:2096
-msgid ""
-"Ximian Evolution is currently offline.  Click on this button to work online."
+msgid "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
 #: shell/e-shell.c:175
@@ -26353,66 +26376,66 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1184
+#: shell/evolution-shell-component.c:1187
 msgid "CORBA error"
 msgstr "CORBA-feil"
 
-#: shell/evolution-shell-component.c:1186
+#: shell/evolution-shell-component.c:1189
 msgid "Interrupted"
 msgstr "Avbroten"
 
-#: shell/evolution-shell-component.c:1188
+#: shell/evolution-shell-component.c:1191
 msgid "Invalid argument"
 msgstr "Ugyldig argument"
 
-#: shell/evolution-shell-component.c:1190
+#: shell/evolution-shell-component.c:1193
 msgid "Already has an owner"
 msgstr "Har allereide ein eigar"
 
-#: shell/evolution-shell-component.c:1192
+#: shell/evolution-shell-component.c:1195
 msgid "No owner"
 msgstr "Ingen eigar"
 
-#: shell/evolution-shell-component.c:1194
+#: shell/evolution-shell-component.c:1197
 #, fuzzy
 msgid "Not found"
 msgstr "Fann ikkje fil"
 
-#: shell/evolution-shell-component.c:1196
+#: shell/evolution-shell-component.c:1199
 #, fuzzy
 msgid "Unsupported type"
 msgstr "Vel modemtype ..."
 
-#: shell/evolution-shell-component.c:1198
+#: shell/evolution-shell-component.c:1201
 msgid "Unsupported schema"
 msgstr "Ustøtta skjema"
 
-#: shell/evolution-shell-component.c:1200
+#: shell/evolution-shell-component.c:1203
 msgid "Unsupported operation"
 msgstr "Ustøtta operasjon"
 
-#: shell/evolution-shell-component.c:1202
+#: shell/evolution-shell-component.c:1205
 msgid "Internal error"
 msgstr "Intern feil"
 
-#: shell/evolution-shell-component.c:1206
+#: shell/evolution-shell-component.c:1209
 msgid "Exists"
 msgstr "Eksisterar"
 
-#: shell/evolution-shell-component.c:1208
+#: shell/evolution-shell-component.c:1211
 msgid "Invalid URI"
 msgstr "Ugyldig URI"
 
-#: shell/evolution-shell-component.c:1212
+#: shell/evolution-shell-component.c:1215
 #, fuzzy
 msgid "Has subfolders"
 msgstr "Vidaresendt melding"
 
-#: shell/evolution-shell-component.c:1214
+#: shell/evolution-shell-component.c:1217
 msgid "No space left"
 msgstr "Ikkje noko plass att"
 
-#: shell/evolution-shell-component.c:1216
+#: shell/evolution-shell-component.c:1219
 msgid "Old owner has died"
 msgstr "Gammal eigar har døydd"
 
@@ -26760,8 +26783,8 @@ msgid "Previews the contacts to be printed"
 msgstr "Sen melding"
 
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:19
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:69
+#: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
 msgstr "Førehands_vising av utskrift"
 
@@ -26811,13 +26834,13 @@ msgstr "Stopp lasting"
 msgid "View the current contact"
 msgstr "tid no"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:28
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:30
+#: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:95
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:42
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr "H_andlingar"
 
@@ -26888,6 +26911,11 @@ msgstr "Gå framover"
 msgid "Go to _Date"
 msgstr "Gå til _dato"
 
+#: ui/evolution-calendar.xml.h:13 calendar/gui/e-cal-view.c:1111
+#: calendar/gui/e-cal-view.c:1180
+msgid "Go to _Today"
+msgstr "Gå _til idag"
+
 #: ui/evolution-calendar.xml.h:14
 msgid "Go to a specific date"
 msgstr "Gå til spesifisert dato"
@@ -26914,27 +26942,42 @@ msgstr "Skriv ut alle"
 msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:15
+#, fuzzy
+msgid "Purg_e"
+msgstr "Bourges"
+
+#: ui/evolution-calendar.xml.h:23
+#, fuzzy
+msgid "Purge old appointments and meetings"
+msgstr "Mappe inneheld avtaler og hendingar"
+
+#: ui/evolution-calendar.xml.h:24
 msgid "Show one day"
 msgstr "Vis ein dag"
 
-#: ui/evolution-calendar.xml.h:23
+#: ui/evolution-calendar.xml.h:25
 msgid "Show one month"
 msgstr "Vis ein månad"
 
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:26
 msgid "Show one week"
 msgstr "Vis ei veke"
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:27
 #, fuzzy
 msgid "Show the working week"
 msgstr "Vis hovudvindauget"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:28
 msgid "Week"
 msgstr "Veke"
 
+#: ui/evolution-calendar.xml.h:36 calendar/gui/e-cal-view.c:1116
+#, fuzzy
+msgid "_Publish Free/Busy Information"
+msgstr "Informasjon"
+
 #: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
@@ -26966,26 +27009,28 @@ msgstr "Sen melding"
 msgid "Print this item"
 msgstr "Skriv ut dette elementet"
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:5
-msgid "Save"
-msgstr "Lagre"
-
-#: ui/evolution-comp-editor.xml.h:13
-msgid "Save As..."
-msgstr "Lagre som ..."
+#: ui/evolution-comp-editor.xml.h:11 ui/evolution-contact-editor.xml.h:7
+#: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-message-composer.xml.h:18
+msgid "Save _As..."
+msgstr "L_agre som ..."
 
-#: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:8
 #: ui/evolution-contact-list-editor.xml.h:6
 #: ui/evolution-signature-editor.xml.h:6
 msgid "Save and Close"
 msgstr "Lagre og lukk"
 
-#: ui/evolution-comp-editor.xml.h:15
+#: ui/evolution-comp-editor.xml.h:13
+#, fuzzy
+msgid "Save and _Close"
+msgstr "Lagre og lukk"
+
+#: ui/evolution-comp-editor.xml.h:14
 msgid "Save the item and close the dialog box"
 msgstr ""
 
-#: ui/evolution-comp-editor.xml.h:16
+#: ui/evolution-comp-editor.xml.h:15
 msgid "Save this item to disk"
 msgstr "Lagre dette elementet til disk"
 
@@ -26998,6 +27043,13 @@ msgstr "Lagre dette elementet til disk"
 msgid "_File"
 msgstr "_Fil"
 
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-list-editor.xml.h:12
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:14
+msgid "_Save"
+msgstr "_Lagre"
+
 #: ui/evolution-composer-entries.xml.h:1
 #, fuzzy
 msgid "Copy selected text to the clipboard"
@@ -27031,12 +27083,6 @@ msgstr "Vel alle kontatene"
 msgid "Print En_velope..."
 msgstr "Skriv ut kon_volutt ..."
 
-#: ui/evolution-contact-editor.xml.h:7
-#: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:18
-msgid "Save _As..."
-msgstr "L_agre som ..."
-
 #: ui/evolution-contact-editor.xml.h:9
 msgid "Save the contact and close the dialog box"
 msgstr ""
@@ -27046,13 +27092,6 @@ msgstr ""
 msgid "Send _Message to Contact..."
 msgstr "Sender ei melding til ein nettverksspelar"
 
-#: ui/evolution-contact-editor.xml.h:15
-#: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:14
-msgid "_Save"
-msgstr "_Lagre"
-
 #: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete this list"
 msgstr "Slett denne lista"
@@ -27222,12 +27261,12 @@ 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 ""
 
 #: ui/evolution-mail-list.xml.h:9
-msgid "Mark All as R_ead"
+#, fuzzy
+msgid "Mark All as _Read"
 msgstr "Markér alle som l_esne"
 
 #: ui/evolution-mail-list.xml.h:10
@@ -27280,7 +27319,7 @@ msgstr "Mellombels gøym dei valde meldingane"
 msgid "Threaded Message list"
 msgstr "Tråda meldingsliste"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:18
+#: ui/evolution-mail-list.xml.h:26
 msgid "_Expunge"
 msgstr ""
 
@@ -27319,420 +27358,431 @@ msgstr "Bruk filterreglar på valde meldingar"
 
 #: ui/evolution-mail-message.xml.h:5
 #, fuzzy
+msgid "Caret _Mode"
+msgstr "Tekststorle_ik"
+
+#: ui/evolution-mail-message.xml.h:6
+#, fuzzy
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "Fann ikkje sendaren av denne meldinga"
 
-#: ui/evolution-mail-message.xml.h:6
+#: ui/evolution-mail-message.xml.h:7
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:7
+#: ui/evolution-mail-message.xml.h:8
 #, fuzzy
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Fann ikkje sendaren av denne meldinga"
 
-#: ui/evolution-mail-message.xml.h:9
+#: ui/evolution-mail-message.xml.h:10
 #, fuzzy
 msgid "Copy selected messages to another folder"
 msgstr "&Kopier bileteplassering"
 
-#: ui/evolution-mail-message.xml.h:10
+#: ui/evolution-mail-message.xml.h:11
 #, fuzzy
 msgid "Create _Virtual Folder From Message"
 msgstr "Mapper"
 
-#: ui/evolution-mail-message.xml.h:11
+#: ui/evolution-mail-message.xml.h:12
 #, fuzzy
 msgid "Create a rule to filter messages from this sender"
 msgstr "Slett e-post frå tenaren"
 
-#: ui/evolution-mail-message.xml.h:12
+#: ui/evolution-mail-message.xml.h:13
 msgid "Create a rule to filter messages to these recipients"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:13
+#: ui/evolution-mail-message.xml.h:14
 msgid "Create a rule to filter messages to this mailing list"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:14
+#: ui/evolution-mail-message.xml.h:15
 #, fuzzy
 msgid "Create a rule to filter messages with this subject"
 msgstr "Lag eit nytt rammesett med denne ramma"
 
-#: ui/evolution-mail-message.xml.h:15
+#: ui/evolution-mail-message.xml.h:16
 #, fuzzy
 msgid "Create a virtual folder for these recipients"
 msgstr "Mapper"
 
-#: ui/evolution-mail-message.xml.h:16
+#: ui/evolution-mail-message.xml.h:17
 msgid "Create a virtual folder for this mailing list"
 msgstr "Lag ei virtuell mappe for denne e-postlista"
 
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:18
 msgid "Create a virtual folder for this sender"
 msgstr "Lag ei virtuell mappe for denne avsendaren"
 
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:19
 #, fuzzy
 msgid "Create a virtual folder for this subject"
 msgstr "Mapper"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:20
 msgid "Decrease the text size"
 msgstr "Minsk tekststorleik"
 
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the next important message"
 msgstr "Vis neste viktige melding"
 
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:23
 #, fuzzy
 msgid "Display the next message"
 msgstr "Vis åtvaringsmelding"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:24
 #, fuzzy
 msgid "Display the next unread message"
 msgstr "Vis informasjonsmelding"
 
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:25
 #, fuzzy
 msgid "Display the next unread thread"
 msgstr "Neste ulesne &tråd"
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:26
 #, fuzzy
 msgid "Display the previous important message"
 msgstr "Vis det førre dokumentet"
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:27
 #, fuzzy
 msgid "Display the previous message"
 msgstr "Vis det førre dokumentet"
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:28
 #, fuzzy
 msgid "Display the previous unread message"
 msgstr "Vis det førre dokumentet"
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:29
 #, fuzzy
 msgid "F_orward"
 msgstr "Vidaresend"
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:30
 #, fuzzy
 msgid "Filter on Mailing _List..."
 msgstr "Fil alt i liste"
 
-#: ui/evolution-mail-message.xml.h:30
+#: ui/evolution-mail-message.xml.h:31
 #, fuzzy
 msgid "Filter on Se_nder..."
 msgstr "Fil under:"
 
-#: ui/evolution-mail-message.xml.h:31
+#: ui/evolution-mail-message.xml.h:32
 #, fuzzy
 msgid "Filter on _Recipients..."
 msgstr "Skriv ut filer"
 
-#: ui/evolution-mail-message.xml.h:32
+#: ui/evolution-mail-message.xml.h:33
 #, fuzzy
 msgid "Filter on _Subject..."
 msgstr "Ingen emne"
 
-#: ui/evolution-mail-message.xml.h:33
+#: ui/evolution-mail-message.xml.h:34
 #, fuzzy
 msgid "Flag selected message(s) for follow-up"
 msgstr "Sentrer dei valte elementa"
 
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:35
 #, fuzzy
 msgid "Follow _Up..."
 msgstr "Fullt _namn ..."
 
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:36
 msgid "Force images in HTML mail to be loaded"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:38
 msgid "Forward the selected message in the body of a new message"
 msgstr "Send meldinga vidare i brødteksta på ei ny melding"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:39
 #, fuzzy
 msgid "Forward the selected message quoted like a reply"
 msgstr "Send valte meldingar vidare som MIME-oversikt?"
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:40
 #, fuzzy
 msgid "Forward the selected message to someone"
 msgstr "Sentrer dei valte elementa"
 
-#: ui/evolution-mail-message.xml.h:40
+#: ui/evolution-mail-message.xml.h:41
 #, fuzzy
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Send valte meldingar vidare som MIME-oversikt?"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:42
 msgid "Increase the text size"
 msgstr "Auk tekststorleik"
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:43
 msgid "Load _Images"
 msgstr "Last b_ileter"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:45
 msgid "Mark as I_mportant"
 msgstr "Markér som v_iktig"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark as U_nread"
 msgstr "Markér som _ulesen"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
 msgid "Mark as Unimp_ortant"
 msgstr "Markér som _uviktig"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Mark the selected message(s) as having been read"
 msgstr "Send valte meldingar vidare som MIME-oversikt?"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 #, fuzzy
 msgid "Mark the selected message(s) as important"
 msgstr "Sentrer dei valte elementa"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 #, fuzzy
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Send valte meldingar vidare som MIME-oversikt?"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 #, fuzzy
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Sentrer dei valte elementa"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:52
 msgid "Mark the selected messages for deletion"
 msgstr "Markér valde melding for sletting"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:53
 msgid "Move"
 msgstr "Flytt"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Move selected message(s) to another folder"
 msgstr "Lagra side til ascii-fil"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:55
 msgid "Next"
 msgstr "Neste"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:56
 msgid "Next _Important Message"
 msgstr "Neste _viktige melding"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:57
 msgid "Next _Thread"
 msgstr "Neste _tråd"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:58
 msgid "Next _Unread Message"
 msgstr "Neste _ulesne melding"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:59
 msgid "Open the selected message in a new window"
 msgstr "Opne vald melding i eit eige vindauge"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:60
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Opne vald melding for sending på nytt"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:61
 msgid "Original Si_ze"
 msgstr "Opprinneleg _storleik"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:62
 msgid "P_revious Unread Message"
 msgstr "Fo_rrige ulesne melding"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:63
 msgid "Post a Reply"
 msgstr "Post eit svar"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:64
 #, fuzzy
 msgid "Post a reply to a message in a Public folder"
 msgstr "Post eit svar til ei melding i ei offentleg mappe"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:65
 msgid "Pr_evious Important Message"
 msgstr "_Forrige viktige melding"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:66
 msgid "Preview the message to be printed"
 msgstr "Førehandsvis meldinga som skal skrivast ut"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:67
 msgid "Previous"
 msgstr "Forrige"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:70
 msgid "Print this message"
 msgstr "Skriv ut denne meldinga"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:71
 msgid "Re_direct"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:72
 #, fuzzy
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Sentrer dei valte elementa"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:77
 msgid "Reset the text to its original size"
 msgstr "Sett tilbake teksta til det opprinnelege"
 
-#: ui/evolution-mail-message.xml.h:77
-msgid "S_earch Message..."
+#: ui/evolution-mail-message.xml.h:78
+#, fuzzy
+msgid "S_earch in Message..."
 msgstr "S_øk i meldingar ..."
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:79
 msgid "S_maller"
 msgstr "M_indre"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:80
 msgid "Save the message as a text file"
 msgstr "Lagre melding som tekstfil"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:81
 #, fuzzy
 msgid "Search for text in the body of the displayed message"
 msgstr "Skriv tittelen på ruta her."
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:82
 #, fuzzy
 msgid "Set up the page settings for your current printer"
 msgstr "Endre sideoppsett for aktiv skrivar"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show Email _Source"
 msgstr "Vis e-post _kjeldekode"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show Full _Headers"
 msgstr "Vis heile meldings_hovudet"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:85
+#, fuzzy
+msgid "Show a blinking cursor in the body of displayed messages"
+msgstr "Skriv tittelen på ruta her."
+
+#: ui/evolution-mail-message.xml.h:86
 msgid "Show message in the normal style"
 msgstr "Vis melding på normal måte"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:87
 msgid "Show message with all email headers"
 msgstr "Vis melding med alle meldingshovud"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:88
 msgid "Show the raw email source of the message"
 msgstr "Vis den rå kjeldekoda til meldinga"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 msgid "Text Si_ze"
 msgstr "Tekststorle_ik"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 #, fuzzy
 msgid "Un-delete the selected messages"
 msgstr "Sentrer dei valte elementa"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 #, fuzzy
 msgid "VFolder on Mailing _List..."
 msgstr "Fil alt i liste"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
 msgid "VFolder on Se_nder..."
 msgstr "Mappenamn:"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:93
 #, fuzzy
 msgid "VFolder on _Recipients..."
 msgstr "Mappa finst: "
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 #, fuzzy
 msgid "VFolder on _Subject..."
 msgstr "Ingen emne"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Attached"
 msgstr "Lagt _ved"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:97
 msgid "_Copy to Folder"
 msgstr "_Kopiér til mappe"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Create Filter From Message"
 msgstr "_Opprett filter frå melding"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Forward Message"
 msgstr "_Vidaresend melding"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Go To"
 msgstr "_Gå til"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Inline"
 msgstr "_Innvevd"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:103
 msgid "_Larger"
 msgstr "_Større"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:104
 msgid "_Message Display"
 msgstr "_Meldingsvisning"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Move to Folder"
 msgstr "_Flytt til mappe"
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Next Message"
 msgstr "_Neste melding"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:107
 msgid "_Normal Display"
 msgstr "_Normal visning"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Open Message"
 msgstr "_Opne melding"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Previous Message"
 msgstr "_Forrige melding"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Quoted"
 msgstr "_Sitert"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:113
 #, fuzzy
 msgid "_Resend..."
 msgstr "_Omdøyp ..."
 
-#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:63
+#: ui/evolution-mail-message.xml.h:115 ui/evolution.xml.h:63
 msgid "_Tools"
 msgstr "Verk_ty"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:116
 #, fuzzy
 msgid "_Undelete"
 msgstr "Slett"
@@ -27809,6 +27859,11 @@ msgstr "S/MIME-kryptér"
 msgid "S/MIME Sign"
 msgstr "S/MIME-signér"
 
+#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:5
+msgid "Save"
+msgstr "Lagre"
+
 #: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Lagre som"
@@ -28002,15 +28057,20 @@ msgstr "Slett valde oppgåver"
 msgid "Mar_k as Complete"
 msgstr "_Merk som utført"
 
-#: ui/evolution-tasks.xml.h:10
+#: ui/evolution-tasks.xml.h:9
+#, fuzzy
+msgid "Mark selected tasks as complete"
+msgstr "_Merk oppgåver som ferdig"
+
+#: ui/evolution-tasks.xml.h:11
 msgid "Paste task from the clipboard"
 msgstr "Lim inn oppgåve frå utklippstavla"
 
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:12
 msgid "Previews the list of tasks to be printed"
 msgstr "Førehandsvis oppgåveliste før utskrift"
 
-#: ui/evolution-tasks.xml.h:13
+#: ui/evolution-tasks.xml.h:14
 msgid "Print the list of tasks"
 msgstr "Skriv ut oppgåveliste"
 
@@ -28214,6 +28274,12 @@ msgstr "_Omdøyp ..."
 msgid "_Send / Receive"
 msgstr "_Sende / Motta"
 
+#: ui/evolution.xml.h:60 calendar/gui/e-cal-view.c:1120
+#: calendar/gui/e-cal-view.c:1200
+#, fuzzy
+msgid "_Settings..."
+msgstr "_Innstillingar for e-post ..."
+
 #: ui/evolution.xml.h:61
 msgid "_Shortcut Bar"
 msgstr "_Snarvegstolpe"
@@ -28340,20 +28406,20 @@ msgstr "Definer visningar"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:427
+#: widgets/misc/e-calendar-item.c:434
 msgid "MTWTFSS"
 msgstr "MTOTFLS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1127
+#: widgets/misc/e-calendar-item.c:1134
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:428
+#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:431
 msgid "Now"
 msgstr "No"
 
-#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:434
+#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:437
 msgid "Today"
 msgstr "I dag"
 
@@ -28471,22 +28537,6 @@ msgstr "Redigér lagra søk ..."
 msgid "_Advanced..."
 msgstr "_Avansert ..."
 
-#: widgets/misc/e-messagebox.c:154
-msgid "Information"
-msgstr "Informasjon"
-
-#: widgets/misc/e-messagebox.c:168
-msgid "Error"
-msgstr "Feil"
-
-#: widgets/misc/e-messagebox.c:175
-msgid "Question"
-msgstr "Spørsmål"
-
-#: widgets/misc/e-messagebox.c:182
-msgid "Message"
-msgstr "Melding"
-
 #: widgets/misc/e-search-bar.c:531
 msgid "_Search"
 msgstr "_Søk"
@@ -28536,6 +28586,186 @@ msgstr "Tilgjengelege lenkjer:"
 msgid "Evolution Addressbook local file backend"
 msgstr "Evolutions addressebok minikortlesar"
 
+#: calendar/gui/e-cal-model-tasks.c:275
+msgid "N"
+msgstr "N"
+
+#: calendar/gui/e-cal-model-tasks.c:275
+msgid "S"
+msgstr "S"
+
+#: calendar/gui/e-cal-model-tasks.c:277
+msgid "E"
+msgstr "E"
+
+#: calendar/gui/e-cal-model-tasks.c:277
+msgid "W"
+msgstr "V"
+
+#: calendar/gui/e-cal-model-tasks.c:550
+#, fuzzy
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"Datoen må tastast inn på dette formatet:\n"
+"\n"
+"%s"
+
+#: calendar/gui/e-cal-model.c:797
+msgid "Recurring"
+msgstr "Repeterande"
+
+#: calendar/gui/e-cal-model.c:799
+msgid "Assigned"
+msgstr "Tildelt"
+
+#: calendar/gui/e-cal-view.c:1094 calendar/gui/e-cal-view.c:1184
+msgid "New _Appointment..."
+msgstr "Ny _avtale ..."
+
+#: calendar/gui/e-cal-view.c:1095 calendar/gui/e-cal-view.c:1186
+msgid "New All Day _Event"
+msgstr "Ny h_eildagshending"
+
+#: calendar/gui/e-cal-view.c:1096 calendar/gui/e-cal-view.c:1188
+#, fuzzy
+msgid "New Meeting"
+msgstr "Møte"
+
+#: calendar/gui/e-cal-view.c:1097 calendar/gui/e-cal-view.c:1190
+msgid "New Task"
+msgstr "Ny oppgåve"
+
+#: calendar/gui/e-cal-view.c:1112 calendar/gui/e-cal-view.c:1182
+msgid "_Go to Date..."
+msgstr "_Gå til dato ..."
+
+#: calendar/gui/e-cal-view.c:1139
+#, fuzzy
+msgid "_Schedule Meeting..."
+msgstr "Køyreplan ..."
+
+#: calendar/gui/e-cal-view.c:1140
+#, fuzzy
+msgid "_Forward as iCalendar..."
+msgstr "Fort framover"
+
+#: calendar/gui/e-cal-view.c:1145
+#, fuzzy
+msgid "Make this Occurrence _Movable"
+msgstr "Se&nd avtale"
+
+#: calendar/gui/e-cal-view.c:1146 calendar/gui/e-cal-view.c:1177
+#, fuzzy
+msgid "Delete this _Occurrence"
+msgstr "Erstatt denne førekomsten?"
+
+#: calendar/gui/e-cal-view.c:1147 calendar/gui/e-cal-view.c:1178
+#, fuzzy
+msgid "Delete _All Occurrences"
+msgstr "Slettar klassen"
+
+#: camel/providers/imapp/camel-imapp-provider.c:47
+#, fuzzy
+msgid "IMAP+"
+msgstr "IMAP"
+
+#: camel/providers/imapp/camel-imapp-provider.c:49
+msgid ""
+"Experimental IMAP 4(.1) client\n"
+"This is untested and unsupported code, you want to use plain imap instead.\n"
+"\n"
+" !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
+msgstr ""
+
+#: camel/providers/imapp/camel-imapp-store.c:333
+#, fuzzy, c-format
+msgid "Could not connect to POP server on %s"
+msgstr "Kunne ikkje lasta kalender '%1'.\n"
+
+#: camel/providers/imapp/camel-imapp-store.c:353
+#: camel/providers/imapp/camel-imapp-store.c:455
+#, fuzzy
+msgid ""
+"Unable to connect to POP server.\n"
+"No support for requested authentication mechanism."
+msgstr "Autentisering:"
+
+#: camel/providers/imapp/camel-imapp-store.c:369
+#, fuzzy, c-format
+msgid "SASL `%s' Login failed: %s"
+msgstr "IMAP-kommando feila: %s"
+
+#: camel/providers/imapp/camel-imapp-store.c:380
+msgid "SASL Protocol error"
+msgstr ""
+
+#: camel/providers/imapp/camel-imapp-store.c:395
+#, fuzzy, c-format
+msgid "I/O Error: %s"
+msgstr "I/U-feil"
+
+#: camel/providers/imapp/camel-imapp-store.c:467
+#: camel/providers/imapp/camel-imapp-store.c:471
+#, fuzzy, c-format
+msgid ""
+"Unable to connect to POP server.\n"
+"Error sending password: %s"
+msgstr "Kunne ikkje lasta kalender '%1'.\n"
+
+#~ msgid "URL:"
+#~ msgstr "URL:"
+
+#, fuzzy
+#~ msgid "_Save as..."
+#~ msgstr "Lagre som ..."
+
+#~ msgid "End Date"
+#~ msgstr "Sluttdato"
+
+#~ msgid "New _Appointment"
+#~ msgstr "Ny _avtale"
+
+#~ msgid "Print..."
+#~ msgstr "Skriv ut ..."
+
+#, fuzzy
+#~ msgid "Could not create a S/MIME signature context."
+#~ msgstr "Kunne ikkje laga kio-jobb.\n"
+
+#, fuzzy
+#~ msgid "Could not create a S/MIME certsonly context."
+#~ msgstr "Kunne ikkje laga kio-jobb.\n"
+
+#, fuzzy
+#~ msgid "Could not create a S/MIME encryption context."
+#~ msgstr "Kunne ikkje laga kio-jobb.\n"
+
+#, fuzzy
+#~ msgid "Could not create a S/MIME envelope context."
+#~ msgstr "Kunne ikkje laga kio-jobb.\n"
+
+#, fuzzy
+#~ msgid "Could not create a S/MIME decode context."
+#~ msgstr "Kunne ikkje laga kio-jobb.\n"
+
+#~ msgid "Save As..."
+#~ msgstr "Lagre som ..."
+
+#~ msgid "Information"
+#~ msgstr "Informasjon"
+
+#~ msgid "Error"
+#~ msgstr "Feil"
+
+#~ msgid "Question"
+#~ msgstr "Spørsmål"
+
+#~ msgid "Message"
+#~ msgstr "Melding"
+
 #~ msgid "Search"
 #~ msgstr "Søk"
 
@@ -29649,3 +29879,4 @@ msgstr "Evolutions addressebok minikortlesar"
 
 #~ msgid "<dd><b>The weather server could not be contacted</b></dd>"
 #~ msgstr "<dd><b>Klarte ikkje å kontakte vêrtenaren</b></dd>"
+