update version reliance

2003-12-07  JP Rosevear  <jpr@ximian.com>

	* configure.in: update version reliance

svn path=/trunk/; revision=23667

1 files changed, 3535 insertions, 2263 deletions

diff --git a/po/nn.po b/po/nn.po
index 4fa87fe12d..e033ae4af8 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nn\n"
-"POT-Creation-Date: 2003-11-07 01:11-0500\n"
+"POT-Creation-Date: 2003-12-07 17:06-0500\n"
 "PO-Revision-Date: 2003-10-28 11:42+0100\n"
 "Last-Translator: Åsmund Skjæveland <aasmunds@fys.uio.no>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -32,52 +32,187 @@ msgstr "Klarte ikkje å laste %s: %s"
 msgid "Could not read pilot's Address application block"
 msgstr "Klarte ikkje å lese addresseblokka i programmet til piloten"
 
-#: addressbook/gui/component/addressbook-config.c:205
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Autofullføringsmapper"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Certificates"
+msgstr "_Sertifikat-ID:"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Configure autocomple here"
+msgstr "Set opp e-postkontoar"
+
+#. Fix me *
+#. can not get name, should be a bug of e-book.Anyway, should set a default name.
+#.
+#. name = e_book_get_name (book);
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
+#: mail/importers/netscape-importer.c:1844 shell/e-shortcuts.c:1088
+msgid "Contacts"
+msgstr "Kontakter"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Evolution Addressbook"
+msgstr "Evolution adressebok"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolution adressebok adressedialog"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution adressebok adressevisar"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution adressebok kortvisar"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook component"
+msgstr "Evolution adressebok-komponent"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook folder viewer"
+msgstr "Evolution adressebok mappevisar"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution e-postinnstillingskontroll"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+msgid "Evolution folder settings configuration control"
+msgstr "Evolution oppsettkontroll for mappeinnstillingar"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Manager your S/Mime certificates here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:145
+#: addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "New Addressbook"
+msgstr "Adressebok"
+
+#: addressbook/gui/component/addressbook-component.c:146
+msgid "Properties..."
+msgstr "Eigenskapar ..."
+
+#: addressbook/gui/component/addressbook-component.c:147
+#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:403
+#: filter/libfilter-i18n.h:10 mail/em-account-prefs.c:236
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+msgid "Delete"
+msgstr "Slett"
+
+#: addressbook/gui/component/addressbook-component.c:148
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:401
+#, fuzzy
+msgid "Rename"
+msgstr "_Gje nytt namn"
+
+#: addressbook/gui/component/addressbook-component.c:217
+#, fuzzy
+msgid "New Contact"
+msgstr "Ny kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:218
+msgid "_Contact"
+msgstr "_Kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:219
+msgid "Create a new contact"
+msgstr "Opprett ny kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:224
+msgid "New Contact List"
+msgstr "Ny kontaktliste"
+
+#: addressbook/gui/component/addressbook-component.c:225
+#, fuzzy
+msgid "Contact _List"
+msgstr "Ny kontakt_liste"
+
+#: addressbook/gui/component/addressbook-component.c:226
+msgid "Create a new contact list"
+msgstr "Opprett ny kontaktliste"
+
+#: addressbook/gui/component/addressbook-component.c:375
+#: calendar/gui/calendar-component.c:834 calendar/gui/tasks-component.c:764
+msgid "On This Computer"
+msgstr ""
+
+#. orange
+#: addressbook/gui/component/addressbook-component.c:385
+#: calendar/gui/calendar-component.c:842 calendar/gui/migration.c:123
+#: calendar/gui/migration.c:146 calendar/gui/tasks-component.c:772
+#: filter/filter-label.c:123 mail/mail-config.c:65 mail/mail-config.glade.h:86
+#: shell/e-config-upgrade.c:1456
+#, fuzzy
+msgid "Personal"
+msgstr "Personleg"
+
+#. red
+#: addressbook/gui/component/addressbook-component.c:392
+#: calendar/gui/calendar-component.c:849 filter/filter-label.c:122
+#: mail/mail-config.c:64 mail/mail-config.glade.h:133
+#: shell/e-config-upgrade.c:1455
+#, fuzzy
+msgid "Work"
+msgstr "Arbeid"
+
+#. Create the LDAP source group
+#: addressbook/gui/component/addressbook-component.c:400
+#, fuzzy
+msgid "On LDAP Servers"
+msgstr "LDAP-tenar"
+
+#. FIXME: parent
+#: addressbook/gui/component/addressbook-config.c:244
+#, fuzzy
+msgid "Could not create a directory for the new addressbook."
+msgstr "Kan ikkje laga mappa %s: %s"
+
+#: addressbook/gui/component/addressbook-config.c:416
 msgid "Failed to connect to LDAP server"
 msgstr "Klarte ikkje å kople til LDAP-tenar"
 
-#: addressbook/gui/component/addressbook-config.c:230
+#: addressbook/gui/component/addressbook-config.c:440
 msgid "Failed to authenticate with LDAP server"
 msgstr "Ikkje i stand til å autentisere mot IMAP-tenar"
 
-#: addressbook/gui/component/addressbook-config.c:258
+#: addressbook/gui/component/addressbook-config.c:468
 msgid "Could not perform query on Root DSE"
 msgstr "Kunne ikke utføra spørjing på Root DSE"
 
-#: addressbook/gui/component/addressbook-config.c:681
+#: addressbook/gui/component/addressbook-config.c:792
 msgid "The server responded with no supported search bases"
 msgstr "Tenaren svarte ikkje med nokon støtta basisar for søk"
 
-#: addressbook/gui/component/addressbook-config.c:1192
+#: addressbook/gui/component/addressbook-config.c:1203
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Denne tenaren stør ikkje LDAPv3 skjemainformasjon"
 
-#: addressbook/gui/component/addressbook-config.c:1214
+#: addressbook/gui/component/addressbook-config.c:1225
 msgid "Error retrieving schema information"
 msgstr "Feil ved henting av skjemainformasjon"
 
-#: addressbook/gui/component/addressbook-config.c:1222
+#: addressbook/gui/component/addressbook-config.c:1233
 msgid "Server did not respond with valid schema information"
 msgstr "Tenaren svarte ikkje med gyldig skjema-informasjon"
 
-#: addressbook/gui/component/addressbook-config.c:1636
-msgid "Account Name"
-msgstr "Kontonamn"
-
-#: addressbook/gui/component/addressbook-config.c:1638
-msgid "Server Name"
-msgstr "Tenarnamn"
-
-#: addressbook/gui/component/addressbook-config.c:1675
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "LDAP var ikkje tatt med i denne versjonen av Evolution"
-
-#: addressbook/gui/component/addressbook-storage.c:178
-msgid "Other Contacts"
-msgstr "Andre kontakter"
-
 # TRN. «Aksessera». Blæ.
-#: addressbook/gui/component/addressbook.c:494
+#: addressbook/gui/component/addressbook.c:500
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -85,7 +220,7 @@ msgstr ""
 "Kan ikkje opna denne adresseboka. Sjå etter at stien\n"
 "finst og at du har løyve til å aksessera han."
 
-#: addressbook/gui/component/addressbook.c:504
+#: addressbook/gui/component/addressbook.c:507
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -95,7 +230,7 @@ msgstr ""
 "du har skrive inn ein ugyldig URI, eller at LDAP-tenaren\n"
 "ikkje kan nåast."
 
-#: addressbook/gui/component/addressbook.c:509
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -107,7 +242,7 @@ msgstr ""
 "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:519
+#: addressbook/gui/component/addressbook.c:521
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the server\n"
@@ -122,44 +257,43 @@ msgid "Unable to open addressbook"
 msgstr "Ikkje i stand å opne adresseboka"
 
 # TRN: Må finna betre ord for «aksessera». Kanskje dette duger?
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:600
 msgid "Accessing LDAP Server anonymously"
 msgstr "Hentar data frå LDAP-tenar anonymt"
 
-#: addressbook/gui/component/addressbook.c:644
+#: addressbook/gui/component/addressbook.c:670
 msgid "Failed to authenticate.\n"
 msgstr "Kan ikkje autentisera.\n"
 
-#: addressbook/gui/component/addressbook.c:652
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:676
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sSkriv inn passord for %s (brukar %s)"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:802
 msgid "Name begins with"
 msgstr "Namnet byrjar med"
 
-#: addressbook/gui/component/addressbook.c:781
+#: addressbook/gui/component/addressbook.c:803
 msgid "Email begins with"
 msgstr "E-post byrjar med"
 
-#: addressbook/gui/component/addressbook.c:782
-#: calendar/gui/cal-search-bar.c:53
+#: addressbook/gui/component/addressbook.c:804
+#: calendar/gui/cal-search-bar.c:52
 msgid "Category is"
 msgstr "Kategori er"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:783
-#: calendar/gui/cal-search-bar.c:49
+#: addressbook/gui/component/addressbook.c:805
+#: calendar/gui/cal-search-bar.c:48
 msgid "Any field contains"
 msgstr "Nokon felt inneheld"
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:806
 msgid "Advanced..."
 msgstr "Avansert ..."
 
-#: addressbook/gui/component/addressbook.c:930
+#: addressbook/gui/component/addressbook.c:927
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -171,7 +305,7 @@ msgstr ""
 "til å visa. Gjer søket ditt meir spesifikt eller hev\n"
 "resultatgrensa i oppsettet for katalogtenaren i denne adresseboka."
 
-#: addressbook/gui/component/addressbook.c:936
+#: addressbook/gui/component/addressbook.c:933
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -183,88 +317,41 @@ msgstr ""
 "auk grensa for kor lang tid eit søk kan ta i katalogtenar-innstillingane\n"
 "for denne adresseboka."
 
-#: addressbook/gui/component/addressbook.c:942
+#: addressbook/gui/component/addressbook.c:939
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "Bakenden for denne adresseboka kunne ikkje tolka spørjinga."
 
-#: addressbook/gui/component/addressbook.c:945
+#: addressbook/gui/component/addressbook.c:942
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Bakenden for denne adresseboka nekta å utføra denne spørjinga."
 
-#: addressbook/gui/component/addressbook.c:948
+#: addressbook/gui/component/addressbook.c:945
 msgid "This query did not complete successfully."
 msgstr "Spørjinga vart ikkje fullført."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1021
-#: calendar/gui/cal-search-bar.c:354
+#: addressbook/gui/component/addressbook.c:982
+#: calendar/gui/cal-search-bar.c:353
 msgid "Any Category"
 msgstr "Nokon kategori"
 
-#: addressbook/gui/component/addressbook.c:1102
+#: addressbook/gui/component/addressbook.c:1063
 #, fuzzy
-msgid "URI of the contacts that the control will display"
+msgid "UID of the contacts source that the view will display"
 msgstr "URI-en som kalenderen skal visa"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#, fuzzy
-msgid "Certificates"
-msgstr "_Sertifikat-ID:"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Configure access to LDAP directory servers here"
-msgstr "Set opp tilgang til LDAP-katalogtenar her"
-
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: mail/importers/netscape-importer.c:1844 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr "Kontakter"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Directory Servers"
-msgstr "Katalogtenarar"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook"
-msgstr "Evolution adressebok"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Kontroll for LDAP-konfigurasjon for Evolution adressebok"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address pop-up"
-msgstr "Evolution adressebok adressedialog"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution adressebok adressevisar"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution adressebok kortvisar"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook component"
-msgstr "Evolution adressebok-komponent"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook folder viewer"
-msgstr "Evolution adressebok mappevisar"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+msgid "EFolderList xml for the list of completion uris"
+msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution e-postinnstillingskontroll"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+msgid ""
+"The number of characters that must be typed before evolution will attempt to "
+"autocomplete"
+msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
@@ -287,6 +374,7 @@ msgstr "V_is støtta basar"
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
 #: calendar/gui/dialogs/new-calendar.glade.h:1
+#: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
@@ -320,8 +408,9 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "Add LDAP Server"
-msgstr "Legg til LDAP-tenar"
+#, fuzzy
+msgid "Addressbook Creation Assistant"
+msgstr "Konfigurasjonsassistent for LDAP"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 msgid "Addressbook Sources"
@@ -337,9 +426,9 @@ msgid "Anonymously"
 msgstr "Anonymt"
 
 #: addressbook/gui/component/ldap-config.glade.h:15
+#, fuzzy
 msgid ""
-"Congratulations, you are finished setting up this LDAP server. You\n"
-"are now ready to access this directory.\n"
+"Congratulations, you are finished setting up this addressbook.\n"
 "\n"
 "Please click the \"Finish\" button to save the settings you have entered "
 "here."
@@ -350,49 +439,50 @@ msgstr ""
 "Trykk på «Fullfør»-knappen for å lagra innstillingane du har\n"
 "skrive inn her."
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:18
 msgid "Connecting"
 msgstr "Koplar til"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished _name:"
 msgstr "Distinguished _name:"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Edit LDAP Server"
 msgstr "Rediger LDAP-tenar"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Email address:"
 msgstr "E-postadresse:"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr "Evolution vil bruka DN til å autentisera deg mot tenaren"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 "Evolution kjem til å bruke denne e-postaddressa for å autentisere deg "
 "ovanfor tenaren"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Finished"
 msgstr "Ferdig"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: smime/gui/smime-ui.glade.h:20
+#: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Allment"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "LDAP Configuration Assistant"
-msgstr "Konfigurasjonsassistent for LDAP"
+#: addressbook/gui/component/ldap-config.glade.h:26
+#, fuzzy
+msgid "Group:"
+msgstr "Gruppe"
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:68
-#: mail/mail-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:68
+#: mail/mail-config.glade.h:76
 msgid "Never"
 msgstr "Aldri"
 
@@ -420,8 +510,8 @@ msgid "S_earch scope: "
 msgstr "Sø_keområde: "
 
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-list-view.c:397 calendar/gui/e-cal-view.c:718
-#: calendar/gui/gnome-cal.c:587
+#: calendar/gui/e-cal-list-view.c:396 calendar/gui/e-cal-view.c:589
+#: calendar/gui/gnome-cal.c:585
 msgid "Searching"
 msgstr "Søker"
 
@@ -475,27 +565,31 @@ msgstr ""
 "for LDAP-søk, og for å oppretta og redigera kontaktar."
 
 #: addressbook/gui/component/ldap-config.glade.h:47
+#, fuzzy
 msgid ""
-"Specifying a display name is the last required step in configuring an LDAP "
-"server."
+"Specifying a display name and group is the first step in setting up an "
+"addressbook."
 msgstr ""
 "Det siste steget i å setja opp ein LDAP-tenar er å setja eit visingsnamn."
 
 #: addressbook/gui/component/ldap-config.glade.h:48
-msgid "Step 1: Server Information"
-msgstr "Steg 1: Tenarinformasjon"
+msgid "Step 1: Folder Characteristics"
+msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:49
-msgid "Step 2: Connecting to Server"
-msgstr "Steg 2: Koplar til tenar"
+#, fuzzy
+msgid "Step 2: Server Information"
+msgstr "Steg 1: Tenarinformasjon"
 
 #: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Step 3: Searching the Directory"
-msgstr "Steg 3: Søker gjennom katalogen"
+#, fuzzy
+msgid "Step 3: Connecting to Server"
+msgstr "Steg 2: Koplar til tenar"
 
 #: addressbook/gui/component/ldap-config.glade.h:51
-msgid "Step 4: Display Name"
-msgstr "Steg 4: Vis namn"
+#, fuzzy
+msgid "Step 4: Searching the Directory"
+msgstr "Steg 3: Søker gjennom katalogen"
 
 #: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Sub"
@@ -507,18 +601,6 @@ msgstr "Støtta søkebasar"
 
 #: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
-"The first step in configuring an LDAP server is to provide its name, and "
-"your log in\n"
-"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 ""
 "The options on this page control how many entries should be included in "
 "your\n"
 "searches, and how long a search should take. Ask your system administrator "
@@ -529,7 +611,7 @@ msgstr ""
 "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
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -540,7 +622,7 @@ msgstr ""
 "starta. Dersom du let denne stå blank, vil søka byrja ved rota på "
 "katalogtreet."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -554,14 +636,14 @@ msgstr ""
 "Dersom du vel «one», vil berre oppføringane eitt nivå under søkebasen din "
 "brukast.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:63
+#, fuzzy
 msgid ""
-"This assistant will help you to access online directory services\n"
-"using LDAP (Lightweight Directory Access Protocol) servers. \n"
+"This assistant will help you create a new addressbook. \n"
 "\n"
-"Adding a new LDAP server requires some specialized information about the "
-"server. Please contact your system administrator if you need help finding "
-"this information."
+"Depending on the type of addressbook you create, additional\n"
+"parameters may be required. Please contact your system\n"
+"administrator if you need help finding this information."
 msgstr ""
 "Denne assistenten hjelper deg med å få tilgang til katalogtenester\n"
 "på nettverket ved hjelp av LDAP (Lightweight Directory Access Protocol)-"
@@ -570,13 +652,13 @@ msgstr ""
 "med din systemansvarlege dersom du treng hjelp til å finna denne "
 "informasjonen."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "Dette er det fulle namnet på LDAP-tenaren. T.d. «ldap.mittfirma.no»."
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
@@ -586,7 +668,7 @@ msgstr ""
 "dette talet\n"
 "for høgt vil få adresseboka di til å gå sakte."
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -596,7 +678,7 @@ msgstr ""
 "at å setja dette til «e-post-adresse» krev at anonym tilgang til LDAP-"
 "tenaren."
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -605,6 +687,15 @@ msgstr ""
 "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:74
+#, fuzzy
+msgid ""
+"This is the name that will appear in your Evolution folder list. It is for "
+"display purposes only. "
+msgstr ""
+"Dette er det namnet på tenaren som vert vist i Evolution si mappeliste.\n"
+"Det vert berre brukt til å visast på skjermen."
+
 #: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
@@ -633,21 +724,34 @@ msgid "Using email address"
 msgstr "Brukar e-post adresse"
 
 #: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr "Når det er mogleg"
 
 #: addressbook/gui/component/ldap-config.glade.h:83
+#, fuzzy
+msgid ""
+"You have decided to configure an LDAP server. The first step in doing this "
+"is to provide its name and your\n"
+"log in 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:85
 msgid "_Display name:"
 msgstr "_Vist namn:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Download limit:"
 msgstr "Grense for ne_dlasting:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:142 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:45 ui/evolution-composer-entries.xml.h:8
+#: addressbook/gui/component/ldap-config.glade.h:87 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:146 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:37 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
@@ -655,54 +759,52 @@ msgstr "Grense for ne_dlasting:"
 msgid "_Edit"
 msgstr "R_edigér"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Log in method:"
 msgstr "Metode for å logga inn:"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Port number:"
 msgstr "_Portnummer:"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Search base:"
 msgstr "_Søkebase:"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Server name:"
 msgstr "_Tenarnamn:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Timeout (minutes):"
 msgstr "_Tid før avbrot (minutt):"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "cards"
 msgstr "kort"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "connecting-tab"
 msgstr "tilkopling-fane"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "general-tab"
 msgstr "almennt-fane"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "searching-tab"
 msgstr "søke-fane"
 
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-msgid "Name"
-msgstr "Namn"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Grensesnitt for val av namn i Evolution adressebok"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:205
 msgid "Remove All"
 msgstr "Fjern alle"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:212
-#: addressbook/gui/component/select-names/e-select-names.c:691
+#: addressbook/gui/component/select-names/e-select-names.c:694
 #: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove"
 msgstr "Fjern"
@@ -729,23 +831,21 @@ msgstr "Legg til kontakter"
 msgid "Unnamed Contact"
 msgstr "Kontakt utan namn"
 
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+msgid "Name"
+msgstr "Namn"
+
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
 msgid "Source"
 msgstr "Kjelde"
 
-#: addressbook/gui/component/select-names/e-select-names.c:504
+#: addressbook/gui/component/select-names/e-select-names.c:518
 msgid "Select Contacts from Addressbook"
 msgstr "Vel kontaktar frå adresseboka"
 
-#: addressbook/gui/component/select-names/e-select-names.c:647
-msgid "Find contact in"
-msgstr "Finn kontakt i"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Grensesnitt for val av namn i Evolution adressebok"
-
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Find"
 msgstr "Finn"
@@ -822,7 +922,8 @@ msgid "D_epartment:"
 msgstr "A_vdeling:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:201 smime/gui/smime-ui.glade.h:15
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
+#: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Detaljar"
 
@@ -889,12 +990,12 @@ msgid "_Categories..."
 msgstr "_Kategoriar ..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: calendar/gui/dialogs/meeting-page.c:635 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1010
-#: calendar/gui/e-calendar-table.c:1028 mail/em-folder-view.c:681
-#: mail/mail-component.c:2088 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:104
+#: calendar/gui/dialogs/meeting-page.c:633 calendar/gui/e-cal-view.c:1223
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-calendar-table.c:1009
+#: calendar/gui/e-calendar-table.c:1027 mail/em-folder-tree.c:1501
+#: mail/em-folder-view.c:705 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:36 ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:18
 msgid "_Delete"
 msgstr "_Slett"
@@ -2027,7 +2128,7 @@ msgid "Esq."
 msgstr "Esq."
 
 #: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "Fullt namn"
 
@@ -2120,11 +2221,27 @@ msgstr "Redigering av kontakter"
 msgid "Save List as VCard"
 msgstr "Lagre liste som VCard"
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+msgid "Changed Contact:"
+msgstr "Endra kontakt:"
+
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr "Kontakt i konflikt:"
+
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
 msgid "Duplicate Contact Detected"
 msgstr "Duplikatkontakt funne"
 
+#: addressbook/gui/merging/eab-contact-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?"
+
 #: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
 msgstr "Ny kontakt"
@@ -2141,22 +2258,6 @@ msgstr ""
 "Namnet eller e-post-adressa til denne kontakten finst\n"
 "alt i denne mappa. Vil du leggja han til likevel?"
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
-msgid "Changed Contact:"
-msgstr "Endra kontakt:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
-msgid "Conflicting Contact:"
-msgstr "Kontakt i konflikt:"
-
-#: addressbook/gui/merging/eab-contact-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:116
 #: widgets/misc/e-filter-bar.c:148
@@ -2255,9 +2356,9 @@ msgstr "Vidaresend kontakt"
 msgid "Send Message to Contact"
 msgstr "Send melding til kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2453
+#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2452
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Skriv ut"
@@ -2279,9 +2380,12 @@ msgstr "Flytt til mappe ..."
 msgid "Cut"
 msgstr "Klipp ut"
 
+#. create the dialog
 #: addressbook/gui/widgets/e-addressbook-view.c:908
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
+#: calendar/gui/calendar-component.c:429
+#: calendar/gui/dialogs/copy-source-dialog.c:135
+#: calendar/gui/tasks-component.c:400 ui/evolution-addressbook.xml.h:2
+#: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopier"
 
@@ -2290,16 +2394,8 @@ msgstr "Kopier"
 msgid "Paste"
 msgstr "Lim inn"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:910
-#: calendar/gui/calendar-component.c:206 filter/libfilter-i18n.h:10
-#: mail/em-account-prefs.c:236 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
-msgid "Delete"
-msgstr "Slett"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:914
-#: calendar/gui/e-cal-view.c:1265
+#: calendar/gui/e-cal-view.c:1192
 msgid "Current View"
 msgstr "Aktiv vising"
 
@@ -2315,166 +2411,170 @@ msgstr ""
 "har krasja. Du må starta Evolution på nytt for å bruka han igjen."
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-msgid "* Click here to add a contact *"
-msgstr "* Trykk her for å legge til ein kontakt *"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr "Assistent"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant Phone"
 msgstr "Telefon til assistent"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
-msgid "Business Address"
-msgstr "Firma-adresse"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 msgid "Business Fax"
 msgstr "Firma-fax"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Business Phone"
 msgstr "Firma-telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Phone 2"
 msgstr "Firma-telefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Callback Phone"
 msgstr "Tilbakering telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Car Phone"
 msgstr "Bil-telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Kategoriar"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 msgid "Company Phone"
 msgstr "Firmatelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Department"
-msgstr "Avdeling"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 #: addressbook/gui/widgets/eab-contact-display.c:216
 #: addressbook/gui/widgets/eab-contact-display.c:217
 #: addressbook/gui/widgets/eab-contact-display.c:218
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:348 smime/lib/e-cert.c:769
 msgid "Email"
 msgstr "E-post"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: addressbook/gui/widgets/eab-popup-control.c:460
 msgid "Email 2"
 msgstr "E-post 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 #: addressbook/gui/widgets/eab-popup-control.c:470
 msgid "Email 3"
 msgstr "E-post 3"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Family Name"
+msgstr "Etternamn"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "File As"
 msgstr "Arkiver som"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Free-busy URL"
-msgstr "Ledig-oppteken-URL"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-#: addressbook/gui/widgets/eab-contact-display.c:221
-msgid "Home Address"
-msgstr "Heime-adresse"
+#, fuzzy
+msgid "Given Name"
+msgstr "Feltnamn"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Home Fax"
 msgstr "Heime-faks"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Phone"
 msgstr "Heime-telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone 2"
 msgstr "Heime-telefon 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "ISDN"
-msgstr "ISDN"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#, fuzzy
+msgid "ISDN Phone"
+msgstr "Telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#, fuzzy
+msgid "Journal"
+msgstr "Jordan"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Manager"
 msgstr "Sjef"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Kallenamn"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Merknad"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Kontor"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organisasjon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-#: addressbook/gui/widgets/eab-contact-display.c:223
-msgid "Other Address"
-msgstr "Alternativ adresse"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Alternativ faks"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
 msgid "Other Phone"
 msgstr "Alternativ telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Pager"
 msgstr "Personsøkjar"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
 msgid "Primary Phone"
 msgstr "Primær telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Profession"
-msgstr "Yrke"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Rolle"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Spouse"
 msgstr "Ektefelle"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "TTY"
-msgstr "TTY"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#, fuzzy
+msgid "TTYTDD"
+msgstr "TTY/TDD"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Telex"
 msgstr "Teleks"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
 msgstr "Tittel"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#, fuzzy
+msgid "Unit"
+msgstr "Unst"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Web Site"
 msgstr "Nettstad"
 
@@ -2567,11 +2667,19 @@ msgstr "Medlemar"
 msgid "Job Title"
 msgstr "_Jobb-tittel:"
 
+#: addressbook/gui/widgets/eab-contact-display.c:221
+msgid "Home Address"
+msgstr "Heime-adresse"
+
 #: addressbook/gui/widgets/eab-contact-display.c:222
 #, fuzzy
 msgid "Work Address"
 msgstr "Heime-adresse"
 
+#: addressbook/gui/widgets/eab-contact-display.c:223
+msgid "Other Address"
+msgstr "Alternativ adresse"
+
 #: addressbook/gui/widgets/eab-contact-display.c:227
 #: addressbook/gui/widgets/eab-contact-display.c:375
 #, fuzzy
@@ -2584,112 +2692,109 @@ msgstr "Heime-faks"
 msgid "Blog"
 msgstr "Bologna"
 
-#: addressbook/gui/widgets/eab-gui-util.c:45
-#: shell/evolution-shell-component.c:1183
+#: addressbook/gui/widgets/eab-gui-util.c:43
 msgid "Success"
 msgstr "Vellukka"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:44
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:536
-#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:914
-#: shell/e-storage.c:601 shell/evolution-shell-component.c:1222
+#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:1011
 msgid "Unknown error"
 msgstr "Ukjend feil"
 
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:45
 msgid "Repository offline"
 msgstr "Fråkopla lager"
 
-#: addressbook/gui/widgets/eab-gui-util.c:48 shell/e-storage.c:587
-#: shell/evolution-shell-component.c:1213
+#: addressbook/gui/widgets/eab-gui-util.c:46
 msgid "Permission denied"
 msgstr "Nekta tilgang"
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:47
 #, fuzzy
 msgid "Contact not found"
 msgstr "Fann ikkje kort"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "Kort-id eksisterar allereide"
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Protocol not supported"
 msgstr "Protokollen er ikkje støtta"
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:604
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-tasks.c:211
-#: calendar/gui/print.c:2321 camel/camel-service.c:734
+#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:600
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-tasks.c:213
+#: calendar/gui/print.c:2320 camel/camel-service.c:734
 #: camel/camel-service.c:772 camel/camel-service.c:856
 #: camel/camel-service.c:896 camel/providers/pop3/camel-pop3-store.c:453
 #: camel/providers/pop3/camel-pop3-store.c:530
 msgid "Cancelled"
 msgstr "Avbroten"
 
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Authentication Failed"
 msgstr "Autentisering feila"
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Authentication Required"
 msgstr "Treng autentisering"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "TLS not Available"
 msgstr "TLS er ikkje tilgjengeleg"
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:54
 msgid "Addressbook does not exist"
 msgstr "Adresseboka finst ikkje"
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Other error"
 msgstr "Anna feil"
 
-#: addressbook/gui/widgets/eab-gui-util.c:84
+#: addressbook/gui/widgets/eab-gui-util.c:82
 msgid "Do you want to save changes?"
 msgstr "Vil du lagre endringar?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:86
+#: addressbook/gui/widgets/eab-gui-util.c:84
 msgid "_Discard"
 msgstr "_Forkast"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
+#: addressbook/gui/widgets/eab-gui-util.c:103
 msgid "Error adding list"
 msgstr "Feil ved tillegging av liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
-#: addressbook/gui/widgets/eab-gui-util.c:459
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:457
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Feil ved tilleggjing av kort"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 msgid "Error modifying list"
 msgstr "Feil ved endring av liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Feil ved endringa av kort"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:122
 msgid "Error removing list"
 msgstr "Feil ved fjerning av liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
-#: addressbook/gui/widgets/eab-gui-util.c:417
+#: addressbook/gui/widgets/eab-gui-util.c:122
+#: addressbook/gui/widgets/eab-gui-util.c:415
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Feil ved fjerning av kort"
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
+#: addressbook/gui/widgets/eab-gui-util.c:204
 #, fuzzy, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2698,7 +2803,7 @@ msgstr ""
 "Å opna %d kort vil også opna %d nye vindauge på skjermen.\n"
 "Vil du verkeleg visa alle desse korta?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:232
+#: addressbook/gui/widgets/eab-gui-util.c:230
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2707,49 +2812,49 @@ msgstr ""
 "%s eksisterar allereide\n"
 "Vil du skrive over?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:236
+#: addressbook/gui/widgets/eab-gui-util.c:234
 msgid "Overwrite"
 msgstr "Skriv over"
 
-#: addressbook/gui/widgets/eab-gui-util.c:272
+#: addressbook/gui/widgets/eab-gui-util.c:270
 #, c-format
 msgid "Error saving %s: %s"
 msgstr "Feil ved lagring av %s: %s"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:309
+#: addressbook/gui/widgets/eab-gui-util.c:307
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:378
+#: addressbook/gui/widgets/eab-gui-util.c:376
 msgid "list"
 msgstr "liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:514
+#: addressbook/gui/widgets/eab-gui-util.c:513
 #, fuzzy
 msgid "Move contact to"
 msgstr "Flytt kort til"
 
-#: addressbook/gui/widgets/eab-gui-util.c:516
+#: addressbook/gui/widgets/eab-gui-util.c:515
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Kopiér kort til"
 
-#: addressbook/gui/widgets/eab-gui-util.c:519
+#: addressbook/gui/widgets/eab-gui-util.c:518
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Flytt kort til"
 
-#: addressbook/gui/widgets/eab-gui-util.c:521
+#: addressbook/gui/widgets/eab-gui-util.c:520
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Kopiér kort til"
 
-#: addressbook/gui/widgets/eab-gui-util.c:710
+#: addressbook/gui/widgets/eab-gui-util.c:706
 msgid "Multiple VCards"
 msgstr "Fleire VKort"
 
-#: addressbook/gui/widgets/eab-gui-util.c:718
+#: addressbook/gui/widgets/eab-gui-util.c:714
 #, c-format
 msgid "VCard for %s"
 msgstr "VKort for %s"
@@ -2945,7 +3050,7 @@ msgstr "Margar"
 msgid "Number of columns:"
 msgstr "Tal på kolonnar:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:78
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
 msgid "Options"
 msgstr "Val"
 
@@ -3131,18 +3236,18 @@ msgstr "Liste utan namn"
 msgid "Split Multi-Day Events:"
 msgstr "Del opp hendingar som går over fleire dagar:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1349
-#: calendar/conduits/todo/todo-conduit.c:887
+#: calendar/conduits/calendar/calendar-conduit.c:1320
+#: calendar/conduits/todo/todo-conduit.c:857
 msgid "Could not start wombat server"
 msgstr "Klarte ikkje å starte wombat-tenar."
 
-#: calendar/conduits/calendar/calendar-conduit.c:1350
-#: calendar/conduits/todo/todo-conduit.c:888
+#: calendar/conduits/calendar/calendar-conduit.c:1321
+#: calendar/conduits/todo/todo-conduit.c:858
 msgid "Could not start wombat"
 msgstr "Klarte ikkje å starte wombat."
 
-#: calendar/conduits/calendar/calendar-conduit.c:1465
-#: calendar/conduits/calendar/calendar-conduit.c:1468
+#: calendar/conduits/calendar/calendar-conduit.c:1436
+#: calendar/conduits/calendar/calendar-conduit.c:1439
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kan ikkje lesa kalender-applikasjonsblokka på kalenderen"
 
@@ -3150,24 +3255,85 @@ msgstr "Kan ikkje lesa kalender-applikasjonsblokka på kalenderen"
 msgid "Default Priority:"
 msgstr "Standard prioritet:"
 
-#: calendar/conduits/todo/todo-conduit.c:975
-#: calendar/conduits/todo/todo-conduit.c:978
+#: calendar/conduits/todo/todo-conduit.c:945
+#: calendar/conduits/todo/todo-conduit.c:948
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kunne ikkje lesa applikasjonsblokka for hugseliste i piloten"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr "Kalender og oppgåver"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#, fuzzy
+msgid "Calendars"
+msgstr "Kalender"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Set opp tidssone, kalender og oppgåveliste her"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolution kalender og oppgåver"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Evolution Calendar configuration control"
+msgstr "Oppsettkontroll for Evolution kalender"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar viewer"
+msgstr "Evolution kalendervisar"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution kalender-/oppgåve-redigering"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Tasks viewer"
+msgstr "Evolution oppgåvevisar"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Evolution kalender og oppgåver-komponent"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Evolution testkomponent"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1082 calendar/gui/print.c:1796
+#: calendar/gui/tasks-control.c:486
+#: calendar/importers/icalendar-importer.c:716
+#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+msgid "Tasks"
+msgstr "Oppgåver"
+
+# TRN: Påminning om ein alarm? Rare greier.
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar alarm notification service"
+msgstr "Evolution Kalender alarmpåminningsteneste"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
 msgid "Starting:"
 msgstr "Startar:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Ending:"
 msgstr "Slutt:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:253
 msgid "Evolution Alarm"
 msgstr "Evolution alarm"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:346
 #, c-format
 msgid "Alarm on %s"
 msgstr "Alarm på %s"
@@ -3246,45 +3412,172 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Ikkje spør om dette programmet fleire gongar."
 
-# TRN: Påminning om ein alarm? Rare greier.
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Calendar alarm notification service"
-msgstr "Evolution Kalender alarmpåminningsteneste"
-
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:157
 msgid "Could not initialize Bonobo"
 msgstr "Kan ikkje initialisera Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:175
+#: calendar/gui/alarm-notify/notify-main.c:160
 msgid "Could not initialize gnome-vfs"
 msgstr "Klarte ikkje å initialisere gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:184
+#: calendar/gui/alarm-notify/notify-main.c:169
 msgid "Could not create the alarm notify service factory"
 msgstr "Kan ikkje laga factory for alarmtenesta"
 
-#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:109
+#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:111
 msgid "invalid time"
 msgstr "ugyldig tid"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+msgid "Allocate less space to weekend appointments"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#, fuzzy
+msgid "Calendars to run alarms for"
+msgstr "iCalendar-feil"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#, fuzzy
+msgid "Color of tasks that are due today"
+msgstr "Farge for oppgåver som skal vera ferdige i dag"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#, fuzzy
+msgid "Color of tasks that are overdue"
+msgstr "Farge for oppgåver som skal vera ferdige i dag"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+msgid "Days that are work days"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+msgid "Default timezone for meetings"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+msgid "Hour the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+msgid "Hour the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+msgid "Intervals shown in Day and Work Week views"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+msgid "Minute the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+msgid "Minute the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+msgid "Number of units for default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+msgid "Number of units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+msgid "Position of the horizontal pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+msgid "Position of the horizontal pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+msgid "Position of the vertical pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+msgid "Position of the vertical pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+msgid "Position of the vertical pane in the task view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+msgid "Programs that can run as part of alarms"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#, fuzzy
+msgid "Show where events end in week and month views"
+msgstr "_Vis sluttidspunkt for avtalar i veke- og månadsvising"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#, fuzzy
+msgid "The view showing when the calendar starts"
+msgstr "Førehandsvisar kalenderen som skal skrivast ut"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+msgid "Time last alarm ran"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+msgid "Units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+msgid "Units of default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+msgid "Weekday the week starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#, fuzzy
+msgid "Whether to ask for confirmation on appointment deletion"
+msgstr "_Be om stadfesting når oppføringar vert sletta"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#, fuzzy
+msgid "Whether to ask for confirmation when folder is expunged"
+msgstr "_Be om stadfesting når oppføringar vert sletta"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#, fuzzy
+msgid "Whether to hide completed tasks"
+msgstr "Slett utførte oppgåver"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+msgid "Whether to set a default reminder for events"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+msgid "Whether to show times in 24h format instead of using am/pm"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#, fuzzy
+msgid "Whether to show week numbers in date navigator"
+msgstr "Vis veke_nummer i datonavigatøren"
+
+#: calendar/gui/cal-search-bar.c:49
 msgid "Summary contains"
 msgstr "Samandrag inneheld"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Description contains"
 msgstr "Skildring inneheld"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "Merknad inneheld"
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1124
+#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1134
 msgid "Unmatched"
 msgstr "Ikkje truffe"
 
-#: calendar/gui/calendar-commands.c:422
+#: calendar/gui/calendar-commands.c:370
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -3294,82 +3587,109 @@ msgstr ""
 "tidslengda. Dersom du held fram, vil du ikkje kunna gjenoppretta desse "
 "hendingane."
 
-#: calendar/gui/calendar-commands.c:428
+#: calendar/gui/calendar-commands.c:376
 msgid "Purge events older than"
 msgstr "Fjern hendingar eldre enn"
 
-#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/calendar-commands.c:381
 #: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
 msgid "days"
 msgstr "dagar"
 
-#: calendar/gui/calendar-commands.c:531
+#: calendar/gui/calendar-commands.c:450
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:534 calendar/gui/e-day-view-top-item.c:692
+#: calendar/gui/calendar-commands.c:453 calendar/gui/e-day-view-top-item.c:692
 #: calendar/gui/e-day-view.c:1359 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%d. %a %b"
 
-#: calendar/gui/calendar-commands.c:536 calendar/gui/calendar-commands.c:541
-#: calendar/gui/calendar-commands.c:543
+#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:460
+#: calendar/gui/calendar-commands.c:462
 msgid "%a %d %b %Y"
 msgstr "%d. %a %b %Y"
 
-#: calendar/gui/calendar-commands.c:560 calendar/gui/calendar-commands.c:566
-#: calendar/gui/calendar-commands.c:572 calendar/gui/calendar-commands.c:574
+#: calendar/gui/calendar-commands.c:479 calendar/gui/calendar-commands.c:485
+#: calendar/gui/calendar-commands.c:491 calendar/gui/calendar-commands.c:493
 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:564
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1518
+#: calendar/gui/calendar-commands.c:483
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1517
 msgid "%d %B"
 msgstr "%d. %b"
 
-#: calendar/gui/calendar-component.c:177
+#: calendar/gui/calendar-component.c:368
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:205
+#: calendar/gui/calendar-component.c:408
+#, fuzzy
+msgid "Rename this calendar to"
+msgstr "Skriv ut denne kalenderen"
+
+#: calendar/gui/calendar-component.c:428
 #, fuzzy
 msgid "New Calendar"
 msgstr "Ny-Caledonia"
 
-#: calendar/gui/calendar-component.c:207
-#, fuzzy
-msgid "Rename"
-msgstr "_Gje nytt namn"
+#: calendar/gui/calendar-component.c:632
+msgid "New appointment"
+msgstr "Ny avtale"
 
-#: calendar/gui/calendar-component.c:408
-msgid "On This Computer"
-msgstr ""
+#: calendar/gui/calendar-component.c:633
+msgid "_Appointment"
+msgstr "A_vtale"
 
-#. orange
-#: calendar/gui/calendar-component.c:416 calendar/gui/migration.c:123
-#: calendar/gui/migration.c:146 filter/filter-label.c:123
-#: mail/mail-config.c:67 mail/mail-config.glade.h:83
-#: shell/e-config-upgrade.c:1456
+#: calendar/gui/calendar-component.c:634
+msgid "Create a new appointment"
+msgstr "Lag ein ny avtale"
+
+#: calendar/gui/calendar-component.c:639
+msgid "New meeting"
+msgstr "Nytt møte"
+
+#: calendar/gui/calendar-component.c:640
+msgid "M_eeting"
+msgstr "Møt_e"
+
+#: calendar/gui/calendar-component.c:641
 #, fuzzy
-msgid "Personal"
-msgstr "Personleg"
+msgid "Create a new meeting request"
+msgstr "Lag ein ny møteførespurnad"
 
-#. red
-#: calendar/gui/calendar-component.c:423 filter/filter-label.c:122
-#: mail/mail-config.c:66 mail/mail-config.glade.h:129
-#: shell/e-config-upgrade.c:1455
+#: calendar/gui/calendar-component.c:646
 #, fuzzy
-msgid "Work"
-msgstr "Arbeid"
+msgid "New all day appointment"
+msgstr "Ny avtale for heile dagen"
+
+#: calendar/gui/calendar-component.c:647
+msgid "All _Day Appointment"
+msgstr "Avtale for heile _dagen"
+
+#: calendar/gui/calendar-component.c:648
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "Lag ein ny avtale"
+
+#: calendar/gui/calendar-component.c:715
+#, c-format
+msgid "Unable to open the calendar '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:727
+msgid "There is no calendar available for creating events and meetings"
+msgstr ""
 
 #. create the remote source group
-#: calendar/gui/calendar-component.c:432
+#: calendar/gui/calendar-component.c:858
 msgid "On The Web"
 msgstr ""
 
@@ -3486,7 +3806,7 @@ msgstr "Send til:"
 msgid "With these arguments:"
 msgstr "Med desse argumenta:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:35
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
 msgid "dialog1"
 msgstr "dialog1"
 
@@ -3503,6 +3823,10 @@ msgstr "timar"
 msgid "minutes"
 msgstr "minutt"
 
+#: calendar/gui/dialogs/alarm-page.c:798
+msgid "Action/Trigger"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -3535,8 +3859,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:985 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:166
+#: calendar/gui/e-itip-control.c:983 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-tasks.c:168
 msgid "Summary:"
 msgstr "Samandrag:"
 
@@ -3565,7 +3889,7 @@ msgstr "slutt på avtale"
 msgid "hour(s)"
 msgstr "time/timar"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:174
+#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "minutt"
 
@@ -3619,7 +3943,7 @@ msgstr "Dagar"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:609
+#: calendar/gui/e-itip-control.c:607
 msgid "Friday"
 msgstr "Fredag"
 
@@ -3633,7 +3957,7 @@ msgstr "Minutt"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:605
+#: calendar/gui/e-itip-control.c:603
 msgid "Monday"
 msgstr "Måndag"
 
@@ -3643,7 +3967,7 @@ msgstr "Su_n"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:608
 msgid "Saturday"
 msgstr "Laurdag"
 
@@ -3657,7 +3981,7 @@ msgstr "Vis veke_nummer i datonavigatøren"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:602
 msgid "Sunday"
 msgstr "Søndag"
 
@@ -3675,7 +3999,7 @@ msgstr "Oppgåveliste"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:606
 msgid "Thursday"
 msgstr "Torsdag"
 
@@ -3693,7 +4017,7 @@ msgstr "Tidsformat:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:604
 msgid "Tuesday"
 msgstr "Tysdag"
 
@@ -3703,12 +4027,12 @@ msgstr "_Veka byrjar:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:607
+#: calendar/gui/e-itip-control.c:605
 msgid "Wednesday"
 msgstr "Onsdag"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:33
 msgid "Work Week"
 msgstr "Arbeidsveke"
 
@@ -3745,7 +4069,7 @@ msgid "_Fri"
 msgstr "_Fre"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:151
 msgid "_General"
 msgstr "_Generelt"
 
@@ -3785,18 +4109,18 @@ msgstr "_Ons"
 msgid "before every appointment"
 msgstr "før kvar avtale"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
 msgstr ""
 "Hendinga som vert sletta er eit møte. Vil du senda ut ei melding om avlysing?"
 
-#: calendar/gui/dialogs/cancel-comp.c:61
+#: calendar/gui/dialogs/cancel-comp.c:60
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Er du sikker på at du vil sletta og avlysa dette møtet?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:66
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
@@ -3804,11 +4128,11 @@ msgstr ""
 "Oppgåva som vert sletta er tildelt nokon. Vil du senda ei melding om "
 "kansellering?"
 
-#: calendar/gui/dialogs/cancel-comp.c:70
+#: calendar/gui/dialogs/cancel-comp.c:69
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Er du sikker på at du vil kansellera og sletta denne oppgåva?"
 
-#: calendar/gui/dialogs/cancel-comp.c:76
+#: calendar/gui/dialogs/cancel-comp.c:75
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
@@ -3816,54 +4140,54 @@ msgstr ""
 "Journaloppføringa som vert sletta er publisert. Vil du senda ei melding om "
 "kansellering?"
 
-#: calendar/gui/dialogs/cancel-comp.c:79
+#: calendar/gui/dialogs/cancel-comp.c:78
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr ""
 "Er du sikker på at du vil kansellera og sletta denne journaloppføringa?"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "Denne hendinga er sletta."
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "Denn oppgåva har vorte sletta."
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr "Denne journaloppføringa er sletta."
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  Du har gjort endringar. Vil du forkasta desse endringane og gå ut av "
 "redigering?"
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s Du har ikkje gjort nokon endringar. Gå ut av redigering?"
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "Hendinga er endra."
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "Oppgåva er endra."
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr "Journalopføringa er endra."
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Du har gjort endringar. Forkast desse endringane og oppdater redigering?"
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Du har ikkje gjort nokon endringar. Oppdater redigering?"
@@ -3873,166 +4197,171 @@ msgstr "%s Du har ikkje gjort nokon endringar. Oppdater redigering?"
 msgid "Validation error: %s"
 msgstr "Valideringsfeil: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2230
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2229
 msgid " to "
 msgstr " til "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2234
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2233
 msgid " (Completed "
 msgstr " (Ferdig "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2236
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2235
 msgid "Completed "
 msgstr "Ferdig "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2241
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2240
 msgid " (Due "
 msgstr " (Ferdig"
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2243
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2242
 msgid "Due "
 msgstr "Ferdig"
 
-#: calendar/gui/dialogs/comp-editor.c:336
+#: calendar/gui/dialogs/comp-editor.c:335
 msgid "Could not update object"
 msgstr "Kan ikkje oppdatera objekt"
 
-#: calendar/gui/dialogs/comp-editor.c:787
-#: calendar/gui/dialogs/comp-editor.c:824
+#: calendar/gui/dialogs/comp-editor.c:786
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "Edit Appointment"
 msgstr "Redigér avtale"
 
-#: calendar/gui/dialogs/comp-editor.c:792
-#: calendar/gui/dialogs/comp-editor.c:829
+#: calendar/gui/dialogs/comp-editor.c:791
+#: calendar/gui/dialogs/comp-editor.c:828
 #, c-format
 msgid "Appointment - %s"
 msgstr "Avtale - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:795
-#: calendar/gui/dialogs/comp-editor.c:832
+#: calendar/gui/dialogs/comp-editor.c:794
+#: calendar/gui/dialogs/comp-editor.c:831
 #, c-format
 msgid "Task - %s"
 msgstr "Oppgåve - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:798
-#: calendar/gui/dialogs/comp-editor.c:835
+#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:834
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journaloppføring - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:809
-#: calendar/gui/dialogs/comp-editor.c:845
+#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:844
 msgid "No summary"
 msgstr "Ikkje noko samandrag"
 
-#: calendar/gui/dialogs/comp-editor.c:1275 calendar/gui/e-cal-view.c:1043
-#: calendar/gui/e-calendar-table.c:1142 composer/e-msg-composer.c:1138
+#: calendar/gui/dialogs/comp-editor.c:1274 calendar/gui/e-cal-view.c:979
+#: calendar/gui/e-calendar-table.c:1141 composer/e-msg-composer.c:1138
 msgid "Save as..."
 msgstr "Lagre som ..."
 
-#: calendar/gui/dialogs/comp-editor.c:1378
-#: calendar/gui/dialogs/comp-editor.c:1402
-#: calendar/gui/dialogs/comp-editor.c:1428
+#: calendar/gui/dialogs/comp-editor.c:1377
+#: calendar/gui/dialogs/comp-editor.c:1401
+#: calendar/gui/dialogs/comp-editor.c:1427
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Endringar som vert gjort i denne oppføringa kan verta forkasta dersom det "
 "kjem ei oppdatering"
 
-#: calendar/gui/dialogs/comp-editor.c:1456
-#: calendar/gui/dialogs/comp-editor.c:1465
+#: calendar/gui/dialogs/comp-editor.c:1455
+#: calendar/gui/dialogs/comp-editor.c:1464
 msgid "Unable to obtain current version!"
 msgstr "Ikkje stand til å få tak i noverande versjon!"
 
-#: calendar/gui/dialogs/delete-comp.c:96
+#: calendar/gui/dialogs/copy-source-dialog.c:141
+#, fuzzy
+msgid "Select destination source"
+msgstr "Vel ei målmappe for importerte data"
+
+#: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Er du sikker på at du vil sletta avtalen «%s»?"
 
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:98
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Er du sikker på at du vil sletta denne avtalen utan tittel?"
 
-#: calendar/gui/dialogs/delete-comp.c:105
+#: calendar/gui/dialogs/delete-comp.c:104
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Er du sikker på at du vil sletta oppgåva «%s»?"
 
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:107
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Er du sikker på at du vil sletta denne oppgåva utan tittel?"
 
-#: calendar/gui/dialogs/delete-comp.c:114
+#: calendar/gui/dialogs/delete-comp.c:113
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Er du sikker på at du vil sletta journaloppføringa «%s»?"
 
-#: calendar/gui/dialogs/delete-comp.c:117
+#: calendar/gui/dialogs/delete-comp.c:116
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Er du sikker på at du vil sletta denne journaloppføringa utan tittel?"
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:131
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "Er du sikker på at du vil sletta %d avtalar?"
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:136
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "Er du sikker på at du vil sletta %d oppgåver?"
 
-#: calendar/gui/dialogs/delete-comp.c:142
+#: calendar/gui/dialogs/delete-comp.c:141
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Er du sikker på at du vil sletta %d journaloppføringar?"
 
-#: calendar/gui/dialogs/delete-error.c:53
+#: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr "Hendinga kan ikkje slettast på grunn av ein CORBA-feil"
 
-#: calendar/gui/dialogs/delete-error.c:56
+#: calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr "Oppgåva kan ikkje slettast på grunn av ein CORBA-feil"
 
-#: calendar/gui/dialogs/delete-error.c:59
+#: calendar/gui/dialogs/delete-error.c:58
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr "Journaloppføringa kan ikkje slettast på grunn av ein CORBA-feil"
 
-#: calendar/gui/dialogs/delete-error.c:62
+#: calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
 msgstr "Oppføringa kan ikkje slettast på grunn av ein CORBA-feil"
 
-#: calendar/gui/dialogs/delete-error.c:69
+#: calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr "Hendinga kan ikkje slettast fordi tilgang vert nekta"
 
-#: calendar/gui/dialogs/delete-error.c:72
+#: calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr "Oppgåva kan ikkje slettast fordi tilgang vert nekta"
 
-#: calendar/gui/dialogs/delete-error.c:75
+#: calendar/gui/dialogs/delete-error.c:74
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr "Journaloppføringa kan ikkje slettast fordi tilgang vert nekta"
 
-#: calendar/gui/dialogs/delete-error.c:78
+#: calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr "Oppføringa kan ikkje slettast fordi tilgang vert nekta"
 
-#: calendar/gui/dialogs/delete-error.c:85
+#: calendar/gui/dialogs/delete-error.c:84
 #, fuzzy
 msgid "The event could not be deleted due to an error"
 msgstr "Hendinga kan ikkje slettast på grunn av ein CORBA-feil"
 
-#: calendar/gui/dialogs/delete-error.c:88
+#: calendar/gui/dialogs/delete-error.c:87
 #, fuzzy
 msgid "The task could not be deleted due to an error"
 msgstr "Oppgåva kan ikkje slettast på grunn av ein CORBA-feil"
 
-#: calendar/gui/dialogs/delete-error.c:91
+#: calendar/gui/dialogs/delete-error.c:90
 #, fuzzy
 msgid "The journal entry could not be deleted due to an error"
 msgstr "Journaloppføringa kan ikkje slettast på grunn av ein CORBA-feil"
 
-#: calendar/gui/dialogs/delete-error.c:94
+#: calendar/gui/dialogs/delete-error.c:93
 #, fuzzy
 msgid "The item could not be deleted due to an error"
 msgstr "Oppføringa kan ikkje slettast på grunn av ein CORBA-feil"
@@ -4049,44 +4378,44 @@ msgstr "Delegér til:"
 msgid "Enter Delegate"
 msgstr "Tast inn delegat"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2267
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2266
 msgid "Appointment"
 msgstr "Avtale"
 
-#: calendar/gui/dialogs/event-editor.c:208
+#: calendar/gui/dialogs/event-editor.c:207
 msgid "Reminder"
 msgstr "Påminning"
 
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:214
 msgid "Recurrence"
 msgstr "Repetering"
 
-#: calendar/gui/dialogs/event-editor.c:222
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439
+#: calendar/gui/dialogs/event-editor.c:221
+#: calendar/gui/dialogs/event-editor.c:294
+#: calendar/gui/dialogs/event-editor.c:438
 #, fuzzy
 msgid "Scheduling"
 msgstr "Planlegg"
 
-#: calendar/gui/dialogs/event-editor.c:229
-#: calendar/gui/dialogs/event-editor.c:298
-#: calendar/gui/dialogs/event-editor.c:442 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:228
+#: calendar/gui/dialogs/event-editor.c:297
+#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Møte"
 
-#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:504
+#: calendar/gui/dialogs/event-page.c:599 calendar/gui/dialogs/task-page.c:503
 msgid "Start date is wrong"
 msgstr "Startdato er feil"
 
-#: calendar/gui/dialogs/event-page.c:610
+#: calendar/gui/dialogs/event-page.c:609
 msgid "End date is wrong"
 msgstr "Sluttdato er feil"
 
-#: calendar/gui/dialogs/event-page.c:633
+#: calendar/gui/dialogs/event-page.c:632
 msgid "Start time is wrong"
 msgstr "Starttid er feil"
 
-#: calendar/gui/dialogs/event-page.c:640
+#: calendar/gui/dialogs/event-page.c:639
 msgid "End time is wrong"
 msgstr "Sluttid er feil"
 
@@ -4155,31 +4484,31 @@ msgid "_Start time:"
 msgstr "_Start-tid:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:312
+#: calendar/gui/dialogs/meeting-page.c:310
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2040
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:690
-#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1749
-#: mail/mail-config.glade.h:75
+#: calendar/gui/e-cal-model-tasks.c:592 composer/e-msg-composer.c:2050
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:714
+#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1783
+#: mail/mail-config.glade.h:78
 #: 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:1483 widgets/misc/e-dateedit.c:1598
+#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Ingen"
 
-#: calendar/gui/dialogs/meeting-page.c:417
+#: calendar/gui/dialogs/meeting-page.c:415
 msgid "The organizer selected no longer has an account."
 msgstr "Den valde organisatoren har ikkje konto lenger."
 
-#: calendar/gui/dialogs/meeting-page.c:423
+#: calendar/gui/dialogs/meeting-page.c:421
 msgid "An organizer is required."
 msgstr "Det må vera ein organisator."
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:436
 msgid "At least one attendee is required."
 msgstr "Det må vera minst ein deltakar."
 
-#: calendar/gui/dialogs/meeting-page.c:631
+#: calendar/gui/dialogs/meeting-page.c:629
 msgid "_Delegate To..."
 msgstr "_Delegér til ..."
 
@@ -4220,21 +4549,15 @@ msgid "Member"
 msgstr "Medlem"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1112 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Rolle"
-
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:14
 #: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
@@ -4254,6 +4577,7 @@ msgid "_Invite Others..."
 msgstr "_Inviter andre ..."
 
 #: calendar/gui/dialogs/new-calendar.c:102
+#: calendar/gui/dialogs/new-task-list.c:46
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
@@ -4286,6 +4610,7 @@ msgid "Could not create directory for new calendar"
 msgstr "Kan ikkje laga mappa %s: %s"
 
 #: calendar/gui/dialogs/new-calendar.c:254
+#: calendar/gui/dialogs/new-task-list.c:131
 #, fuzzy
 msgid "A group must be selected"
 msgstr "Det må vera ein organisator."
@@ -4315,34 +4640,59 @@ msgstr "Kalenderinformasjon"
 msgid "Calendar Name"
 msgstr "Kalender"
 
-#: calendar/gui/dialogs/recur-comp.c:51
+#: calendar/gui/dialogs/new-task-list.c:56
+#, fuzzy
+msgid "Could not create directory for new task list"
+msgstr "Kan ikkje laga mappa %s: %s"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:2
+#, fuzzy
+msgid "<b>Task List Options</b>"
+msgstr "Kalenderinformasjon"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:3
+#, fuzzy
+msgid "Add New Task List"
+msgstr "Oppgåveliste"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:4
+#, fuzzy
+msgid "Task List Group"
+msgstr "Oppgåveliste"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:5
+#, fuzzy
+msgid "Task List Name"
+msgstr "Oppgåveliste"
+
+#: calendar/gui/dialogs/recur-comp.c:50
 msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr "Du endrar ei hending som skjer fleire gongar. Kva vil du endra?"
 
-#: calendar/gui/dialogs/recur-comp.c:55
+#: calendar/gui/dialogs/recur-comp.c:54
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr "Du endrar ei oppgåve som skal gjerast fleire gongar. Kva vil du endra?"
 
-#: calendar/gui/dialogs/recur-comp.c:59
+#: calendar/gui/dialogs/recur-comp.c:58
 msgid ""
 "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr ""
 "Du endrar ei journaloppføring som står fleire gongar. Kva vil du endra?"
 
-#: calendar/gui/dialogs/recur-comp.c:73
+#: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
 msgstr "Berre denne instansen"
 
-#: calendar/gui/dialogs/recur-comp.c:77
+#: calendar/gui/dialogs/recur-comp.c:76
 #, fuzzy
 msgid "This and Prior Instances"
 msgstr "Denne og framtidige instansar"
 
-#: calendar/gui/dialogs/recur-comp.c:83
+#: calendar/gui/dialogs/recur-comp.c:82
 msgid "This and Future Instances"
 msgstr "Denne og framtidige instansar"
 
-#: calendar/gui/dialogs/recur-comp.c:88
+#: calendar/gui/dialogs/recur-comp.c:87
 msgid "All Instances"
 msgstr "Alle instansane"
 
@@ -4391,11 +4741,16 @@ msgstr "dag"
 msgid "on the"
 msgstr "den"
 
-#: calendar/gui/dialogs/recurrence-page.c:1365
+#: calendar/gui/dialogs/recurrence-page.c:1366
 #, fuzzy
 msgid "occurrences"
 msgstr "gong(ar)"
 
+#: calendar/gui/dialogs/recurrence-page.c:2334
+#, fuzzy
+msgid "Date/Time"
+msgstr "Dato/tid:"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:1
 msgid "A_dd"
 msgstr "Le_gg til"
@@ -4464,7 +4819,7 @@ msgstr "veke(r)"
 msgid "year(s)"
 msgstr "år"
 
-#: calendar/gui/dialogs/save-comp.c:54
+#: calendar/gui/dialogs/save-comp.c:53
 msgid ""
 "This event has been changed, but has not been saved.\n"
 "\n"
@@ -4474,31 +4829,31 @@ msgstr ""
 "\n"
 "Vil du lagra endringane?"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1546
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr "_Forkast endringar"
 
-#: calendar/gui/dialogs/save-comp.c:63
+#: calendar/gui/dialogs/save-comp.c:62
 msgid "Save Event"
 msgstr "Lagra hending"
 
-#: calendar/gui/dialogs/send-comp.c:58
+#: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
 msgstr "Møteinformasjonen er oppretta. Senda ut?"
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The meeting information has changed. Send an updated version?"
 msgstr "Møteinformasjonen er endra. Senda ein oppdatert versjon?"
 
-#: calendar/gui/dialogs/send-comp.c:68
+#: calendar/gui/dialogs/send-comp.c:67
 msgid "The task assignment information has been created. Send it?"
 msgstr "Informasjonen om tildelinga av oppgåva er endra. Send ut?"
 
-#: calendar/gui/dialogs/send-comp.c:72
+#: calendar/gui/dialogs/send-comp.c:71
 msgid "The task information has changed. Send an updated version?"
 msgstr "Oppgåveinformasjonen er endra. Send ein oppdatert versjon?"
 
-#: calendar/gui/dialogs/task-details-page.c:405
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "Dato for fullføring er feil"
 
@@ -4509,43 +4864,43 @@ msgid "% _Complete"
 msgstr "% _ferdig"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:602
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:598
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-meeting-model.c:289
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:208
-#: calendar/gui/print.c:2318
+#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:210
+#: calendar/gui/print.c:2317
 msgid "Completed"
 msgstr "Ferdig"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:229
-#: mail/message-list.c:912
+#: calendar/gui/e-calendar-table.c:402 calendar/gui/e-tasks.c:231
+#: mail/message-list.c:916
 msgid "High"
 msgstr "Høg"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:600
-#: calendar/gui/e-cal-model-tasks.c:662 calendar/gui/e-calendar-table.c:477
-#: calendar/gui/e-tasks.c:205 calendar/gui/print.c:2315
+#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:596
+#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-calendar-table.c:476
+#: calendar/gui/e-tasks.c:207 calendar/gui/print.c:2314
 msgid "In Progress"
 msgstr "Under arbeid"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:233
-#: mail/message-list.c:910
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-tasks.c:235
+#: mail/message-list.c:914
 msgid "Low"
 msgstr "Lav"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:404
-#: calendar/gui/e-tasks.c:231 mail/message-list.c:911
+#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:403
+#: calendar/gui/e-tasks.c:233 mail/message-list.c:915
 msgid "Normal"
 msgstr "Vanleg"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:598
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-tasks.c:215
-#: calendar/gui/print.c:2312
+#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:594
+#: calendar/gui/e-calendar-table.c:475 calendar/gui/e-tasks.c:217
+#: calendar/gui/print.c:2311
 msgid "Not Started"
 msgstr "Ikkje starta"
 
@@ -4554,7 +4909,7 @@ msgid "Progress"
 msgstr "Framgang"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/e-calendar-table.c:405
 msgid "Undefined"
 msgstr "Udefinert"
 
@@ -4574,21 +4929,21 @@ msgstr "_Status:"
 msgid "_Web Page:"
 msgstr "_Nettsideaddresse:"
 
-#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Enkel"
 
-#: calendar/gui/dialogs/task-editor.c:208
-#: calendar/gui/dialogs/task-editor.c:271
-#: calendar/gui/dialogs/task-editor.c:408
+#: calendar/gui/dialogs/task-editor.c:207
+#: calendar/gui/dialogs/task-editor.c:270
+#: calendar/gui/dialogs/task-editor.c:407
 msgid "Assignment"
 msgstr "Tildeling"
 
-#: calendar/gui/dialogs/task-page.c:477
+#: calendar/gui/dialogs/task-page.c:476
 msgid "Due date is wrong"
 msgstr "Forfallsdato er feil"
 
-#: calendar/gui/dialogs/task-page.c:537
+#: calendar/gui/dialogs/task-page.c:536
 msgid "Due date is before start date!"
 msgstr "Forfallsdato er før startdato"
 
@@ -4596,9 +4951,9 @@ msgstr "Forfallsdato er før startdato"
 msgid "Con_fidential"
 msgstr "Kon_fidensielt"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:245
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:42
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:247
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:44
 msgid "Description:"
 msgstr "Skildring:"
 
@@ -4703,26 +5058,21 @@ msgstr "%s %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s for ein ukjent utløysartype"
 
-#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-cal-list-view.c:262 calendar/gui/e-cal-model.c:283
+#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:380
 msgid "Public"
 msgstr "Offentleg"
 
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:292
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:292
+#: calendar/gui/e-calendar-table.c:381
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:294
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-calendar-table.c:382
 msgid "Confidential"
 msgstr "Konfidensiell"
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Kategoriar"
-
 #: calendar/gui/e-cal-list-view.etspec.h:3
 #: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Description"
@@ -4734,28 +5084,26 @@ msgid "Start Date"
 msgstr "Start-dato"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:15 shell/e-shortcuts.c:1082
+#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Samandrag"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6
-#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:172
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:178
 msgid "color"
 msgstr "farge"
 
 # TRN: «del», kanskje?
 #: calendar/gui/e-cal-list-view.etspec.h:7
-#: calendar/gui/e-calendar-table.etspec.h:20
 msgid "component"
 msgstr "komponent"
 
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:455
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:454
 msgid "Free"
 msgstr "Ledig"
 
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:456
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:455
 #: calendar/gui/e-meeting-time-sel.c:399
-#: shell/evolution-shell-component.c:1207
 msgid "Busy"
 msgstr "Oppteke"
 
@@ -4767,7 +5115,7 @@ msgstr "N"
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:277
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
 msgid "E"
 msgstr "E"
 
@@ -4775,7 +5123,7 @@ msgstr "E"
 msgid "W"
 msgstr "V"
 
-#: calendar/gui/e-cal-model-tasks.c:550
+#: calendar/gui/e-cal-model-tasks.c:546
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4785,7 +5133,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-model.c:261
 #: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:529
 #: calendar/gui/e-meeting-model.c:782 calendar/gui/e-meeting-store.c:159
@@ -4793,7 +5141,7 @@ msgstr ""
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-model.c:273
 #: calendar/gui/e-meeting-model.c:783 calendar/gui/e-meeting-store.c:171
 msgid "No"
@@ -4801,17 +5149,17 @@ msgstr "Nei"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1023 calendar/gui/e-itip-control.c:1239
 #: calendar/gui/e-meeting-list-view.c:144
 #: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-model.c:217
 #: calendar/gui/e-meeting-model.c:252 calendar/gui/e-meeting-model.c:317
 #: calendar/gui/e-meeting-model.c:754 calendar/gui/e-meeting-model.c:770
 #: calendar/gui/e-meeting-store.c:115 calendar/gui/e-meeting-store.c:150
-#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1619
-#: camel/camel-gpg-context.c:1670 camel/camel-tcp-stream-openssl.c:631
+#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1654
+#: camel/camel-gpg-context.c:1705 camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1902
-#: widgets/misc/e-charset-picker.c:60
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1952
+#: shell/e-component-registry.c:164 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Ukjend"
 
@@ -4823,180 +5171,178 @@ msgstr "Repeterande"
 msgid "Assigned"
 msgstr "Tildelt"
 
-#: calendar/gui/e-cal-view.c:393 calendar/gui/e-calendar-table.c:1348
-msgid "Updating objects"
-msgstr "Oppdaterar objekt"
-
-#: calendar/gui/e-cal-view.c:739 calendar/gui/e-calendar-table.c:724
+#: calendar/gui/e-cal-view.c:610 calendar/gui/e-calendar-table.c:723
 msgid "Deleting selected objects"
 msgstr "Slettar valde objekt"
 
-#: calendar/gui/e-cal-view.c:1250 calendar/gui/e-cal-view.c:1339
+#: calendar/gui/e-cal-view.c:717 calendar/gui/e-calendar-table.c:1347
+msgid "Updating objects"
+msgstr "Oppdaterar objekt"
+
+#: calendar/gui/e-cal-view.c:1177 calendar/gui/e-cal-view.c:1262
 msgid "New _Appointment..."
 msgstr "Ny _avtale ..."
 
-#: calendar/gui/e-cal-view.c:1251 calendar/gui/e-cal-view.c:1341
-#: ui/evolution-calendar.xml.h:23
+#: calendar/gui/e-cal-view.c:1178 calendar/gui/e-cal-view.c:1264
 msgid "New All Day _Event"
 msgstr "Ny h_eildagshending"
 
-#: calendar/gui/e-cal-view.c:1252 calendar/gui/e-cal-view.c:1343
+#: calendar/gui/e-cal-view.c:1179 calendar/gui/e-cal-view.c:1266
 msgid "New Meeting"
 msgstr "Nytt møte"
 
-#: calendar/gui/e-cal-view.c:1253 calendar/gui/e-cal-view.c:1345
+#: calendar/gui/e-cal-view.c:1180 calendar/gui/e-cal-view.c:1268
 msgid "New Task"
 msgstr "Ny oppgåve"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:993
-#: calendar/gui/e-calendar-table.c:1035 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:47 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
+#: calendar/gui/e-cal-view.c:1184 calendar/gui/e-cal-view.c:1207
+#: calendar/gui/e-cal-view.c:1274 calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1034 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
 #: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "S_kriv ut"
 
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:999
-#: calendar/gui/e-calendar-table.c:1033 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:46 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-cal-view.c:1188 calendar/gui/e-cal-view.c:1214
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1032 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr "_Lim inn"
 
-#: calendar/gui/e-cal-view.c:1267 calendar/gui/e-cal-view.c:1335
-#: ui/evolution-calendar.xml.h:18
+#: calendar/gui/e-cal-view.c:1194 calendar/gui/e-cal-view.c:1258
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to _Today"
 msgstr "Gå _til idag"
 
-#: calendar/gui/e-cal-view.c:1268 calendar/gui/e-cal-view.c:1337
+#: calendar/gui/e-cal-view.c:1195 calendar/gui/e-cal-view.c:1260
 msgid "_Go to Date..."
 msgstr "_Gå til dato ..."
 
-#: calendar/gui/e-cal-view.c:1272 ui/evolution-calendar.xml.h:48
+#: calendar/gui/e-cal-view.c:1199 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "_Publiser ledig/oppteken-informasjon"
 
-#: calendar/gui/e-cal-view.c:1276 calendar/gui/e-cal-view.c:1355
-#: ui/evolution.xml.h:28
-msgid "_Settings..."
-msgstr "_Innstillingar ..."
-
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1031
-#: mail/em-folder-view.c:658 shell/e-shortcuts-view.c:422
+#: calendar/gui/e-cal-view.c:1205 calendar/gui/e-cal-view.c:1270
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-calendar-table.c:1030
+#: mail/em-folder-view.c:680 shell/e-shortcuts-view.c:422
 #: ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Opne"
 
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-calendar-table.c:1037
-#: mail/em-folder-view.c:660 mail/em-popup.c:584 mail/em-popup.c:640
-#: ui/evolution-mail-message.xml.h:120
+#: calendar/gui/e-cal-view.c:1206 calendar/gui/e-cal-view.c:1276
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1036
+#: mail/em-folder-view.c:682 mail/em-popup.c:590 mail/em-popup.c:646
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "_Lagre som ..."
 
-#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
-#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1026
+#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1252
+#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1025
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Kl_ipp ut"
 
-#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:998 calendar/gui/e-calendar-table.c:1024
-#: mail/mail-component.c:2083 ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:101 ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-cal-view.c:1213 calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1023
+#: mail/em-folder-tree.c:1496 ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:17
 msgid "_Copy"
 msgstr "_Kopier"
 
-#: calendar/gui/e-cal-view.c:1295
+#: calendar/gui/e-cal-view.c:1218
 msgid "_Schedule Meeting..."
 msgstr "_Set opp møte ..."
 
-#: calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1219
 msgid "_Forward as iCalendar..."
 msgstr "_Send vidare som iCalendar ..."
 
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
+#: calendar/gui/e-cal-view.c:1224 calendar/gui/e-cal-view.c:1255
 msgid "Delete this _Occurrence"
 msgstr "Slett denne _hendinga"
 
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
+#: calendar/gui/e-cal-view.c:1225 calendar/gui/e-cal-view.c:1256
 msgid "Delete _All Occurrences"
 msgstr "Slett _alle hendingane"
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-cal-view.c:1278 ui/evolution.xml.h:30
+msgid "_Settings..."
+msgstr "_Innstillingar ..."
+
+#: calendar/gui/e-calendar-table.c:424
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:425
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:426
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:427
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:428
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:429
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:430
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:431
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:432
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:433
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:434
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:991
+#: calendar/gui/e-calendar-table.c:990
 msgid "Open _Web Page"
 msgstr "_Opna nettside"
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:1002
 msgid "_Assign Task"
 msgstr "_Tildel oppgåve"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1003
 msgid "_Forward as iCalendar"
 msgstr "Send _vidare som iCalendar"
 
-#: calendar/gui/e-calendar-table.c:1005
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Mark as Complete"
 msgstr "_Merk som komplett"
 
-#: calendar/gui/e-calendar-table.c:1006
+#: calendar/gui/e-calendar-table.c:1005
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Merk valde oppgåver som ferdige"
 
-#: calendar/gui/e-calendar-table.c:1011 calendar/gui/e-calendar-table.c:1029
+#: calendar/gui/e-calendar-table.c:1010 calendar/gui/e-calendar-table.c:1028
 msgid "_Delete Selected Tasks"
 msgstr "Slett _den valde oppgåver"
 
-#: calendar/gui/e-calendar-table.c:1431
+#: calendar/gui/e-calendar-table.c:1430
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Trykk her for å leggje til ei oppgåve"
@@ -5010,8 +5356,8 @@ msgstr "prosent ferdig"
 msgid "Alarms"
 msgstr "Alarmar"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
-#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:579
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
+#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:576
 msgid "Complete"
 msgstr "Ferdig"
 
@@ -5040,19 +5386,19 @@ msgid "URL"
 msgstr "URL"
 
 #. 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:180
+#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d.%m.%Y %H.%M.%S"
 
 # TRN: %p blir null-streng her. Trur eg.
 #. 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:175
+#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d.%m.%Y %H.%M.%S %p"
 
-#: calendar/gui/e-cell-date-edit-text.c:126
+#: calendar/gui/e-cell-date-edit-text.c:125
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -5071,7 +5417,7 @@ msgstr "%02i minutt oppdeling"
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
 #: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1342
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1534
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1533
 msgid "%A %d %B"
 msgstr "%A %d. %B"
 
@@ -5084,125 +5430,125 @@ msgstr "%d. %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:596 calendar/gui/e-week-view.c:325
-#: calendar/gui/print.c:819
+#: calendar/gui/print.c:818
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:599 calendar/gui/e-week-view.c:328
-#: calendar/gui/print.c:821
+#: calendar/gui/print.c:820
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-itip-control.c:142
+#: calendar/gui/e-itip-control.c:139
 #, c-format
 msgid "start_calendar_server(): %s"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:636
 msgid "Yes. (Complex Recurrence)"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:650
+#: calendar/gui/e-itip-control.c:648
 msgid "Every day"
 msgstr "Kvar dag"
 
-#: calendar/gui/e-itip-control.c:652
+#: calendar/gui/e-itip-control.c:650
 #, c-format
 msgid "Every %d days"
 msgstr "Kvar %d. dag"
 
-#: calendar/gui/e-itip-control.c:658
+#: calendar/gui/e-itip-control.c:656
 msgid "Every week"
 msgstr "Kvar veke"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:658
 #, c-format
 msgid "Every %d weeks"
 msgstr "Kvar %d. veke"
 
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:661
 msgid "Every week on "
 msgstr "Kvar veke på "
 
-#: calendar/gui/e-itip-control.c:665
+#: calendar/gui/e-itip-control.c:663
 #, c-format
 msgid "Every %d weeks on "
 msgstr "Kvar %d. veke på "
 
-#: calendar/gui/e-itip-control.c:673
+#: calendar/gui/e-itip-control.c:671
 msgid " and "
 msgstr " og "
 
-#: calendar/gui/e-itip-control.c:680
+#: calendar/gui/e-itip-control.c:678
 #, c-format
 msgid "The %s day of "
 msgstr "Den %s dagen i "
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:691
 #, c-format
 msgid "The %s %s of "
 msgstr "Den %s %s i "
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:696
 msgid "every month"
 msgstr "kvar månad"
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:701
 #, c-format
 msgid "every %d months"
 msgstr "kvar %d. månad"
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:707
 msgid "Every year"
 msgstr "Kvart år"
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:709
 #, c-format
 msgid "Every %d years"
 msgstr "Kvart %d. år"
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:721
 #, c-format
 msgid " a total of %d times"
 msgstr " totalt %d gongar"
 
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:730
 msgid ", ending on "
 msgstr ", sluttar på"
 
-#: calendar/gui/e-itip-control.c:756
+#: calendar/gui/e-itip-control.c:754
 msgid "<b>Starts:</b> "
 msgstr "<b>Byrjar:</b> "
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:764
 msgid "<b>Ends:</b> "
 msgstr "<b>Sluttar:</b>"
 
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:784
 msgid "<b>Completed:</b> "
 msgstr "<b>Fullført:</b> "
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:794
 msgid "<b>Due:</b> "
 msgstr "<b>Skal vera ferdig:</b>"
 
-#: calendar/gui/e-itip-control.c:833 calendar/gui/e-itip-control.c:886
+#: calendar/gui/e-itip-control.c:831 calendar/gui/e-itip-control.c:884
 msgid "iCalendar Information"
 msgstr "iCalendar-informasjon"
 
 #. Title
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:846
 msgid "iCalendar Error"
 msgstr "iCalendar-feil"
 
-#: calendar/gui/e-itip-control.c:917 calendar/gui/e-itip-control.c:933
-#: calendar/gui/e-itip-control.c:944 calendar/gui/e-itip-control.c:961
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-itip-control.c:931
+#: calendar/gui/e-itip-control.c:942 calendar/gui/e-itip-control.c:959
 msgid "An unknown person"
 msgstr "Ein ukjent person"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:968
+#: calendar/gui/e-itip-control.c:966
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5210,323 +5556,322 @@ msgstr ""
 "<br> Sjå gjennom den følgjande informasjon, og velj ei handling frå menyen "
 "under."
 
-#: calendar/gui/e-itip-control.c:983
+#: calendar/gui/e-itip-control.c:981
 msgid "<i>None</i>"
 msgstr "<i>Ingen</i>"
 
-#: calendar/gui/e-itip-control.c:994
+#: calendar/gui/e-itip-control.c:992
 msgid "Location:"
 msgstr "Plassering:"
 
 #. write status
-#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-tasks.c:201
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-tasks.c:203
 msgid "Status:"
 msgstr "Status:"
 
-#: calendar/gui/e-itip-control.c:1013 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-model.c:281 calendar/gui/e-meeting-model.c:304
 #: calendar/gui/e-meeting-model.c:796 calendar/gui/e-meeting-store.c:179
-#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:419
+#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:418
 msgid "Accepted"
 msgstr "Akseptert"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/itip-utils.c:422
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/itip-utils.c:421
 msgid "Tentatively Accepted"
 msgstr "Mellombels godteke"
 
-#: calendar/gui/e-itip-control.c:1021 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:1019 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-model.c:283 calendar/gui/e-meeting-model.c:306
 #: calendar/gui/e-meeting-model.c:797 calendar/gui/e-meeting-store.c:181
-#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:425
-#: calendar/gui/itip-utils.c:451
+#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:424
+#: calendar/gui/itip-utils.c:450
 msgid "Declined"
 msgstr "Avslått"
 
-#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1108
-#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
-#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1132 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1158 calendar/gui/e-itip-control.c:1171
 msgid "Choose an action:"
 msgstr "Vel ei handling:"
 
-#: calendar/gui/e-itip-control.c:1081
+#: calendar/gui/e-itip-control.c:1079
 msgid "Update"
 msgstr "Oppdater"
 
-#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1113
-#: calendar/gui/e-itip-control.c:1136 calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-itip-control.c:1162 calendar/gui/e-itip-control.c:1175
-#: shell/e-shell.c:904 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: shell/e-shell.c:1001 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1107
 msgid "Accept"
 msgstr "Godta"
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1108
 msgid "Tentatively accept"
 msgstr "Godta mellombels"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1109
 msgid "Decline"
 msgstr "Avslå"
 
-#: calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1133
 msgid "Send Free/Busy Information"
 msgstr "Send ledig/oppteken-informasjon"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update respondent status"
 msgstr "Opdatér status på svar"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1159
 msgid "Send Latest Information"
 msgstr "Send nyaste informasjon"
 
-#: calendar/gui/e-itip-control.c:1174 calendar/gui/itip-utils.c:439
-#: mail/mail-send-recv.c:389 mail/mail-send-recv.c:441
-#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
-#: ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1172 calendar/gui/itip-utils.c:438
+#: mail/mail-send-recv.c:386 mail/mail-send-recv.c:438
+#: shell/e-shell-startup-wizard.c:788 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> bar publisert møteinformasjon."
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1262
 msgid "Meeting Information"
 msgstr "Møteinformasjon"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1267
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> ber om at %s er til stades på eit møte."
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1269
 #, 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:1272
+#: calendar/gui/e-itip-control.c:1270
 msgid "Meeting Proposal"
 msgstr "Møteframlegg"
 
-#: calendar/gui/e-itip-control.c:1276
+#: calendar/gui/e-itip-control.c:1274
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> ynskjer å leggje til noko til eit eksisterande møte."
 
-#: calendar/gui/e-itip-control.c:1277
+#: calendar/gui/e-itip-control.c:1275
 msgid "Meeting Update"
 msgstr "Møteoppdatering"
 
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> ber om å få den nyaste møteinformasjonen."
 
-#: calendar/gui/e-itip-control.c:1282
+#: calendar/gui/e-itip-control.c:1280
 msgid "Meeting Update Request"
 msgstr "Førespurnad om møteoppdatering"
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> har svart på ein førespurnad om eit møte."
 
-#: calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-itip-control.c:1288
 msgid "Meeting Reply"
 msgstr "Møtesvar"
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1295
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> har avlyst eit møte."
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1296
 msgid "Meeting Cancellation"
 msgstr "Møtekansellering"
 
-#: calendar/gui/e-itip-control.c:1305 calendar/gui/e-itip-control.c:1372
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1303 calendar/gui/e-itip-control.c:1370
+#: calendar/gui/e-itip-control.c:1405
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> har sendt ei uforståeleg melding."
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1304
 msgid "Bad Meeting Message"
 msgstr "Feil i møtemelding"
 
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> har publisert informasjon om ei oppgåve."
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1329
 msgid "Task Information"
 msgstr "Oppgåveinformasjon"
 
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1334
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> ber om at %s utfører ei oppgåve."
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1336
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> ber om at du utfører ei oppgåve."
 
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1337
 msgid "Task Proposal"
 msgstr "Oppgåveframlegg"
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1341
 #, 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:1344
+#: calendar/gui/e-itip-control.c:1342
 msgid "Task Update"
 msgstr "Oppgåveoppdatering"
 
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1346
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> ber om å få den nyaste oppgåveinformasjonen."
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1347
 msgid "Task Update Request"
 msgstr "Oppgåveoppdateringsforepørjing"
 
-#: calendar/gui/e-itip-control.c:1356
+#: calendar/gui/e-itip-control.c:1354
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> har svart på ei  oppgåvetildeling."
 
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1355
 msgid "Task Reply"
 msgstr "Oppgåvesvar"
 
-#: calendar/gui/e-itip-control.c:1364
+#: calendar/gui/e-itip-control.c:1362
 #, 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:1365
+#: calendar/gui/e-itip-control.c:1363
 msgid "Task Cancellation"
 msgstr "Oppgåvekansellering"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1371
 msgid "Bad Task Message"
 msgstr "Ugyldig oppgåvemelding"
 
-#: calendar/gui/e-itip-control.c:1392
+#: calendar/gui/e-itip-control.c:1390
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> har publisert ledig/oppteken-informasjon."
 
-#: calendar/gui/e-itip-control.c:1393
+#: calendar/gui/e-itip-control.c:1391
 msgid "Free/Busy Information"
 msgstr "Fri/ledig-informasjon"
 
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> spør etter ledig/oppteken-informasjonen din."
 
-#: calendar/gui/e-itip-control.c:1398
+#: calendar/gui/e-itip-control.c:1396
 msgid "Free/Busy Request"
 msgstr "Fri/ledig forespørsel"
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 "<b>%s</b> har svart på ein førespurnad etter ledig/oppteken-informasjon."
 
-#: calendar/gui/e-itip-control.c:1403
+#: calendar/gui/e-itip-control.c:1401
 msgid "Free/Busy Reply"
 msgstr "Fri/Oppteke svar"
 
-#: calendar/gui/e-itip-control.c:1408
+#: calendar/gui/e-itip-control.c:1406
 msgid "Bad Free/Busy Message"
 msgstr "Ugyldig ledig/oppteken-melding"
 
-#: calendar/gui/e-itip-control.c:1484
+#: calendar/gui/e-itip-control.c:1482
 msgid "The message does not appear to be properly formed"
 msgstr "Meldinga ser ikkje ut til å vera rett forma"
 
-#: calendar/gui/e-itip-control.c:1552
+#: calendar/gui/e-itip-control.c:1550
 msgid "The message contains only unsupported requests."
 msgstr "Denne meldingar inneheld berre førespurnader som ikkje er støtta."
 
-#: calendar/gui/e-itip-control.c:1583 calendar/gui/e-itip-control.c:1589
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1587
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Vedlegg inneheld ikkje ei gyldig kalendermelding."
 
-#: calendar/gui/e-itip-control.c:1614
+#: calendar/gui/e-itip-control.c:1612
 msgid "The attachment has no viewable calendar items"
 msgstr "Vedlegget inneheld ingen kalendervedlegg som let seg visa."
 
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1851
 msgid "Calendar file could not be updated!\n"
 msgstr "Kalenderfila kan ikkje oppdaterast!\n"
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1853
 msgid "Update complete\n"
 msgstr "Oppdateringa er ferdig\n"
 
-#: calendar/gui/e-itip-control.c:1885 calendar/gui/e-itip-control.c:1957
+#: calendar/gui/e-itip-control.c:1883 calendar/gui/e-itip-control.c:1955
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Deltakarstatus kan ikkje oppdaterast, for oppføringa finst ikkje lenger."
 
-#: calendar/gui/e-itip-control.c:1901 calendar/gui/e-itip-control.c:1939
+#: calendar/gui/e-itip-control.c:1899 calendar/gui/e-itip-control.c:1937
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objektet er ugyldig og kan ikkje oppdaterast\n"
 
-#: calendar/gui/e-itip-control.c:1911
+#: calendar/gui/e-itip-control.c:1909
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Dette svaret er ikkje frå ein aktiv deltakar. Skal vedkommande leggjast til "
 "som deltakar?"
 
-#: calendar/gui/e-itip-control.c:1923
+#: calendar/gui/e-itip-control.c:1921
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Deltakarstatusen kan ikkje oppdaterast på grunn av ein ugyldig status!\n"
 
-#: calendar/gui/e-itip-control.c:1942
+#: calendar/gui/e-itip-control.c:1940
 msgid "There was an error on the CORBA system\n"
 msgstr "Det oppstod ein feil i CORBA-systemet\n"
 
-#: calendar/gui/e-itip-control.c:1945
+#: calendar/gui/e-itip-control.c:1943
 msgid "Object could not be found\n"
 msgstr "Fann ikkje objekt.\n"
 
-#: calendar/gui/e-itip-control.c:1948
+#: calendar/gui/e-itip-control.c:1946
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Du har ikkje dei løyva som trengst for å oppdatera kalenderen\n"
 
-#: calendar/gui/e-itip-control.c:1951
+#: calendar/gui/e-itip-control.c:1949
 msgid "Attendee status updated\n"
 msgstr "Deltakarstatus oppdatert\n"
 
-#: calendar/gui/e-itip-control.c:1954
+#: calendar/gui/e-itip-control.c:1952
 msgid "Attendee status could not be updated!\n"
 msgstr "Deltakarstatus kan ikkje oppdaterast!\n"
 
-#: calendar/gui/e-itip-control.c:1992
+#: calendar/gui/e-itip-control.c:1990
 msgid "Removal Complete"
 msgstr "Fjerning ferdig"
 
-#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2074
+#: calendar/gui/e-itip-control.c:2024 calendar/gui/e-itip-control.c:2072
 msgid "Item sent!\n"
 msgstr "Oppføring sendt!\n"
 
-#: calendar/gui/e-itip-control.c:2028 calendar/gui/e-itip-control.c:2078
+#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2076
 msgid "The item could not be sent!\n"
 msgstr "Oppføringen kan ikkje sendast!\n"
 
@@ -5688,7 +6033,7 @@ msgstr "%a %d/%m/%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
@@ -5752,45 +6097,40 @@ msgstr "Tida møtet _startar:"
 msgid "Meeting _end time:"
 msgstr "Møt_e slutttid:"
 
-#: calendar/gui/e-tasks.c:179
+#: calendar/gui/e-tasks.c:181
 msgid "Start Date:"
 msgstr "Startdato:"
 
-#: calendar/gui/e-tasks.c:195
+#: calendar/gui/e-tasks.c:197
 msgid "Due Date:"
 msgstr "Forfallsdato:"
 
 #. write priority
-#: calendar/gui/e-tasks.c:223
+#: calendar/gui/e-tasks.c:225
 msgid "Priority:"
 msgstr "Prioritet:"
 
 #. URL
-#: calendar/gui/e-tasks.c:279
+#: calendar/gui/e-tasks.c:281
 msgid "Web Page:"
 msgstr "Nettside:"
 
-#: calendar/gui/e-tasks.c:715
-#, c-format
-msgid "Opening tasks at %s"
-msgstr "Opnar oppgåver på %s"
-
-#: calendar/gui/e-tasks.c:764 calendar/gui/tasks-control.c:199
+#: calendar/gui/e-tasks.c:710 calendar/gui/tasks-control.c:200
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Kan ikkje lasta oppgåvene i «%s»"
 
-#: calendar/gui/e-tasks.c:779
+#: calendar/gui/e-tasks.c:725
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoden som krevst for å lasta «%s» er ikkje støtta"
 
-#: calendar/gui/e-tasks.c:793 calendar/gui/gnome-cal.c:1766
+#: calendar/gui/e-tasks.c:739 calendar/gui/gnome-cal.c:1765
 #, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Du har ikkje løyve til å opna mappa i «%s»"
 
-#: calendar/gui/e-tasks.c:854 calendar/gui/gnome-cal.c:1981
+#: calendar/gui/e-tasks.c:800 calendar/gui/gnome-cal.c:1979
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -5799,48 +6139,39 @@ msgstr ""
 "Feil på %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:904
+#: calendar/gui/e-tasks.c:958
 msgid "Completing tasks..."
 msgstr "Fullfører oppgåver ..."
 
-#: calendar/gui/e-tasks.c:927
+#: calendar/gui/e-tasks.c:981
 msgid "Deleting selected objects..."
 msgstr "Slettar valde objekt ..."
 
-#: calendar/gui/e-tasks.c:967
+#: calendar/gui/e-tasks.c:1006
 msgid "Expunging"
 msgstr "Tømer"
 
-#: calendar/gui/e-tasks.c:1032
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1797 calendar/gui/tasks-control.c:487
-#: calendar/importers/icalendar-importer.c:713
-#: mail/importers/netscape-importer.c:1845 shell/e-local-storage.c:183
+#: calendar/gui/gnome-cal.c:1604 mail/importers/netscape-importer.c:1843
 #: shell/e-shortcuts.c:1086
-msgid "Tasks"
-msgstr "Oppgåver"
-
-#: calendar/gui/gnome-cal.c:1605 mail/importers/netscape-importer.c:1843
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1085
 msgid "Calendar"
 msgstr "Kalender"
 
-#: calendar/gui/gnome-cal.c:1738
+#: calendar/gui/gnome-cal.c:1737
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Kan ikkje opna mappa i «%s»"
 
-#: calendar/gui/gnome-cal.c:1752
+#: calendar/gui/gnome-cal.c:1751
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metoden som krevst for å opna «%s» er ikkje støtta"
 
-#: calendar/gui/gnome-cal.c:1809
+#: calendar/gui/gnome-cal.c:1808
 #, c-format
 msgid "Adding alarms for %s"
 msgstr "Legg til alarmar for %s"
 
-#: calendar/gui/gnome-cal.c:2002
+#: calendar/gui/gnome-cal.c:2000
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5848,7 +6179,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2010
+#: calendar/gui/gnome-cal.c:2008
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5856,57 +6187,10 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2902
+#: calendar/gui/gnome-cal.c:2848
 msgid "Purging"
 msgstr "Tømmer"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Kalender og oppgåver"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#, fuzzy
-msgid "Calendars"
-msgstr "Kalender"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Set opp tidssone, kalender og oppgåveliste her"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution kalender og oppgåver"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Oppsettkontroll for Evolution kalender"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Evolution kalendervisar"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution kalender-/oppgåve-redigering"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Evolution oppgåvevisar"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Evolution kalender og oppgåver-komponent"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Evolution testkomponent"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "April"
@@ -5963,296 +6247,332 @@ msgstr "Oktober"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/itip-utils.c:268 calendar/gui/itip-utils.c:316
-#: calendar/gui/itip-utils.c:348
+#: calendar/gui/itip-utils.c:267 calendar/gui/itip-utils.c:315
+#: calendar/gui/itip-utils.c:347
 msgid "An organizer must be set."
 msgstr "Det må vera ein organisator."
 
-#: calendar/gui/itip-utils.c:303
+#: calendar/gui/itip-utils.c:302
 msgid "At least one attendee is necessary"
 msgstr "Det må vera minst ein deltakar"
 
-#: calendar/gui/itip-utils.c:391 calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 msgid "Event information"
 msgstr "Informasjon om hending"
 
-#: calendar/gui/itip-utils.c:393 calendar/gui/itip-utils.c:502
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:501
 msgid "Task information"
 msgstr "Informasjon om oppgåve"
 
-#: calendar/gui/itip-utils.c:395 calendar/gui/itip-utils.c:504
+#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
 msgid "Journal information"
 msgstr "Journalinformasjon"
 
-#: calendar/gui/itip-utils.c:397 calendar/gui/itip-utils.c:522
+#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:521
 msgid "Free/Busy information"
 msgstr "Ledig/oppteken-informasjon"
 
-#: calendar/gui/itip-utils.c:399
+#: calendar/gui/itip-utils.c:398
 msgid "Calendar information"
 msgstr "Kalenderinformasjon"
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:434
 msgid "Updated"
 msgstr "Oppdatert"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:442
 msgid "Refresh"
 msgstr "Oppdater"
 
-#: calendar/gui/itip-utils.c:447
+#: calendar/gui/itip-utils.c:446
 msgid "Counter-proposal"
 msgstr "Motframlegg"
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:517
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Ledig/oppteken-informasjon (%s til %s)"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:527
 msgid "iCalendar information"
 msgstr "iCalendar-informasjon"
 
-#: calendar/gui/itip-utils.c:668
+#: calendar/gui/itip-utils.c:667
 msgid "You must be an attendee of the event."
 msgstr "Du må delta på denne hendinga."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:483
+#: calendar/gui/print.c:482
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Su"
 msgstr "Sun"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Mo"
 msgstr "Mån"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Tu"
 msgstr "Tys"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "We"
 msgstr "Ons"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Th"
 msgstr "Tor"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Fr"
 msgstr "Fre"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Sa"
 msgstr "Lau"
 
 #. Day
-#: calendar/gui/print.c:1892
+#: calendar/gui/print.c:1891
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Vald dag (%a %d %b %Y)"
 
-#: calendar/gui/print.c:1917 calendar/gui/print.c:1921
+#: calendar/gui/print.c:1916 calendar/gui/print.c:1920
 msgid "%a %b %d"
 msgstr "%a %d. %b"
 
-#: calendar/gui/print.c:1918
+#: calendar/gui/print.c:1917
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1922 calendar/gui/print.c:1924
-#: calendar/gui/print.c:1925
+#: calendar/gui/print.c:1921 calendar/gui/print.c:1923
+#: calendar/gui/print.c:1924
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/print.c:1929
+#: calendar/gui/print.c:1928
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Vald veke (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1937
+#: calendar/gui/print.c:1936
 msgid "Selected month (%b %Y)"
 msgstr "Vald månad (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1944
+#: calendar/gui/print.c:1943
 msgid "Selected year (%Y)"
 msgstr "Vald år (%Y)"
 
-#: calendar/gui/print.c:2269
+#: calendar/gui/print.c:2268
 msgid "Task"
 msgstr "Oppgåve"
 
-#: calendar/gui/print.c:2328
+#: calendar/gui/print.c:2327
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: calendar/gui/print.c:2345
+#: calendar/gui/print.c:2344
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioritet: %s"
 
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Prosent ferdig: %i"
 
-#: calendar/gui/print.c:2369
+#: calendar/gui/print.c:2368
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2383
+#: calendar/gui/print.c:2382
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategoriar %s"
 
-#: calendar/gui/print.c:2394
+#: calendar/gui/print.c:2393
 msgid "Contacts: "
 msgstr "Kontaktar: "
 
-#: calendar/gui/print.c:2532 calendar/gui/print.c:2618
-#: calendar/gui/tasks-control.c:564 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2531 calendar/gui/print.c:2617
+#: calendar/gui/tasks-control.c:563 mail/em-format-html-print.c:147
 msgid "Print Preview"
 msgstr "Førehandsvising av utskrift"
 
-#: calendar/gui/print.c:2566
+#: calendar/gui/print.c:2565
 msgid "Print Item"
 msgstr "Skriv ut element"
 
-#: calendar/gui/print.c:2639
+#: calendar/gui/print.c:2638
 msgid "Print Setup"
 msgstr "Utskriftoppsett"
 
+#: calendar/gui/tasks-component.c:338
+#, c-format
+msgid "Task List '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:378
+#, fuzzy
+msgid "Rename this task list to"
+msgstr "Gi denne snarvegen nytt namn"
+
+#: calendar/gui/tasks-component.c:398
+#, fuzzy
+msgid "New Task List"
+msgstr "Oppgåveliste"
+
+#: calendar/gui/tasks-component.c:590
+msgid "New task"
+msgstr "Ny oppgåve"
+
+#: calendar/gui/tasks-component.c:591
+msgid "_Task"
+msgstr "_Oppgåve"
+
+#: calendar/gui/tasks-component.c:592
+msgid "Create a new task"
+msgstr "Opprett ei ny oppgåve"
+
+#: calendar/gui/tasks-component.c:659
+#, c-format
+msgid "Unable to open the task list '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:671
+msgid "There is no calendar available for creating tasks"
+msgstr ""
+
 #: calendar/gui/tasks-control.c:148
 msgid "The URI of the tasks folder to display"
 msgstr "Adressa til oppgåvemappa som skal visast"
 
-#: calendar/gui/tasks-control.c:448
+#: calendar/gui/tasks-control.c:447
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6264,11 +6584,11 @@ msgstr ""
 "\n"
 "Vil du sletta desse oppgåvene?"
 
-#: calendar/gui/tasks-control.c:451
+#: calendar/gui/tasks-control.c:450
 msgid "Do not ask me again."
 msgstr "Ikkje spør igjen"
 
-#: calendar/gui/tasks-control.c:593
+#: calendar/gui/tasks-control.c:592
 msgid "Print Tasks"
 msgstr "Skriv ut oppgåver"
 
@@ -6296,15 +6616,15 @@ msgstr "iCalendar-filer (.ics)"
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar-filer (.vcf)"
 
-#: calendar/importers/icalendar-importer.c:466
+#: calendar/importers/icalendar-importer.c:469
 msgid "Reminder!!"
 msgstr "Påminning!"
 
-#: calendar/importers/icalendar-importer.c:706
+#: calendar/importers/icalendar-importer.c:709
 msgid "Calendar Events"
 msgstr "Kalenderhending"
 
-#: calendar/importers/icalendar-importer.c:731
+#: calendar/importers/icalendar-importer.c:734
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -6312,7 +6632,7 @@ msgstr ""
 "Evolution har funne Gnome Calendar-filer.\n"
 "Vil du importera desse inn i Evolution?"
 
-#: calendar/importers/icalendar-importer.c:738
+#: calendar/importers/icalendar-importer.c:741
 msgid "Gnome Calendar"
 msgstr "Gnome Calendar"
 
@@ -7866,32 +8186,32 @@ msgstr "Stillehavet/Wallis"
 msgid "Pacific/Yap"
 msgstr "Stillehavet/Yap"
 
-#: camel/camel-cipher-context.c:99
+#: camel/camel-cipher-context.c:101
 #, fuzzy
 msgid "Signing is not supported by this cipher"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: camel/camel-cipher-context.c:139
+#: camel/camel-cipher-context.c:140
 #, fuzzy
 msgid "Verifying is not supported by this cipher"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: camel/camel-cipher-context.c:181
+#: camel/camel-cipher-context.c:180
 #, fuzzy
 msgid "Encryption is not supported by this cipher"
 msgstr "Knapp (ikkje støtta av KControl)"
 
-#: camel/camel-cipher-context.c:220
+#: camel/camel-cipher-context.c:219
 #, fuzzy
 msgid "Decryption is not supported by this cipher"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: camel/camel-cipher-context.c:256
+#: camel/camel-cipher-context.c:254
 #, fuzzy
 msgid "You may not import keys with this cipher"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: camel/camel-cipher-context.c:286
+#: camel/camel-cipher-context.c:284
 #, fuzzy
 msgid "You may not export keys with this cipher"
 msgstr "Den oppgitte fila finst ikkje"
@@ -7943,91 +8263,91 @@ msgstr "Lagrar mappe «%s»"
 msgid "You must be working online to complete this operation"
 msgstr "Kan ikkje gjera LIST-operasjon ferdig"
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
 #, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Kan ikkje oppretta røyr til «%s»: %s"
 
-#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
-#: camel/camel-process.c:92
+#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-process.c:90
 #, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Kan ikkje oppretta underprosess «%s»: %s"
 
-#: camel/camel-filter-driver.c:759
+#: camel/camel-filter-driver.c:754
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Ugyldig meldingsstraum motteken frå %s: %s"
 
-#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
+#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
 msgid "Syncing folders"
 msgstr "Synkroniserar mapper"
 
-#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Feil under lesing av filter: %s: %s"
 
-#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
+#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Feil under køyring av filter: %s: %s"
 
-#: camel/camel-filter-driver.c:1114
+#: camel/camel-filter-driver.c:1108
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1123
+#: camel/camel-filter-driver.c:1117
 #, fuzzy
 msgid "Unable to process spool folder"
 msgstr "Kan ikkje laga 'spool'-katalog"
 
-#: camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1132
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Hentar melding %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1142
+#: camel/camel-filter-driver.c:1136
 msgid "Cannot open message"
 msgstr "Kan ikkje opne melding"
 
-#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
+#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
 #, c-format
 msgid "Failed on message %d"
 msgstr "Feila på melding %d"
 
-#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
 msgid "Syncing folder"
 msgstr "Synkroniser mapper"
 
-#: camel/camel-filter-driver.c:1230
+#: camel/camel-filter-driver.c:1224
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Hentar melding %d av %d"
 
-#: camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Feila på melding %d av %d"
 
-#: camel/camel-filter-search.c:134
+#: camel/camel-filter-search.c:136
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "Klarte ikkje å dekode melding."
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:386
 #, fuzzy
 msgid "Invalid arguments to (system-flag)"
 msgstr "Ugyldig(e) argument"
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:401
 #, fuzzy
 msgid "Invalid arguments to (user-tag)"
 msgstr "Ugyldig(e) argument"
 
 # TRN: Kva er eit filtersøk? Skjønar eg dette rett?
-#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
+#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
 #, fuzzy, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Feil under køyring av filtersøk: %s: %s"
@@ -8059,39 +8379,39 @@ msgstr ""
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder.c:585
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1163
+#: camel/camel-folder.c:1164
 #, fuzzy, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 "Feil ved lesing av fil:\n"
 "%s"
 
-#: camel/camel-folder.c:1203
+#: camel/camel-folder.c:1204
 #, fuzzy, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 "Feil ved lesing av fil:\n"
 "%s"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Moving messages"
 msgstr "Flyttar melding"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 #, fuzzy
 msgid "Copying messages"
 msgstr "Melding"
 
-#: camel/camel-folder.c:1571
+#: camel/camel-folder.c:1572
 msgid "Filtering new message(s)"
 msgstr "Filtrerer nye meldingar"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:703
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8099,47 +8419,47 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:717
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:735
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:743
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:763 camel/camel-gpg-context.c:1253
-#: camel/camel-gpg-context.c:1388 camel/camel-gpg-context.c:1465
-#: camel/camel-gpg-context.c:1570 mail/mail-send-recv.c:575
+#: camel/camel-gpg-context.c:770 camel/camel-gpg-context.c:1260
+#: camel/camel-gpg-context.c:1417 camel/camel-gpg-context.c:1497
+#: camel/camel-gpg-context.c:1604 mail/mail-send-recv.c:572
 msgid "Cancelled."
 msgstr "Avbroten."
 
-#: camel/camel-gpg-context.c:781
+#: camel/camel-gpg-context.c:788
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:794
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Uventa svar frå POP-tenaren: %s"
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:806
 #, fuzzy
 msgid "No data provided"
 msgstr "Gå til side"
 
-#: camel/camel-gpg-context.c:837
+#: camel/camel-gpg-context.c:844
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 
 # TRN: Denne bør skrivast om.
-#: camel/camel-gpg-context.c:1114
+#: camel/camel-gpg-context.c:1121
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8151,52 +8471,65 @@ msgstr ""
 "%s"
 
 # TRN: Sjå førre.
-#: camel/camel-gpg-context.c:1119
+#: camel/camel-gpg-context.c:1126
 #, fuzzy, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr ""
 "Kan ikkje bruka GPG på %s: %s\n"
 "s"
 
-#: camel/camel-gpg-context.c:1232 camel/camel-smime-context.c:351
+#: camel/camel-gpg-context.c:1239 camel/camel-smime-context.c:406
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Klarte ikkje å skrive data: %s"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-gpg-context.c:1618
-#: camel/camel-gpg-context.c:1669
+#: camel/camel-gpg-context.c:1253 camel/camel-gpg-context.c:1653
+#: camel/camel-gpg-context.c:1704
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Kan ikkje køyra gpg: %s"
 
-#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1380
-#: camel/camel-gpg-context.c:1458 camel/camel-gpg-context.c:1481
-#: camel/camel-gpg-context.c:1563 camel/camel-gpg-context.c:1587
-#: camel/camel-gpg-context.c:1640 camel/camel-gpg-context.c:1691
+#: camel/camel-gpg-context.c:1277 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1490 camel/camel-gpg-context.c:1513
+#: camel/camel-gpg-context.c:1597 camel/camel-gpg-context.c:1621
+#: camel/camel-gpg-context.c:1675 camel/camel-gpg-context.c:1726
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Klarte ikkje å dekode melding."
 
-#: camel/camel-gpg-context.c:1289
+#: camel/camel-gpg-context.c:1296
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1365
+#: camel/camel-gpg-context.c:1376 camel/camel-gpg-context.c:1385
+#: camel/camel-smime-context.c:701 camel/camel-smime-context.c:712
+#: camel/camel-smime-context.c:719
+#, fuzzy
+msgid "Cannot verify message signature: Incorrect message format"
+msgstr ""
+"Kan ikkje stadfesta signaturen på meldinga: Kan ikkje laga mellombels fil: %s"
+
+#: camel/camel-gpg-context.c:1392
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Kan ikkje stadfesta signaturen på meldinga: Kan ikkje laga mellombels fil: %s"
 
-#: camel/camel-gpg-context.c:1441
+#: camel/camel-gpg-context.c:1473
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Klarte ikkje å skrive data: %s"
 
-#: camel/camel-gpg-context.c:1499
+#: camel/camel-gpg-context.c:1531
 msgid "This is a digitally encrypted message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1595
+#: camel/camel-gpg-context.c:1628 camel/camel-smime-context.c:974
+#, fuzzy
+msgid "Encrypted content"
+msgstr "Indekser innhaldet i meldingskroppane"
+
+#: camel/camel-gpg-context.c:1632
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Kunne ikkje motta fil"
@@ -8296,15 +8629,15 @@ msgstr "Feil under skriving av mellombels meldingsfil: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Feil under kopiering av mellombels meldingsfil: %s"
 
-#: camel/camel-multipart-encrypted.c:228 camel/camel-multipart-encrypted.c:243
+#: camel/camel-multipart-encrypted.c:229 camel/camel-multipart-encrypted.c:244
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:256
+#: camel/camel-multipart-encrypted.c:257
 msgid "Failed to decrypt MIME part: invalid structure"
 msgstr ""
 
-#: camel/camel-multipart-signed.c:687
+#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724
 #, fuzzy
 msgid "parse error"
 msgstr "Anna feil"
@@ -8609,12 +8942,12 @@ msgstr ""
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:350 camel/camel-session.c:400
+#: camel/camel-session.c:352 camel/camel-session.c:402
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:523
+#: camel/camel-session.c:525
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8623,72 +8956,83 @@ msgstr ""
 "Klarte ikkje å laga katalog %s:\n"
 "%s"
 
-#: camel/camel-smime-context.c:167
+#: camel/camel-smime-context.c:96
 #, fuzzy, c-format
 msgid "Enter security pass-phrase for `%s'"
 msgstr "Tast inn passord for %s"
 
-#: camel/camel-smime-context.c:446
+#: camel/camel-smime-context.c:501
 #, fuzzy
 msgid "Unverified"
 msgstr "Udefinert"
 
-#: camel/camel-smime-context.c:448
+#: camel/camel-smime-context.c:503
 #, fuzzy
 msgid "Good signature"
 msgstr "Legg til kriterium"
 
-#: camel/camel-smime-context.c:450
+#: camel/camel-smime-context.c:505
 #, fuzzy
 msgid "Bad signature"
 msgstr "Legg til kriterium"
 
-#: camel/camel-smime-context.c:452
+#: camel/camel-smime-context.c:507
 msgid "Content tampered with or altered in transit"
 msgstr ""
 
-#: camel/camel-smime-context.c:454
+#: camel/camel-smime-context.c:509
 #, fuzzy
 msgid "Signing certificate not found"
 msgstr "Oppsettsdatabasen ikkje funnen"
 
-#: camel/camel-smime-context.c:456
+#: camel/camel-smime-context.c:511
 #, fuzzy
 msgid "Signing certificate not trusted"
 msgstr "Sertifikatet kan ikkje stolast på"
 
-#: camel/camel-smime-context.c:458
+#: camel/camel-smime-context.c:513
 msgid "Signature algorithm unknown"
 msgstr ""
 
-#: camel/camel-smime-context.c:460
+#: camel/camel-smime-context.c:515
 msgid "Siganture algorithm unsupported"
 msgstr ""
 
-#: camel/camel-smime-context.c:462
+#: camel/camel-smime-context.c:517
 #, fuzzy
 msgid "Malformed signature"
 msgstr "Lagre signatur"
 
-#: camel/camel-smime-context.c:464
+#: camel/camel-smime-context.c:519
 #, fuzzy
 msgid "Processing error"
 msgstr "Anna feil"
 
-#: camel/camel-smime-context.c:593
+#: camel/camel-smime-context.c:634
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Tenar: %s, Type: %s"
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:217
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Leitar etter tilleggsmodular"
 
-#: camel/camel-store.c:266
+#: camel/camel-store.c:273
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Klarar ikkje å opprette mappe: Ugyldig operasjon på dette lageret"
 
+#: camel/camel-store.c:791 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1119
+msgid "Trash"
+msgstr "Papirkorg"
+
+#: camel/camel-store.c:793 mail/mail-ops.c:1125
+#: ui/evolution-mail-message.xml.h:46
+#, fuzzy
+msgid "Junk"
+msgstr "Juni"
+
 #: camel/camel-tcp-stream-openssl.c:568
 msgid "Unable to get issuer's certificate"
 msgstr ""
@@ -8888,7 +9232,7 @@ msgid ""
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-url.c:290 mail/mail-tools.c:146
+#: camel/camel-url.c:290 mail/mail-tools.c:138
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Klarter ikkje å tolke URL frå «%s»"
@@ -8908,22 +9252,22 @@ msgstr "Inga slik melding %s i %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Berre sjekk for ny e-post."
 
-#: camel/camel-vee-store.c:261
+#: camel/camel-vee-store.c:278
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kan ikkje sletta mappe: %s: Ugyldig operasjon"
 
-#: camel/camel-vee-store.c:280
+#: camel/camel-vee-store.c:299
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kan ikkje sletta mappa: %s: Mappa finst ikkje"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:312
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kan ikkje byta namn på mappa: %s: Ugyldig operasjon"
 
-#: camel/camel-vee-store.c:301
+#: camel/camel-vee-store.c:320
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kan ikkje endra namn på mappa: %s: Mappa finst ikkje"
@@ -9003,7 +9347,7 @@ msgstr "Kan ikkje henta melding: %s"
 #: 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:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 #: camel/providers/local/camel-mh-folder.c:210
 #: camel/providers/local/camel-mh-folder.c:219
@@ -9017,7 +9361,7 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:1923
 #: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "Ingen slik melding"
@@ -9055,55 +9399,72 @@ msgid "Failed to cache %s: %s"
 msgstr "Kan ikkje leggja %s i mellomlageret: %s"
 
 #: camel/providers/imap/camel-imap-provider.c:43
+#, fuzzy
+msgid "Connection to Server"
+msgstr " Koplar til tenar ..."
+
+#: camel/providers/imap/camel-imap-provider.c:45
+#, fuzzy
+msgid "Use custom command to connect to server"
+msgstr "Klarte ikkje å kople til LDAP-tenar"
+
+#: camel/providers/imap/camel-imap-provider.c:47
+#, fuzzy
+msgid "Command:"
+msgstr ""
+"\n"
+"Merknad:"
+
+#: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
 msgstr "Ser etter ny e-post"
 
-#: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap/camel-imap-provider.c:52
 msgid "Check for new messages in all folders"
 msgstr "Sjå etter ny e-post i alle mappene"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1178
+#: camel/providers/imap/camel-imap-provider.c:55
 msgid "Folders"
 msgstr "Mapper"
 
-#: camel/providers/imap/camel-imap-provider.c:50
+#: camel/providers/imap/camel-imap-provider.c:57
 msgid "Show only subscribed folders"
 msgstr "Vis kun abbonerte mapper"
 
-#: camel/providers/imap/camel-imap-provider.c:52
+#: camel/providers/imap/camel-imap-provider.c:59
 msgid "Override server-supplied folder namespace"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:54
+#: camel/providers/imap/camel-imap-provider.c:61
 msgid "Namespace"
 msgstr "Namnerom"
 
-#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Bruk filter på nye meldingar i INBOX på denne tenaren"
 
 # TRN: Kva betyr dette?
-#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap/camel-imap-provider.c:66
 #, fuzzy
 msgid "Automatically synchronize remote mail locally"
 msgstr "Automatisk synkroniser ekstern e-post med lokal"
 
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:72
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:74
 msgid "For reading and storing mail on IMAP servers."
 msgstr "For lesing og lagring av e-post på IMAP-tenarar."
 
-#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imap/camel-imap-provider.c:89
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-store.c:265
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:82
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:85
 msgid "Password"
 msgstr "Passord"
 
-#: camel/providers/imap/camel-imap-provider.c:84
+#: camel/providers/imap/camel-imap-provider.c:91
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
@@ -9358,7 +9719,7 @@ msgid "Could not rename folder %s to %s: %s"
 msgstr "Kan ikkje endra namnet på mappa «%s» til «%s»: %s"
 
 #: camel/providers/local/camel-local-store.c:364
-#: camel/providers/local/camel-mbox-store.c:474
+#: camel/providers/local/camel-mbox-store.c:475
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Kan ikkje endra namnet på «%s»: %s"
@@ -9473,29 +9834,29 @@ msgstr "Ser etter nye meldingar"
 msgid "Storing folder"
 msgstr "Lagrar mappe"
 
-#: camel/providers/local/camel-mbox-folder.c:230
+#: camel/providers/local/camel-mbox-folder.c:225
 #: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Kan ikkje låsa mappa «%s»: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:289
+#: camel/providers/local/camel-mbox-folder.c:284
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Kan ikkje opna postboksen: %s %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:349
+#: camel/providers/local/camel-mbox-folder.c:344
 msgid "Mail append cancelled"
 msgstr "Å leggja til ein e-post vart avbrote"
 
-#: camel/providers/local/camel-mbox-folder.c:352
+#: camel/providers/local/camel-mbox-folder.c:347
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Kan ikkje leggja til ei melding i mbox-fila: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:440
-#: camel/providers/local/camel-mbox-folder.c:471
-#: camel/providers/local/camel-mbox-folder.c:479
+#: camel/providers/local/camel-mbox-folder.c:435
+#: camel/providers/local/camel-mbox-folder.c:466
+#: camel/providers/local/camel-mbox-folder.c:474
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9504,11 +9865,11 @@ msgstr ""
 "Kan ikkje henta melding: %s frå mappa «%s»\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:472
+#: camel/providers/local/camel-mbox-folder.c:467
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Mappa ser ut til å vera øydelagt og kan ikkje reparerast."
 
-#: camel/providers/local/camel-mbox-folder.c:480
+#: camel/providers/local/camel-mbox-folder.c:475
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Bygginga av meldinga feila. Øydelagt mailbox?"
 
@@ -9575,12 +9936,17 @@ msgstr "Kan ikkje laga katalogen «%s»: %s"
 msgid "Cannot create folder: %s: %s"
 msgstr "Kan ikkje laga mappa: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:408
+#: camel/providers/local/camel-mbox-store.c:340
+#, fuzzy
+msgid "Folder already exists"
+msgstr "Kort-id eksisterar allereide"
+
+#: camel/providers/local/camel-mbox-store.c:409
 #, c-format
 msgid "Could not rename %s to %s: %s"
 msgstr "Kan ikkje endra namnet på «%s» til «%s»: %s"
 
-#: camel/providers/local/camel-mbox-store.c:427
+#: camel/providers/local/camel-mbox-store.c:428
 msgid "The new folder name is illegal."
 msgstr "Det nye mappenamnet er ikkje gyldig."
 
@@ -9623,7 +9989,7 @@ msgstr "Kan ikkje lukka kjeldamappa %s: %s"
 msgid "Could not close temp folder: %s"
 msgstr "Kan ikkje lukka mellombels mappe: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/mail-component.c:1885
+#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1285
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kan ikkje endra namnet på mappa: %s"
@@ -9911,7 +10277,7 @@ msgstr "Slett etter %s dag(ar)"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:81
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr "POP"
 
@@ -9995,7 +10361,7 @@ msgid "No such folder `%s'."
 msgstr "Inga slik mappe «%s»."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10047,7 +10413,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:98
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -10219,7 +10585,7 @@ msgstr ""
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:632
 #, fuzzy
 msgid "Sending message"
 msgstr "Sen melding"
@@ -10344,7 +10710,7 @@ msgstr "%.1fM"
 msgid "%.0fG"
 msgstr "%.1fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1375
+#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1380
 msgid "attachment"
 msgstr "vedlegg"
 
@@ -10392,14 +10758,14 @@ msgstr "MIME-type:"
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:289
+#: composer/e-msg-composer-hdrs.c:287
 #, 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:482
+#: composer/e-msg-composer-hdrs.c:480
 #, fuzzy
 msgid "Click here for the address book"
 msgstr "Legg adresse til adresseboka"
@@ -10411,46 +10777,46 @@ msgstr "Legg adresse til adresseboka"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:513
+#: composer/e-msg-composer-hdrs.c:510
 msgid "Reply-To:"
 msgstr "Svar-til:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:519
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "Frå:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:525
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Emne:"
 
-#: composer/e-msg-composer-hdrs.c:534
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "Til:"
 
-#: composer/e-msg-composer-hdrs.c:535
+#: composer/e-msg-composer-hdrs.c:532
 #, fuzzy
 msgid "Enter the recipients of the message"
 msgstr "Oppgi eit nytt namn på meldinga."
 
-#: composer/e-msg-composer-hdrs.c:538
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:539
+#: composer/e-msg-composer-hdrs.c:536
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:543
+#: composer/e-msg-composer-hdrs.c:540
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10459,16 +10825,21 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:550
+#: composer/e-msg-composer-hdrs.c:547
 #, fuzzy
 msgid "Post To:"
 msgstr "Porto"
 
-#: composer/e-msg-composer-hdrs.c:552
+#: composer/e-msg-composer-hdrs.c:548
 #, fuzzy
 msgid "Posting destination"
 msgstr "Ingen skildring"
 
+#: composer/e-msg-composer-hdrs.c:548
+#, fuzzy
+msgid "Choose a folder to post the message to."
+msgstr "Kunne ikkje lagra melding(ar)."
+
 #: composer/e-msg-composer-select-file.c:119
 #, fuzzy
 msgid "Attach file(s)"
@@ -10503,22 +10874,22 @@ msgstr "Fila eksisterar, skriv over?"
 msgid "Error saving file: %s"
 msgstr "Feil under lagring av fil: %s"
 
-#: composer/e-msg-composer.c:1203
+#: composer/e-msg-composer.c:1204
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Feil ved lasting av fil %s"
 
-#: composer/e-msg-composer.c:1241
+#: composer/e-msg-composer.c:1242
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Feil under tilgang til fil: %s"
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1250
 #, fuzzy
 msgid "Unable to retrieve message from editor"
 msgstr "Kunne ikkje motta fil"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10527,7 +10898,7 @@ msgstr ""
 "Kan ikkje søka i fil: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1264
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10536,7 +10907,7 @@ msgstr ""
 "Kan ikkje kutta av fil: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1273
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10545,7 +10916,7 @@ msgstr ""
 "Kan ikkje kopiera fildeskriptor: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1282
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10554,13 +10925,13 @@ msgstr ""
 "Feil under automatisk lagring av meldinga: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1378
+#: composer/e-msg-composer.c:1386
 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:1541
+#: composer/e-msg-composer.c:1550
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10571,35 +10942,35 @@ msgstr ""
 "\n"
 "Vil du lagra endringane?"
 
-#: composer/e-msg-composer.c:1550
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr "Åtvaring: Melding er endra"
 
-#: composer/e-msg-composer.c:1582
+#: composer/e-msg-composer.c:1592
 msgid "Open file"
 msgstr "Opna fil"
 
-#: composer/e-msg-composer.c:2001
+#: composer/e-msg-composer.c:2011
 #, fuzzy
 msgid "Signature:"
 msgstr "Signatur:"
 
-#: composer/e-msg-composer.c:2041 mail/mail-account-gui.c:1260
+#: composer/e-msg-composer.c:2051 mail/mail-account-gui.c:1260
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2221 composer/e-msg-composer.c:2918
-#: composer/e-msg-composer.c:2919
+#: composer/e-msg-composer.c:2231 composer/e-msg-composer.c:2929
+#: composer/e-msg-composer.c:2930
 msgid "Compose a message"
 msgstr "Skriv ei melding"
 
-#: composer/e-msg-composer.c:2950
+#: composer/e-msg-composer.c:2961
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2980
+#: composer/e-msg-composer.c:2991
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -10608,25 +10979,27 @@ msgid ""
 "of gtkhtml and libgtkhtml installed.\n"
 msgstr "Kan ikkje laga nytt vindauge.\n"
 
-#: composer/e-msg-composer.c:3050
+#: composer/e-msg-composer.c:3061
 #, 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:4060
+#: composer/e-msg-composer.c:4071
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
 #: data/evolution.desktop.in.in.h:1
-msgid "The Evolution groupware suite"
+#, fuzzy
+msgid "The Ximian Evolution Groupware Suite"
 msgstr "Gruppevareverktyet Evolution"
 
 #: data/evolution.desktop.in.in.h:2
-msgid "Ximian Evolution"
+#, fuzzy
+msgid "Ximian Evolution (Unstable)"
 msgstr "Ximian Evolution"
 
 #: data/evolution.keys.in.h:1
@@ -10875,13 +11248,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
+#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
 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:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -11013,7 +11386,7 @@ msgstr "Tiaren"
 msgid "You must specify a folder."
 msgstr "Stilnamn:"
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:437
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:459
 #: mail/mail-account-gui.c:1099
 msgid "Select Folder"
 msgstr "Vel mappe"
@@ -11027,24 +11400,24 @@ msgstr ""
 "Feil i det regulære uttrykket «%s»:\n"
 "%s"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
-#: mail/mail-config.glade.h:61 shell/e-config-upgrade.c:1454
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:63
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1454
 msgid "Important"
 msgstr "Viktig"
 
 #. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
+#: filter/filter-label.c:124 mail/mail-config.c:66
+#: mail/mail-config.glade.h:123 shell/e-config-upgrade.c:1457
 msgid "To Do"
 msgstr "Hugseliste"
 
 #. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:65
+#: filter/filter-label.c:125 mail/mail-config.c:67 mail/mail-config.glade.h:68
 #: shell/e-config-upgrade.c:1458
 msgid "Later"
 msgstr "Seinare"
 
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+#: filter/filter-part.c:531
 msgid "Test"
 msgstr "Test"
 
@@ -11140,7 +11513,7 @@ msgstr "sidan"
 msgid "months"
 msgstr "månader"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:175
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "sekund"
 
@@ -11241,7 +11614,7 @@ msgstr "Uttrykk"
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:689
+#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:713
 msgid "Label"
 msgstr "Etikett"
 
@@ -11314,115 +11687,121 @@ msgid "Source Account"
 msgstr "Avsendarkonto"
 
 #: filter/libfilter-i18n.h:35
+#, fuzzy
+msgid "Spam"
+msgstr "Sprut"
+
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "Spesifikk linje i hovud"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "Stopp prosessering"
 
-#: filter/libfilter-i18n.h:38 mail/em-format-html.c:1369 mail/em-format.c:678
+#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1438 mail/em-format.c:678
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: smime/lib/e-cert.c:1074
 msgid "Subject"
 msgstr "Emne"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:40
 msgid "Unset Status"
 msgstr "Nullstill status"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:41
 msgid "contains"
 msgstr "inneheld"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:42
 msgid "does not contain"
 msgstr "inneheld ikkje"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:43
 msgid "does not end with"
 msgstr "sluttar ikkje med"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:44
 msgid "does not exist"
 msgstr "finst ikkje"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:45
 #, fuzzy
 msgid "does not return"
 msgstr "finst ikkje"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:46
 msgid "does not sound like"
 msgstr "høyres ikkje ut som"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:47
 msgid "does not start with"
 msgstr "startar ikkje med"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:48
 msgid "ends with"
 msgstr "sluttar med"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:49
 msgid "exists"
 msgstr "eksisterar"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:50
 msgid "is Flagged"
 msgstr "er flagga"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:51
 #, fuzzy
 msgid "is after"
 msgstr "var etter"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:52
 #, fuzzy
 msgid "is before"
 msgstr "var før"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:53
 msgid "is greater than"
 msgstr "er større enn"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:54
 msgid "is less than"
 msgstr "er mindre enn"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 msgid "is not Flagged"
 msgstr "er ikkje flagga"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 msgid "is not"
 msgstr "er ikkje"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:57
 msgid "is"
 msgstr "er"
 
-#: filter/libfilter-i18n.h:57
+#: filter/libfilter-i18n.h:58
 msgid "returns greater than"
 msgstr "returnerer større enn"
 
-#: filter/libfilter-i18n.h:58
+#: filter/libfilter-i18n.h:59
 msgid "returns less than"
 msgstr "returnerer mindre enn"
 
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:60
 msgid "returns"
 msgstr "returnerer"
 
-#: filter/libfilter-i18n.h:60
+#: filter/libfilter-i18n.h:61
 msgid "sounds like"
 msgstr "høyres ut som"
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:62
 msgid "starts with"
 msgstr "byrjar med"
 
 #: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:921
+#: mail/mail-vfolder.c:915
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Regelnamnet «%s» er ikkje unikt. Vel eit anna namn"
@@ -11447,18 +11826,77 @@ msgstr "Regelnamn"
 msgid "Score Rules"
 msgstr "Poengreglar"
 
-#: filter/vfolder-rule.c:207
+#: filter/vfolder-rule.c:209
 msgid "You must name this vfolder."
 msgstr "Du må gje denne mappa eit namn."
 
-#: filter/vfolder-rule.c:221
+#: filter/vfolder-rule.c:223
 msgid "You need to to specify at least one folder as a source."
 msgstr "Du må ha minst ei mappe som kjelde."
 
-#: filter/vfolder-rule.c:534
+#: filter/vfolder-rule.c:539
 msgid "VFolder source"
 msgstr "vMappe-kjelde"
 
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr "Redigerarinstillingar"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+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 "Set opp stavekontroll, signaturar og meldingsredigeraren"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr "Set opp e-postkontoar"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Evolution Mail"
+msgstr "Evolution e-post"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution oppsettkontroll for e-postkontoar"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail component"
+msgstr "Evolution e-postkomponent"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail composer"
+msgstr "Evolution e-postredigerar"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolution oppsettkontroll for e-postredigerar"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail folder viewer"
+msgstr "Evolution e-post-mappevisar"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Evolution e-postinnstillingskontroll"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:783
+#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
+#: mail/importers/pine-importer.c:572
+msgid "Mail"
+msgstr "E-post"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "E-postkontoar"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:71
+msgid "Mail Preferences"
+msgstr "E-postinnstillingar"
+
 #: mail/em-account-prefs.c:233
 msgid "Are you sure you want to delete this account?"
 msgstr "Er du sikker på at du vil sletta denne kontoen?"
@@ -11501,7 +11939,7 @@ msgid "Protocol"
 msgstr "Protokoll"
 
 #: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:349
-#: mail/mail-config.c:1246
+#: mail/mail-config.c:1250
 #, fuzzy
 msgid "Unnamed"
 msgstr "Namnlaus"
@@ -11527,20 +11965,17 @@ msgstr "Legg till skriptsignatur"
 msgid "Signature(s)"
 msgstr "Signatur(ar)"
 
-#. FIXME: this wording sucks
-#: mail/em-composer-utils.c:117
+#: mail/em-composer-utils.c:123
+#, fuzzy, c-format
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
+"%sSend anyway?"
 msgstr ""
 "Du sender ei HTML-formatert melding. Pass på at dei følgjande mottakarane\n"
 "er i stand til å lesa HTML-e-post, og faktisk vil ha slik post:\n"
 
-#: mail/em-composer-utils.c:129
-msgid "Send anyway?"
-msgstr "Send likevel?"
-
-#: mail/em-composer-utils.c:150
+#: mail/em-composer-utils.c:137
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11548,7 +11983,7 @@ msgstr ""
 "Meldinga har ikkje noko emne.\n"
 "Send likevel?"
 
-#: mail/em-composer-utils.c:176
+#: mail/em-composer-utils.c:153
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11556,11 +11991,11 @@ msgstr ""
 "Sidan kontaktlista du sender til, er sett opp til å gøyme addressatane, vil "
 "den sette opp alle mottakarane som Bcc."
 
-#: mail/em-composer-utils.c:180
+#: mail/em-composer-utils.c:157
 msgid "This message contains only Bcc recipients."
 msgstr "Denne meldinga inneheld kun Bcc-mottakarar."
 
-#: mail/em-composer-utils.c:185
+#: mail/em-composer-utils.c:162
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11570,11 +12005,11 @@ msgstr ""
 "«Apparently-To»-topptekst.\n"
 "Send likevel?"
 
-#: mail/em-composer-utils.c:329
+#: mail/em-composer-utils.c:301
 msgid "You must specify recipients in order to send this message."
 msgstr "Du må spesifisere mottakarar for å sende denne meldinga."
 
-#: mail/em-composer-utils.c:566
+#: mail/em-composer-utils.c:543
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11586,189 +12021,400 @@ msgstr ""
 msgid "Create _Virtual Folder From Search..."
 msgstr "Lag _virtuell mappe frå søk ..."
 
-#: mail/em-folder-browser.c:773 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
-msgid "Mail"
-msgstr "E-post"
-
-#: mail/em-folder-selection-button.c:66
+#: mail/em-folder-selection-button.c:116
 #: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<klikk her for å velje mappe>"
 
-#: mail/em-folder-selection-button.c:89 shell/e-folder-list.c:122
-#: shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "«%s» i «%s»"
+#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+msgid "Create New Folder"
+msgstr "Lag ny mappe"
 
-#: mail/em-folder-selector.c:267
-#, fuzzy
-msgid "Folder _name"
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1091
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+msgid "Specify where to create the folder:"
+msgstr "Oppgje kor mappa skal lagast:"
+
+#: mail/em-folder-selector.c:263
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+msgid "Folder _name:"
 msgstr "Mappe_namn:"
 
-#: mail/em-folder-view.c:577 mail/em-folder-view.c:591
-#: mail/mail-component.c:1632 mail/mail-component.c:1643
-#: shell/e-shell-importer.c:1061
+#: mail/em-folder-tree-model.c:559 mail/em-utils.c:1943
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Klarte ikkje å lage mellombels katalog: %s"
+
+#: mail/em-folder-tree-model.c:568
+#, fuzzy, c-format
+msgid "Could not create temporary mbox store: %s"
+msgstr "Klarte ikkje å lage mellombels katalog: %s"
+
+#: mail/em-folder-tree-model.c:577
+#, fuzzy, c-format
+msgid "Could not create temporary mbox folder: %s"
+msgstr "Klarte ikkje å lage mellombels katalog: %s"
+
+#: mail/em-folder-tree-model.c:592
+#, fuzzy, c-format
+msgid "Could not copy messages to temporary mbox folder: %s"
+msgstr "Kan ikkje lukka mellombels mappe: %s"
+
+#: mail/em-folder-tree-model.c:771 mail/em-folder-tree-model.c:1001
+msgid "Loading..."
+msgstr "Lastar ..."
+
+#: mail/em-folder-tree.c:969 mail/em-folder-tree.c:1056
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: mail/em-folder-tree.c:985 mail/em-folder-tree.c:998
+#: mail/em-folder-view.c:590 mail/em-folder-view.c:604
+#: shell/e-shell-importer.c:1060
 msgid "Select folder"
 msgstr "Vel mappe"
 
+#: mail/em-folder-tree.c:1091
+#, fuzzy
+msgid "Create folder"
+msgstr "Lag ei ny mappe"
+
+#: mail/em-folder-tree.c:1179
+#, fuzzy, c-format
+msgid "Could not delete folder: %s"
+msgstr "Kan ikkje sletta mappa «%s»: %s"
+
+#: mail/em-folder-tree.c:1200
+#, fuzzy, c-format
+msgid "Really delete folder \"%s\" and all of its subfolders?"
+msgstr "Verkeleg sletta mappa «%s»?"
+
+#: mail/em-folder-tree.c:1210 shell/e-shell-folder-commands.c:416
+#, c-format
+msgid "Delete \"%s\""
+msgstr "Slett «%s»"
+
+#: mail/em-folder-tree.c:1244 shell/e-shell-folder-commands.c:534
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "Endra namn på mappa «%s» til:"
+
+#: mail/em-folder-tree.c:1248 shell/e-shell-folder-commands.c:541
+msgid "Rename Folder"
+msgstr "Endra namn på mappa"
+
+#: mail/em-folder-tree.c:1272 shell/e-shell-folder-commands.c:554
+#, c-format
+msgid "A folder named \"%s\" already exists. Please use a different name."
+msgstr "Ei mappe som har namnet «%s» finst allereie. Bruk eit anna namn."
+
+#: mail/em-folder-tree.c:1370
+#, fuzzy
+msgid "Folder properties"
+msgstr "Eigenskapar"
+
+#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
+#: mail/em-folder-tree.c:1376
+msgid "Properties"
+msgstr "Eigenskapar"
+
+#: mail/em-folder-tree.c:1384
+#, fuzzy
+msgid "Folder Name"
+msgstr "_Mappenamn:"
+
+#: mail/em-folder-tree.c:1491 ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:32
+msgid "_View"
+msgstr "_Visning"
+
+#: mail/em-folder-tree.c:1492
+#, fuzzy
+msgid "Open in _New Window"
+msgstr "Opne i eige vindauge"
+
+#: mail/em-folder-tree.c:1497
+#, fuzzy
+msgid "_Move"
+msgstr "Flytt"
+
+#: mail/em-folder-tree.c:1500
+#, fuzzy
+msgid "_New Folder..."
+msgstr "_Ny mappe"
+
+#: mail/em-folder-tree.c:1502 shell/e-shortcuts-view.c:427
+msgid "_Rename"
+msgstr "_Gje nytt namn"
+
+#: mail/em-folder-tree.c:1505 ui/evolution-mail-list.xml.h:27
+msgid "_Properties..."
+msgstr "Ei_genskapar ..."
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:659 mail/em-popup.c:583
+#: mail/em-folder-view.c:681 mail/em-popup.c:589
 msgid "_Edit as New Message..."
 msgstr "R_ediger som ny melding .."
 
-#: mail/em-folder-view.c:661
+#: mail/em-folder-view.c:683
 msgid "_Print"
 msgstr "S_kriv ut"
 
-#: mail/em-folder-view.c:664 ui/evolution-mail-message.xml.h:118
+#: mail/em-folder-view.c:686 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "Sva_r til avsendar"
 
-#: mail/em-folder-view.c:665 mail/em-popup.c:644
-#: ui/evolution-mail-message.xml.h:80
+#: mail/em-folder-view.c:687 mail/em-popup.c:650
+#: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Svar til _liste"
 
-#: mail/em-folder-view.c:666 mail/em-popup.c:645
-#: ui/evolution-mail-message.xml.h:79
+#: mail/em-folder-view.c:688 mail/em-popup.c:651
+#: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: mail/em-folder-view.c:667 mail/em-popup.c:647
+#: mail/em-folder-view.c:689 mail/em-popup.c:653
 msgid "_Forward"
 msgstr "_Vidaresend"
 
-#: mail/em-folder-view.c:670
+#: mail/em-folder-view.c:692
 msgid "Follo_w Up..."
 msgstr "_Følg opp ..."
 
-#: mail/em-folder-view.c:671
+#: mail/em-folder-view.c:693
 msgid "Fla_g Completed"
 msgstr "_Merk som ferdig"
 
-#: mail/em-folder-view.c:672
+#: mail/em-folder-view.c:694
 msgid "Cl_ear Flag"
 msgstr "_Fjern merke"
 
-#: mail/em-folder-view.c:675 ui/evolution-mail-message.xml.h:47
+#: mail/em-folder-view.c:697 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "Mar_ker som lesen"
 
-#: mail/em-folder-view.c:676
+#: mail/em-folder-view.c:698
 msgid "Mark as _Unread"
 msgstr "Marker som _ulesen"
 
-#: mail/em-folder-view.c:677
+#: mail/em-folder-view.c:699
 msgid "Mark as _Important"
 msgstr "Marker som v_iktig"
 
-#: mail/em-folder-view.c:678
+#: mail/em-folder-view.c:700
 msgid "_Mark as Unimportant"
 msgstr "Marker som ikkje vi_ktig"
 
-#: mail/em-folder-view.c:682
+#: mail/em-folder-view.c:701 ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Mark as _Junk"
+msgstr "Marker som _ulesen"
+
+#: mail/em-folder-view.c:702 ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Mark as _Not Junk"
+msgstr "Marker som v_iktig"
+
+#: mail/em-folder-view.c:706
 msgid "U_ndelete"
 msgstr "_Angra sletting"
 
-#: mail/em-folder-view.c:685
+#: mail/em-folder-view.c:709
 msgid "Mo_ve to Folder..."
 msgstr "Flytt til _mappe ..."
 
-#: mail/em-folder-view.c:686 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-view.c:710 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Kopier til mappe ..."
 
-#: mail/em-folder-view.c:694
+#: mail/em-folder-view.c:718
 msgid "Add Sender to Address_book"
 msgstr "_Legg til avsendar i adresseboka"
 
 # TRN: «Bruk» rett? Kva med «Køyr» eller «Filtrer»?
-#: mail/em-folder-view.c:697
+#: mail/em-folder-view.c:721
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "_Bruk filter"
 
-#: mail/em-folder-view.c:700
+#: mail/em-folder-view.c:724
 msgid "Crea_te Rule From Message"
 msgstr "_Lag regel frå melding"
 
-#: mail/em-folder-view.c:701
+#: mail/em-folder-view.c:725
 msgid "VFolder on _Subject"
 msgstr "vMappe på _emne"
 
-#: mail/em-folder-view.c:702
+#: mail/em-folder-view.c:726
 msgid "VFolder on Se_nder"
 msgstr "vMappe på avse_dar"
 
-#: mail/em-folder-view.c:703
+#: mail/em-folder-view.c:727
 msgid "VFolder on _Recipients"
 msgstr "vMappe på mottaka_r"
 
-#: mail/em-folder-view.c:704
+#: mail/em-folder-view.c:728
 msgid "VFolder on Mailing _List"
 msgstr "vMappe på e-post_liste"
 
-#: mail/em-folder-view.c:706
+#: mail/em-folder-view.c:730
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "vMappe på avse_dar"
 
-#: mail/em-folder-view.c:710
+#: mail/em-folder-view.c:734
 msgid "Filter on Sub_ject"
 msgstr "Filtrér på _emne"
 
-#: mail/em-folder-view.c:711
+#: mail/em-folder-view.c:735
 msgid "Filter on Sen_der"
 msgstr "Filtrér på avsen_dar:"
 
-#: mail/em-folder-view.c:712
+#: mail/em-folder-view.c:736
 msgid "Filter on Re_cipients"
 msgstr "Filtrer på _mottakarar"
 
-#: mail/em-folder-view.c:713
+#: mail/em-folder-view.c:737
 msgid "Filter on _Mailing List"
 msgstr "Filtrer på _e-postliste"
 
-#: mail/em-folder-view.c:715
+#: mail/em-folder-view.c:739
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "Filtrér på avsen_dar:"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1487 mail/em-folder-view.c:1525
-#: mail/mail-config.glade.h:38
+#: mail/em-folder-view.c:1511 mail/em-folder-view.c:1549
+#: mail/mail-config.glade.h:40
 msgid "Default"
 msgstr "Forvald"
 
-#: mail/em-folder-view.c:1559
+#: mail/em-folder-view.c:1583
 msgid "Print Message"
 msgstr "Skriv ut melding"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1825
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Kopier lenkjeadresse"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:343
+#: mail/em-format-html-display.c:368
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Treff:"
 
-#: mail/em-format-html-display.c:638
+#: mail/em-format-html-display.c:597 mail/em-format-html.c:564
+#, fuzzy
+msgid "Unsigned"
+msgstr "Tildelt"
+
+#: mail/em-format-html-display.c:597
 msgid ""
-"This message is digitally signed. Click the lock icon for more information."
+"This message is not signed.  There is no guarantee the sender of the message "
+"is authentic."
 msgstr ""
 
-#: mail/em-format-html-display.c:728
+#: mail/em-format-html-display.c:598 mail/em-format-html.c:565
+#, fuzzy
+msgid "Valid signature"
+msgstr "Legg til kriterium"
+
+#: mail/em-format-html-display.c:598
+msgid ""
+"This message is signed and is valid, the sender of this message is very "
+"likely who they claim to be."
+msgstr ""
+
+#: mail/em-format-html-display.c:599 mail/em-format-html.c:566
+#, fuzzy
+msgid "Invalid signature"
+msgstr "Legg til kriterium"
+
+#: mail/em-format-html-display.c:599
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+
+#: mail/em-format-html-display.c:600 mail/em-format-html.c:567
+msgid "Valid signature, cannot verify sender"
+msgstr ""
+
+#: mail/em-format-html-display.c:600
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
+
+#: mail/em-format-html-display.c:606 mail/em-format-html.c:573
+#, fuzzy
+msgid "Unencrypted"
+msgstr "Avbroten"
+
+#: mail/em-format-html-display.c:606
+msgid ""
+"This message is not encrypted.  It's content may be viewed in transit across "
+"The Internet."
+msgstr ""
+
+#: mail/em-format-html-display.c:607 mail/em-format-html.c:574
+msgid "Encrypted, weak"
+msgstr ""
+
+#: mail/em-format-html-display.c:607
+msgid ""
+"This message is encrypted, but with a weak encryption algorithm.  It would "
+"be difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:608 mail/em-format-html.c:575
+#, fuzzy
+msgid "Encrypted"
+msgstr "PGP-kryptér"
+
+#: mail/em-format-html-display.c:608
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
+
+#: mail/em-format-html-display.c:609 mail/em-format-html.c:576
+msgid "Encrypted, strong"
+msgstr ""
+
+#: mail/em-format-html-display.c:609
+msgid ""
+"This message is encrypted, with a strong encryption algorithm.  It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:779 mail/em-format-html.c:645
+#, fuzzy
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Kunne ikkje senda meldinga: %s"
+
+#: mail/em-format-html-display.c:814 mail/em-format-html.c:1042
+#: mail/em-format.c:1196
+#, fuzzy
+msgid "Unsupported signature format"
+msgstr "Ustøtta skjema"
+
+#: mail/em-format-html-display.c:822 mail/em-format-html.c:1050
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "Kan ikkje dekryptera sertifikatsignaturen."
+
+#: mail/em-format-html-display.c:917
 #, fuzzy
 msgid "_View Inline"
 msgstr "Vis innvevd"
 
-#: mail/em-format-html-display.c:729
+#: mail/em-format-html-display.c:918
 #, fuzzy
 msgid "_Hide"
 msgstr "Gøym"
@@ -11778,184 +12424,207 @@ msgstr "Gøym"
 msgid "Page %d of %d"
 msgstr "Side %d av %d"
 
-#: mail/em-format-html.c:451 mail/em-format-html.c:453
+#: mail/em-format-html.c:457 mail/em-format-html.c:459
 #, fuzzy, c-format
 msgid "Retrieving `%s'"
 msgstr "Hentar melding %s"
 
-#: mail/em-format-html.c:708
+#: mail/em-format-html.c:826
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/em-format-html.c:738
+#: mail/em-format-html.c:856
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:749
+#: mail/em-format-html.c:867
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/em-format-html.c:751
+#: mail/em-format-html.c:869
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:772
+#: mail/em-format-html.c:890
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:783
+#: mail/em-format-html.c:901
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/em-format-html.c:905 mail/em-format.c:1219
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr ""
-
-#: mail/em-format-html.c:906 mail/em-format.c:1217
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr ""
-
-#: mail/em-format-html.c:930 mail/em-format.c:1190
-msgid "No signature present"
-msgstr ""
-
-#: mail/em-format-html.c:932 mail/em-format.c:1192
-#, fuzzy
-msgid "Session not initialised"
-msgstr "Kunne ikkje initiere Bonobo"
-
-#: mail/em-format-html.c:943 mail/em-format.c:1203
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "Ustøtta skjema"
-
-#: mail/em-format-html.c:992
+#: mail/em-format-html.c:1029
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/em-format-html.c:1079
+#: mail/em-format-html.c:1141
 #, fuzzy
 msgid "Formatting message"
 msgstr "Flyttar melding"
 
-#: mail/em-format-html.c:1354 mail/em-format.c:673
+#: mail/em-format-html.c:1423 mail/em-format.c:673
 #: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
 msgid "From"
 msgstr "Frå"
 
-#: mail/em-format-html.c:1356 mail/em-format.c:674
+#: mail/em-format-html.c:1425 mail/em-format.c:674
 msgid "Reply-To"
 msgstr "Svar-til"
 
-#: mail/em-format-html.c:1358 mail/em-format.c:675
+#: mail/em-format-html.c:1427 mail/em-format.c:675
 #: mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Til"
 
-#: mail/em-format-html.c:1360 mail/em-format.c:676
+#: mail/em-format-html.c:1429 mail/em-format.c:676
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/em-format-html.c:1362 mail/em-format.c:677
+#: mail/em-format-html.c:1431 mail/em-format.c:677
 msgid "Bcc"
 msgstr "Bcc:"
 
-#: mail/em-format-html.c:1381
+#: mail/em-format-html.c:1450
 msgid "Mailer"
 msgstr "E-postprogram"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1408
+#: mail/em-format-html.c:1477
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1411
+#: mail/em-format-html.c:1480
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1422 mail/em-format.c:679
+#: mail/em-format-html.c:1491 mail/em-format.c:679
 #: mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Dato"
 
-#: mail/em-format.c:893
+#: mail/em-format.c:892
 #, c-format
 msgid "%s attachment"
 msgstr "%s vedlegg"
 
-#: mail/em-format.c:1259
+#: mail/em-format.c:1185
 #, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Kunne ikkje senda meldinga: %s"
+msgid "Session not initialised"
+msgstr "Kunne ikkje initiere Bonobo"
+
+#: mail/em-format.c:1210
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr ""
+
+#: mail/em-format.c:1212
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
 
-#: mail/em-popup.c:593
+#: mail/em-junk-filter.c:72
+msgid "Spamassassin (built-in)"
+msgstr ""
+
+#: mail/em-migrate.c:120
+#, fuzzy
+msgid "Migrating..."
+msgstr "Ventar ..."
+
+#: mail/em-migrate.c:128
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: mail/em-migrate.c:161
+#, fuzzy, c-format
+msgid "Migrating `%s':"
+msgstr "Pingar %s"
+
+#: mail/em-migrate.c:627
+#, fuzzy, c-format
+msgid "Failed to migrate `%s': %s"
+msgstr "Kan ikkje leggja %s i mellomlageret: %s"
+
+#: mail/em-migrate.c:653 mail/em-migrate.c:670
+#, fuzzy, c-format
+msgid "Failed to create directory `%s': %s"
+msgstr "Kan ikkje oppretta røyr til «%s»: %s"
+
+#: mail/em-migrate.c:682
+#, fuzzy, c-format
+msgid "Failed to open store for `%s': %s"
+msgstr "Klarte ikkje å slå opp verten «%s»: %s"
+
+#: mail/em-popup.c:599
 msgid "Save As..."
 msgstr "Lagre som ..."
 
-#: mail/em-popup.c:641
+#: mail/em-popup.c:647
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:643
+#: mail/em-popup.c:649
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "Sva_r til avsendar"
 
-#: mail/em-popup.c:680
+#: mail/em-popup.c:697
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Opna ved innsetjing"
 
-#: mail/em-popup.c:681
+#: mail/em-popup.c:698
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Sender ei melding til ein nettverksspelar"
 
-#: mail/em-popup.c:682
+#: mail/em-popup.c:699
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Legg til adressebok"
 
-#: mail/em-popup.c:788
+#: mail/em-popup.c:805
 #, c-format
 msgid "Open in %s..."
 msgstr "Opne i %s ..."
 
-#: mail/em-subscribe-editor.c:579
+#: mail/em-subscribe-editor.c:583
 #, fuzzy
 msgid "This store does not support subscriptions, or the are not enabled."
 msgstr "Denne tenaren stør ikkje LDAPv3 skjemainformasjon"
 
-#: mail/em-subscribe-editor.c:608
+#: mail/em-subscribe-editor.c:612
 #, fuzzy
 msgid "Subscribed"
 msgstr "Abonnér"
 
-#: mail/em-subscribe-editor.c:612 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:616
 msgid "Folder"
 msgstr "Mappe"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:799
+#: mail/em-subscribe-editor.c:803
 msgid "Please select a server."
 msgstr "Velj ein tenar"
 
-#: mail/em-subscribe-editor.c:820
+#: mail/em-subscribe-editor.c:824
 msgid "No server has been selected"
 msgstr "Ingen tenar har vorte vald"
 
-#: mail/em-utils.c:88
+#: mail/em-utils.c:93
 msgid "Don't show this message again."
 msgstr "Ikkje vis denne meldinga att"
 
 # TRN: Dårleg.
-#: mail/em-utils.c:270
+#: mail/em-utils.c:275
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11964,27 +12633,27 @@ msgstr ""
 "Feil ved lesing av filterinformasjon:\n"
 "%s"
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:284
 msgid "Filters"
 msgstr "Filter"
 
-#: mail/em-utils.c:486
+#: mail/em-utils.c:491
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "Vidaresendt melding"
 
-#: mail/em-utils.c:1039
+#: mail/em-utils.c:1044
 msgid "an unknown sender"
 msgstr "ein ukjend avsendar"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1049
+#: mail/em-utils.c:1054
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "På %a, %d/%m/%Y klokka %H:%M, skreiv %%s:"
 
-#: mail/em-utils.c:1325
+#: mail/em-utils.c:1330
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -11993,7 +12662,7 @@ msgstr ""
 "Klarte ikkje å lagra til «%s»\n"
 " %s"
 
-#: mail/em-utils.c:1330
+#: mail/em-utils.c:1335
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -12002,25 +12671,26 @@ msgstr ""
 "%s eksisterer allereide\n"
 "Vil du skriva over?"
 
-#: mail/em-utils.c:1373
+#: mail/em-utils.c:1378
 #, fuzzy
 msgid "message"
 msgstr "Melding"
 
-#: mail/em-utils.c:1430
+#: mail/em-utils.c:1435
 #, fuzzy
 msgid "Save Message..."
 msgstr "Lagre melding som ..."
 
-#: mail/em-utils.c:1893 mail/mail-component.c:501
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Klarte ikkje å lage mellombels katalog: %s"
+#: mail/em-utils.c:1473
+#, fuzzy
+msgid "Add address"
+msgstr "Adresse"
 
-#: mail/em-utils.c:2211
+#: mail/em-utils.c:2262
+#, fuzzy, c-format
 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"
+"This operation will permanently remove all deleted messages in the folder `%"
+"s'. If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
@@ -12029,58 +12699,429 @@ msgstr ""
 "\n"
 "Vil du fjerna desse meldingane?"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Redigerarinstillingar"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+#: mail/em-utils.c:2288
+#, fuzzy
 msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr "Set opp e-postinnstillingar, inkludert tryggleik og meldingsvising"
+"This operation will permanently remove all deleted messages in all folders. "
+"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/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "Set opp stavekontroll, signaturar og meldingsredigeraren"
+#: mail/evolution-mail.schemas.in.in.h:1
+#, fuzzy
+msgid "Automatic link recognition"
+msgstr "enkle innlegg"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Set opp e-postkontoar"
+#: mail/evolution-mail.schemas.in.in.h:2
+#, fuzzy
+msgid "Automatic smiley recognition"
+msgstr "enkle innlegg"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Evolution e-post"
+#: mail/evolution-mail.schemas.in.in.h:3
+msgid "Check incoming mail being junk"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution oppsettkontroll for e-postkontoar"
+#: mail/evolution-mail.schemas.in.in.h:4
+msgid "Citation highlight colour"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Evolution e-postkomponent"
+#: mail/evolution-mail.schemas.in.in.h:5
+msgid "Citation highlight colour."
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Evolution e-postredigerar"
+#: mail/evolution-mail.schemas.in.in.h:6
+#, fuzzy
+msgid "Default charset in which to compose messages"
+msgstr "Standardemne for meldinga"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolution oppsettkontroll for e-postredigerar"
+#: mail/evolution-mail.schemas.in.in.h:7
+#, fuzzy
+msgid "Default charset in which to compose messages."
+msgstr "Standardemne for meldinga"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
-msgstr "Evolution e-post-mappevisar"
+#: mail/evolution-mail.schemas.in.in.h:8
+#, fuzzy
+msgid "Default charset in which to display messages"
+msgstr "Skriv tittelen på ruta her."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Evolution e-postinnstillingskontroll"
+#: mail/evolution-mail.schemas.in.in.h:9
+#, fuzzy
+msgid "Default charset in which to display messages."
+msgstr "Skriv tittelen på ruta her."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
+#: mail/evolution-mail.schemas.in.in.h:10
+#, fuzzy
+msgid "Default forward style"
+msgstr "Standard vidaresendingsstil er: "
+
+#: mail/evolution-mail.schemas.in.in.h:11
+#, fuzzy
+msgid "Default reply style"
+msgstr "Standard vidaresendingsstil er: "
+
+#: mail/evolution-mail.schemas.in.in.h:12
+msgid "Draw spelling error indicators on words as you type."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:13
+#, fuzzy
+msgid "Empty Trash folders on exit"
+msgstr "_Tøm papirkorga ved avslutting"
+
+#: mail/evolution-mail.schemas.in.in.h:14
+#, fuzzy
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr "_Tøm papirkorga ved avslutting"
+
+#: mail/evolution-mail.schemas.in.in.h:15
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:16
+msgid "Enable/disable caret mode"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:17
+#, fuzzy
+msgid "Height of the message-list pane"
+msgstr "Send meldinga seinare"
+
+#: mail/evolution-mail.schemas.in.in.h:18
+msgid "Height of the message-list pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:19
+msgid ""
+"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
+"any mime-types appearing in this list which map to a bonobo-component viewer "
+"in GNOME's mime-type database may be used for displaying content."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:20
+msgid "List of Labels and their associated colours"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:21
+#, fuzzy
+msgid "List of accounts"
 msgstr "E-postkontoar"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:68
-msgid "Mail Preferences"
-msgstr "E-postinnstillingar"
+#: mail/evolution-mail.schemas.in.in.h:22
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:23
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:colour where colour uses the HTML hex encoding."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:24
+msgid "List of mime types to check for bonobo component viewers"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:25
+msgid "Load images for HTML messages over http"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:26
+msgid ""
+"Load images for HTML messages over http(s). Possible values are: 0 - Never "
+"load images off the net 1 - Load images if sender is in the addressbook 2 - "
+"Always load images off the net"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:27
+#, fuzzy
+msgid "Log filter actions"
+msgstr "_Loggfør filterhandlingar til:"
+
+#: mail/evolution-mail.schemas.in.in.h:28
+#, fuzzy
+msgid "Log filter actions to the specified log file."
+msgstr "_Loggfør filterhandlingar til:"
+
+#: mail/evolution-mail.schemas.in.in.h:29
+#, fuzzy
+msgid "Logfile to log filter actions"
+msgstr "_Loggfør filterhandlingar til:"
+
+#: mail/evolution-mail.schemas.in.in.h:30
+#, fuzzy
+msgid "Logfile to log filter actions."
+msgstr "_Loggfør filterhandlingar til:"
+
+#: mail/evolution-mail.schemas.in.in.h:31
+msgid "Mark as Seen after specified timeout"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:32
+msgid "Mark as Seen after specified timeout."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:33
+msgid "Mark citations in the message \"Preview\""
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:34
+msgid "Mark citations in the message \"Preview\"."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:35
+msgid "Message-display style (normal, full headers, source)"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:36
+#, fuzzy
+msgid "New Mail Notify sound file"
+msgstr "Påminning ved ny e-post"
+
+#: mail/evolution-mail.schemas.in.in.h:37
+#, fuzzy
+msgid "New Mail Notify type"
+msgstr "Påminning ved ny e-post"
+
+#: mail/evolution-mail.schemas.in.in.h:38
+msgid "Prompt on empty subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:39
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:40
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:41
+msgid "Prompt when user expunges"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:42
+msgid "Prompt when user only fills Bcc"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:43
+#, fuzzy
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr ""
+"S_pør ved sending av HTML-meldingar til kontaktar som ikkje vil ha slike"
+
+#: mail/evolution-mail.schemas.in.in.h:44
+#, fuzzy
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgstr "Spø_r ved sending av melding som berre har mottakarar i Bcc-feltet"
+
+#: mail/evolution-mail.schemas.in.in.h:45
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:46
+msgid "Recognize links in text and replace them."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:47
+msgid "Recognize smileys in text and replace them with images."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Run junk test on incoming mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "S3kr3t 0pt10n"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
+msgid "S3kr3t 0pt10n."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:51
+#, fuzzy
+msgid "Send HTML mail by default"
+msgstr "Send e-post i HTML-format?"
+
+#: mail/evolution-mail.schemas.in.in.h:52
+#, fuzzy
+msgid "Send HTML mail by default."
+msgstr "Send e-post i HTML-format?"
+
+#: mail/evolution-mail.schemas.in.in.h:53
+#, fuzzy
+msgid "Show Animations"
+msgstr "Vi_s animerte bilete"
+
+#: mail/evolution-mail.schemas.in.in.h:54
+#, fuzzy
+msgid "Show animated images as animations."
+msgstr "Vi_s animerte bilete"
+
+#: mail/evolution-mail.schemas.in.in.h:55
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:56
+#, fuzzy
+msgid "Show deleted messages in the message-list"
+msgstr "Vis melding på normal måte"
+
+#: mail/evolution-mail.schemas.in.in.h:57
+#, fuzzy
+msgid "Show the \"Preview\" pane"
+msgstr "Førehandsvis i"
+
+#: mail/evolution-mail.schemas.in.in.h:58
+msgid "Show the \"Preview\" pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:59
+msgid "Sound file to play when new mail arrives."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:60
+msgid "Specifies the type of New Mail Notification the user wishes to use."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:61
+msgid "Spell check inline"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:62
+#, fuzzy
+msgid "Terminal font"
+msgstr "_Terminalskrifttype:"
+
+#: mail/evolution-mail.schemas.in.in.h:63
+msgid "The terminal font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:64
+msgid "The variable width font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:65
+#, fuzzy
+msgid "Thread the message list."
+msgstr "Tråda meldingsliste"
+
+#: mail/evolution-mail.schemas.in.in.h:66
+#, fuzzy
+msgid "Thread the message-list"
+msgstr "Tråda meldingsliste"
+
+#: mail/evolution-mail.schemas.in.in.h:67
+msgid "Thread the message-list based on Subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:68
+msgid "Timeout for marking message as Seen"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:69
+msgid "Timeout for marking message as Seen."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:70
+#, fuzzy
+msgid "UID string of the default account."
+msgstr "Gjer _denne til standardkonto"
+
+#: mail/evolution-mail.schemas.in.in.h:71
+msgid "Use custom fonts"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:72
+msgid "Use custom fonts for displaying mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:73
+#, fuzzy
+msgid "Variable width font"
+msgstr "V_ariabel breidde:"
+
+#: mail/evolution-mail.schemas.in.in.h:74
+msgid "View/Bcc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:75
+msgid "View/Bcc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "View/Cc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "View/Cc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
+msgid "View/From menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "View/From menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
+msgid "View/PostTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:81
+msgid "View/PostTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:82
+msgid "View/ReplyTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:83
+msgid "View/ReplyTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:84
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Evolution Elm-importerar"
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
+msgid "Evolution mbox importer"
+msgstr "Evolution mbox-importerar"
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
+
+#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolution Netscape Mail-importerar"
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Evolution Outlook Express 4-importerar"
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
+
+#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Pine importer"
+msgstr "Evolution Pine-importerar"
 
 #: mail/importers/elm-importer.c:105
 msgid "Evolution is importing your old Elm mail"
@@ -12120,34 +13161,6 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Evolution Elm-importerar"
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
-msgid "Evolution mbox importer"
-msgstr "Evolution mbox-importerar"
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolution Netscape Mail-importerar"
-
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Evolution Outlook Express 4-importerar"
-
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
-#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Pine importer"
-msgstr "Evolution Pine-importerar"
-
 #: mail/importers/netscape-importer.c:75
 #, c-format
 msgid "Priority Filter \"%s\""
@@ -12210,12 +13223,6 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importerer gamle Netscape-data"
 
-#. Fill in the new fields
-#: mail/importers/netscape-importer.c:1842 mail/mail-ops.c:1110
-#: shell/e-local-storage.c:184
-msgid "Trash"
-msgstr "Papirkorg"
-
 #: mail/importers/netscape-importer.c:1995
 msgid "Scanning mail filters"
 msgstr "Søker gjennom e-postfilter"
@@ -12224,7 +13231,7 @@ msgstr "Søker gjennom e-postfilter"
 msgid "Scanning directory"
 msgstr "Søker gjennom katalog"
 
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:556
+#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:563
 msgid "Starting import"
 msgstr "Startar importering"
 
@@ -12299,23 +13306,23 @@ msgid "You have not filled in all of the required information."
 msgstr "Du har ikkje fyllt ut all den påkrevde informasjonen."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:146
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Evolutions kontohandtering"
 
-#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:153
 msgid "_Host:"
 msgstr "_Vert:"
 
-#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:123
+#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:127
 msgid "User_name:"
 msgstr "Br_ukarnamn:"
 
-#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:156
+#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:162
 msgid "_Path:"
 msgstr "_Sti:"
 
-#: mail/mail-account-gui.c:1946
+#: mail/mail-account-gui.c:1970
 msgid "You may not create two accounts with the same name."
 msgstr "Du kan ikkje opprette to kontoar med det same namnet."
 
@@ -12324,35 +13331,35 @@ msgstr "Du kan ikkje opprette to kontoar med det same namnet."
 msgid "Mail to %s"
 msgstr "E-post til %s"
 
-#: mail/mail-autofilter.c:257
+#: mail/mail-autofilter.c:260
 #, c-format
 msgid "Subject is %s"
 msgstr "Emne er %s"
 
-#: mail/mail-autofilter.c:273
+#: mail/mail-autofilter.c:276
 #, c-format
 msgid "Mail from %s"
 msgstr "Melding frå %s"
 
-#: mail/mail-autofilter.c:290
+#: mail/mail-autofilter.c:293
 #, fuzzy, c-format
 msgid "%s mailing list"
 msgstr "%s e-postliste"
 
-#: mail/mail-autofilter.c:314
+#: mail/mail-autofilter.c:317
 #, fuzzy, c-format
 msgid "Replies to %s"
 msgstr "Svart til"
 
-#: mail/mail-autofilter.c:367
+#: mail/mail-autofilter.c:370
 msgid "Add Filter Rule"
 msgstr "Legg til filter-regel"
 
-#: mail/mail-autofilter.c:416
+#: mail/mail-autofilter.c:419
 msgid "The following filter rule(s):\n"
 msgstr "Dei følgjande filterreglane:\n"
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:425
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -12363,144 +13370,30 @@ msgstr ""
 "    «%s»\n"
 "og har blitt oppdaterte."
 
-#: mail/mail-component.c:194
-msgid "Connecting..."
-msgstr "Koplar til tenar ..."
-
-#: mail/mail-component.c:351
+#: mail/mail-component.c:214
 msgid "On this Computer"
 msgstr ""
 
-#: mail/mail-component.c:373
-msgid "This folder cannot contain messages."
-msgstr "Denne mappa kan ikkje innehalda meldingar."
-
-#: mail/mail-component.c:487
-#, fuzzy, c-format
-msgid "Could not open source folder: %s"
-msgstr "Kan ikkje opna delt mappe: %s"
-
-#: mail/mail-component.c:516
-#, fuzzy, c-format
-msgid "Could not create temporary mbox store: %s"
-msgstr "Klarte ikkje å lage mellombels katalog: %s"
+#: mail/mail-component.c:379
+msgid "New Mail Message"
+msgstr "Ny e-postmelding"
 
-#: mail/mail-component.c:532
-#, fuzzy, c-format
-msgid "Could not create temporary mbox folder: %s"
-msgstr "Klarte ikkje å lage mellombels katalog: %s"
+#: mail/mail-component.c:380
+msgid "_Mail Message"
+msgstr "_E-post"
 
-#: mail/mail-component.c:553
-#, fuzzy, c-format
-msgid "Could not copy messages to temporary mbox folder: %s"
-msgstr "Kan ikkje lukka mellombels mappe: %s"
+#: mail/mail-component.c:381
+msgid "Compose a new mail message"
+msgstr "Skriv ein e-post"
 
-#: mail/mail-component.c:1014
+#: mail/mail-component.c:472
 #, c-format
 msgid ""
 "The following error occured while migrating your mail data:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-component.c:1632
-#, fuzzy
-msgid "Select destination to copy folder into"
-msgstr "Vel ei målmappe for importerte data"
-
-#: mail/mail-component.c:1643
-#, fuzzy
-msgid "Select destination to move folder into"
-msgstr "Vel ei målmappe for importerte data"
-
-#: mail/mail-component.c:1707
-#, fuzzy
-msgid "Create folder"
-msgstr "Lag ei ny mappe"
-
-#: mail/mail-component.c:1707
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
-msgid "Specify where to create the folder:"
-msgstr "Oppgje kor mappa skal lagast:"
-
-#: mail/mail-component.c:1788
-#, fuzzy, c-format
-msgid "Could not delete folder: %s"
-msgstr "Kan ikkje sletta mappa «%s»: %s"
-
-#: mail/mail-component.c:1812
-#, fuzzy, c-format
-msgid "Really delete folder \"%s\" and all of its subfolders?"
-msgstr "Verkeleg sletta mappa «%s»?"
-
-#: mail/mail-component.c:1821 shell/e-shell-folder-commands.c:416
-#, c-format
-msgid "Delete \"%s\""
-msgstr "Slett «%s»"
-
-#: mail/mail-component.c:1842 shell/e-shell-folder-commands.c:534
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "Endra namn på mappa «%s» til:"
-
-#: mail/mail-component.c:1844 shell/e-shell-folder-commands.c:541
-msgid "Rename Folder"
-msgstr "Endra namn på mappa"
-
-#: mail/mail-component.c:1849 shell/e-shell-folder-commands.c:547
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "Det oppgjevne mappenamnet er ikkje gyldig: %s"
-
-#: mail/mail-component.c:1860
-#, fuzzy, c-format
-msgid "A folder named \"%s\" already exists.  Please use a different name."
-msgstr "Ei mappe som har namnet «%s» finst allereie. Bruk eit anna namn."
-
-#: mail/mail-component.c:1967
-#, fuzzy
-msgid "Folder properties"
-msgstr "Eigenskapar"
-
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/mail-component.c:1975
-msgid "Properties"
-msgstr "Eigenskapar"
-
-#: mail/mail-component.c:1979
-#, fuzzy
-msgid "Folder Name"
-msgstr "_Mappenamn:"
-
-#: mail/mail-component.c:2078 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:30
-msgid "_View"
-msgstr "_Visning"
-
-#: mail/mail-component.c:2079
-#, fuzzy
-msgid "Open in _New Window"
-msgstr "Opne i eige vindauge"
-
-#: mail/mail-component.c:2084
-#, fuzzy
-msgid "_Move"
-msgstr "Flytt"
-
-#: mail/mail-component.c:2087
-#, fuzzy
-msgid "_New Folder..."
-msgstr "_Ny mappe"
-
-#: mail/mail-component.c:2089 shell/e-shortcuts-view.c:427
-msgid "_Rename"
-msgstr "_Gje nytt namn"
-
-#: mail/mail-component.c:2092 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "Ei_genskapar ..."
-
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:60
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:63
 msgid "Identity"
 msgstr "Identitet"
 
@@ -12550,11 +13443,11 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: mail/mail-config.c:1086
+#: mail/mail-config.c:1090
 msgid "Checking Service"
 msgstr "Sjekkar teneste"
 
-#: mail/mail-config.c:1164 mail/mail-config.c:1168
+#: mail/mail-config.c:1168 mail/mail-config.c:1172
 #, fuzzy
 msgid "Connecting to server..."
 msgstr " Koplar til tenar ..."
@@ -12642,27 +13535,36 @@ msgid "C_olors"
 msgstr "_Lukk"
 
 #: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Check _Incoming Mail"
+msgstr "Ser etter ny e-post"
+
+#: mail/mail-config.glade.h:27
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Ser etter ny e-post"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
+msgid "Checks incoming mail messages to be Junk"
+msgstr ""
+
+#: mail/mail-config.glade.h:30
 msgid "Color for _misspelled words:"
 msgstr "_Farge for feilstava ord:"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 #, fuzzy
 msgid "Composing Messages"
 msgstr "Skriv ei melding"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "Configuration"
 msgstr "Oppsett"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12672,491 +13574,509 @@ msgid ""
 "Click \"Apply\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr "_Standard"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Default Behavior"
 msgstr "Standardåtferd"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Default character _encoding:"
 msgstr "Standardt_eiknsett:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Deleting Mail"
 msgstr "Hentar e-post"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Kan ikkje opne melding"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Ferdig"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Drafts _folder:"
 msgstr "Mappe for _utkast:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr "S_lå på"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Email Accounts"
 msgstr "E-post inneheld"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Email _address:"
 msgstr "E-post_adresse:"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "Empty _trash folders on exit"
 msgstr "_Tøm papirkorga ved avslutting"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "_Sertifikat-ID:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Evolution Account Assistant"
 msgstr "KDeelop-installering"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Køyr autorun.sh"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Fi_xed -width:"
 msgstr "Fast _breidd:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Filter Options"
+msgstr "&lt;&lt; Ferre val"
+
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Font Properties"
 msgstr "Eigenskapar"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:60
 msgid "Format messages in _HTML"
 msgstr "Formater meldingar med _HTML"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:61
 msgid "Highlight _quotations with"
 msgstr "_Merk sitering med"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:62
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr "Innvevd"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:66
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Labels and Colors"
 msgstr "Lagre og lukk"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:69
 msgid "Loading Images"
 msgstr "Lastar bilete"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "Oppsett for post"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr "Postkaseeplassering"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Message Composer"
 msgstr "Melding motteken"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:74
 #, fuzzy
 msgid "Message Display"
 msgstr "Meldingsvising"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Message Fonts"
 msgstr "Meldinga inneheld"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Påminning ved ny e-post"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:79
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:80
 msgid "Optional Information"
 msgstr "Valfri informasjon"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:82
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organi_sasjon:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:83
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG-nø_kkel-ID:"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Vel ein farge"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:88
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Spø_r ved sending av melding som berre har mottakarar i Bcc-feltet"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:90
 msgid "Printed Fonts"
 msgstr "Skrifttypar til utskrift"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Quote original message"
 msgstr "Kan ikkje opne melding"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "Sitert"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:94
 msgid "Re_member this password"
 msgstr "_Husk dette passordet"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:95
 msgid "Re_ply-To:"
 msgstr "S_var-til:"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Receiving Email"
 msgstr "Mottek e-post"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:97
 msgid "Receiving _Options"
 msgstr "Val for m_ottak"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Remember this _password"
 msgstr "Hugs dette _passordet"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:99
 #, fuzzy
 msgid "Required Information"
 msgstr "Tenarinformasjon"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 #, fuzzy
 msgid "Restore Defaults"
 msgstr "Forvald"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:102
 msgid "S_ecurity"
 msgstr "Tryggl_eik"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:103
 #, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "Trygg MIME"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:108
 #, fuzzy
 msgid "Sending Email"
 msgstr "Send"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Mappe for sendte _meldingar:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "Send meldingar"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Tenaren kre_v autentisering"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Tenar-oppsett"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "Tenar-_type: "
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Oppsettsdatabasen ikkje funnen"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 msgid "Specify _filename:"
 msgstr "Oppgje _filnamn:"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Standard Unix mbox"
 msgstr "Standard unix e-postkasse"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:126
+msgid "Use _Daemon"
+msgstr ""
+
+#: mail/mail-config.glade.h:128
 msgid "V_ariable-width:"
 msgstr "V_ariabel breidde:"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Forward\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "_Add Signature"
 msgstr "_HTML-signatur:"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:135
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:136
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:137
 msgid "_Authentication Type: "
 msgstr "_Autentiseringtype: "
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "_Autentiseringtype: "
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:139
 msgid "_Automatically check for new mail every"
 msgstr "_Sjå etter nye meldingar kvart"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:140
 msgid "_Automatically insert smiley images"
 msgstr "Legg til smilefjes _automatisk"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:141
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:142
 msgid "_Confirm when expunging a folder"
 msgstr "_Stadfest ved tøming av mappe"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "_Default signature:"
 msgstr "_HTML-signatur:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:144
 msgid "_Defaults"
 msgstr "_Standard"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:145
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:147
 msgid "_Enable"
 msgstr "_Skru på"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:148
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:149
 msgid "_Forward style:"
 msgstr "_Vidaresendingsstil:"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 #, fuzzy
 msgid "_Full name:"
 msgstr "_Fullt namn:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:152
 msgid "_HTML Mail"
 msgstr "_HTML-e-post"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:154
 msgid "_Identity"
 msgstr "_Identitet"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
+#, fuzzy
+msgid "_Junk"
+msgstr "Juni"
+
+#: mail/mail-config.glade.h:156
 msgid "_Load images if sender is in addressbook"
 msgstr "_Last bileta dersom sendaren står i adresseboka"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:157
+msgid "_Local Tests Only"
+msgstr ""
+
+#: mail/mail-config.glade.h:158
 msgid "_Make this my default account"
 msgstr "Gjer _denne til standardkonto"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:159
 msgid "_Mark messages as read after"
 msgstr "_Merk meldingar som lest etter"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:160
 msgid "_Name:"
 msgstr "_Namn:"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:161
 msgid "_Never load images off the net"
 msgstr "Last aldri bilete frå _nettet"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:163
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:164
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "S_pør ved sending av HTML-meldingar til kontaktar som ikkje vil ha slike"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:165
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Spør ved sending av meldingar med eit tomt emnefelt"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:166
 msgid "_Receiving Mail"
 msgstr "_Mottak av e-post"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:167
 msgid "_Reply style:"
 msgstr "Sva_rstil:"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:168
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Script:"
 msgstr "_Tryggleik"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Select..."
 msgstr "_Slett ..."
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:171
 msgid "_Sending Mail"
 msgstr "_Sender e-post"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:172
 msgid "_Show animated images"
 msgstr "Vi_s animerte bilete"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Signatures"
 msgstr "_HTML-signatur:"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:174
 msgid "_Standard Font:"
 msgstr "_Standard skrifttype:"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 msgid "_Terminal Font:"
 msgstr "_Terminalskrifttype:"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:176
 msgid "_Use secure connection (SSL):"
 msgstr "Br_uk sikker tilknytning (SSL)"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:177
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "skildring"
 
-#: mail/mail-folder-cache.c:830
+#: mail/mail-folder-cache.c:776
 #, c-format
 msgid "Pinging %s"
 msgstr "Pingar %s"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13165,7 +14085,7 @@ msgstr ""
 "Feil ved «%s»:\n"
 "%s"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:263
 #, fuzzy, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13174,7 +14094,7 @@ msgstr ""
 "Feil ved lesing av fil:\n"
 "%s"
 
-#: mail/mail-mt.c:911
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Arbeidar"
 
@@ -13187,118 +14107,118 @@ msgstr "Les mapper"
 msgid "Fetching Mail"
 msgstr "Hentar e-post"
 
-#: mail/mail-ops.c:561
+#: mail/mail-ops.c:558
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr ""
 
-#: mail/mail-ops.c:582
+#: mail/mail-ops.c:579
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:591
+#: mail/mail-ops.c:588
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Kan ikkje leggja til i lokal «Sendt»-mappe: %s"
 
-#: mail/mail-ops.c:633
+#: mail/mail-ops.c:630
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Sender «%s»"
 
-#: mail/mail-ops.c:751
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sender melding %d av %d"
 
-#: mail/mail-ops.c:770
+#: mail/mail-ops.c:767
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Feila på melding %d av %d"
 
-#: mail/mail-ops.c:772
+#: mail/mail-ops.c:769
 msgid "Complete."
 msgstr "Ferdig."
 
-#: mail/mail-ops.c:866
+#: mail/mail-ops.c:863
 msgid "Saving message to folder"
 msgstr "Lagrar meldingar i mappe"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flyttar meldingar til %s"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopierer meldingar til %s"
 
-#: mail/mail-ops.c:1060
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Leitar gjennom mapper i «%s»"
 
-#: mail/mail-ops.c:1248
+#: mail/mail-ops.c:1260
 msgid "Forwarded messages"
 msgstr "Vidaresendt melding"
 
-#: mail/mail-ops.c:1291
+#: mail/mail-ops.c:1303
 #, c-format
 msgid "Opening folder %s"
 msgstr "Opnar mappe %s"
 
-#: mail/mail-ops.c:1363
+#: mail/mail-ops.c:1375
 #, c-format
 msgid "Opening store %s"
 msgstr "Opnar lager %s"
 
-#: mail/mail-ops.c:1441
+#: mail/mail-ops.c:1453
 #, c-format
 msgid "Removing folder %s"
 msgstr "Fjernar mappe %s"
 
-#: mail/mail-ops.c:1535
+#: mail/mail-ops.c:1547
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Lagrar mappe «%s»"
 
-#: mail/mail-ops.c:1586
+#: mail/mail-ops.c:1598
 msgid "Refreshing folder"
 msgstr "Friskar opp mappe"
 
-#: mail/mail-ops.c:1622 mail/mail-ops.c:1673
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 msgid "Expunging folder"
 msgstr "Tømer mappe"
 
-#: mail/mail-ops.c:1670
+#: mail/mail-ops.c:1682
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Tømer papirkorga i «%s»"
 
-#: mail/mail-ops.c:1671 shell/e-local-storage.c:1151
+#: mail/mail-ops.c:1683
 msgid "Local Folders"
 msgstr "Lokale mapper"
 
-#: mail/mail-ops.c:1746
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Hentar melding %s"
 
-#: mail/mail-ops.c:1818
+#: mail/mail-ops.c:1838
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Mottek %d melding(ar)"
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1922
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Lagrar %d melding(ar)"
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1970
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13307,7 +14227,7 @@ msgstr ""
 "Kan ikkje laga utdatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1978
+#: mail/mail-ops.c:1998
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13316,11 +14236,11 @@ msgstr ""
 "Feil ved lagring av meldingar til: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2049
+#: mail/mail-ops.c:2069
 msgid "Saving attachment"
 msgstr "Lagrar vedlegg"
 
-#: mail/mail-ops.c:2066
+#: mail/mail-ops.c:2086
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13329,21 +14249,25 @@ msgstr ""
 "Kan ikkje laga utdatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2096
+#: mail/mail-ops.c:2116
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Klarte ikkje å skrive data: %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Koplar frå %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Koplar til %s på nytt"
 
+#: mail/mail-ops.c:2366
+msgid "Changing junk status"
+msgstr ""
+
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr "Skil mellom store og små bokstavar"
@@ -13360,61 +14284,76 @@ msgstr "Finn:"
 msgid "Search"
 msgstr "Søk"
 
-#: mail/mail-send-recv.c:148
+#: mail/mail-security.glade.h:2
+#, fuzzy
+msgid "Digital Signature"
+msgstr "Legg til kriterium"
+
+#: mail/mail-security.glade.h:3
+#, fuzzy
+msgid "Encryption"
+msgstr "Unntak"
+
+#: mail/mail-security.glade.h:4
+#, fuzzy
+msgid "Security Information"
+msgstr "Kontoinformasjon"
+
+#: mail/mail-send-recv.c:146
 msgid "Cancelling..."
 msgstr "Avbryt ..."
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:253
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Tenar: %s, Type: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:255
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:257
 #, c-format
 msgid "Type: %s"
 msgstr "Type: %s"
 
-#: mail/mail-send-recv.c:309
+#: mail/mail-send-recv.c:306
 msgid "Send & Receive Mail"
 msgstr "Send og motta e-post"
 
-#: mail/mail-send-recv.c:310
+#: mail/mail-send-recv.c:307
 #, fuzzy
 msgid "Cancel _All"
 msgstr "Avbryt alle"
 
-#: mail/mail-send-recv.c:391
+#: mail/mail-send-recv.c:388
 msgid "Updating..."
 msgstr "Oppdaterar ..."
 
-#: mail/mail-send-recv.c:391 mail/mail-send-recv.c:443
+#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
 msgid "Waiting..."
 msgstr "Ventar ..."
 
-#: mail/mail-session.c:230
+#: mail/mail-session.c:234
 msgid "User canceled operation."
 msgstr "Brukar avbraut operasjonen."
 
-#: mail/mail-session.c:263
+#: mail/mail-session.c:267
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Tast inn passord for %s"
 
-#: mail/mail-session.c:265
+#: mail/mail-session.c:269
 msgid "Enter Password"
 msgstr "Tast inn passord"
 
-#: mail/mail-session.c:288
+#: mail/mail-session.c:292
 #, fuzzy
 msgid "_Remember this password"
 msgstr "Fjern denne oppføringa"
 
-#: mail/mail-session.c:289
+#: mail/mail-session.c:293
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
@@ -13454,26 +14393,31 @@ msgstr ""
 msgid "Name:"
 msgstr "Namn:"
 
-#: mail/mail-tools.c:279
+#: mail/mail-tools.c:271
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Vidaresendt melding - %s"
 
-#: mail/mail-tools.c:281
+#: mail/mail-tools.c:273
 msgid "Forwarded message"
 msgstr "Vidaresendt melding"
 
-#: mail/mail-vfolder.c:91
+#: mail/mail-tools.c:313
+#, fuzzy, c-format
+msgid "Invalid folder: `%s'"
+msgstr "Opnar mappe %s"
+
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Set opp vMappe: %s"
 
-#: mail/mail-vfolder.c:209
+#: mail/mail-vfolder.c:205
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr ""
 
-#: mail/mail-vfolder.c:467
+#: mail/mail-vfolder.c:463
 #, fuzzy, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13482,88 +14426,88 @@ msgid ""
 "And have been updated."
 msgstr " s."
 
-#: mail/mail-vfolder.c:780
+#: mail/mail-vfolder.c:774
 msgid "VFolders"
 msgstr "vMapper"
 
-#: mail/mail-vfolder.c:839
+#: mail/mail-vfolder.c:833
 msgid "vFolders"
 msgstr "vMapper"
 
-#: mail/mail-vfolder.c:878
+#: mail/mail-vfolder.c:872
 msgid "Edit VFolder"
 msgstr "Rediger vMappe"
 
-#: mail/mail-vfolder.c:898
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Prøvar å redigere ei vmappe «%s» som ikkje finnest."
 
-#: mail/mail-vfolder.c:970
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "Ny vMappe"
 
-#: mail/message-list.c:900
+#: mail/message-list.c:904
 msgid "Unseen"
 msgstr "Ulesen"
 
-#: mail/message-list.c:901
+#: mail/message-list.c:905
 msgid "Seen"
 msgstr "Lest"
 
-#: mail/message-list.c:902
+#: mail/message-list.c:906
 msgid "Answered"
 msgstr "Svara"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:907
 msgid "Multiple Unseen Messages"
 msgstr "Fleire uleste meldingar"
 
-#: mail/message-list.c:904
+#: mail/message-list.c:908
 msgid "Multiple Messages"
 msgstr "Fleire meldingar"
 
-#: mail/message-list.c:908
+#: mail/message-list.c:912
 msgid "Lowest"
 msgstr "Lavast"
 
-#: mail/message-list.c:909
+#: mail/message-list.c:913
 msgid "Lower"
 msgstr "Senk"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:917
 msgid "Higher"
 msgstr "Høgare"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:918
 msgid "Highest"
 msgstr "Høgast"
 
-#: mail/message-list.c:1231
+#: mail/message-list.c:1241
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1238
+#: mail/message-list.c:1248
 msgid "Today %l:%M %p"
 msgstr "I dag, %l:%M:%p"
 
-#: mail/message-list.c:1247
+#: mail/message-list.c:1257
 msgid "Yesterday %l:%M %p"
 msgstr "I går, %l:%M:%p"
 
-#: mail/message-list.c:1259
+#: mail/message-list.c:1269
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1267
+#: mail/message-list.c:1277
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1279
 msgid "%b %d %Y"
 msgstr "%d. %b %Y"
 
-#: mail/message-list.c:3062
+#: mail/message-list.c:3082
 msgid "Generating message list"
 msgstr "Opprettar meldingsliste"
 
@@ -13625,11 +14569,11 @@ msgstr "Vidaresend"
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
 msgid "Reply"
 msgstr "Svar"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
 msgid "Reply to All"
 msgstr "Svar til alle"
 
@@ -13686,41 +14630,139 @@ msgstr "_Abbonér"
 msgid "_Unsubscribe"
 msgstr "_Fjern abbonnment"
 
-#: shell/e-folder-dnd-bridge.c:55
-#, c-format
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr ""
+"Set opp spesielle mapper og åtferd får mappene når du arbeider fråkopla her."
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+msgid "Evolution Shell"
+msgstr "Evolution skal"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+msgid "Folder Settings"
+msgstr "Mappeinnstillingar"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:1
+#, fuzzy
+msgid "480"
+msgstr "380"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:2
+#, fuzzy
+msgid "Default shortcut group"
+msgstr "Byt namn på denne snarveggruppa"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:3
+msgid "Default width of the folder bar pane"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:4
+#, fuzzy
+msgid "Default width of the shortcut bar pane"
+msgstr "Gøym snarveglinja"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:5
+#, fuzzy
+msgid "Default window height"
+msgstr "Standard prioritet:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:6
+#, fuzzy
+msgid "Default window width"
+msgstr "Standard prioritet:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:7
+#, fuzzy
+msgid "Evolution configuration version"
+msgstr "Evolution grensesnitt for oppsett av e-post"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:8
+#, fuzzy
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr "Be om at vedlegget til vanleg vert vist som ein del av meldinga."
+
+#: shell/apps_evolution_shell.schemas.in.in.h:9
 msgid ""
-"Cannot transfer folder:\n"
-"%s"
+"If set to true, Evolution will start up in offline mode instead of online "
+"mode."
 msgstr ""
-"Kan ikkje overføra mappe:\n"
-"%s"
 
-#: shell/e-folder-list.c:338
-msgid "Add a Folder"
-msgstr "Legg til mappe"
+#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid ""
+"If set to true, the warning dialog in development versions of Evolution is "
+"not displayed."
+msgstr ""
 
-#: shell/e-local-storage.c:179
-msgid "Drafts"
-msgstr "Kladd"
+#: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr ""
 
-#: shell/e-local-storage.c:180 shell/e-shell-view.c:481
-#: shell/e-shortcuts.c:1084
-msgid "Inbox"
-msgstr "Innboks"
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Path to the default calendar folder"
+msgstr ""
 
-#: shell/e-local-storage.c:181
-msgid "Outbox"
-msgstr "Utboks"
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+#, fuzzy
+msgid "Path to the default contacts folder"
+msgstr "Opnar standard oppgåvemappe"
 
-#: shell/e-local-storage.c:182
-msgid "Sent"
-msgstr "Sendt"
+#: shell/apps_evolution_shell.schemas.in.in.h:14
+#, fuzzy
+msgid "Path to the default mail folder"
+msgstr "Opnar standard oppgåvemappe"
 
-#: shell/e-setup.c:145
+#: shell/apps_evolution_shell.schemas.in.in.h:15
+#, fuzzy
+msgid "Path to the default tasks folder"
+msgstr "Opnar standard oppgåvemappe"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:16
+msgid "Physical URI to the default calendar folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:17
+msgid "Physical URI to the default contacts folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:18
+msgid "Physical URI to the default mail folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:19
+#, fuzzy
+msgid "Physical URI to the default tasks folder"
+msgstr "Opnar standard oppgåvemappe"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:20
+msgid "Whether Evolution should start up in offline mode"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:21
+#, fuzzy
+msgid "Whether to show the folder bar"
+msgstr "Avgjer om snarvegstolpen skal vise"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:22
+#, fuzzy
+msgid "Whether to show the shortcut bar"
+msgstr "Avgjer om snarvegstolpen skal vise"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:23
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:24
+#, fuzzy
+msgid "mail"
+msgstr "E-post"
+
+#: shell/e-setup.c:144
 msgid "Could not update files correctly"
 msgstr "Kunne ikkje oppdatera filene"
 
-#: shell/e-setup.c:166
+#: shell/e-setup.c:165
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -13731,7 +14773,7 @@ msgstr ""
 "%s\n"
 "Feil: %s"
 
-#: shell/e-setup.c:177
+#: shell/e-setup.c:176
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -13740,7 +14782,7 @@ msgstr ""
 "Ein feil oppsto under kopiering av filer til\n"
 "«%s»."
 
-#: shell/e-setup.c:243
+#: shell/e-setup.c:242
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -13751,7 +14793,7 @@ msgstr ""
 "Flytt henne slik at Evolution kan installera\n"
 "brukarfilene."
 
-#: shell/e-setup.c:252
+#: shell/e-setup.c:251
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -13849,10 +14891,11 @@ msgstr ""
 "Kan ikkje endra namn på mappa:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:554
+#: shell/e-shell-folder-commands.c:547
+#: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr "Ei mappe som har namnet «%s» finst allereie. Bruk eit anna namn."
+msgid "The specified folder name is not valid: %s"
+msgstr "Det oppgjevne mappenamnet er ikkje gyldig: %s"
 
 #: shell/e-shell-folder-commands.c:584
 msgid "Selected folder does not belong to another user"
@@ -13876,19 +14919,15 @@ msgstr ""
 "Kan ikkje laga den oppgjevne mappa:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:318
-msgid "Create New Folder"
-msgstr "Lag ny mappe"
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Utan tittel)"
 
-#: shell/e-shell-importer.c:139
+#: shell/e-shell-importer.c:138
 msgid "Choose the type of importer to run:"
 msgstr "Vel importerar som skal køyrast:"
 
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -13902,11 +14941,11 @@ msgstr ""
 "Du kan velja «Automatisk» dersom du ikkje veit. Då vil Evolution prøva å "
 "finna ut kva slags fil det er sjølv."
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
+#: shell/e-shell-importer.c:147 shell/e-shell-startup-wizard.c:731
 msgid "Please select the information that you would like to import:"
 msgstr "Vel informasjonen du vil importere:"
 
-#: shell/e-shell-importer.c:151
+#: shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No settings\n"
@@ -13918,7 +14957,7 @@ msgstr ""
 "som kan importerast vart ikkje funne. Klikk på «Tilbake»-knappen\n"
 "dersom du vil prøva igjen.\n"
 
-#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
+#: shell/e-shell-importer.c:218 shell/e-shell-importer.c:249
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -13927,21 +14966,21 @@ msgstr ""
 "Importerar %s\n"
 "Importerar element %d."
 
-#: shell/e-shell-importer.c:323
+#: shell/e-shell-importer.c:322
 msgid "Select importer"
 msgstr "Vel importerar"
 
-#: shell/e-shell-importer.c:464
+#: shell/e-shell-importer.c:463
 #, c-format
 msgid "File %s does not exist"
 msgstr "Fila %s finst ikkje"
 
-#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:464 shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:523
 msgid "Evolution Error"
 msgstr "Evolution feil"
 
-#: shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:480
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -13950,11 +14989,11 @@ msgstr ""
 "Det er ingen importerarar som kan handsama\n"
 "%s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:489
 msgid "Importing"
 msgstr "Importerar"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:496
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -13963,17 +15002,17 @@ msgstr ""
 "Importerar %s.\n"
 "Startar %s"
 
-#: shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:508
 #, c-format
 msgid "Error starting %s"
 msgstr "Feil ved start av %s"
 
-#: shell/e-shell-importer.c:523
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid "Error loading %s"
 msgstr "Feil ved asting av %s"
 
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:539
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -13982,31 +15021,31 @@ msgstr ""
 "Importerer %s\n"
 "Importerer oppføring 1."
 
-#: shell/e-shell-importer.c:594
+#: shell/e-shell-importer.c:593
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: shell/e-shell-importer.c:643
+#: shell/e-shell-importer.c:642
 msgid "_Filename:"
 msgstr "_Filnamn:"
 
-#: shell/e-shell-importer.c:648
+#: shell/e-shell-importer.c:647
 msgid "Select a file"
 msgstr "Vel ei fil"
 
-#: shell/e-shell-importer.c:658
+#: shell/e-shell-importer.c:657
 msgid "File _type:"
 msgstr "Fil_type:"
 
-#: shell/e-shell-importer.c:684
+#: shell/e-shell-importer.c:683
 msgid "Import data and settings from _older programs"
 msgstr "Importér data _og innstillingar frå eldre program"
 
-#: shell/e-shell-importer.c:687
+#: shell/e-shell-importer.c:686
 msgid "Import a _single file"
 msgstr "Importer ei ein_skild fil"
 
-#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
+#: shell/e-shell-importer.c:754 shell/e-shell-startup-wizard.c:560
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -14014,46 +15053,27 @@ msgstr ""
 "Vent...\n"
 "Leitar etter eksisterande oppsett"
 
-#: shell/e-shell-importer.c:758
+#: shell/e-shell-importer.c:757
 msgid "Starting Intelligent Importers"
 msgstr "Startar intelligent import"
 
-#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
+#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:686
 #, c-format
 msgid "From %s:"
 msgstr "Frå %s:"
 
-#: shell/e-shell-importer.c:1062
+#: shell/e-shell-importer.c:1061
 msgid "Select a destination folder for importing this data"
 msgstr "Vel ei målmappe for importerte data"
 
-#: shell/e-shell-importer.c:1191
+#: shell/e-shell-importer.c:1190
 msgid "_Import"
 msgstr "_Importér"
 
-#: shell/e-shell-offline-handler.c:592
+#: shell/e-shell-offline-handler.c:596
 msgid "Closing connections..."
 msgstr "Lukkar tilkoplingar ..."
 
-#: shell/e-shell-offline-sync.c:163
-#, c-format
-msgid ""
-"Error synchronizing \"%s\":\n"
-"%s"
-msgstr ""
-"Feil ved synkronisering av «%s»:\n"
-"%s"
-
-#: shell/e-shell-offline-sync.c:232
-msgid "Syncing Folder"
-msgstr "Synkroniserer mapper"
-
-#. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:311
-#, c-format
-msgid "Synchronizing \"%s\" (%d of %d) ..."
-msgstr "Synkroniserer «%s» (%d av %d) ..."
-
 #: shell/e-shell-settings-dialog.c:346
 msgid "Evolution Settings"
 msgstr "Evolution innstillingar"
@@ -14088,7 +15108,7 @@ msgstr "Kan ikkje opna delt mappe: %s"
 msgid "Cannot find the specified shared folder."
 msgstr "Kan ikkje finna den spesifiserte delte mappa."
 
-#: shell/e-shell-startup-wizard.c:771
+#: shell/e-shell-startup-wizard.c:778
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -14102,16 +15122,10 @@ msgstr ""
 "\n"
 "Vil du avslutta hjelparen?"
 
-#: shell/e-shell-startup-wizard.c:782
+#: shell/e-shell-startup-wizard.c:789
 msgid "Quit Assistant"
 msgstr "Avslutt hjelpar"
 
-#: 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"
-
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "Ingen mappenamn spesifisert."
@@ -14171,62 +15185,49 @@ msgstr "Lag ny snarveg"
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Vel mappa som snarvegen skal peika på:"
 
-#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:279
+#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:314
 msgid "_Work Online"
 msgstr "Arbeid _tilkopla"
 
-#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:292
-#: ui/evolution.xml.h:31
+#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:327
+#: ui/evolution.xml.h:34
 msgid "_Work Offline"
 msgstr "Arbeid _fråkopla"
 
-#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:305
-#: ui/evolution.xml.h:19
+#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:340
+#: ui/evolution.xml.h:20
 msgid "Work Offline"
 msgstr "Arbeid fråkopla"
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr "(Ingen mappe vist)"
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr "(Ingen)"
-
-#: shell/e-shell-view.c:2083
+#: shell/e-shell-window.c:324
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution er tilkopla. Klikk på denne knappen for å arbeida fråkopla."
 
-#: shell/e-shell-view.c:2090
+#: shell/e-shell-window.c:331
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution held på å kopla frå."
 
-#: shell/e-shell-view.c:2096
+#: shell/e-shell-window.c:337
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution er fråkopla. Klikk på denne knappen for å arbeida tilkopla."
 
-#: shell/e-shell.c:906
+#: shell/e-shell.c:1003
 msgid "Invalid arguments"
 msgstr "Ugyldige argument"
 
-#: shell/e-shell.c:908
+#: shell/e-shell.c:1005
 msgid "Cannot register on OAF"
 msgstr "Kan ikkje registrera i OAF"
 
-#: shell/e-shell.c:910
+#: shell/e-shell.c:1007
 msgid "Configuration Database not found"
 msgstr "Oppsettsdatabasen ikkje funnen"
 
-#: shell/e-shell.c:912 shell/e-storage.c:571
+#: shell/e-shell.c:1009
 msgid "Generic error"
 msgstr "Generell feil"
 
@@ -14339,74 +15340,18 @@ msgstr "Fj_ern"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Fjern denne snarvegen frå snarvegstolpen"
 
-#: shell/e-shortcuts.c:649
+#: shell/e-shortcuts.c:650
 msgid "Error saving shortcuts."
 msgstr "Feil ved lagring av snavegar."
 
-#: shell/e-shortcuts.c:1096
+#: shell/e-shortcuts.c:1085
+msgid "Inbox"
+msgstr "Innboks"
+
+#: shell/e-shortcuts.c:1097
 msgid "Shortcuts"
 msgstr "Snarvegar"
 
-#: shell/e-storage.c:569
-msgid "No error"
-msgstr "Ingen feil"
-
-#: shell/e-storage.c:573
-msgid "A folder with the same name already exists"
-msgstr "Ei mappe med det namnet finst frå før."
-
-#: shell/e-storage.c:575
-msgid "The specified folder type is not valid"
-msgstr "Den oppgitte mappetypen er ugyldig."
-
-#: shell/e-storage.c:577
-msgid "I/O error"
-msgstr "I/U-feil"
-
-#: shell/e-storage.c:579
-msgid "Not enough space to create the folder"
-msgstr "Ikkje nok plass til å oppretta mappa"
-
-#: shell/e-storage.c:581
-msgid "The folder is not empty"
-msgstr "Mappa er ikkje tom"
-
-#: shell/e-storage.c:583
-msgid "The specified folder was not found"
-msgstr "Den oppgitte mappa finst ikkje"
-
-#: shell/e-storage.c:585
-msgid "Function not implemented in this storage"
-msgstr "Funksjonen er ikkje implementert i dette lageret"
-
-#: shell/e-storage.c:589
-msgid "Operation not supported"
-msgstr "Operasjonen er ikkje støtta"
-
-#: shell/e-storage.c:591
-msgid "The specified type is not supported in this storage"
-msgstr "Den oppgjevne typen er ikkje støtta i dette lageret"
-
-#: shell/e-storage.c:593
-msgid "The specified folder cannot be modified or removed"
-msgstr "Den oppgjevne mappa kan ikkje endrast eller fjernast"
-
-#: shell/e-storage.c:595
-msgid "Cannot make a folder a child of one of its descendants"
-msgstr "Kan ikkje gjera ei mappe til eit barn av ein av etterkomarane sine"
-
-#: shell/e-storage.c:597
-msgid "Cannot create a folder with that name"
-msgstr "Kan ikkje laga ei mappe med det namnet"
-
-#: shell/e-storage.c:599
-msgid "This operation cannot be performed in off-line mode"
-msgstr "Denne operasjonen kan ikkje utførast i fråkopla modus"
-
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Avkryssingsboks"
-
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -14417,6 +15362,17 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% ferdig)"
 
+#: shell/e-user-creatable-items-handler.c:600
+#: shell/e-user-creatable-items-handler.c:641
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "Ny"
+
+#: shell/evolution-folder-selector-button.c:128
+#, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "«%s» i «%s»"
+
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -14454,74 +15410,6 @@ msgstr ""
 "Feilen frå aktiveringssystemet er:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1187
-msgid "CORBA error"
-msgstr "CORBA-feil"
-
-#: shell/evolution-shell-component.c:1189
-msgid "Interrupted"
-msgstr "Avbroten"
-
-#: shell/evolution-shell-component.c:1191
-msgid "Invalid argument"
-msgstr "Ugyldig argument"
-
-#: shell/evolution-shell-component.c:1193
-msgid "Already has an owner"
-msgstr "Har allereide ein eigar"
-
-#: shell/evolution-shell-component.c:1195
-msgid "No owner"
-msgstr "Ingen eigar"
-
-#: shell/evolution-shell-component.c:1197
-msgid "Not found"
-msgstr "Ikkje funnen"
-
-#: shell/evolution-shell-component.c:1199
-msgid "Unsupported type"
-msgstr "Typen er ikkje støtta"
-
-#: shell/evolution-shell-component.c:1201
-msgid "Unsupported schema"
-msgstr "Ustøtta skjema"
-
-#: shell/evolution-shell-component.c:1203
-msgid "Unsupported operation"
-msgstr "Ustøtta operasjon"
-
-#: shell/evolution-shell-component.c:1205
-msgid "Internal error"
-msgstr "Intern feil"
-
-#: shell/evolution-shell-component.c:1209
-msgid "Exists"
-msgstr "Eksisterar"
-
-#: shell/evolution-shell-component.c:1211
-msgid "Invalid URI"
-msgstr "Ugyldig URI"
-
-#: shell/evolution-shell-component.c:1215
-msgid "Has subfolders"
-msgstr "Har undermapper"
-
-#: shell/evolution-shell-component.c:1217
-msgid "No space left"
-msgstr "Ikkje noko plass att"
-
-#: shell/evolution-shell-component.c:1219
-msgid "Old owner has died"
-msgstr "Gammal eigar har døydd"
-
-#: shell/evolution-test-component.c:63
-msgid "Test type"
-msgstr "Testtype"
-
-#: shell/evolution-test-component.c:703
-msgid "Evolution Test Component"
-msgstr "Evolution testkomponent"
-
 #: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Active Connections"
 msgstr "Aktive tilkoplingar"
@@ -14550,10 +15438,6 @@ msgstr "_E-post:"
 msgid "_Tasks:"
 msgstr "_Oppgåver:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-msgid "Folder _name:"
-msgstr "Mappe_namn:"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 msgid "Folder _type:"
 msgstr "Mappe_type:"
@@ -14615,23 +15499,6 @@ msgstr ""
 "\n"
 "Trykk på «Bruk»-knappen for å lagra innstillingane dine."
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr ""
-"Set opp spesielle mapper og åtferd får mappene når du arbeider fråkopla her."
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-msgid "Evolution Shell"
-msgstr "Evolution skal"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Evolution folder settings configuration control"
-msgstr "Evolution oppsettkontroll for mappeinnstillingar"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "Folder Settings"
-msgstr "Mappeinnstillingar"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Klikk på «Importer» for å importera fila til Evolution."
@@ -14670,7 +15537,7 @@ msgstr ""
 msgid "Importers"
 msgstr "Importerarar"
 
-#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:21
+#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr "Importér"
 
@@ -14686,16 +15553,16 @@ msgstr "Ikkje spør meg igjen"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution kan importera data frå desse filene:"
 
-#: shell/main.c:109 shell/main.c:561
+#: shell/main.c:114 shell/main.c:559
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:115
+#: shell/main.c:120
 msgid "Evolution is now exiting ..."
 msgstr "Evolution avsluttar no ..."
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:265
+#: shell/main.c:270
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -14733,7 +15600,7 @@ msgstr ""
 "Me vonar at du nyt resultata av det harde arbeidet vårt, og me ventar\n"
 "i spenning på dine bidrag.\n"
 
-#: shell/main.c:289
+#: shell/main.c:294
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -14741,36 +15608,48 @@ msgstr ""
 "Takk frå\n"
 "Ximian Evolution-utviklarane\n"
 
-#: shell/main.c:297
+#: shell/main.c:302
 msgid "Don't tell me again"
 msgstr "Ikkje sei ifrå igjen"
 
-#: shell/main.c:389
+#: shell/main.c:352
+#, c-format
+msgid ""
+"Warning: Evolution could not upgrade all your data from version %s.\n"
+"The data hasn't been deleted, but it will not be seen by this version of "
+"Evolution.\n"
+msgstr ""
+
+#: shell/main.c:411
 msgid "Cannot access the Ximian Evolution shell."
 msgstr ""
 
-#: shell/main.c:398
+#: shell/main.c:420
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Kan ikkje starta Ximian Evolution-skalet: %s"
 
-#: shell/main.c:530
+#: shell/main.c:526
+msgid "Start Evolution activating the specified component"
+msgstr ""
+
+#: shell/main.c:528
 msgid "Start in offline mode"
 msgstr "Startar i fråkopla modus"
 
-#: shell/main.c:532
+#: shell/main.c:530
 msgid "Start in online mode"
 msgstr "Startar i fråkopla modus"
 
-#: shell/main.c:535
+#: shell/main.c:533
 msgid "Forcibly shut down all evolution components"
 msgstr "Tving alle komponentane i Evolution til å avslutta"
 
-#: shell/main.c:538
+#: shell/main.c:536
 msgid "Send the debugging output of all components to a file."
 msgstr "Send feilsøkingsutskrift frå alle komponentane til ei fil."
 
-#: shell/main.c:565
+#: shell/main.c:563
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -14779,31 +15658,58 @@ msgstr ""
 "%s: «--online» og «--offline» kan ikkje brukast samstundes.\n"
 "  Bruk «%s --help» for å få meir informasjon.\n"
 
-#: smime/gui/certificate-manager.c:74 smime/gui/certificate-manager.c:115
-#: smime/gui/certificate-manager.c:168
+#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:238
+#: smime/gui/certificate-manager.c:395
+#, fuzzy
+msgid "Select a cert to import..."
+msgstr "Vel importerar"
+
+#: smime/gui/certificate-manager.c:156 smime/gui/certificate-manager.c:317
+#: smime/gui/certificate-manager.c:473
 #, fuzzy
 msgid "Certificate Name"
 msgstr "_Sertifikat-ID:"
 
-#: smime/gui/certificate-manager.c:80 smime/gui/certificate-manager.c:127
+#: smime/gui/certificate-manager.c:162 smime/gui/certificate-manager.c:329
 #, fuzzy
 msgid "Purposes"
 msgstr "Framgang"
 
-#: smime/gui/certificate-manager.c:86 smime/gui/smime-ui.glade.h:29
+#: smime/gui/certificate-manager.c:168 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:512
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:92
+#: smime/gui/certificate-manager.c:174
 #, fuzzy
 msgid "Expires"
 msgstr "Uttrykk"
 
-#: smime/gui/certificate-manager.c:121
+#: smime/gui/certificate-manager.c:323
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "E-postadresse:"
 
+#: smime/gui/certificate-viewer.c:281
+#, fuzzy, c-format
+msgid "Certificate Viewer: %s"
+msgstr "_Sertifikat-ID:"
+
+#. FIXME: add serial no, validity date, uses
+#: smime/gui/e-cert-selector.c:116
+#, c-format
+msgid ""
+"Issued to:\n"
+"  Subject: %s\n"
+msgstr ""
+
+#: smime/gui/e-cert-selector.c:117
+#, c-format
+msgid ""
+"Issued by:\n"
+"  Subject: %s\n"
+msgstr ""
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -14861,91 +15767,378 @@ msgid "Backup All"
 msgstr "Blackpool"
 
 #: smime/gui/smime-ui.glade.h:13
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#, fuzzy
+msgid "Certificate"
+msgstr "_Sertifikat-ID:"
+
+#: smime/gui/smime-ui.glade.h:15
+#, fuzzy
+msgid "Certificate Authority Trust"
+msgstr "Sertifikatet kan ikkje stolast på"
+
+#: smime/gui/smime-ui.glade.h:16
+#, fuzzy
+msgid "Certificate details"
+msgstr "_Sertifikat-ID:"
+
+#: smime/gui/smime-ui.glade.h:17
 #, fuzzy
 msgid "Common Name (CN)"
 msgstr "Felles namn"
 
-#: smime/gui/smime-ui.glade.h:14
+#: smime/gui/smime-ui.glade.h:18
 #, fuzzy
 msgid "Contact Certificates"
 msgstr "_Sertifikat-ID:"
 
-#: smime/gui/smime-ui.glade.h:16
+#: smime/gui/smime-ui.glade.h:21
+#, no-c-format
+msgid "Do you want to trust \"%s\" for the following purposes?"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:22
+msgid "Dummy window only"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:23
 #, fuzzy
 msgid "Edit"
 msgstr "R_edigér"
 
-#: smime/gui/smime-ui.glade.h:17
+#: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:18
+#: smime/gui/smime-ui.glade.h:25
 #, fuzzy
 msgid "Email Signer Certificate"
 msgstr "Kan ikkje verifisera sertifikat."
 
-#: smime/gui/smime-ui.glade.h:19
+#: smime/gui/smime-ui.glade.h:26
 #, fuzzy
 msgid "Expires On"
 msgstr "Uttrykk"
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:29
 msgid "Issued On"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:30
 msgid "MD5 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:24
+#: smime/gui/smime-ui.glade.h:31
 #, fuzzy
 msgid "Organization (O)"
 msgstr "Organisasjon"
 
-#: smime/gui/smime-ui.glade.h:25
+#: smime/gui/smime-ui.glade.h:32
 #, fuzzy
 msgid "Organizational Unit (OU)"
 msgstr "Organisasjonseining"
 
-#: smime/gui/smime-ui.glade.h:26
+#: smime/gui/smime-ui.glade.h:33
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:27
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:28
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
 msgid "SSL Server Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:30
+#: smime/gui/smime-ui.glade.h:37
+msgid "Trust this CA to identify email users."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
+msgid "Trust this CA to identify software developers."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:39
+msgid "Trust this CA to identify web sites."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:40
 #, fuzzy
 msgid "View"
 msgstr "_Visning"
 
-#: smime/gui/smime-ui.glade.h:31
+#: smime/gui/smime-ui.glade.h:41
+#, fuzzy
+msgid "View Certificate"
+msgstr "_Sertifikat-ID:"
+
+#: smime/gui/smime-ui.glade.h:42
+msgid "You have been asked to trust a new Certificate Authority (CA)."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:32
+#: smime/gui/smime-ui.glade.h:44
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:33
+#: smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34
+#: smime/gui/smime-ui.glade.h:46
 #, fuzzy
 msgid "Your Certificates"
 msgstr "_Sertifikat-ID:"
 
-#: smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert-db.c:494
 #, fuzzy
-msgid "import"
-msgstr "Importér"
+msgid "Certificate already exists"
+msgstr "Kort-id eksisterar allereide"
+
+#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%d/%m/%Y"
+
+#: smime/lib/e-cert.c:473
+#, fuzzy
+msgid "Version"
+msgstr "Vermont"
+
+#: smime/lib/e-cert.c:488
+#, fuzzy
+msgid "Version 1"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:491
+#, fuzzy
+msgid "Version 2"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:494
+#, fuzzy
+msgid "Version 3"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:576
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:579
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:582
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:585
+#, fuzzy
+msgid "C"
+msgstr " C"
+
+#: smime/lib/e-cert.c:588
+#, fuzzy
+msgid "CN"
+msgstr "N"
+
+#: smime/lib/e-cert.c:591
+msgid "OU"
+msgstr ""
+
+#: smime/lib/e-cert.c:594
+#, fuzzy
+msgid "O"
+msgstr "OK"
+
+#: smime/lib/e-cert.c:597
+msgid "L"
+msgstr ""
+
+#: smime/lib/e-cert.c:600
+#, fuzzy
+msgid "DN"
+msgstr "N"
+
+#: smime/lib/e-cert.c:603
+msgid "DC"
+msgstr ""
+
+#: smime/lib/e-cert.c:606
+#, fuzzy
+msgid "ST"
+msgstr "SMTP"
+
+#: smime/lib/e-cert.c:609
+msgid "PKCS #1 RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:612
+#, fuzzy
+msgid "Certificate Key Usage"
+msgstr "_Sertifikat-ID:"
+
+#: smime/lib/e-cert.c:615
+#, fuzzy
+msgid "Netscape Certificate Type"
+msgstr "_Sertifikat-ID:"
+
+#: smime/lib/e-cert.c:618
+#, fuzzy
+msgid "Certificate Authority Key Identifier"
+msgstr "Sertifikatet kan ikkje stolast på"
+
+#: smime/lib/e-cert.c:621
+#, fuzzy
+msgid "UID"
+msgstr "ID"
+
+#: smime/lib/e-cert.c:630
+#, c-format
+msgid "Object Identifier (%s)"
+msgstr ""
+
+#: smime/lib/e-cert.c:681
+msgid "Algorithm Identifier"
+msgstr ""
+
+#: smime/lib/e-cert.c:689
+msgid "Algorithm Parameters"
+msgstr ""
+
+#: smime/lib/e-cert.c:711
+#, fuzzy
+msgid "Subject Public Key Info"
+msgstr ""
+"\n"
+"Offentleg nøkkel: "
+
+#: smime/lib/e-cert.c:716
+msgid "Subject Public Key Algorithm"
+msgstr ""
+
+#: smime/lib/e-cert.c:731
+#, fuzzy
+msgid "Subject's Public Key"
+msgstr "Emne er %s"
+
+#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#, fuzzy
+msgid "Error: Unable to process extension"
+msgstr "Kan ikkje laga 'spool'-katalog"
+
+#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+msgid "Object Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:777
+#, fuzzy
+msgid "SSL Certificate Authority"
+msgstr "Sertifikatet kan ikkje stolast på"
+
+#: smime/lib/e-cert.c:781
+#, fuzzy
+msgid "Email Certificate Authority"
+msgstr "Kan ikkje verifisera sertifikat."
+
+#: smime/lib/e-cert.c:809
+#, fuzzy
+msgid "Signing"
+msgstr "Stauning"
+
+#: smime/lib/e-cert.c:813
+#, fuzzy
+msgid "Non-repudiation"
+msgstr "Ingen informasjon"
+
+#: smime/lib/e-cert.c:817
+msgid "Key Encipherment"
+msgstr ""
+
+#: smime/lib/e-cert.c:821
+#, fuzzy
+msgid "Data Encipherment"
+msgstr "vedlegg"
+
+#: smime/lib/e-cert.c:825
+msgid "Key Agreement"
+msgstr ""
+
+#: smime/lib/e-cert.c:829
+#, fuzzy
+msgid "Certificate Signer"
+msgstr "_Sertifikat-ID:"
+
+#: smime/lib/e-cert.c:833
+msgid "CRL Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:881
+#, fuzzy
+msgid "Critical"
+msgstr "Curitiba"
+
+#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#, fuzzy
+msgid "Not Critical"
+msgstr "North Carolina"
+
+#: smime/lib/e-cert.c:907
+#, fuzzy
+msgid "Extensions"
+msgstr "Uttrykk"
+
+#: smime/lib/e-cert.c:978
+#, fuzzy, c-format
+msgid "%s = %s"
+msgstr "%s %s"
+
+#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#, fuzzy
+msgid "Certificate Signature Algorithm"
+msgstr "Signaturfil:"
+
+#: smime/lib/e-cert.c:1043
+#, fuzzy
+msgid "Issuer"
+msgstr "Set _inn"
+
+#: smime/lib/e-cert.c:1097
+msgid "Issuer Unique ID"
+msgstr ""
+
+#: smime/lib/e-cert.c:1116
+#, fuzzy
+msgid "Subject Unique ID"
+msgstr "Emne er %s"
+
+#: smime/lib/e-cert.c:1159
+#, fuzzy
+msgid "Certificate Signature Value"
+msgstr "Signaturfil:"
+
+#: smime/lib/e-pkcs12.c:246
+msgid "PKCS12 File Password"
+msgstr ""
+
+#: smime/lib/e-pkcs12.c:246
+#, fuzzy
+msgid "Enter password for PKCS12 file:"
+msgstr "Tast inn passord for %s"
+
+#: smime/lib/e-pkcs12.c:379
+#, fuzzy
+msgid "Imported Certificate"
+msgstr "_Sertifikat-ID:"
 
 #: tools/evolution-launch-composer.c:324
 msgid "An attachment to add."
@@ -14996,7 +16189,7 @@ msgstr "Kopier utval"
 msgid "Copy to Folder..."
 msgstr "Kopier til mappe ..."
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:4
 msgid "Cut the selection"
 msgstr "Klipp ut valde område"
 
@@ -15012,7 +16205,7 @@ msgstr "Flytt kontaktar til ei anna mappe ..."
 msgid "Move to Folder..."
 msgstr "Flytt til mappe ..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:28
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:20
 msgid "Paste the clipboard"
 msgstr "Lim inn frå utklippstavla"
 
@@ -15020,8 +16213,8 @@ msgstr "Lim inn frå utklippstavla"
 msgid "Previews the contacts to be printed"
 msgstr "Førehandsvisar kontaktane som skal skrivast ut"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:30
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:22
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
 #: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
 msgstr "Førehands_vising av utskrift"
@@ -15067,13 +16260,13 @@ msgstr "Stopp lasting"
 msgid "View the current contact"
 msgstr "Vis den valde kontakten"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:42
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:22
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:23
 msgid "_Actions"
 msgstr "H_andlingar"
 
@@ -15103,140 +16296,109 @@ msgstr "_Send melding til kontakt ..."
 
 #: ui/evolution-calendar.xml.h:3
 #, fuzzy
-msgid "Create a new all-day event"
-msgstr "Lag ein ny avtale for heile dagen"
-
-#: ui/evolution-calendar.xml.h:4
-msgid "Create a new appointment"
-msgstr "Lag ein ny avtale"
-
-#: ui/evolution-calendar.xml.h:5
-#, fuzzy
 msgid "Create a new calendar"
 msgstr "Lag ei ny mappe"
 
-#: ui/evolution-calendar.xml.h:6
-#, fuzzy
-msgid "Create a new meeting"
-msgstr "Lag ein ny møteførespurnad"
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new task"
-msgstr "Opprett ei ny oppgåve"
-
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:5
 msgid "Day"
 msgstr "Dag"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:6
 msgid "Delete All Occurrences"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "Slett avtalen"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:8
 #, fuzzy
 msgid "Delete this Occurrence"
 msgstr "Slett denne førekomsten?"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:9
 #, fuzzy
 msgid "Delete this occurrence"
 msgstr "Slett denne førekomsten?"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "Gå til"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "Gå bakover"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "Gå framover"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:13
 msgid "Go to _Date"
 msgstr "Gå til _dato"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to a specific date"
 msgstr "Gå til spesifisert dato"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to today"
 msgstr "Gå til i dag"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:17
 msgid "List"
 msgstr "Liste"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Månad"
 
-#: ui/evolution-calendar.xml.h:24
-msgid "New _Appointment"
-msgstr "Ny _avtale"
-
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:19
 #, fuzzy
 msgid "New _Calendar"
 msgstr "Ny-Caledonia"
 
-#: ui/evolution-calendar.xml.h:26
-#, fuzzy
-msgid "New _Meeting"
-msgstr "Nytt møte"
-
-#: ui/evolution-calendar.xml.h:27
-msgid "New _Task"
-msgstr "Ny oppgåve"
-
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:21
 msgid "Previews the calendar to be printed"
 msgstr "Førehandsvisar kalenderen som skal skrivast ut"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:23
 msgid "Print this calendar"
 msgstr "Skriv ut denne kalenderen"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:24
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Offentleggjer ledig/oppteken-informasjon for denne kalenderen"
 
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:25 ui/evolution-tasks.xml.h:15
 msgid "Purg_e"
 msgstr "_Fjern"
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:26
 msgid "Purge old appointments and meetings"
 msgstr "Fjern gamle avtalar og møter"
 
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:27
 msgid "Show as list"
 msgstr "Vis som liste"
 
-#: ui/evolution-calendar.xml.h:36
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one day"
 msgstr "Vis ein dag"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:29
 msgid "Show one month"
 msgstr "Vis ein månad"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one week"
 msgstr "Vis ei veke"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "Vis arbeidsveka"
 
-#: ui/evolution-calendar.xml.h:40
+#: ui/evolution-calendar.xml.h:32
 msgid "Week"
 msgstr "Veke"
 
@@ -15300,7 +16462,7 @@ msgstr "Lagre dette elementet til disk"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:25
 msgid "_File"
 msgstr "_Fil"
 
@@ -15516,7 +16678,7 @@ msgstr "Markér alle som l_esne"
 msgid "Mark all visible messages as read"
 msgstr "Markér alle synlege meldingar som lest"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
 msgid "Paste message(s) from the clipboard"
 msgstr "Lim inn melding(ar) frå utklippstavla"
 
@@ -15572,16 +16734,6 @@ msgstr "_Invertér val"
 msgid "_Threaded Message List"
 msgstr "_Tråda meldingsliste"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Lukk vindauge"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:23
-msgid "_Close"
-msgstr "L_ukk"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Addressbook"
 msgstr "_Legg til avsendar i adresseboka"
@@ -15762,273 +16914,298 @@ msgstr "Send valte meldingar vidare som MIME-oversikt?"
 msgid "Increase the text size"
 msgstr "Auk tekststorleik"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
 msgid "Load _Images"
 msgstr "Last b_ilete"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark as I_mportant"
 msgstr "Markér som v_iktig"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark as U_nread"
 msgstr "Markér som _ulesen"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as Unimp_ortant"
 msgstr "Markér som _uviktig"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:54
 #, 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:52
+#: ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark the selected message(s) as important"
 msgstr "Sentrer dei valte elementa"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Mark the selected message(s) as junk"
+msgstr "Sentrer dei valte elementa"
+
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Mark the selected message(s) as not being junk"
+msgstr "Send valte meldingar vidare som MIME-oversikt?"
+
+#: ui/evolution-mail-message.xml.h:58
 #, 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:54
+#: ui/evolution-mail-message.xml.h:59
 #, fuzzy
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Sentrer dei valte elementa"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected messages for deletion"
 msgstr "Markér valde melding for sletting"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:61
 msgid "Move"
 msgstr "Flytt"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:62
 #, fuzzy
 msgid "Move selected message(s) to another folder"
 msgstr "Lagra side til ascii-fil"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:63
 msgid "Next"
 msgstr "Neste"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:64
 msgid "Next _Important Message"
 msgstr "Neste _viktige melding"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:65
 msgid "Next _Thread"
 msgstr "Neste _tråd"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:66
 msgid "Next _Unread Message"
 msgstr "Neste _ulesne melding"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:67
+#, fuzzy
+msgid "Not Junk"
+msgstr "Ikkje funnen"
+
+#: ui/evolution-mail-message.xml.h:68
 msgid "Open the selected message in a new window"
 msgstr "Opne vald melding i eit eige vindauge"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:69
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Opne vald melding for sending på nytt"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:70
 msgid "Original Si_ze"
 msgstr "Opprinneleg _storleik"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:71
 msgid "P_revious Unread Message"
 msgstr "Fo_rrige ulesne melding"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:73
 #, fuzzy
 msgid "Post a Repl_y"
 msgstr "Post eit svar"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:74
 #, 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:69
+#: ui/evolution-mail-message.xml.h:75
 msgid "Pr_evious Important Message"
 msgstr "_Forrige viktige melding"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:76
 msgid "Preview the message to be printed"
 msgstr "Førehandsvis meldinga som skal skrivast ut"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:77
 msgid "Previous"
 msgstr "Forrige"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:80
 msgid "Print this message"
 msgstr "Skriv ut denne meldinga"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:81
 msgid "Re_direct"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:82
 #, fuzzy
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Sentrer dei valte elementa"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reset the text to its original size"
 msgstr "Sett tilbake teksta til det opprinnelege"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "S_earch in Message..."
 msgstr "S_øk i meldingar ..."
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:89
 msgid "S_maller"
 msgstr "M_indre"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:90
 msgid "Save the message as a text file"
 msgstr "Lagre melding som tekstfil"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 #, fuzzy
 msgid "Search for text in the body of the displayed message"
 msgstr "Skriv tittelen på ruta her."
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
 msgid "Set up the page settings for your current printer"
 msgstr "Endre sideoppsett for aktiv skrivar"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "Show Email _Source"
 msgstr "Vis e-post _kjeldekode"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:94
 msgid "Show Full _Headers"
 msgstr "Vis heile meldings_hovudet"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:95
 #, fuzzy
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Skriv tittelen på ruta her."
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show message in the normal style"
 msgstr "Vis melding på normal måte"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:97
 msgid "Show message with all email headers"
 msgstr "Vis melding med alle meldingshovud"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show the raw email source of the message"
 msgstr "Vis den rå kjeldekoda til meldinga"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:99
 msgid "Text Si_ze"
 msgstr "Tekststorle_ik"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:100
 #, fuzzy
 msgid "Un-delete the selected messages"
 msgstr "Sentrer dei valte elementa"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:101
 #, fuzzy
 msgid "VFolder on Mailing _List..."
 msgstr "Fil alt i liste"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:102
 #, fuzzy
 msgid "VFolder on Se_nder..."
 msgstr "Mappenamn:"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:103
 #, fuzzy
 msgid "VFolder on _Recipients..."
 msgstr "Mappa finst: "
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:104
 #, fuzzy
 msgid "VFolder on _Subject..."
 msgstr "Ingen emne"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Attached"
 msgstr "Lagt _ved"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Copy to Folder"
 msgstr "_Kopiér til mappe"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Create Filter From Message"
 msgstr "_Opprett filter frå melding"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Forward Message"
 msgstr "_Vidaresend melding"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:112
 msgid "_Go To"
 msgstr "_Gå til"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Inline"
 msgstr "_Innvevd"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Larger"
 msgstr "_Større"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Message Display"
 msgstr "_Meldingsvisning"
 
-#: ui/evolution-mail-message.xml.h:110
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Move to Folder"
 msgstr "_Flytt til mappe"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Next Message"
 msgstr "_Neste melding"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Normal Display"
 msgstr "_Normal visning"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Open Message"
 msgstr "_Opne melding"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Previous Message"
 msgstr "_Forrige melding"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:123
 msgid "_Quoted"
 msgstr "_Sitert"
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:125
 #, fuzzy
 msgid "_Resend..."
 msgstr "_Omdøyp ..."
 
-#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:29
+#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:31
 msgid "_Tools"
 msgstr "Verk_tøy"
 
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:128
 #, fuzzy
 msgid "_Undelete"
 msgstr "Slett"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Lukk vindauge"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:24
+msgid "_Close"
+msgstr "L_ukk"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Legg ved"
@@ -16309,12 +17486,13 @@ msgid "Change Evolution's settings"
 msgstr "Endre innstillingar for Evolution"
 
 #: ui/evolution.xml.h:5
-msgid "E_xit"
-msgstr "_Avslutt"
+#, fuzzy
+msgid "Create a new window"
+msgstr "Lag eit nytt notat"
 
 #: ui/evolution.xml.h:6
-msgid "Evolution _Window"
-msgstr "Evolution _vindauge"
+msgid "E_xit"
+msgstr "_Avslutt"
 
 #: ui/evolution.xml.h:7
 msgid "Exit the program"
@@ -16326,61 +17504,74 @@ msgstr ""
 
 #: ui/evolution.xml.h:10
 #, fuzzy
-msgid "Open a new Evolution window"
-msgstr "Evolution _vindauge"
+msgid "Open a new window"
+msgstr "Opne i eige vindauge"
 
 #: ui/evolution.xml.h:11
 msgid "Pi_lot Settings..."
 msgstr "Pi_lot-innstillingar ..."
 
 #: ui/evolution.xml.h:12
+msgid "Send / Receive"
+msgstr "Send / Motta"
+
+#: ui/evolution.xml.h:13
+msgid "Send queued items and retrieve new items"
+msgstr "Send køa meldingar og motta ny meldingar"
+
+#: ui/evolution.xml.h:14
 msgid "Set up Pilot configuration"
 msgstr "Oppsett for pilot"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Show information about Ximian Evolution"
 msgstr "Vis informasjon om Ximian Evolution"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Submit Bug Report"
 msgstr "Send inn feilrapport"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Submit _Bug Report"
 msgstr "Send inn _feilrapport"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Send inn ei feilmelding ved hjelp av Bug Buddy"
 
-#: ui/evolution.xml.h:17
-msgid "Toggle"
-msgstr "Byt"
-
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:19
 msgid "Toggle whether we are working offline."
 msgstr ""
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:21
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _FAQ"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:22
 msgid "_About Ximian Evolution..."
 msgstr "_Om Ximian Evolution ..."
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:26
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:27
 msgid "_Import..."
 msgstr "_Importér ..."
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:28
 msgid "_New"
 msgstr "_Ny"
 
+#: ui/evolution.xml.h:29
+msgid "_Send / Receive"
+msgstr "_Sende / Motta"
+
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "_Window"
+msgstr "_Finn no"
+
 #: ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Skriv ut samandrag"
@@ -16509,12 +17700,12 @@ 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:456
+#: widgets/misc/e-calendar-item.c:423
 msgid "MTWTFSS"
 msgstr "MTOTFLS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1174
+#: widgets/misc/e-calendar-item.c:1128
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -16648,7 +17839,7 @@ msgstr "_Søk"
 msgid "_Find Now"
 msgstr "_Finn no"
 
-#: widgets/misc/e-search-bar.c:538
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
 msgid "_Clear"
 msgstr "_Tøm"
 
@@ -16665,24 +17856,255 @@ msgstr ""
 msgid "Text"
 msgstr "Tekst"
 
-#: widgets/misc/e-search-bar.c:928
-msgid "Clear"
-msgstr "Tøm"
-
 #: widgets/misc/e-search-bar.c:930
-msgid "Find Now"
+#, fuzzy
+msgid "Find _Now"
 msgstr "Finn no"
 
+#~ msgid "Account Name"
+#~ msgstr "Kontonamn"
+
+#~ msgid "Server Name"
+#~ msgstr "Tenarnamn"
+
+#~ msgid "LDAP was not enabled in this build of Evolution"
+#~ msgstr "LDAP var ikkje tatt med i denne versjonen av Evolution"
+
+#~ msgid "Other Contacts"
+#~ msgstr "Andre kontakter"
+
+#~ msgid "Configure access to LDAP directory servers here"
+#~ msgstr "Set opp tilgang til LDAP-katalogtenar her"
+
+#~ msgid "Directory Servers"
+#~ msgstr "Katalogtenarar"
+
+#~ msgid "Evolution Addressbook LDAP Configuration Control"
+#~ msgstr "Kontroll for LDAP-konfigurasjon for Evolution adressebok"
+
+#~ msgid "Add LDAP Server"
+#~ msgstr "Legg til LDAP-tenar"
+
+#~ msgid "Step 4: Display Name"
+#~ msgstr "Steg 4: Vis namn"
+
+#~ msgid "Find contact in"
+#~ msgstr "Finn kontakt i"
+
+#~ msgid "* Click here to add a contact *"
+#~ msgstr "* Trykk her for å legge til ein kontakt *"
+
+#~ msgid "Business Address"
+#~ msgstr "Firma-adresse"
+
+#~ msgid "Department"
+#~ msgstr "Avdeling"
+
+#~ msgid "Free-busy URL"
+#~ msgstr "Ledig-oppteken-URL"
+
+#~ msgid "ISDN"
+#~ msgstr "ISDN"
+
+#~ msgid "Profession"
+#~ msgstr "Yrke"
+
+#~ msgid "TTY"
+#~ msgstr "TTY"
+
+#~ msgid "Opening tasks at %s"
+#~ msgstr "Opnar oppgåver på %s"
+
+#~ msgid "Send anyway?"
+#~ msgstr "Send likevel?"
+
 #, fuzzy
-#~ msgid "e_book_cancel: there is no current operation"
-#~ msgstr "Avbryt den aktive e-post-operasjonen"
+#~ msgid "Folder _name"
+#~ msgstr "Mappe_namn:"
+
+#~ msgid "Connecting..."
+#~ msgstr "Koplar til tenar ..."
+
+#~ msgid "This folder cannot contain messages."
+#~ msgstr "Denne mappa kan ikkje innehalda meldingar."
 
 #, fuzzy
-#~ msgid "Given Name"
-#~ msgstr "Feltnamn"
+#~ msgid "Could not open source folder: %s"
+#~ msgstr "Kan ikkje opna delt mappe: %s"
 
-#~ msgid "Family Name"
-#~ msgstr "Etternamn"
+#, fuzzy
+#~ msgid "Select destination to move folder into"
+#~ msgstr "Vel ei målmappe for importerte data"
+
+#, fuzzy
+#~ msgid "A folder named \"%s\" already exists.  Please use a different name."
+#~ msgstr "Ei mappe som har namnet «%s» finst allereie. Bruk eit anna namn."
+
+#~ msgid ""
+#~ "Cannot transfer folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kan ikkje overføra mappe:\n"
+#~ "%s"
+
+#~ msgid "Add a Folder"
+#~ msgstr "Legg til mappe"
+
+#~ msgid "Drafts"
+#~ msgstr "Kladd"
+
+#~ msgid "Outbox"
+#~ msgstr "Utboks"
+
+#~ msgid "Sent"
+#~ msgstr "Sendt"
+
+#~ msgid ""
+#~ "Error synchronizing \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Feil ved synkronisering av «%s»:\n"
+#~ "%s"
+
+#~ msgid "Syncing Folder"
+#~ msgstr "Synkroniserer mapper"
+
+#~ msgid "Synchronizing \"%s\" (%d of %d) ..."
+#~ msgstr "Synkroniserer «%s» (%d av %d) ..."
+
+#~ msgid "(No folder displayed)"
+#~ msgstr "(Ingen mappe vist)"
+
+#~ msgid "%s (%d)"
+#~ msgstr "%s (%d)"
+
+#~ msgid "(None)"
+#~ msgstr "(Ingen)"
+
+#~ msgid "No error"
+#~ msgstr "Ingen feil"
+
+#~ msgid "A folder with the same name already exists"
+#~ msgstr "Ei mappe med det namnet finst frå før."
+
+#~ msgid "The specified folder type is not valid"
+#~ msgstr "Den oppgitte mappetypen er ugyldig."
+
+#~ msgid "I/O error"
+#~ msgstr "I/U-feil"
+
+#~ msgid "Not enough space to create the folder"
+#~ msgstr "Ikkje nok plass til å oppretta mappa"
+
+#~ msgid "The folder is not empty"
+#~ msgstr "Mappa er ikkje tom"
+
+#~ msgid "The specified folder was not found"
+#~ msgstr "Den oppgitte mappa finst ikkje"
+
+#~ msgid "Function not implemented in this storage"
+#~ msgstr "Funksjonen er ikkje implementert i dette lageret"
+
+#~ msgid "Operation not supported"
+#~ msgstr "Operasjonen er ikkje støtta"
+
+#~ msgid "The specified type is not supported in this storage"
+#~ msgstr "Den oppgjevne typen er ikkje støtta i dette lageret"
+
+#~ msgid "The specified folder cannot be modified or removed"
+#~ msgstr "Den oppgjevne mappa kan ikkje endrast eller fjernast"
+
+#~ msgid "Cannot make a folder a child of one of its descendants"
+#~ msgstr "Kan ikkje gjera ei mappe til eit barn av ein av etterkomarane sine"
+
+#~ msgid "Cannot create a folder with that name"
+#~ msgstr "Kan ikkje laga ei mappe med det namnet"
+
+#~ msgid "This operation cannot be performed in off-line mode"
+#~ msgstr "Denne operasjonen kan ikkje utførast i fråkopla modus"
+
+#~ msgid "Checkbox"
+#~ msgstr "Avkryssingsboks"
+
+#~ msgid "CORBA error"
+#~ msgstr "CORBA-feil"
+
+#~ msgid "Invalid argument"
+#~ msgstr "Ugyldig argument"
+
+#~ msgid "Already has an owner"
+#~ msgstr "Har allereide ein eigar"
+
+#~ msgid "No owner"
+#~ msgstr "Ingen eigar"
+
+#~ msgid "Unsupported type"
+#~ msgstr "Typen er ikkje støtta"
+
+#~ msgid "Unsupported schema"
+#~ msgstr "Ustøtta skjema"
+
+#~ msgid "Unsupported operation"
+#~ msgstr "Ustøtta operasjon"
+
+#~ msgid "Internal error"
+#~ msgstr "Intern feil"
+
+#~ msgid "Exists"
+#~ msgstr "Eksisterar"
+
+#~ msgid "Invalid URI"
+#~ msgstr "Ugyldig URI"
+
+#~ msgid "Has subfolders"
+#~ msgstr "Har undermapper"
+
+#~ msgid "No space left"
+#~ msgstr "Ikkje noko plass att"
+
+#~ msgid "Old owner has died"
+#~ msgstr "Gammal eigar har døydd"
+
+#~ msgid "Test type"
+#~ msgstr "Testtype"
+
+#~ msgid "Evolution Test Component"
+#~ msgstr "Evolution testkomponent"
+
+#, fuzzy
+#~ msgid "import"
+#~ msgstr "Importér"
+
+#, fuzzy
+#~ msgid "Create a new all-day event"
+#~ msgstr "Lag ein ny avtale for heile dagen"
+
+#~ msgid "New _Appointment"
+#~ msgstr "Ny _avtale"
+
+#, fuzzy
+#~ msgid "New _Meeting"
+#~ msgstr "Nytt møte"
+
+#~ msgid "New _Task"
+#~ msgstr "Ny oppgåve"
+
+#~ msgid "Evolution _Window"
+#~ msgstr "Evolution _vindauge"
+
+#, fuzzy
+#~ msgid "Open a new Evolution window"
+#~ msgstr "Evolution _vindauge"
+
+#~ msgid "Toggle"
+#~ msgstr "Byt"
+
+#~ msgid "Clear"
+#~ msgstr "Tøm"
+
+#, fuzzy
+#~ msgid "e_book_cancel: there is no current operation"
+#~ msgstr "Avbryt den aktive e-post-operasjonen"
 
 #, fuzzy
 #~ msgid "Address List"
@@ -16772,9 +18194,6 @@ msgstr "Finn no"
 #~ msgid "VCard (.vcf, .gcrd)"
 #~ msgstr "VCard (.vcf, .gcrd)"
 
-#~ msgid "Loading..."
-#~ msgstr "Lastar ..."
-
 #~ msgid "Searching..."
 #~ msgstr "Søkjer ..."
 
@@ -16827,10 +18246,6 @@ msgstr "Finn no"
 #~ msgstr "EBook vart ikkje lasta\n"
 
 #, fuzzy
-#~ msgid "Object ID already exists"
-#~ msgstr "Kort-id eksisterar allereide"
-
-#, fuzzy
 #~ msgid "Operation has been cancelled"
 #~ msgstr "Operasjonen vart avbroten"
 
@@ -16916,9 +18331,6 @@ msgstr "Finn no"
 #~ msgid "Evolution Addressbook local backend"
 #~ msgstr "Evolutions addressebok minikortlesar"
 
-#~ msgid "Phone"
-#~ msgstr "Telefon"
-
 #~ msgid "Birth date"
 #~ msgstr "Fødselsdag"
 
@@ -16928,9 +18340,6 @@ msgstr "Finn no"
 #~ msgid "Arbitrary"
 #~ msgstr "Vilkårleg"
 
-#~ msgid "ID"
-#~ msgstr "ID"
-
 #~ msgid "Last Use"
 #~ msgstr "Sist brukt"
 
@@ -17027,9 +18436,6 @@ msgstr "Finn no"
 #~ msgid "Folder containing contact information"
 #~ msgstr "Mappe som inneheld kontaktinformasjon"
 
-#~ msgid "LDAP Server"
-#~ msgstr "LDAP-tenar"
-
 #~ msgid "LDAP server containing contact information"
 #~ msgstr "LDAP-tenar som inneheld kontaktinformasjon"
 
@@ -17039,18 +18445,6 @@ msgstr "Finn no"
 #~ msgid "Public folder containing contact information"
 #~ msgstr "Offentleg mappe som inneheld kontaktinformasjon"
 
-#~ msgid "_Contact"
-#~ msgstr "_Kontakt"
-
-#~ msgid "Create a new contact"
-#~ msgstr "Opprett ny kontakt"
-
-#~ msgid "New Contact List"
-#~ msgstr "Ny kontaktliste"
-
-#~ msgid "Create a new contact list"
-#~ msgstr "Opprett ny kontaktliste"
-
 #~ msgid "Disable Queries"
 #~ msgstr "Slå av spørjingar"
 
@@ -17063,9 +18457,6 @@ msgstr "Finn no"
 #~ msgid "Is New Card"
 #~ msgstr "Er nytt kort"
 
-#~ msgid "TTY/TDD"
-#~ msgstr "TTY/TDD"
-
 #~ msgid "No cards"
 #~ msgstr "Ingen kort"
 
@@ -17115,30 +18506,6 @@ msgstr "Finn no"
 #~ msgid "Public folder containing to-do items"
 #~ msgstr "Offentleg mappe som inneheld huskeliste"
 
-#~ msgid "New appointment"
-#~ msgstr "Ny avtale"
-
-#~ msgid "_Appointment"
-#~ msgstr "A_vtale"
-
-#~ msgid "New meeting"
-#~ msgstr "Nytt møte"
-
-#~ msgid "M_eeting"
-#~ msgstr "Møt_e"
-
-#~ msgid "New task"
-#~ msgstr "Ny oppgåve"
-
-#~ msgid "_Task"
-#~ msgstr "_Oppgåve"
-
-#~ msgid "New All Day Appointment"
-#~ msgstr "Ny avtale for heile dagen"
-
-#~ msgid "All _Day Appointment"
-#~ msgstr "Avtale for heile _dagen"
-
 #~ msgid "Could not update invalid object"
 #~ msgstr "Kan ikkje oppdatera ugyldig objekt"
 
@@ -17169,9 +18536,6 @@ msgstr "Finn no"
 #~ msgid "Opening calendar at %s"
 #~ msgstr "Opnar kaldender på %s"
 
-#~ msgid "Opening default tasks folder"
-#~ msgstr "Opnar standard oppgåvemappe"
-
 #~ msgid "Purging event %s"
 #~ msgstr "Fjernar hending %s"
 
@@ -17272,9 +18636,6 @@ msgstr "Finn no"
 #~ msgid "Virtual Trash folder"
 #~ msgstr "Virtuell papirkorgmappe"
 
-#~ msgid "Properties..."
-#~ msgstr "Eigenskapar ..."
-
 #~ msgid "Change this folder's properties"
 #~ msgstr "Endra eigenskapane til mappa"
 
@@ -17284,15 +18645,6 @@ msgstr "Finn no"
 #~ msgid "You have unsent messages, do you wish to quit anyway?"
 #~ msgstr "Du har usendte meldingar, vil du avslutta likevel?"
 
-#~ msgid "New Mail Message"
-#~ msgstr "Ny e-postmelding"
-
-#~ msgid "_Mail Message"
-#~ msgstr "_E-post"
-
-#~ msgid "Compose a new mail message"
-#~ msgstr "Skriv ein e-post"
-
 # TRN: «Send» betre enn «post»?
 #~ msgid "_Post Message"
 #~ msgstr "_Post meldinga"
@@ -17306,9 +18658,6 @@ msgstr "Finn no"
 #~ msgid "Getting Folder Information"
 #~ msgstr "Hentar informasjon om mapper"
 
-#~ msgid "Evolution Mail configuration interface"
-#~ msgstr "Evolution grensesnitt for oppsett av e-post"
-
 #~ msgid "Local folders/%s"
 #~ msgstr "Lokale mapper/%s"
 
@@ -18981,9 +20330,6 @@ msgstr "Finn no"
 #~ msgid "Cumberland"
 #~ msgstr "Cumberland"
 
-#~ msgid "Curitiba"
-#~ msgstr "Curitiba"
-
 #~ msgid "Curitiba Apt"
 #~ msgstr "Curitiba Apt"
 
@@ -21959,9 +23305,6 @@ msgstr "Finn no"
 #~ msgid "North Bend"
 #~ msgstr "North Bend"
 
-#~ msgid "North Carolina"
-#~ msgstr "North Carolina"
-
 #~ msgid "North Conway"
 #~ msgstr "North Conway"
 
@@ -23572,9 +24915,6 @@ msgstr "Finn no"
 #~ msgid "State College"
 #~ msgstr "State College"
 
-#~ msgid "Stauning"
-#~ msgstr "Stauning"
-
 #~ msgid "Staunton"
 #~ msgstr "Staunton"
 
@@ -24165,9 +25505,6 @@ msgstr "Finn no"
 #~ msgid "United Arab Emirates "
 #~ msgstr "Sameinte Arabiske Emiratar"
 
-#~ msgid "Unst"
-#~ msgstr "Unst"
-
 #~ msgid "Upington"
 #~ msgstr "Upington"
 
@@ -24277,12 +25614,6 @@ msgstr "Finn no"
 #~ msgid "Veracruz"
 #~ msgstr "Veracruz"
 
-#~ msgid "Vermillion"
-#~ msgstr "Vermillion"
-
-#~ msgid "Vermont"
-#~ msgstr "Vermont"
-
 #~ msgid "Vernal"
 #~ msgstr "Vernal"
 
@@ -24739,9 +26070,6 @@ msgstr "Finn no"
 #~ msgid " F"
 #~ msgstr " F"
 
-#~ msgid " C"
-#~ msgstr " C"
-
 #~ msgid "knots"
 #~ msgstr "knop"
 
@@ -25311,10 +26639,6 @@ msgstr "Finn no"
 #~ msgstr "Ledig storleik"
 
 #, fuzzy
-#~ msgid "Spray"
-#~ msgstr "Sprut"
-
-#, fuzzy
 #~ msgid "Spray in the vicinity"
 #~ msgstr "Yr i området"
 
@@ -25509,9 +26833,6 @@ msgstr "Finn no"
 #~ msgid "_Show full path for folders"
 #~ msgstr "Vi_s full sti til mapper"
 
-#~ msgid "Create a new note"
-#~ msgstr "Lag eit nytt notat"
-
 #~ msgid "Cannot initialize Evolution's notes component."
 #~ msgstr "Kan ikkje starta Evolution Notat-komponenten"
 
@@ -25583,15 +26904,6 @@ msgstr "Finn no"
 #~ msgid "Remove a folder added with \"Open Other User's Folder\""
 #~ msgstr "Lag _ny mappe ..."
 
-#~ msgid "Send / Receive"
-#~ msgstr "Send / Motta"
-
-#~ msgid "Send queued items and retrieve new items"
-#~ msgstr "Send køa meldingar og motta ny meldingar"
-
-#~ msgid "Toggle whether to show the shortcut bar"
-#~ msgstr "Avgjer om snarvegstolpen skal vise"
-
 #~ msgid "View the selected folder"
 #~ msgstr "Vis den valde mappa"
 
@@ -25620,9 +26932,6 @@ msgstr "Finn no"
 #~ msgid "_Rename..."
 #~ msgstr "_Omdøyp ..."
 
-#~ msgid "_Send / Receive"
-#~ msgstr "_Sende / Motta"
-
 #~ msgid "_Shortcut Bar"
 #~ msgstr "_Snarvegstolpe"
 
@@ -25915,10 +27224,6 @@ msgstr "Finn no"
 #~ msgstr "Repetering"
 
 #, fuzzy
-#~ msgid "Automatically _detect links"
-#~ msgstr "enkle innlegg"
-
-#, fuzzy
 #~ msgid "Emacs"
 #~ msgstr "Aust"
 
@@ -26022,9 +27327,6 @@ msgstr "Finn no"
 #~ msgid "1234"
 #~ msgstr "1234"
 
-#~ msgid "380"
-#~ msgstr "380"
-
 #~ msgid "666"
 #~ msgstr "666"
 
@@ -26032,10 +27334,6 @@ msgstr "Finn no"
 #~ msgid "<- _Remove"
 #~ msgstr "Fje_rn"
 
-#, fuzzy
-#~ msgid "<< Fewer Options"
-#~ msgstr "&lt;&lt; Ferre val"
-
 #~ msgid "Attribute"
 #~ msgstr "Attributt"
 
@@ -26531,9 +27829,6 @@ msgstr "Finn no"
 #~ msgid "Send _later"
 #~ msgstr "Send _seinare"
 
-#~ msgid "Send the message later"
-#~ msgstr "Send meldinga seinare"
-
 #~ msgid "_Pilot Settings..."
 #~ msgstr "_Pilot-innstillingar"
 
@@ -26772,34 +28067,17 @@ msgstr "Finn no"
 
 #~ msgid ""
 #~ "\n"
-#~ "Comment: "
-#~ msgstr ""
-#~ "\n"
-#~ "Merknad:"
-
-#~ msgid ""
-#~ "\n"
 #~ "Unique String: "
 #~ msgstr ""
 #~ "\n"
 #~ "Unik streng:"
 
-#~ msgid ""
-#~ "\n"
-#~ "Public Key: "
-#~ msgstr ""
-#~ "\n"
-#~ "Offentleg nøkkel: "
-
 #~ msgid "Waiting for connection to LDAP server..."
 #~ msgstr "Ventar på å kople til LDAP-tenar ..."
 
 #~ msgid "New _Contact"
 #~ msgstr "Ny _kontakt"
 
-#~ msgid "New Contact _List"
-#~ msgstr "Ny kontakt_liste"
-
 #~ msgid "Advanced"
 #~ msgstr "Avansert"
 
@@ -26868,9 +28146,6 @@ msgstr "Finn no"
 #~ msgid "Composer"
 #~ msgstr "Meldingsskrivar"
 
-#~ msgid "Default Forward style is: "
-#~ msgstr "Standard vidaresendingsstil er: "
-
 #~ msgid "Display"
 #~ msgstr "Vis"
 
@@ -26883,9 +28158,6 @@ msgstr "Finn no"
 #~ msgid "Sources"
 #~ msgstr "Kjelder"
 
-#~ msgid "_Log filter actions to:"
-#~ msgstr "_Loggfør filterhandlingar til:"
-
 #~ msgid "_Organization:"
 #~ msgstr "_Organisasjon:"