Add some missing files. Update Norwegian translation.

2004-05-02 Kjartan Maraas <kmaraas@gnome.org> * POTFILES.in: Add some missing files. * no.po: Update Norwegian translation. svn path=/trunk/; revision=25738
author: Kjartan Maraas <kmaraas@gnome.org> 2004-05-03 04:31:08 +0800
committer: Kjartan Maraas <kmaraas@src.gnome.org> 2004-05-03 04:31:08 +0800
commit: 54535a17f301f9c5ece272a56f22ec8909d4f445 (patch)
tree: 71bf3dbde3017d45565883ae849c9d2242c98158 /po/no.po
parent: d26948bf077b439cdf731d65df354f6c7870d4cf (diff)
download: gsoc2013-evolution-54535a17f301f9c5ece272a56f22ec8909d4f445.tar
gsoc2013-evolution-54535a17f301f9c5ece272a56f22ec8909d4f445.tar.gz
gsoc2013-evolution-54535a17f301f9c5ece272a56f22ec8909d4f445.tar.bz2
gsoc2013-evolution-54535a17f301f9c5ece272a56f22ec8909d4f445.tar.lz
gsoc2013-evolution-54535a17f301f9c5ece272a56f22ec8909d4f445.tar.xz
gsoc2013-evolution-54535a17f301f9c5ece272a56f22ec8909d4f445.tar.zst
gsoc2013-evolution-54535a17f301f9c5ece272a56f22ec8909d4f445.zip
1 files changed, 2412 insertions, 2608 deletions
diff --git a/po/no.po b/po/no.po
index c9c23b32a6..a10e48e5b0 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,14 +5,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.5\n"
-"POT-Creation-Date: 2004-04-29 13:14-0400\n"
-"PO-Revision-Date: 2004-03-26 19:03+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-05-02 22:22+0200\n"
+"PO-Revision-Date: 2004-05-02 22:29+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <i18n-nb@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
-"Report-Msgid-Bugs-To: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: a11y/addressbook/ea-addressbook-view.c:94
@@ -21,6 +21,14 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "evolution adressebok"
 
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
+msgstr "topptekst for kontakt: "
+
+#: a11y/addressbook/ea-minicard.c:166
+msgid "evolution minicard"
+msgstr "evolution minikort"
+
 #: a11y/addressbook/ea-minicard-view.c:101
 msgid "current addressbook folder "
 msgstr "aktiv adressebokmappe "
@@ -41,14 +49,6 @@ msgstr " kort"
 msgid " card"
 msgstr " kort"
 
-#: a11y/addressbook/ea-minicard.c:105
-msgid "contact's header: "
-msgstr "topptekst for kontakt: "
-
-#: a11y/addressbook/ea-minicard.c:166
-msgid "evolution minicard"
-msgstr "evolution minikort"
-
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
 msgstr "Forvalgt synkroniseringsadresse:"
@@ -63,63 +63,20 @@ msgstr "Kunne ikke laste adressebok"
 msgid "Could not read pilot's Address application block"
 msgstr "Kunne ikke lese pilotens adresseapplikasjonsblokk"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Autocompletion"
-msgstr "Autofullføring"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Certificates"
-msgstr "Sertifikater"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Configure autocomple here"
-msgstr "Konfigurer automatisk fullføring 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:4
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: calendar/gui/migration.c:373
-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 adressevisning"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution adressebok kortvisning"
-
-#: 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 mappevisning"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Kontroll for S/MIME sertifikathåndtering for Evolution"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "Aksesserer LDAP-tjener anonymt"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution folder settings configuration control"
-msgstr "Konfigurasjonskontroll for mappeinnstillinger i Evolution"
+#: addressbook/gui/component/addressbook.c:165
+#: camel/providers/groupwise/camel-gw-listener.c:369
+msgid "Failed to authenticate.\n"
+msgstr "Kunne ikke autentisere.\n"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
-msgstr "Håndter dine S/MIME-sertifikater her"
+#: addressbook/gui/component/addressbook.c:171
+#: camel/providers/groupwise/camel-gw-listener.c:358
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sSkriv inn passord for %s (bruker %s)"
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -146,45 +103,42 @@ msgid "Create a new contact list"
 msgstr "Opprett en ny kontaktliste"
 
 #: addressbook/gui/component/addressbook-component.c:109
-#, fuzzy
 msgid "New Contacts Group"
-msgstr "Ny kontakt"
+msgstr "Ny kontaktgruppe"
 
 #: addressbook/gui/component/addressbook-component.c:110
-#, fuzzy
 msgid "_Contacts Group"
-msgstr "_Kontakter:"
+msgstr "_Kontaktgruppe"
 
 #: addressbook/gui/component/addressbook-component.c:111
-#, fuzzy
 msgid "Create a new contacts group"
-msgstr "Opprett en ny snarveigruppe"
+msgstr "Opprett en ny kontaktgruppe"
 
-#: addressbook/gui/component/addressbook-config.c:466
+#: addressbook/gui/component/addressbook-config.c:463
 msgid "Failed to connect to LDAP server"
 msgstr "Kunne ikke koble til LDAP-tjener"
 
-#: addressbook/gui/component/addressbook-config.c:490
+#: addressbook/gui/component/addressbook-config.c:487
 msgid "Failed to authenticate with LDAP server"
 msgstr "Kunne ikke autentisere mot LDAP-tjener"
 
-#: addressbook/gui/component/addressbook-config.c:518
+#: addressbook/gui/component/addressbook-config.c:515
 msgid "Could not perform query on Root DSE"
 msgstr "Kunne ikke utføre spørring på Root DSE"
 
-#: addressbook/gui/component/addressbook-config.c:822
+#: addressbook/gui/component/addressbook-config.c:820
 msgid "The server responded with no supported search bases"
 msgstr "Tjeneren svarte ikke med noen støttede basis for søk"
 
-#: addressbook/gui/component/addressbook-config.c:1216
+#: addressbook/gui/component/addressbook-config.c:1220
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Denne tjeneren støtter ikke LDAPv3 schema-informasjon"
 
-#: addressbook/gui/component/addressbook-config.c:1237
+#: addressbook/gui/component/addressbook-config.c:1241
 msgid "Error retrieving schema information"
 msgstr "Feil under henting av schema-informasjon"
 
-#: addressbook/gui/component/addressbook-config.c:1245
+#: addressbook/gui/component/addressbook-config.c:1249
 msgid "Server did not respond with valid schema information"
 msgstr "Tjener svarte ikke med gyldig schema-informasjon"
 
@@ -200,6 +154,7 @@ msgid "Migrating `%s':"
 msgstr "Migrerer «%s»:"
 
 #. create the local source group
+#. On This Computer is always first and VFolders is always last
 #: addressbook/gui/component/addressbook-migrate.c:438
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
 #: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
@@ -208,6 +163,9 @@ msgid "On This Computer"
 msgstr "På denne datamaskinen"
 
 #. Create the default Person addressbook
+#. Create the default Person calendar
+#. Create the default Person task list
+#. orange
 #: addressbook/gui/component/addressbook-migrate.c:446
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
@@ -277,20 +235,50 @@ msgstr ""
 "\n"
 "Vennligst vent mens Evolution migrerer dine mapper..."
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "Aksesserer LDAP-tjener anonymt"
+#: addressbook/gui/component/addressbook-view.c:687
+#, c-format
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
+msgstr "Adressebok «%s» vil bli fjernet. Er du sikker på at du vil fortsette?"
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
-msgid "Failed to authenticate.\n"
-msgstr "Kunne ikke autentisere.\n"
+#: addressbook/gui/component/addressbook-view.c:774
+msgid "New Address Book"
+msgstr "Ny adressebok"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sSkriv inn passord for %s (bruker %s)"
+#: addressbook/gui/component/addressbook-view.c:775
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:427 calendar/gui/tasks-component.c:361
+#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+#: ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "Slett"
+
+#: addressbook/gui/component/addressbook-view.c:776
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
+msgid "Properties..."
+msgstr "Egenskaper ..."
+
+#: addressbook/gui/component/addressbook-view.c:1001
+msgid "UID of the contacts source that the view will display"
+msgstr "UID for kontaktkilden som visningen skal vise"
+
+#: addressbook/gui/component/addressbook-view.c:1006
+msgid "The URI that the address book will display"
+msgstr "URIen som adresseboken skal vise"
+
+#. Fix me *
+#. can not get name, should be a bug of e-book.Anyway, should set a default name.
+#.
+#. name = e_book_get_name (book);
+#. Create the contacts group
+#: addressbook/gui/component/addressbook-view.c:1031
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
+#: calendar/gui/migration.c:373
+msgid "Contacts"
+msgstr "Kontakter"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -310,6 +298,54 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "Autocompletion"
+msgstr "Autofullføring"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Certificates"
+msgstr "Sertifikater"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "Configure autocomplete here"
+msgstr "Konfigurer automatisk fullføring her"
+
+#: 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 adressevisning"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution adressebok kortvisning"
+
+#: 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 mappevisning"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Kontroll for S/MIME sertifikathåndtering for Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution folder settings configuration control"
+msgstr "Konfigurasjonskontroll for mappeinnstillinger i Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Manager your S/Mime certificates here"
+msgstr "Håndter dine S/MIME-sertifikater her"
+
 #: addressbook/gui/component/ldap-config.glade.h:1
 msgid "  S_how Supported Bases "
 msgstr " V_is støttede baser "
@@ -331,13 +367,14 @@ msgstr " V_is støttede baser "
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
 
 #: addressbook/gui/component/ldap-config.glade.h:3
 msgid "1"
-msgstr ""
+msgstr "1"
 
 #: addressbook/gui/component/ldap-config.glade.h:4
 msgid "1:00"
@@ -353,7 +390,7 @@ msgstr "389"
 
 #: addressbook/gui/component/ldap-config.glade.h:7
 msgid "5"
-msgstr ""
+msgstr "5"
 
 #: addressbook/gui/component/ldap-config.glade.h:8
 msgid "5:00"
@@ -364,39 +401,32 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:10
-#, fuzzy
 msgid "<b>Authentication</b>"
-msgstr "Autentisering"
+msgstr "<b>Autentisering</b>"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-#, fuzzy
 msgid "<b>Display</b>"
-msgstr "_Vis"
+msgstr "<b>Visning</b>"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
-#, fuzzy
 msgid "<b>Downloading</b>"
-msgstr "<b>Utgående e-post:</b>"
+msgstr "<b>Laster ned</b>"
 
 #: addressbook/gui/component/ldap-config.glade.h:13
-#, fuzzy
 msgid "<b>Searching</b>"
-msgstr "Søker"
+msgstr "<b>Søker</b>"
 
 #: addressbook/gui/component/ldap-config.glade.h:14
-#, fuzzy
 msgid "<b>Server Information</b>"
-msgstr "Steg 2: Tjenerinformasjon"
+msgstr "<b>Tjenerinformasjon</b>"
 
 #: addressbook/gui/component/ldap-config.glade.h:15
-#, fuzzy
 msgid "<b>Type:</b>"
-msgstr "<b>Ferdig:</b> "
+msgstr "<b>Type:</b>"
 
 #: addressbook/gui/component/ldap-config.glade.h:16
-#, fuzzy
 msgid "Add Contacts Group"
-msgstr "_Kontakter:"
+msgstr "Legg til kontaktgruppe"
 
 #: addressbook/gui/component/ldap-config.glade.h:17
 msgid "Address Book Properties"
@@ -418,9 +448,8 @@ msgstr "Grunnleggende"
 
 #: addressbook/gui/component/ldap-config.glade.h:21
 #: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
 msgid "C_olor:"
-msgstr "Farger"
+msgstr "F_arge:"
 
 #: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Connecting"
@@ -437,19 +466,16 @@ msgid "Distinguished _name:"
 msgstr "Distinguished _name:"
 
 #: addressbook/gui/component/ldap-config.glade.h:25
-#, fuzzy
 msgid "Distinguished name"
-msgstr "Distinguished _name:"
+msgstr "Distinguished name"
 
 #: addressbook/gui/component/ldap-config.glade.h:26
-#, fuzzy
 msgid "Download limit:"
-msgstr "Grense for ne_dlasting:"
+msgstr "Grense for nedlasting:"
 
 #: addressbook/gui/component/ldap-config.glade.h:27
-#, fuzzy
 msgid "Email address"
-msgstr "E-postadresse:"
+msgstr "E-postadresse"
 
 #: addressbook/gui/component/ldap-config.glade.h:28
 msgid "Email address:"
@@ -466,13 +492,13 @@ msgstr ""
 "Evolution vil bruke denne e-post adressen til å autentisere deg mot tjeneren"
 
 #: addressbook/gui/component/ldap-config.glade.h:31
-#, fuzzy
 msgid "Find Possible Search Bases"
-msgstr "Støttede søkebaser"
+msgstr "Finn mulige søkebaser"
 
 #: addressbook/gui/component/ldap-config.glade.h:32
-#: calendar/gui/dialogs/calendar-setup.glade.h:6 mail/mail-config.glade.h:84
-#: smime/gui/smime-ui.glade.h:27
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Generelt"
 
@@ -499,18 +525,16 @@ msgid "S_earch scope: "
 msgstr "Sø_keområde: "
 
 #: addressbook/gui/component/ldap-config.glade.h:38
-#, fuzzy
 msgid "Search base only"
-msgstr "Søkebase:"
+msgstr "Kun søkebase"
 
 #: addressbook/gui/component/ldap-config.glade.h:39
 msgid "Search base:"
 msgstr "Søkebase:"
 
 #: addressbook/gui/component/ldap-config.glade.h:40
-#, fuzzy
 msgid "Search scope:"
-msgstr "Sø_keområde: "
+msgstr "Søkeområde:"
 
 #: addressbook/gui/component/ldap-config.glade.h:41
 msgid "Searching"
@@ -645,9 +669,8 @@ msgid "This option controls how long a search will be run."
 msgstr "Dette alternativet kontrollerer hvor lenge et søk vil kjøre."
 
 #: addressbook/gui/component/ldap-config.glade.h:70
-#, fuzzy
 msgid "Timeout:"
-msgstr "Tidformat:"
+msgstr "Tidsavbrudd:"
 
 #: addressbook/gui/component/ldap-config.glade.h:71
 msgid "U_se SSL/TLS:"
@@ -667,9 +690,8 @@ msgid "Whenever Possible"
 msgstr "Når mulig"
 
 #: addressbook/gui/component/ldap-config.glade.h:75
-#, fuzzy
 msgid "_Add Contacts Group"
-msgstr "_Kontakter:"
+msgstr "_Legg til kontaktgruppe"
 
 #: addressbook/gui/component/ldap-config.glade.h:76
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
@@ -681,9 +703,8 @@ msgid "_Download limit:"
 msgstr "Grense for ne_dlasting:"
 
 #: addressbook/gui/component/ldap-config.glade.h:78
-#, fuzzy
 msgid "_Email address:"
-msgstr "E-postadresse:"
+msgstr "_E-postadresse:"
 
 #: addressbook/gui/component/ldap-config.glade.h:79
 msgid "_Log in method:"
@@ -699,9 +720,8 @@ msgid "_Port number:"
 msgstr "_Portnummer:"
 
 #: addressbook/gui/component/ldap-config.glade.h:82
-#, fuzzy
 msgid "_Port:"
-msgstr "_Prioritet:"
+msgstr "_Port:"
 
 #: addressbook/gui/component/ldap-config.glade.h:83
 msgid "_Search base:"
@@ -712,7 +732,6 @@ msgid "_Server name:"
 msgstr "_Tjenernavn:"
 
 #: addressbook/gui/component/ldap-config.glade.h:85
-#, fuzzy
 msgid "_Server:"
 msgstr "Tj_ener:"
 
@@ -721,9 +740,8 @@ msgid "_Timeout (minutes):"
 msgstr "_Tidsavbrudd (minutter):"
 
 #: addressbook/gui/component/ldap-config.glade.h:87
-#, fuzzy
 msgid "_Use secure connection:"
-msgstr "Br_uk sikker forbindelse (SSL):"
+msgstr "Br_uk sikker forbindelse:"
 
 #: addressbook/gui/component/ldap-config.glade.h:88
 msgid "cards"
@@ -748,20 +766,27 @@ msgstr "minutter"
 msgid "searching-tab"
 msgstr "searching-tab"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Grensesnitt for navnevalg i Evolution adressebok"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Fjern alle"
+#: addressbook/gui/component/select-names/e-select-names.c:497
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+msgid "Select Contacts from Address Book"
+msgstr "Velg kontakter fra adresseboken"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Fjern"
 
+#: 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 "Navn"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
+msgid "Remove All"
+msgstr "Fjern alle"
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Vis kontaktliste"
@@ -784,22 +809,15 @@ msgstr "Legg til i kontakter"
 msgid "Unnamed Contact"
 msgstr "Kontakt uten navn:"
 
-#: 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 "Navn"
-
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
 #: addressbook/gui/widgets/e-addressbook-view.c:222
 msgid "Source"
 msgstr "Kilde"
 
-#: addressbook/gui/component/select-names/e-select-names.c:497
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Select Contacts from Address Book"
-msgstr "Velg kontakter fra adresseboken"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Grensesnitt for navnevalg i Evolution adressebok"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "<b>Contacts</b>"
@@ -822,48 +840,40 @@ msgid "_Find"
 msgstr "_Finn"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
-#, fuzzy
 msgid "<b>Email</b>"
-msgstr "<b>Utgående e-post:</b>"
+msgstr "<b>E-post</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:3
-#, fuzzy
 msgid "<b>Home</b>"
-msgstr "<b>Ferdig:</b> "
+msgstr "<b>Hjem</b> "
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:4
-#, fuzzy
 msgid "<b>Instant Messaging</b>"
-msgstr "Øyeblikksmeldinger"
+msgstr "<b>Øyeblikksmeldinger</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#, fuzzy
 msgid "<b>Job</b>"
-msgstr "<b>Hvis</b> "
+msgstr "<b>Jobb</b> "
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#, fuzzy
 msgid "<b>Miscellaneous</b>"
-msgstr "<b>Feltverdi</b>"
+msgstr "<b>Forskjellig</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-#, fuzzy
 msgid "<b>Other</b>"
-msgstr "<b>Ferdig:</b> "
+msgstr "<b>Annet</b> "
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#, fuzzy
 msgid "<b>Telephone</b>"
-msgstr "<b>Ferdig:</b> "
+msgstr "<b>Telefon</b> "
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "<b>Web Addresses</b>"
-msgstr ""
+msgstr "<b>Nettaddresser</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#, fuzzy
 msgid "<b>Work</b>"
-msgstr "<b>Hvis</b> "
+msgstr "<b>Arbeid</b> "
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
 #: addressbook/gui/contact-editor/e-contact-editor.c:179
@@ -873,34 +883,28 @@ msgid "AIM"
 msgstr "AIM"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#, fuzzy
 msgid "Address 2:"
-msgstr "Adresse _2:"
+msgstr "Adresse 2:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#, fuzzy
 msgid "Address:"
-msgstr "_Adresse:"
+msgstr "Adresse:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:14
-#, fuzzy
 msgid "Anniversary:"
-msgstr "Br_yllupsdag:"
+msgstr "Bryllupsdag:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:15
-#, fuzzy
 msgid "Assistant:"
-msgstr "Assistent"
+msgstr "Assistent:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#, fuzzy
 msgid "Birthday:"
-msgstr "F_ødselsdag:"
+msgstr "Fødselsdag:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#, fuzzy
 msgid "Blog:"
-msgstr "Weblogg"
+msgstr "Weblogg:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #: calendar/gui/dialogs/event-page.glade.h:5
@@ -908,14 +912,12 @@ msgid "Calendar:"
 msgstr "Kalender:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#, fuzzy
 msgid "City:"
-msgstr "_By:"
+msgstr "By:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#, fuzzy
 msgid "Company:"
-msgstr "Kommando:"
+msgstr "Firma:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #: addressbook/gui/contact-editor/e-contact-editor.c:260
@@ -931,34 +933,30 @@ msgid "Contact Editor"
 msgstr "Kontaktredigering"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:23
-#, fuzzy
 msgid "Country:"
-msgstr "Lan_d:"
+msgstr "Land:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:24
-#, fuzzy
 msgid "Department:"
-msgstr "Avd_eling:"
+msgstr "Avdeling:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#, fuzzy
 msgid "Free/Busy:"
-msgstr "L_edig/opptatt URL:"
+msgstr "Ledig/opptatt:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "Full _Name..."
 msgstr "Fullt _navn..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:27
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
 #: addressbook/gui/contact-editor/e-contact-editor.c:194
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
 msgid "Home"
 msgstr "Hjemme"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#, fuzzy
 msgid "Job title:"
-msgstr "_Jobbtittel:"
+msgstr "Jobbtittel:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #: calendar/gui/e-itip-control.c:936
@@ -971,24 +969,20 @@ msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
-#, fuzzy
 msgid "Mailing Address"
-msgstr "E-postadresse"
+msgstr "Postadresse"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:32
-#, fuzzy
 msgid "Manager:"
-msgstr "Leder"
+msgstr "Leder:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#, fuzzy
 msgid "Ni_ckname:"
-msgstr "Kalle_navn:"
+msgstr "_Kallenavn:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
-#, fuzzy
 msgid "Notes:"
-msgstr "No_tater:"
+msgstr "Notater:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:35
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
@@ -996,72 +990,79 @@ msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:36
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
 #: addressbook/gui/contact-editor/e-contact-editor.c:195
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
 msgid "Other"
 msgstr "Andre"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:38
-#, fuzzy
 msgid "Personal Information"
-msgstr "Tilleggsinformasjon"
+msgstr "Personlig informasjon"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:39
-#, fuzzy
 msgid "Profession:"
-msgstr "Y_rke:"
+msgstr "Yrke:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:40
-#, fuzzy
 msgid "State/Province:"
-msgstr "_Stat/Provins:"
+msgstr "Stat/provins:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:41
-#, fuzzy
 msgid "Wants to receive HTML mail"
-msgstr "Vil motta _HTML e-post"
+msgstr "Ønsker å motta HTML-formatert e-post"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:42
-#, fuzzy
 msgid "Webcam:"
-msgstr "Nettside:"
+msgstr "Nettkamera:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:244
 #: addressbook/gui/contact-editor/e-contact-editor.c:193
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:244
 #: filter/filter-label.c:122 mail/em-migrate.c:923 mail/mail-config.c:66
 #: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "Arbeid"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:44
-#, fuzzy
 msgid "Zip/Postal Code:"
-msgstr "_ZIP/Postnummer:"
+msgstr "Zip/postnummer:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:45
-#, fuzzy
 msgid "_Categories"
-msgstr "Kategorier"
+msgstr "_Kategorier"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:46
-#, fuzzy
 msgid "_File under:"
-msgstr "Filnavn:"
+msgstr "_Lagre under:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
-#, fuzzy
 msgid "_Where:"
-msgstr "Tj_ener:"
+msgstr "_Hvor:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:48
 msgid "item7"
-msgstr ""
+msgstr "oppføring7"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:49
 msgid "item8"
+msgstr "oppføring8"
+
+#: addressbook/gui/contact-editor/eab-editor.c:316
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Er du sikker på at du vil\n"
+"slette disse kontaktene?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
 msgstr ""
+"Er du sikker på at du vil\n"
+"slette denne kontakten?"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
 #: addressbook/gui/widgets/eab-contact-display.c:311
@@ -1070,16 +1071,16 @@ msgid "Address"
 msgstr "Adresse"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
+#: addressbook/gui/contact-editor/e-contact-editor.c:281
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:281
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
+#: addressbook/gui/widgets/e-minicard.c:174
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:174
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 msgid "Editable"
 msgstr "Redigerbar"
 
@@ -2051,42 +2052,13 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr "AOL øyeblikksmeldinger"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
 #: addressbook/gui/contact-editor/e-contact-editor.c:180
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
 #: addressbook/gui/widgets/eab-contact-display.c:305
 #: addressbook/gui/widgets/eab-contact-display.c:324
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr "Yahoo Messenger"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:304
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "ICQ"
-msgstr "ICQ"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-msgid "Service"
-msgstr "Tjeneste"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:578
-#: calendar/gui/e-cal-list-view.etspec.h:2
-msgid "Location"
-msgstr "Lokasjon"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr "Brukernavn"
-
 #: addressbook/gui/contact-editor/e-contact-editor.c:181
 #: addressbook/gui/widgets/eab-contact-display.c:307
 #: addressbook/gui/widgets/eab-contact-display.c:326
@@ -2099,6 +2071,13 @@ msgstr "Yahoo"
 msgid "MSN"
 msgstr "MSN"
 
+#: addressbook/gui/contact-editor/e-contact-editor.c:183
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/widgets/eab-contact-display.c:304
+#: addressbook/gui/widgets/eab-contact-display.c:323
+msgid "ICQ"
+msgstr "ICQ"
+
 #: addressbook/gui/contact-editor/e-contact-editor.c:184
 msgid "GroupWise"
 msgstr "GroupWise"
@@ -2136,6 +2115,28 @@ msgstr "Denne kontakten hører til disse kategoriene:"
 msgid "Could not find widget for a field: `%s'"
 msgstr "Kunne ikke finne widget for felt: «%s»"
 
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+msgid "AOL Instant Messenger"
+msgstr "AOL øyeblikksmeldinger"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr "Yahoo Messenger"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+msgid "Service"
+msgstr "Tjeneste"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
+#: calendar/gui/e-cal-list-view.etspec.h:2
+msgid "Location"
+msgstr "Lokasjon"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+msgid "Username"
+msgstr "Brukernavn"
+
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Hurtigkontakt"
@@ -2153,22 +2154,6 @@ msgstr "_Fullt navn:"
 msgid "E-_mail:"
 msgstr "E-_post:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:316
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Er du sikker på at du vil\n"
-"slette disse kontaktene?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:319
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Er du sikker på at du vil\n"
-"slette denne kontakten?"
-
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Adresse _2:"
@@ -2314,8 +2299,8 @@ msgstr "kontakt-liste-redigering"
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
 #: addressbook/gui/widgets/e-addressbook-view.c:215
-#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Bok"
 
@@ -2376,418 +2361,6 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Avansert søk"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
-msgid "No contacts"
-msgstr "Ingen kontakter"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:151
-#, c-format
-msgid "%d contact"
-msgid_plural "%d contacts"
-msgstr[0] "%d kontakt"
-msgstr[1] "%d kontakter"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:302
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:229
-#: addressbook/gui/widgets/e-minicard-view-widget.c:112
-#: addressbook/gui/widgets/e-minicard-view.c:467
-msgid "Query"
-msgstr "Spør"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:445
-msgid "Error getting book view"
-msgstr "Feil under henting av bokvisning"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:399
-msgid "Model"
-msgstr "Modell"
-
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:103
-msgid "Error modifying card"
-msgstr "Feil ved endring av kort"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:161
-msgid "Name begins with"
-msgstr "Navn begynner med"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:162
-msgid "Email begins with"
-msgstr "E-post begynner med"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:57
-msgid "Category is"
-msgstr "Kategorien er"
-
-#. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-#: calendar/gui/cal-search-bar.c:50
-msgid "Any field contains"
-msgstr "Et felt inneholder"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: addressbook/gui/widgets/e-addressbook-view.c:170
-msgid "Advanced..."
-msgstr "Avansert..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:236
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:249
-#: calendar/gui/e-meeting-time-sel.etspec.h:11
-msgid "Type"
-msgstr "Type"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:506
-msgid "Address Book"
-msgstr "Adressebok"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2066
-#: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
-msgstr "Lagre som VCard"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
-msgid "New Contact..."
-msgstr "Ny kontakt..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
-msgid "New Contact List..."
-msgstr "Ny kontaktliste..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
-msgid "Go to Folder..."
-msgstr "Gå til mappe..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
-msgid "Import..."
-msgstr "Importer..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
-msgid "Search for Contacts..."
-msgstr "Søk etter kontakter..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
-msgid "Address Book Sources..."
-msgstr "Adressebok-kilder..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
-msgid "Pilot Settings..."
-msgstr "Innstillinger for pilot..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
-#: ui/evolution-addressbook.xml.h:10
-msgid "Forward Contact"
-msgstr "Videresend kontakt"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
-msgid "Send Message to Contact"
-msgstr "Send melding til kontakt"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
-#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
-#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
-msgid "Print"
-msgstr "Skriv ut"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
-msgid "Print Envelope"
-msgstr "Skriv ut konvolutt"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
-msgid "Copy to Address Book..."
-msgstr "Kopier til adressebok..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1080
-msgid "Move to Address Book..."
-msgstr "Flytt til adressebok..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
-msgid "Cut"
-msgstr "Klipp ut"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:425 calendar/gui/tasks-component.c:359
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
-msgid "Copy"
-msgstr "Kopier"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
-msgid "Paste"
-msgstr "Lim inn"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:427 calendar/gui/tasks-component.c:361
-#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
-#: ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Slett"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1262
-msgid "Current View"
-msgstr "Aktiv visning"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1309
-#, c-format
-msgid ""
-"The addressbook backend for\n"
-"%s\n"
-"has crashed. You will have to restart Evolution in order to use it again"
-msgstr ""
-"Adressebokmotoren for\n"
-"%s\n"
-"har krasjet. Du vil måtte starte Evolution på nytt for å kunne bruke den "
-"igjen"
-
-#. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1657
-#: calendar/gui/cal-search-bar.c:362
-msgid "Any Category"
-msgstr "Enhver kategori"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-msgid "Assistant"
-msgstr "Assistent"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
-msgid "Assistant Phone"
-msgstr "Assistents telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
-msgid "Business Fax"
-msgstr "Faks på arbeid"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
-msgid "Business Phone"
-msgstr "Arbeidstelefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
-msgid "Business Phone 2"
-msgstr "Arbeidstelefon 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
-msgid "Callback Phone"
-msgstr "Telefon for tilbakeringing"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
-msgid "Car Phone"
-msgstr "Biltelefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-msgid "Categories"
-msgstr "Kategorier"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-msgid "Company Phone"
-msgstr "Firmatelefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:512 smime/lib/e-cert.c:774
-msgid "Email"
-msgstr "E-post"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:442
-msgid "Email 2"
-msgstr "E-post 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:452
-msgid "Email 3"
-msgstr "E-post 3"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
-msgid "Family Name"
-msgstr "Etternavn"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
-msgid "File As"
-msgstr "Lagre som"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Given Name"
-msgstr "Gitt navn"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Home Fax"
-msgstr "Faks hjemme"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-msgid "Home Phone"
-msgstr "Hjemmetelefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
-msgid "Home Phone 2"
-msgstr "Hjemmetelefon 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
-msgid "ISDN Phone"
-msgstr "ISDN-telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
-msgid "Journal"
-msgstr "Journal"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "Manager"
-msgstr "Leder"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:331
-msgid "Mobile Phone"
-msgstr "Mobiltelefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-msgid "Nickname"
-msgstr "Kallenavn"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Note"
-msgstr "Kommentar"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-msgid "Office"
-msgstr "Kontor"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:300
-msgid "Organization"
-msgstr "Organisasjon"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
-msgid "Other Fax"
-msgstr "Annen faks"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-msgid "Other Phone"
-msgstr "Annen telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
-msgid "Pager"
-msgstr "Personsøker"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
-msgid "Primary Phone"
-msgstr "Primær telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
-msgid "Radio"
-msgstr "Radio"
-
-#: 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:35
-msgid "TTYTDD"
-msgstr "TTYTDD"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-msgid "Telex"
-msgstr "Teleks"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "Title"
-msgstr "Tittel"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-msgid "Unit"
-msgstr "Enhet"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-msgid "Web Site"
-msgstr "Nettside"
-
-#: addressbook/gui/widgets/e-minicard-label.c:115
-#: addressbook/gui/widgets/e-minicard.c:137
-msgid "Width"
-msgstr "Bredde"
-
-#: addressbook/gui/widgets/e-minicard-label.c:122
-#: addressbook/gui/widgets/e-minicard.c:144
-msgid "Height"
-msgstr "Høyde"
-
-#: addressbook/gui/widgets/e-minicard-label.c:129
-#: addressbook/gui/widgets/e-minicard.c:152
-msgid "Has Focus"
-msgstr "Har fokus"
-
-#: addressbook/gui/widgets/e-minicard-label.c:136
-msgid "Field"
-msgstr "Felt"
-
-#: addressbook/gui/widgets/e-minicard-label.c:143
-msgid "Field Name"
-msgstr "Feltnavn"
-
-#: addressbook/gui/widgets/e-minicard-label.c:150
-msgid "Text Model"
-msgstr "Tekstmodell"
-
-#: addressbook/gui/widgets/e-minicard-label.c:157
-msgid "Max field name length"
-msgstr "Maksimal lengde på feltnavn"
-
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Kolonnebredde"
-
-#: addressbook/gui/widgets/e-minicard-view.c:142
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view.\n"
-"\n"
-"Double-click here to create a new Contact."
-msgstr ""
-"\n"
-"\n"
-"Ingen oppføringer i denne visningen\n"
-"\n"
-"Dobbelklikk her for å opprette en ny kontakt."
-
-#: addressbook/gui/widgets/e-minicard-view.c:145
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view."
-msgstr ""
-"\n"
-"\n"
-"Ingen oppføringer i denne visningen."
-
-#: addressbook/gui/widgets/e-minicard-view.c:453
-msgid "Adapter"
-msgstr "Adapter"
-
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Valgt"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "Har markør"
-
 #: addressbook/gui/widgets/eab-contact-display.c:114
 #: addressbook/gui/widgets/eab-contact-display.c:177
 msgid "(map)"
@@ -2807,6 +2380,11 @@ msgstr "Listemedlemmer"
 msgid "E-mail"
 msgstr "E-post"
 
+#: addressbook/gui/widgets/eab-contact-display.c:300
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Organization"
+msgstr "Organisasjon"
+
 #: addressbook/gui/widgets/eab-contact-display.c:301
 msgid "Position"
 msgstr "Stilling"
@@ -2842,14 +2420,30 @@ msgstr "WWW"
 msgid "Blog"
 msgstr "Weblogg"
 
+#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Mobile Phone"
+msgstr "Mobiltelefon"
+
 #: addressbook/gui/widgets/eab-contact-display.c:335
 msgid "personal"
 msgstr "personlig"
 
+#: addressbook/gui/widgets/eab-contact-display.c:342
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Note"
+msgstr "Kommentar"
+
 #: addressbook/gui/widgets/eab-contact-display.c:508
 msgid "Job Title"
 msgstr "Jobbtittel"
 
+#: addressbook/gui/widgets/eab-contact-display.c:512
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: smime/lib/e-cert.c:774
+msgid "Email"
+msgstr "E-post"
+
 #: addressbook/gui/widgets/eab-contact-display.c:539
 msgid "Home page"
 msgstr "Hjemmeside"
@@ -2906,8 +2500,9 @@ msgstr "Protokollen er ikke støttet"
 #. E_BOOK_ERROR_CANCELLED
 #: addressbook/gui/widgets/eab-gui-util.c:61
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:627
-#: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
+#: calendar/gui/e-cal-component-preview.c:233
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
+#: calendar/gui/e-cal-model-tasks.c:627 calendar/gui/print.c:2349
 #: camel/camel-service.c:728 camel/camel-service.c:766
 #: camel/camel-service.c:850 camel/camel-service.c:890
 #: camel/providers/pop3/camel-pop3-store.c:451
@@ -2917,9 +2512,8 @@ msgstr "Avbrutt"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
 #: addressbook/gui/widgets/eab-gui-util.c:62
-#, fuzzy
 msgid "Could not cancel"
-msgstr "Kunne ikke åpne kilde"
+msgstr "Kunne ikke avbryte"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
 #: addressbook/gui/widgets/eab-gui-util.c:63
@@ -2939,9 +2533,8 @@ msgstr "TLS er ikke tilgjengelig"
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
 #: addressbook/gui/widgets/eab-gui-util.c:67
-#, fuzzy
 msgid "No such source"
-msgstr "Ingen slik melding"
+msgstr "Ingen slik kilde"
 
 #. E_BOOK_ERROR_OTHER_ERROR
 #: addressbook/gui/widgets/eab-gui-util.c:68
@@ -3126,6 +2719,16 @@ msgstr "(ingen)"
 msgid "Primary Email"
 msgstr "Primær e-post"
 
+#: addressbook/gui/widgets/eab-popup-control.c:442
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+msgid "Email 2"
+msgstr "E-post 2"
+
+#: addressbook/gui/widgets/eab-popup-control.c:452
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+msgid "Email 3"
+msgstr "E-post 3"
+
 #: addressbook/gui/widgets/eab-popup-control.c:568
 msgid "Select an Action"
 msgstr "Velg en handling"
@@ -3172,6 +2775,378 @@ msgstr "Vis kompakt VCard"
 msgid "Save in addressbook"
 msgstr "Lagre i adressebok"
 
+#: addressbook/gui/widgets/e-addressbook-model.c:148
+msgid "No contacts"
+msgstr "Ingen kontakter"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:151
+#, c-format
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "%d kontakt"
+msgstr[1] "%d kontakter"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:302
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
+#: addressbook/gui/widgets/e-addressbook-view.c:229
+#: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
+msgid "Query"
+msgstr "Spør"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:445
+msgid "Error getting book view"
+msgstr "Feil under henting av bokvisning"
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:399
+msgid "Model"
+msgstr "Modell"
+
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:103
+msgid "Error modifying card"
+msgstr "Feil ved endring av kort"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:161
+msgid "Name begins with"
+msgstr "Navn begynner med"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:162
+msgid "Email begins with"
+msgstr "E-post begynner med"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:163
+#: calendar/gui/cal-search-bar.c:58
+msgid "Category is"
+msgstr "Kategorien er"
+
+#. We attach subitems below
+#: addressbook/gui/widgets/e-addressbook-view.c:164
+#: calendar/gui/cal-search-bar.c:51
+msgid "Any field contains"
+msgstr "Et felt inneholder"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: addressbook/gui/widgets/e-addressbook-view.c:170
+msgid "Advanced..."
+msgstr "Avansert..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:236
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-meeting-list-view.c:249
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
+msgid "Type"
+msgstr "Type"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:506
+msgid "Address Book"
+msgstr "Adressebok"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:850
+#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:2066
+#: ui/evolution-addressbook.xml.h:19
+msgid "Save as VCard"
+msgstr "Lagre som VCard"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1057
+msgid "New Contact..."
+msgstr "Ny kontakt..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1058
+msgid "New Contact List..."
+msgstr "Ny kontaktliste..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1061
+msgid "Go to Folder..."
+msgstr "Gå til mappe..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1062
+msgid "Import..."
+msgstr "Importer..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
+msgid "Search for Contacts..."
+msgstr "Søk etter kontakter..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1065
+msgid "Address Book Sources..."
+msgstr "Adressebok-kilder..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
+msgid "Pilot Settings..."
+msgstr "Innstillinger for pilot..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: ui/evolution-addressbook.xml.h:10
+msgid "Forward Contact"
+msgstr "Videresend kontakt"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+msgid "Send Message to Contact"
+msgstr "Send melding til kontakt"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
+#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
+msgid "Print"
+msgstr "Skriv ut"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1075
+msgid "Print Envelope"
+msgstr "Skriv ut konvolutt"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1079
+msgid "Copy to Address Book..."
+msgstr "Kopier til adressebok..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1080
+msgid "Move to Address Book..."
+msgstr "Flytt til adressebok..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "Klipp ut"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1084
+#: calendar/gui/calendar-component.c:425 calendar/gui/tasks-component.c:359
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
+#: ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "Kopier"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
+msgid "Paste"
+msgstr "Lim inn"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
+#: calendar/gui/e-calendar-view.c:1279
+msgid "Current View"
+msgstr "Aktiv visning"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1309
+#, c-format
+msgid ""
+"The addressbook backend for\n"
+"%s\n"
+"has crashed. You will have to restart Evolution in order to use it again"
+msgstr ""
+"Adressebokmotoren for\n"
+"%s\n"
+"har krasjet. Du vil måtte starte Evolution på nytt for å kunne bruke den "
+"igjen"
+
+#. All, unmatched, separator
+#: addressbook/gui/widgets/e-addressbook-view.c:1657
+#: calendar/gui/cal-search-bar.c:365
+msgid "Any Category"
+msgstr "Enhver kategori"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "Assistant"
+msgstr "Assistent"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+msgid "Assistant Phone"
+msgstr "Assistents telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Business Fax"
+msgstr "Faks på arbeid"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Phone"
+msgstr "Arbeidstelefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+msgid "Business Phone 2"
+msgstr "Arbeidstelefon 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Callback Phone"
+msgstr "Telefon for tilbakeringing"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Car Phone"
+msgstr "Biltelefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+msgid "Categories"
+msgstr "Kategorier"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Company Phone"
+msgstr "Firmatelefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Family Name"
+msgstr "Etternavn"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+msgid "File As"
+msgstr "Lagre som"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
+msgid "Given Name"
+msgstr "Gitt navn"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Home Fax"
+msgstr "Faks hjemme"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Phone"
+msgstr "Hjemmetelefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+msgid "Home Phone 2"
+msgstr "Hjemmetelefon 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "ISDN Phone"
+msgstr "ISDN-telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Journal"
+msgstr "Journal"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
+msgid "Manager"
+msgstr "Leder"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Nickname"
+msgstr "Kallenavn"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+msgid "Office"
+msgstr "Kontor"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+msgid "Other Fax"
+msgstr "Annen faks"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Phone"
+msgstr "Annen telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+msgid "Pager"
+msgstr "Personsøker"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Primary Phone"
+msgstr "Primær telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+msgid "Radio"
+msgstr "Radio"
+
+#: 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:35
+msgid "TTYTDD"
+msgstr "TTYTDD"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Telex"
+msgstr "Teleks"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
+msgid "Title"
+msgstr "Tittel"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+msgid "Unit"
+msgstr "Enhet"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+msgid "Web Site"
+msgstr "Nettside"
+
+#: addressbook/gui/widgets/e-minicard.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:115
+msgid "Width"
+msgstr "Bredde"
+
+#: addressbook/gui/widgets/e-minicard.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:122
+msgid "Height"
+msgstr "Høyde"
+
+#: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard-label.c:129
+msgid "Has Focus"
+msgstr "Har fokus"
+
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Valgt"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "Har markør"
+
+#: addressbook/gui/widgets/e-minicard-label.c:136
+msgid "Field"
+msgstr "Felt"
+
+#: addressbook/gui/widgets/e-minicard-label.c:143
+msgid "Field Name"
+msgstr "Feltnavn"
+
+#: addressbook/gui/widgets/e-minicard-label.c:150
+msgid "Text Model"
+msgstr "Tekstmodell"
+
+#: addressbook/gui/widgets/e-minicard-label.c:157
+msgid "Max field name length"
+msgstr "Maksimal lengde på feltnavn"
+
+#: addressbook/gui/widgets/e-minicard-view.c:142
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view.\n"
+"\n"
+"Double-click here to create a new Contact."
+msgstr ""
+"\n"
+"\n"
+"Ingen oppføringer i denne visningen\n"
+"\n"
+"Dobbelklikk her for å opprette en ny kontakt."
+
+#: addressbook/gui/widgets/e-minicard-view.c:145
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view."
+msgstr ""
+"\n"
+"\n"
+"Ingen oppføringer i denne visningen."
+
+#: addressbook/gui/widgets/e-minicard-view.c:453
+msgid "Adapter"
+msgstr "Adapter"
+
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Kolonnebredde"
+
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
 msgstr "Kortvisning"
@@ -3180,17 +3155,17 @@ msgstr "Kortvisning"
 msgid "GTK Tree View"
 msgstr "GTK-trevisning"
 
-#: addressbook/gui/widgets/test-reflow.c:106
+#: addressbook/gui/widgets/test-reflow.c:119
 msgid "Reflow Test"
 msgstr ""
 
-#: addressbook/gui/widgets/test-reflow.c:107
+#: addressbook/gui/widgets/test-reflow.c:120
 #: addressbook/printing/test-contact-print-style-editor.c:54
 #: addressbook/printing/test-print.c:53
 msgid "Copyright (C) 2000, Ximian, Inc."
 msgstr "Opphavsrett © 2000, Ximian, Inc."
 
-#: addressbook/gui/widgets/test-reflow.c:109
+#: addressbook/gui/widgets/test-reflow.c:122
 msgid "This should test the reflow canvas item"
 msgstr ""
 
@@ -3203,23 +3178,16 @@ msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP Data Interchange Format (.ldif)"
 
 #: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
-#, fuzzy
 msgid "Evolution VCard Importer"
-msgstr "Evolution iCalendar-import"
+msgstr "Evolution VCard-import"
 
 #: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
-#, fuzzy
 msgid "Evolution VCard importer"
-msgstr "Evolution vCalendar-import"
+msgstr "Evolution VCard-import"
 
 #: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
 msgid "VCard (.vcf, .gcrd)"
-msgstr ""
-
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Skriv ut konvolutt"
+msgstr "VCard (.vcf, .gcrd)"
 
 #: addressbook/printing/e-contact-print.c:998
 msgid "Print contacts"
@@ -3230,6 +3198,11 @@ msgstr "Skriv ut kontakter"
 msgid "Print contact"
 msgstr "Skriv ut kontakt"
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Skriv ut konvolutt"
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pkt. Tahoma"
@@ -3414,16 +3387,6 @@ msgstr "Test på utskrift av kontakt"
 msgid "This should test the contact print code"
 msgstr ""
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:629
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
-msgid "Can not open file"
-msgstr "Kan ikke åpne fil"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-msgid "Can not load URI"
-msgstr "Kan ikke laste URI"
-
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr "Oppgi utdatafil i stedet for standard utdata"
@@ -3478,6 +3441,16 @@ msgstr ""
 msgid "Impossible internal error."
 msgstr "Umulig intern feil."
 
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:629
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
+msgid "Can not open file"
+msgstr "Kan ikke åpne fil"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
+msgid "Can not load URI"
+msgstr "Kan ikke laste URI"
+
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Feil under lasting av standard adressebok."
@@ -3490,11 +3463,12 @@ msgstr "Innfil"
 msgid "No filename provided."
 msgstr "Ingen filnavn spesifisert."
 
-#: addressbook/util/e-destination.c:576
+#: addressbook/util/e-destination.c:577
 msgid "Unnamed List"
 msgstr "Liste uten navn"
 
-#: calendar/common/authentication.c:37 smime/gui/component.c:48
+#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Oppgi passord"
 
@@ -3526,99 +3500,35 @@ msgstr "Forvalgt prioritet:"
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kunne ikke lese pilotens applikasjonsblokk for oppgaveliste"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Kalender og oppgaver"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: calendar/gui/calendar-component.c:944
-msgid "Calendars"
-msgstr "Kalendere"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Konfigurer din tidssone, kalender og oppgaveliste her "
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution kalender og oppgaver"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Konfigurasjonskontroll for Evolution kalender"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Visning for møteplanlegging i Evolution kalender"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Evolution kalendervisning"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Redigering av kalender/oppgaver for Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Evolution oppgavevisning"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Calendar component"
-msgstr "Evolution kalenderkomponent"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Evolution's Tasks component"
-msgstr "Oppgavekomponent for Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:892 calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:586 calendar/gui/tasks-control.c:516
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Oppgaver"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Tjeneste for alarm-meldinger i Evolution kalender"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 msgid "Starting:"
 msgstr "Starter:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
 msgid "Ending:"
 msgstr "Slutter:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:258
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:259
 msgid "Evolution Alarm"
 msgstr "Evolution alarm"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:353
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:358
 #, c-format
 msgid "Alarm on %s"
 msgstr "Alarm på %s"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
-#: ui/evolution-contact-list-editor.xml.h:1
-#: ui/evolution-signature-editor.xml.h:1
-msgid "C_lose"
-msgstr "_Lukk"
+msgid "Snooze _time (minutes):"
+msgstr "Utsett-_tid (minutter)"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Snoo_ze"
-msgstr "Utse_tt"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-msgid "Snooze time (minutes)"
-msgstr "Utsett-tid (minutter)"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
 msgid "_Edit appointment"
 msgstr "R_ediger avtale"
 
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+msgid "_Snooze"
+msgstr "Ut_sett"
+
 #: calendar/gui/alarm-notify/alarm-queue.c:873
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
@@ -3687,6 +3597,10 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Ikke spør meg om dette programmet igjen."
 
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Tjeneste for alarm-meldinger i Evolution kalender"
+
 #: calendar/gui/alarm-notify/notify-main.c:164
 msgid "Could not initialize Bonobo"
 msgstr "Kunne ikke initiere Bonobo"
@@ -3827,27 +3741,7 @@ msgstr "Om tider skal vises i 24-timers format i stedet for å bruke AM/PM"
 msgid "Whether to show week numbers in date navigator"
 msgstr "Om ukenummer skal vises i minikalenderen"
 
-#: calendar/gui/cal-search-bar.c:51
-msgid "Summary contains"
-msgstr "Sammendrag inneholder"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Description contains"
-msgstr "Beskrivelse inneholder"
-
-#: calendar/gui/cal-search-bar.c:54
-msgid "Comment contains"
-msgstr "Kommentar inneholder"
-
-#: calendar/gui/cal-search-bar.c:56
-msgid "Location contains"
-msgstr "Lokasjon inneholder"
-
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
-msgid "Unmatched"
-msgstr "Ingen treff"
-
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1607
+#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1706
 #: camel/providers/groupwise/camel-gw-listener.c:304
 #: camel/providers/groupwise/camel-gw-listener.c:327
 msgid "Calendar"
@@ -3878,8 +3772,13 @@ 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:434 calendar/gui/e-day-view-top-item.c:694
-#: calendar/gui/e-day-view.c:1589 calendar/gui/e-week-view-main-item.c:329
+#. strftime format %a = abbreviated weekday name,
+#. %d = day of month, %b = abbreviated month name.
+#. You can change the order but don't change the
+#. specifiers or add anything.
+#: calendar/gui/calendar-commands.c:434 calendar/gui/e-day-view.c:1589
+#: calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3910,70 +3809,71 @@ msgstr "Kalender «%s» vil bli fjernet. Er du sikker på at du vil fortsette?"
 msgid "New Calendar"
 msgstr "Ny kalender"
 
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
-msgid "Properties..."
-msgstr "Egenskaper ..."
-
-#: calendar/gui/calendar-component.c:790
+#: calendar/gui/calendar-component.c:800
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Kan ikke åpne kalender «%s» for oppretting av hendelser og møter"
 
-#: calendar/gui/calendar-component.c:802
+#: calendar/gui/calendar-component.c:812
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Ingen kalender er tilgjengelig for oppretting av hendelser og møter"
 
-#: calendar/gui/calendar-component.c:836
+#: calendar/gui/calendar-component.c:846
 msgid ""
 "Selected calendar is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1095
+#: calendar/gui/calendar-component.c:954
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "Calendars"
+msgstr "Kalendere"
+
+#: calendar/gui/calendar-component.c:1110
 msgid "New appointment"
 msgstr "Ny avtale"
 
-#: calendar/gui/calendar-component.c:1096
+#: calendar/gui/calendar-component.c:1111
 msgid "_Appointment"
 msgstr "A_vtale"
 
-#: calendar/gui/calendar-component.c:1097
+#: calendar/gui/calendar-component.c:1112
 msgid "Create a new appointment"
 msgstr "Opprett en ny avtale"
 
-#: calendar/gui/calendar-component.c:1103
+#: calendar/gui/calendar-component.c:1118
 msgid "New meeting"
 msgstr "Nytt møte"
 
-#: calendar/gui/calendar-component.c:1104
+#: calendar/gui/calendar-component.c:1119
 msgid "M_eeting"
 msgstr "Møt_e"
 
-#: calendar/gui/calendar-component.c:1105
+#: calendar/gui/calendar-component.c:1120
 msgid "Create a new meeting request"
 msgstr "Opprett en ny møteforespørsel"
 
-#: calendar/gui/calendar-component.c:1111
+#: calendar/gui/calendar-component.c:1126
 msgid "New all day appointment"
 msgstr "Ny avtale for hele dagen"
 
-#: calendar/gui/calendar-component.c:1112
+#: calendar/gui/calendar-component.c:1127
 msgid "All _Day Appointment"
 msgstr "Avtale for hele _dagen"
 
-#: calendar/gui/calendar-component.c:1113
+#: calendar/gui/calendar-component.c:1128
 msgid "Create a new all-day appointment"
 msgstr "Opprett en ny avtale for hele dagen"
 
-#: calendar/gui/calendar-component.c:1119
+#: calendar/gui/calendar-component.c:1134
 msgid "New calendar"
 msgstr "Ny kalender"
 
-#: calendar/gui/calendar-component.c:1120
+#: calendar/gui/calendar-component.c:1135
 msgid "C_alendar"
 msgstr "K_alender"
 
-#: calendar/gui/calendar-component.c:1121
+#: calendar/gui/calendar-component.c:1136
 msgid "Create a new calendar"
 msgstr "Opprett en ny kalender"
 
@@ -4003,6 +3903,26 @@ msgstr "Ukevisning"
 msgid "Month View"
 msgstr "Månedsvisning"
 
+#: calendar/gui/cal-search-bar.c:52
+msgid "Summary contains"
+msgstr "Sammendrag inneholder"
+
+#: calendar/gui/cal-search-bar.c:53
+msgid "Description contains"
+msgstr "Beskrivelse inneholder"
+
+#: calendar/gui/cal-search-bar.c:55
+msgid "Comment contains"
+msgstr "Kommentar inneholder"
+
+#: calendar/gui/cal-search-bar.c:57
+msgid "Location contains"
+msgstr "Lokasjon inneholder"
+
+#: calendar/gui/cal-search-bar.c:369 camel/camel-vee-store.c:329
+msgid "Unmatched"
+msgstr "Ingen treff"
+
 #: calendar/gui/comp-editor-factory.c:408
 msgid "Error while opening the calendar"
 msgstr "Feil under åpning av kalenderen"
@@ -4139,6 +4059,7 @@ msgstr "Send en melding"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
+#: calendar/gui/e-cal-component-preview.c:187
 #: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Sammendrag:"
@@ -4177,6 +4098,85 @@ msgstr "minutt(er)"
 msgid "start of appointment"
 msgstr "start på avtale"
 
+#: calendar/gui/dialogs/calendar-setup.c:166
+msgid "You must specify a location to get the calendar from."
+msgstr "Du må oppgi en lokasjon å hente kalenderen fra."
+
+#: calendar/gui/dialogs/calendar-setup.c:174
+#, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "Kildelokasjon «%s» er ikke riktig utformet."
+
+#: calendar/gui/dialogs/calendar-setup.c:189
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr "Kildelokasjon «%s» er ikke en webcal-kilde."
+
+#: calendar/gui/dialogs/calendar-setup.c:234
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr "Kilde med navn «%s» eksisterer allerede i valgt gruppe"
+
+#: calendar/gui/dialogs/calendar-setup.c:247
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+"Gruppen «%s» er ekstern. Du må oppgi en lokasjon å hente kalenderen fra"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+msgid "Add Calendar"
+msgstr "Legg til kalender"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+msgid "Add Tasks Group"
+msgstr "Legg til oppgavegruppe"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5
+msgid "Calendar Properties"
+msgstr "Kalenderegenskaper"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:8
+msgid "Remote"
+msgstr "Ekstern"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+msgid "Task List Properties"
+msgstr "Egenskaper for oppgaveliste"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+msgid "_Add Calendar"
+msgstr "_Legg til kalender"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+msgid "_Add Group"
+msgstr "_Legg til gruppe"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:14
+msgid "_Refresh Interval:"
+msgstr "Oppdate_ringsintervall:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15
+msgid "_Refresh:"
+msgstr "_Oppdater:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:16
+msgid "_Source URL:"
+msgstr "_Kilde-URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:17
+msgid "_Type:"
+msgstr "_Type:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:18
+msgid "_URL:"
+msgstr "_URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+msgid "weeks"
+msgstr "uker"
+
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
 #: calendar/gui/dialogs/cal-prefs-dialog.c:567 mail/em-account-prefs.c:463
@@ -4231,162 +4231,169 @@ msgid "60 minutes"
 msgstr "60 minutter"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "Alerts"
-msgstr "Advarsler"
+msgid "<b>Alerts</b>"
+msgstr "<b>Varsel</b> "
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+msgid "<b>General</b>"
+msgstr "<b>Generell</b> "
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+msgid "<b>Task List</b>"
+msgstr "<b>Oppgaveliste</b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+msgid "<b>Time</b>"
+msgstr "<b>Tid</b> "
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+msgid "<b>Work Week</b>"
+msgstr "<b>Arbeidsuke</b> "
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Calendar and Tasks Settings"
 msgstr "Innstillinger for kalender og oppgaver"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Color for overdue tasks"
 msgstr "Farge for utgåtte oppgaver"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "Color for tasks due today"
 msgstr "Farge for oppgaver som går ut i dag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Day _ends:"
 msgstr "Dag_en slutter:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Days"
 msgstr "Dager"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+msgid "Display"
+msgstr "Vis"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr "A_ktiver"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+msgid "Free/Busy Publishing"
+msgstr "Publisering av ledig/opptatt-tid"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: calendar/gui/dialogs/recurrence-page.c:1048
 #: calendar/gui/e-itip-control.c:563
 msgid "Friday"
 msgstr "Fredag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Hours"
 msgstr "Timer"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "Minutes"
 msgstr "Minutter"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
 #: calendar/gui/e-itip-control.c:559
 msgid "Monday"
 msgstr "Mandag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "S_un"
 msgstr "S_ø."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
 #: calendar/gui/e-itip-control.c:564
 msgid "Saturday"
 msgstr "Lørdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Sh_ow a reminder"
 msgstr "_Vis en påminnelse"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Show week _numbers in date navigator"
 msgstr "Vis uke_nummer i datonavigasjon"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
 #: calendar/gui/e-itip-control.c:558
 msgid "Sunday"
 msgstr "Søndag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "T_asks due today:"
 msgstr "Oppg_aver som går ut i dag:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "T_hu"
 msgstr "T_o."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Task List"
-msgstr "Oppgaveliste"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
 #: calendar/gui/e-itip-control.c:562
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Time"
-msgstr "Tid"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Time _zone:"
 msgstr "Tids_sone:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Time format:"
 msgstr "Tidformat:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
 #: calendar/gui/e-itip-control.c:560
 msgid "Tuesday"
 msgstr "Tirsdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "W_eek starts:"
 msgstr "Uk_en starter:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
 #: calendar/gui/e-itip-control.c:561
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ui/evolution-calendar.xml.h:37
-msgid "Work Week"
-msgstr "Arbeidsuke"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Work days:"
 msgstr "Arbeidsdager:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_12 hour (AM/PM)"
 msgstr "_12 timer (AM/PM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_24 hour"
 msgstr "_24 timer"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Add URL"
 msgstr "_Legg til URL"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_Ask for confirmation when deleting items"
 msgstr "Spør etter bekreftelse ved sletting _av oppføringer"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Compress weekends in month view"
 msgstr "_Komprimer helger i månedsvisning"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Day begins:"
 msgstr "_Dagen begynner:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "_Display"
-msgstr "_Vis"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
 #: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
@@ -4396,140 +4403,46 @@ msgstr "_Vis"
 msgid "_Edit"
 msgstr "R_ediger"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "_Free/Busy Publishing"
-msgstr "Publisering av ledig/opptatt-tid"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Fri"
 msgstr "_Fr."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_General"
-msgstr "_Generell"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Hide completed tasks after"
 msgstr "Sk_jul utførte oppgaver etter"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Mon"
 msgstr "_Ma."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Overdue tasks:"
 msgstr "Utgåtte _oppgaver:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_Sat"
 msgstr "L_ø."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_Show appointment end times in week and month views"
 msgstr "Vi_s tid for avtalers slutt i ukes- og månedsvisning"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Time divisions:"
 msgstr "Oppdeling av _tid:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Tue"
 msgstr "_Ti."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Wed"
 msgstr "_On."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "before every appointment"
 msgstr "før hver avtale"
 
-#: calendar/gui/dialogs/calendar-setup.c:166
-msgid "You must specify a location to get the calendar from."
-msgstr "Du må oppgi en lokasjon å hente kalenderen fra."
-
-#: calendar/gui/dialogs/calendar-setup.c:174
-#, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "Kildelokasjon «%s» er ikke riktig utformet."
-
-#: calendar/gui/dialogs/calendar-setup.c:189
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr "Kildelokasjon «%s» er ikke en webcal-kilde."
-
-#: calendar/gui/dialogs/calendar-setup.c:234
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr "Kilde med navn «%s» eksisterer allerede i valgt gruppe"
-
-#: calendar/gui/dialogs/calendar-setup.c:247
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
-msgstr ""
-"Gruppen «%s» er ekstern. Du må oppgi en lokasjon å hente kalenderen fra"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-#, fuzzy
-msgid "Add Calendar"
-msgstr "Legg til ny kalender"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-#, fuzzy
-msgid "Add Tasks Group"
-msgstr "Oppgavelistegruppe"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "Calendar Properties"
-msgstr "Kalenderegenskaper"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:8
-msgid "Remote"
-msgstr "Ekstern"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "Task List Properties"
-msgstr "Egenskaper for oppgaveliste"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "Legg til ny kalender"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-#, fuzzy
-msgid "_Add Group"
-msgstr "_Legg til gruppe..."
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-msgid "_Refresh Interval:"
-msgstr "Oppdate_ringsintervall:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
-#, fuzzy
-msgid "_Refresh:"
-msgstr "Oppdater"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-msgid "_Source URL:"
-msgstr "_Kilde-URL:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
-#, fuzzy
-msgid "_Type:"
-msgstr "Type:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
-#, fuzzy
-msgid "_URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "uker"
-
 #: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
@@ -4611,81 +4524,81 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Du har ikke gjort endringer. Oppdater redigering?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr "Valideringsfeil: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " til "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Fullført "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Fullført "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Ferdig "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Ferdig "
-
-#: calendar/gui/dialogs/comp-editor.c:431
+#: calendar/gui/dialogs/comp-editor.c:430
 msgid "Could not update object"
 msgstr "Kunne ikke oppdatere objekt"
 
-#: calendar/gui/dialogs/comp-editor.c:904
-#: calendar/gui/dialogs/comp-editor.c:941
+#: calendar/gui/dialogs/comp-editor.c:903
+#: calendar/gui/dialogs/comp-editor.c:940
 msgid "Edit Appointment"
 msgstr "Rediger avtale"
 
-#: calendar/gui/dialogs/comp-editor.c:909
-#: calendar/gui/dialogs/comp-editor.c:946
+#: calendar/gui/dialogs/comp-editor.c:908
+#: calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Appointment - %s"
 msgstr "Avtale - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:912
-#: calendar/gui/dialogs/comp-editor.c:949
+#: calendar/gui/dialogs/comp-editor.c:911
+#: calendar/gui/dialogs/comp-editor.c:948
 #, c-format
 msgid "Task - %s"
 msgstr "Oppgave - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:915
-#: calendar/gui/dialogs/comp-editor.c:952
+#: calendar/gui/dialogs/comp-editor.c:914
+#: calendar/gui/dialogs/comp-editor.c:951
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journaloppføring - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:926
-#: calendar/gui/dialogs/comp-editor.c:962
+#: calendar/gui/dialogs/comp-editor.c:925
+#: calendar/gui/dialogs/comp-editor.c:961
 msgid "No summary"
 msgstr "Ingen sammendrag"
 
-#: calendar/gui/dialogs/comp-editor.c:1377
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1020
+#: calendar/gui/dialogs/comp-editor.c:1376
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1037
 #: composer/e-msg-composer.c:1183
 msgid "Save as..."
 msgstr "Lagre som..."
 
-#: calendar/gui/dialogs/comp-editor.c:1480
-#: calendar/gui/dialogs/comp-editor.c:1515
-#: calendar/gui/dialogs/comp-editor.c:1541
+#: calendar/gui/dialogs/comp-editor.c:1479
+#: calendar/gui/dialogs/comp-editor.c:1514
+#: calendar/gui/dialogs/comp-editor.c:1540
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Endringer som gjøres i denne oppføringen kan bli forkastet hvis det kommer "
 "enoppdatering"
 
-#: calendar/gui/dialogs/comp-editor.c:1577
+#: calendar/gui/dialogs/comp-editor.c:1576
 msgid "Unable to use current version!"
 msgstr "Kan ikke bruke denne versjonen!"
 
+#: calendar/gui/dialogs/comp-editor-page.c:463
+#, c-format
+msgid "Validation error: %s"
+msgstr "Valideringsfeil: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " til "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Fullført "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Fullført "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (Ferdig "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Ferdig "
+
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 msgid "Could not open source"
 msgstr "Kunne ikke åpne kilde"
@@ -4726,24 +4639,24 @@ msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Er du sikker på at du vil slette denne journaloppføringen uten tittel?"
 
 #: calendar/gui/dialogs/delete-comp.c:131
-#, fuzzy, c-format
+#, c-format
 msgid "Are you sure you want to delete %d appointment?"
 msgid_plural "Are you sure you want to delete %d appointments?"
-msgstr[0] "Er du sikker på at du vil slette %d avtaler?"
+msgstr[0] "Er du sikker på at du vil slette %d avtale?"
 msgstr[1] "Er du sikker på at du vil slette %d avtaler?"
 
 #: calendar/gui/dialogs/delete-comp.c:138
-#, fuzzy, c-format
+#, c-format
 msgid "Are you sure you want to delete %d task?"
 msgid_plural "Are you sure you want to delete %d tasks?"
-msgstr[0] "Er du sikker på at du vil slette %d oppgaver?"
+msgstr[0] "Er du sikker på at du vil slette %d oppgave?"
 msgstr[1] "Er du sikker på at du vil slette %d oppgaver?"
 
 #: calendar/gui/dialogs/delete-comp.c:145
-#, fuzzy, c-format
+#, c-format
 msgid "Are you sure you want to delete %d journal entry?"
 msgid_plural "Are you sure you want to delete %d journal entries?"
-msgstr[0] "Er du sikker på at du vil slette %d journaloppføringer?"
+msgstr[0] "Er du sikker på at du vil slette %d journaloppføring?"
 msgstr[1] "Er du sikker på at du vil slette %d journaloppføringer?"
 
 #: calendar/gui/dialogs/delete-error.c:52
@@ -4838,7 +4751,7 @@ msgstr "Hendelse uten startdato"
 msgid "Event with no end date"
 msgstr "Hendelse uten sluttdato"
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:514
+#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
 msgid "Start date is wrong"
 msgstr "Startdato er feil"
 
@@ -4922,11 +4835,16 @@ msgid "_Start time:"
 msgstr "_Start-tid:"
 
 #. an empty string is the same as 'None'
+#. add a "None" option to the stores menu
+#. Put the "None" and "UTC" entries at the top of the combo's list.
+#. When "None" is selected we want the field to be cleared.
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
 #: calendar/gui/dialogs/meeting-page.c:311
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:619 composer/e-msg-composer.c:2102
 #: mail/em-account-prefs.c:424 mail/em-folder-view.c:804
-#: mail/mail-account-gui.c:1540 mail/mail-account-gui.c:2034
+#: mail/mail-account-gui.c:1540 mail/mail-account-gui.c:2033
 #: mail/mail-config.glade.h:100
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
@@ -4946,15 +4864,15 @@ msgstr "En organisator kreves."
 msgid "At least one attendee is required."
 msgstr "Minst en deltaker kreves."
 
-#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:651
 msgid "_Delegate To..."
 msgstr "_Deleger til..."
 
 #. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:654
+#: calendar/gui/dialogs/meeting-page.c:655
 #: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1295 calendar/gui/e-calendar-view.c:1327
-#: mail/em-folder-tree.c:2541 mail/em-folder-view.c:795
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
+#: mail/em-folder-tree.c:2609 mail/em-folder-view.c:795
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
@@ -5025,7 +4943,7 @@ msgid "_Change Organizer"
 msgstr "En_dre organisator"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:6
-#: calendar/gui/e-meeting-time-sel.c:417
+#: calendar/gui/e-meeting-time-sel.c:419
 msgid "_Invite Others..."
 msgstr "_Inviter andre..."
 
@@ -5271,38 +5189,44 @@ msgid "% _Complete"
 msgstr "% _fullført"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:625
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-meeting-store.c:187
+#: calendar/gui/e-cal-component-preview.c:230
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-cal-model-tasks.c:350
+#: calendar/gui/e-cal-model-tasks.c:625 calendar/gui/e-meeting-store.c:187
 #: calendar/gui/e-meeting-store.c:210 calendar/gui/print.c:2346
 msgid "Completed"
 msgstr "Fullført"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
+#: calendar/gui/e-cal-component-preview.c:249
 #: calendar/gui/e-calendar-table.c:374 mail/message-list.c:923
 msgid "High"
 msgstr "Høy"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:623
-#: calendar/gui/e-cal-model-tasks.c:698 calendar/gui/e-calendar-table.c:448
+#: calendar/gui/e-cal-component-preview.c:227
+#: calendar/gui/e-calendar-table.c:448 calendar/gui/e-cal-model-tasks.c:348
+#: calendar/gui/e-cal-model-tasks.c:623 calendar/gui/e-cal-model-tasks.c:698
 #: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr "Under arbeid"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-cal-component-preview.c:253
 #: calendar/gui/e-calendar-table.c:376 mail/message-list.c:921
 msgid "Low"
 msgstr "Lav"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:375
+#: calendar/gui/e-cal-component-preview.c:251
+#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:875
 #: mail/message-list.c:922
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:621
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-component-preview.c:237
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/e-cal-model-tasks.c:346
+#: calendar/gui/e-cal-model-tasks.c:621 calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "Ikke startet"
 
@@ -5337,11 +5261,11 @@ msgstr "_Nettside:"
 msgid "Assignment"
 msgstr "Tildeling"
 
-#: calendar/gui/dialogs/task-page.c:487
+#: calendar/gui/dialogs/task-page.c:486
 msgid "Due date is wrong"
 msgstr "Ferdigdato er feil"
 
-#: calendar/gui/dialogs/task-page.c:824
+#: calendar/gui/dialogs/task-page.c:823
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Kan ikke åpne oppgaver i «%s»."
@@ -5350,8 +5274,9 @@ msgstr "Kan ikke åpne oppgaver i «%s»."
 msgid "Con_fidential"
 msgstr "Ko_nfidensiell"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:982
-#: calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/e-cal-component-preview.c:268
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
 msgid "Description:"
 msgstr "Beskrivelse:"
@@ -5495,101 +5420,52 @@ msgstr "%s ved %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s for en ukjent utløsertype"
 
-#: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:316
-#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:352
-msgid "Public"
-msgstr "Offentlig"
-
-#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
-#: calendar/gui/e-calendar-table.c:353
-msgid "Private"
-msgstr "Privat"
-
-#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
-#: calendar/gui/e-calendar-table.c:354
-msgid "Confidential"
-msgstr "Konfidensiell"
-
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr "Sluttdato"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Startdato"
-
-#: calendar/gui/e-cal-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:10 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Sammendrag"
-
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
-msgid "Free"
-msgstr "Ledig"
-
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Opptatt"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "N"
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2214
+#, c-format
+msgid "Click to open %s"
+msgstr "Klikk for å åpne %s"
 
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "S"
+#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:750
+msgid "Untitled"
+msgstr "Uten navn"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
-msgid "E"
-msgstr "Ø"
+#: calendar/gui/e-cal-component-preview.c:194
+#: calendar/gui/e-cal-component-preview.c:205
+msgid "Start Date:"
+msgstr "Startdato:"
 
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "V"
+#: calendar/gui/e-cal-component-preview.c:216
+msgid "Due Date:"
+msgstr "Ferdig-dato:"
 
-#: calendar/gui/e-cal-model-tasks.c:573
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Den geografiske posisjonen må skrives inn på formatet: \n"
-"\n"
-"45.436845,125.862501"
+#. write status
+#: calendar/gui/e-cal-component-preview.c:223
+#: calendar/gui/e-itip-control.c:950
+msgid "Status:"
+msgstr "Status:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
-msgid "Yes"
-msgstr "Ja"
+#: calendar/gui/e-cal-component-preview.c:247
+msgid "Priority:"
+msgstr "Prioritet:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Nei"
+#: calendar/gui/e-cal-component-preview.c:300
+msgid "Web Page:"
+msgstr "Nettside:"
 
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:329 calendar/gui/e-cal-model.c:332
-#: calendar/gui/e-itip-control.c:967 calendar/gui/e-itip-control.c:1169
-#: calendar/gui/e-meeting-list-view.c:144
-#: calendar/gui/e-meeting-list-view.c:158 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:1674 camel/camel-gpg-context.c:1725
-#: 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:2120
-#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Ukjent"
+#: calendar/gui/e-calendar-table.c:352 calendar/gui/e-cal-list-view.c:255
+#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
+msgid "Public"
+msgstr "Offentlig"
 
-#: calendar/gui/e-cal-model.c:872
-msgid "Recurring"
-msgstr "Gjeninntreffer"
+#: calendar/gui/e-calendar-table.c:353 calendar/gui/e-cal-list-view.c:256
+#: calendar/gui/e-cal-model.c:330
+msgid "Private"
+msgstr "Privat"
 
-#: calendar/gui/e-cal-model.c:874
-msgid "Assigned"
-msgstr "Tildelt"
+#: calendar/gui/e-calendar-table.c:354 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-cal-model.c:332
+msgid "Confidential"
+msgstr "Konfidensiell"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5635,16 +5511,25 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:629
+#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
+msgid "Free"
+msgstr "Ledig"
+
+#: calendar/gui/e-calendar-table.c:427 calendar/gui/e-cal-model-calendar.c:166
+#: calendar/gui/e-meeting-time-sel.c:401
+msgid "Busy"
+msgstr "Opptatt"
+
+#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
 msgid "Deleting selected objects"
 msgstr "Sletter valgte objekter"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:730
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
 msgid "Updating objects"
 msgstr "Oppdaterer objekter"
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1275 calendar/gui/e-calendar-view.c:1355
+#: calendar/gui/e-calendar-view.c:1292 calendar/gui/e-calendar-view.c:1372
 #: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Åpne"
@@ -5654,15 +5539,15 @@ msgid "Open _Web Page"
 msgstr "_Åpne nettside"
 
 #: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1361
-#: mail/em-folder-view.c:772 mail/em-popup.c:690 mail/em-popup.c:805
+#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1378
+#: mail/em-folder-view.c:772 mail/em-popup.c:692 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "Lagre _som..."
 
 #: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1254 calendar/gui/e-calendar-view.c:1277
-#: calendar/gui/e-calendar-view.c:1359 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-view.c:1271 calendar/gui/e-calendar-view.c:1294
+#: calendar/gui/e-calendar-view.c:1376 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:124
 #: ui/evolution-tasks.xml.h:25
@@ -5670,23 +5555,23 @@ msgid "_Print..."
 msgstr "S_kriv ut..."
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1282 calendar/gui/e-calendar-view.c:1325
+#: calendar/gui/e-calendar-view.c:1299 calendar/gui/e-calendar-view.c:1342
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Kli_pp ut"
 
 #: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1283 calendar/gui/e-calendar-view.c:1323
-#: mail/em-folder-tree.c:2534 ui/evolution-addressbook.xml.h:31
+#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1340
+#: mail/em-folder-tree.c:2602 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Kopier"
 
 #: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1258 calendar/gui/e-calendar-view.c:1284
-#: calendar/gui/e-calendar-view.c:1357 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-view.c:1275 calendar/gui/e-calendar-view.c:1301
+#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:122 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
@@ -5743,83 +5628,167 @@ msgstr "Prioritet"
 msgid "Start date"
 msgstr "Startdato"
 
+#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-cal-list-view.etspec.h:4 mail/mail-security.glade.h:5
+msgid "Summary"
+msgstr "Sammendrag"
+
 #: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Task sort"
 msgstr "Oppgavesortering"
 
-#: calendar/gui/e-calendar-view.c:1247 calendar/gui/e-calendar-view.c:1335
+#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1352
 msgid "New _Appointment..."
 msgstr "Ny _avtale..."
 
-#: calendar/gui/e-calendar-view.c:1248 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1357
 msgid "New All Day _Event"
 msgstr "Ny avtale som varer h_ele dagen"
 
-#: calendar/gui/e-calendar-view.c:1249 calendar/gui/e-calendar-view.c:1345
+#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1362
 msgid "New Meeting"
 msgstr "Nytt møte"
 
-#: calendar/gui/e-calendar-view.c:1250 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1367
 msgid "New Task"
 msgstr "Ny oppgave"
 
-#: calendar/gui/e-calendar-view.c:1264 ui/evolution-calendar.xml.h:26
-#, fuzzy
+#: calendar/gui/e-calendar-view.c:1281 ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
-msgstr "Velg _tråd"
+msgstr "Velg i _dag"
 
-#: calendar/gui/e-calendar-view.c:1265
-#, fuzzy
+#: calendar/gui/e-calendar-view.c:1282
 msgid "_Select Date..."
-msgstr "Velg..."
+msgstr "_Velg dato..."
 
-#: calendar/gui/e-calendar-view.c:1269 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1286 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publiser ledig/opptatt-informasjon"
 
-#: calendar/gui/e-calendar-view.c:1288
+#: calendar/gui/e-calendar-view.c:1305
 msgid "Cop_y to Calendar..."
 msgstr "Kop_ier til kalender..."
 
-#: calendar/gui/e-calendar-view.c:1289
+#: calendar/gui/e-calendar-view.c:1306
 msgid "Mo_ve to Calendar..."
 msgstr "Fl_ytt til kalender..."
 
-#: calendar/gui/e-calendar-view.c:1290
+#: calendar/gui/e-calendar-view.c:1307
 msgid "_Schedule Meeting..."
 msgstr "_Sett opp møte..."
 
-#: calendar/gui/e-calendar-view.c:1291
+#: calendar/gui/e-calendar-view.c:1308
 msgid "_Forward as iCalendar..."
 msgstr "_Videresend som iCalendar..."
 
-#: calendar/gui/e-calendar-view.c:1296 calendar/gui/e-calendar-view.c:1328
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
 msgid "Delete this _Occurrence"
 msgstr "Slett denne _hendelsen"
 
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1329
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
 msgid "Delete _All Occurrences"
 msgstr "Slett _alle hendelser"
 
-#: calendar/gui/e-calendar-view.c:1331
+#: calendar/gui/e-calendar-view.c:1348
 msgid "Go to _Today"
 msgstr "Gå _til i dag"
 
-#: calendar/gui/e-calendar-view.c:1333
+#: calendar/gui/e-calendar-view.c:1350
 msgid "_Go to Date..."
 msgstr "_Gå til dato..."
 
-#: calendar/gui/e-calendar-view.c:1363 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1380 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "Inn_stillinger..."
 
+#: calendar/gui/e-cal-list-view.etspec.h:1
+msgid "End Date"
+msgstr "Sluttdato"
+
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Start Date"
+msgstr "Startdato"
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:967 calendar/gui/e-itip-control.c:1169
+#: calendar/gui/e-meeting-list-view.c:144
+#: calendar/gui/e-meeting-list-view.c:158 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:1674 camel/camel-gpg-context.c:1725
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1534
+#: camel/providers/imap4/camel-imap4-engine.c:1561
+#: camel/providers/imap4/camel-imap4-engine.c:1591
+#: camel/providers/imap4/camel-imap4-engine.c:1631
+#: camel/providers/imap4/camel-imap4-store.c:1034
+#: camel/providers/imap4/camel-imap4-utils.c:292
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2120
+#: shell/e-component-registry.c:170 widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "Ukjent"
+
+#: calendar/gui/e-cal-model.c:877
+msgid "Recurring"
+msgstr "Gjeninntreffer"
+
+#: calendar/gui/e-cal-model.c:879
+msgid "Assigned"
+msgstr "Tildelt"
+
+#: calendar/gui/e-cal-model.c:881 calendar/gui/e-cal-model-tasks.c:981
+#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
+msgid "Yes"
+msgstr "Ja"
+
+#: calendar/gui/e-cal-model.c:881 calendar/gui/e-cal-model-tasks.c:981
+#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr "Nei"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "N"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "S"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+msgid "E"
+msgstr "Ø"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "V"
+
+#: calendar/gui/e-cal-model-tasks.c:573
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"Den geografiske posisjonen må skrives inn på formatet: \n"
+"\n"
+"45.436845,125.862501"
+
 #. strftime format of a weekday, a date and a time, 24-hour.
+#. strptime format of a weekday, a date and a time,
+#. in 24-hour format.
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format.
 #: 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"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
+#. strptime format of a weekday, a date and a time,
+#. in 12-hour format.
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format.
 #: 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"
@@ -5836,36 +5805,43 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i minutters oppdeling"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:818 calendar/gui/e-week-view.c:593
+#: calendar/gui/print.c:838
+msgid "am"
+msgstr "am"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:596
+#: calendar/gui/print.c:840
+msgid "pm"
+msgstr "pm"
 
 #. 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:690 calendar/gui/e-day-view.c:1572
+#. strftime format %A = full weekday name, %d = day of
+#. month, %B = full month name. You can change the
+#. order but don't change the specifiers or add
+#. anything.
+#: calendar/gui/e-day-view.c:1572 calendar/gui/e-day-view-top-item.c:690
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1605
+#. strftime format %d = day of month, %b = abbreviated
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: calendar/gui/e-day-view.c:1605 calendar/gui/e-day-view-top-item.c:698
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%d %b"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:818 calendar/gui/e-week-view.c:593
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:596
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i minutters oppdeling"
 
 #: calendar/gui/e-itip-control.c:592
 msgid "Yes. (Complex Recurrence)"
@@ -5879,18 +5855,18 @@ msgstr[0] "Hver dag"
 msgstr[1] "Hver %d dag"
 
 #: calendar/gui/e-itip-control.c:608
-#, fuzzy, c-format
+#, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Hver uke"
-msgstr[1] "Hver uke"
+msgstr[1] "Hver %d uker"
 
 #: calendar/gui/e-itip-control.c:610
-#, fuzzy, c-format
+#, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "Hver uke på "
-msgstr[1] "Hver uke på "
+msgstr[1] "Hver %d uker på "
 
 #: calendar/gui/e-itip-control.c:618
 msgid " and "
@@ -5907,24 +5883,24 @@ msgid "The %s %s of "
 msgstr "Den %s %s i "
 
 #: calendar/gui/e-itip-control.c:645
-#, fuzzy, c-format
+#, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "hver måned"
-msgstr[1] "hver måned"
+msgstr[1] "hver %d måneder"
 
 #: calendar/gui/e-itip-control.c:649
-#, fuzzy, c-format
+#, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Hvert år"
-msgstr[1] "Hvert år"
+msgstr[1] "Hvert %d år"
 
 #: calendar/gui/e-itip-control.c:660
-#, fuzzy, c-format
+#, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
-msgstr[0] " totalt %d ganger"
+msgstr[0] " totalt %d gang"
 msgstr[1] " totalt %d ganger"
 
 #: calendar/gui/e-itip-control.c:669
@@ -5974,10 +5950,6 @@ msgstr ""
 msgid "<i>None</i>"
 msgstr "<i>Ingen</i>"
 
-#: calendar/gui/e-itip-control.c:950
-msgid "Status:"
-msgstr "Status:"
-
 #: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
@@ -6377,7 +6349,7 @@ msgid "Needs Action"
 msgstr "Trenger handling"
 
 #: calendar/gui/e-meeting-list-view.c:182 calendar/gui/e-meeting-store.c:183
-#: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
+#: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:400
 msgid "Tentative"
 msgstr "Tentativ"
 
@@ -6390,89 +6362,102 @@ msgstr "Delegert"
 msgid "In Process"
 msgstr "Under arbeid"
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:452
-#: calendar/gui/e-meeting-time-sel.c:2060
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d %B, %Y"
-
-#. This is a strftime() format string %a = abbreviated weekday
-#. name, %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:456
-#: calendar/gui/e-meeting-time-sel.c:2093 e-util/e-time-utils.c:203
-#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
-msgid "%a %m/%d/%Y"
-msgstr "%a %d.%m.%Y"
-
-#. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
-msgid "%m/%d/%Y"
-msgstr "%d.%m.%Y"
-
-#: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
+#: calendar/gui/e-meeting-time-sel.c:402 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Ute"
 
-#: calendar/gui/e-meeting-time-sel.c:401
+#: calendar/gui/e-meeting-time-sel.c:403
 msgid "No Information"
 msgstr "Ingen informasjon"
 
-#: calendar/gui/e-meeting-time-sel.c:440
+#: calendar/gui/e-meeting-time-sel.c:442
 msgid "_Options"
 msgstr "_Alternativer"
 
-#: calendar/gui/e-meeting-time-sel.c:457
+#: calendar/gui/e-meeting-time-sel.c:459
 msgid "Show _Only Working Hours"
 msgstr "Vis k_un arbeidstid"
 
-#: calendar/gui/e-meeting-time-sel.c:467
+#: calendar/gui/e-meeting-time-sel.c:469
 msgid "Show _Zoomed Out"
 msgstr "Vis _zoomet ut"
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:484
 msgid "_Update Free/Busy"
 msgstr "_Oppdater ledig/opptatt"
 
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:499
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:515
+#: calendar/gui/e-meeting-time-sel.c:517
 msgid "_Autopick"
 msgstr "_Autovelg"
 
-#: calendar/gui/e-meeting-time-sel.c:530
+#: calendar/gui/e-meeting-time-sel.c:532
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:547
+#: calendar/gui/e-meeting-time-sel.c:549
 msgid "_All People and Resources"
 msgstr "_Alle mennesker og ressurser"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:558
 msgid "All _People and One Resource"
 msgstr "Alle _mennesker og en ressurs"
 
-#: calendar/gui/e-meeting-time-sel.c:565
+#: calendar/gui/e-meeting-time-sel.c:567
 msgid "_Required People"
 msgstr "_Obligatoriske mennesker"
 
-#: calendar/gui/e-meeting-time-sel.c:574
+#: calendar/gui/e-meeting-time-sel.c:576
 msgid "Required People and _One Resource"
 msgstr "Obligatoriske mennesker _og en ressurs"
 
-#: calendar/gui/e-meeting-time-sel.c:593
+#: calendar/gui/e-meeting-time-sel.c:595
 msgid "Meeting _start time:"
 msgstr "Tid for møtets _start:"
 
-#: calendar/gui/e-meeting-time-sel.c:613
+#: calendar/gui/e-meeting-time-sel.c:615
 msgid "Meeting _end time:"
 msgstr "Tid for møtets slutt:"
 
-#: calendar/gui/e-tasks.c:525 calendar/gui/gnome-cal.c:1912
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel.c:2062
+#: calendar/gui/e-meeting-time-sel-item.c:452
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d %B, %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday name,
+#. %m = month number, %d = month day, %Y = full year.
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#. strptime format of a weekday and a date.
+#. strftime format of a weekday and a date.
+#: calendar/gui/e-meeting-time-sel.c:2095
+#: calendar/gui/e-meeting-time-sel-item.c:456 e-util/e-time-utils.c:203
+#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
+msgid "%a %m/%d/%Y"
+msgstr "%a %d.%m.%Y"
+
+#. This is a strftime() format string %m = month number,
+#. %d = month day, %Y = full year.
+#. strptime format of a weekday and a date.
+#. This is the preferred date format for the locale.
+#. This is a strftime() format for a short date. %m = month,
+#. %d = day of month, %Y = year (all digits).
+#: 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:1604
+msgid "%m/%d/%Y"
+msgstr "%d.%m.%Y"
+
+#: calendar/gui/e-pub-utils.c:300
+#, c-format
+msgid "Enter the password for %s"
+msgstr "Oppgi passord for %s"
+
+#: calendar/gui/e-tasks.c:616 calendar/gui/gnome-cal.c:2021
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6481,24 +6466,19 @@ msgstr ""
 "Feil på «%s»:\n"
 " %s"
 
-#. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:544
+#: calendar/gui/e-tasks.c:644 calendar/gui/gnome-cal.c:2060
 #, c-format
-msgid ""
-"The task backend for\n"
-"%s\n"
-" has crashed."
-msgstr ""
-"Oppgavemotoren for\n"
-"%s\n"
-" har krasjet."
+msgid "The task backend for '%s' has crashed."
+msgstr "Oppgavemotor for «%s» har krasjet."
 
-#: calendar/gui/e-tasks.c:624
+#. FIXME Loading should be async
+#. FIXME With no event handling here the status message never actually changes
+#: calendar/gui/e-tasks.c:718
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Åpner oppgaver på %s"
 
-#: calendar/gui/e-tasks.c:645
+#: calendar/gui/e-tasks.c:741
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6507,57 +6487,94 @@ msgstr ""
 "Feil under åpning av «%s»:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:664
+#: calendar/gui/e-tasks.c:762
 msgid "Loading tasks"
 msgstr "Laster oppgaver"
 
-#: calendar/gui/e-tasks.c:766
+#: calendar/gui/e-tasks.c:866
 msgid "Completing tasks..."
 msgstr "Fullfører oppgaver..."
 
-#: calendar/gui/e-tasks.c:789
+#: calendar/gui/e-tasks.c:889
 msgid "Deleting selected objects..."
 msgstr "Sletter valgte objekter..."
 
-#: calendar/gui/e-tasks.c:816
+#: calendar/gui/e-tasks.c:916
 msgid "Expunging"
 msgstr "Tømmer"
 
-#: calendar/gui/gnome-cal.c:1773
+#: calendar/gui/e-tasks.c:992
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:591
+#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Oppgaver"
+
+#: calendar/gui/gnome-cal.c:1879
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Laster avtaler på %s"
 
-#: calendar/gui/gnome-cal.c:1792
+#: calendar/gui/gnome-cal.c:1898
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Laster oppgaver på %s"
 
-#: calendar/gui/gnome-cal.c:1812
+#: calendar/gui/gnome-cal.c:1921
 #, c-format
 msgid "Opening %s"
 msgstr "Åpner %s"
 
-#: calendar/gui/gnome-cal.c:1941
-#, fuzzy, c-format
+#: calendar/gui/gnome-cal.c:2051
+#, c-format
 msgid "The calendar backend for '%s' has crashed."
-msgstr ""
-"Kalendermotoren for\n"
-"%s\n"
-" har krasjet."
+msgstr "Kalendermotoren for «%s» har krasjet."
 
-#: calendar/gui/gnome-cal.c:1953
-#, fuzzy, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-"Oppgavemotoren for\n"
-"%s\n"
-" har krasjet."
-
-#: calendar/gui/gnome-cal.c:2757
+#: calendar/gui/gnome-cal.c:2895
 msgid "Purging"
 msgstr "Sletter"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr "Kalender og oppgaver"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Konfigurer din tidssone, kalender og oppgaveliste her "
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolution kalender og oppgaver"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Evolution Calendar configuration control"
+msgstr "Konfigurasjonskontroll for Evolution kalender"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Visning for møteplanlegging i Evolution kalender"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar viewer"
+msgstr "Evolution kalendervisning"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar/Task editor"
+msgstr "Redigering av kalender/oppgaver for Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Tasks viewer"
+msgstr "Evolution oppgavevisning"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+msgid "Evolution's Calendar component"
+msgstr "Evolution kalenderkomponent"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Evolution's Tasks component"
+msgstr "Oppgavekomponent for Evolution"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "April"
@@ -6603,18 +6620,16 @@ msgid "October"
 msgstr "Oktober"
 
 #: calendar/gui/goto-dialog.glade.h:12
-#, fuzzy
 msgid "Select Date"
-msgstr "Velg all tekst"
+msgstr "Velg dato"
 
 #: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "September"
 
 #: calendar/gui/goto-dialog.glade.h:14
-#, fuzzy
 msgid "_Select Today"
-msgstr "Velg mappe"
+msgstr "_Velg i dag"
 
 #: calendar/gui/itip-utils.c:271 calendar/gui/itip-utils.c:319
 #: calendar/gui/itip-utils.c:351
@@ -6944,47 +6959,44 @@ msgstr ""
 msgid "New Task List"
 msgstr "Ny oppgaveliste"
 
-#: calendar/gui/tasks-component.c:464
+#: calendar/gui/tasks-component.c:469
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "Kan ikke åpne oppgaveliste «%s» for oppretting av hendelser og møter"
 
-#: calendar/gui/tasks-component.c:476
+#: calendar/gui/tasks-component.c:481
 msgid "There is no calendar available for creating tasks"
 msgstr "Ingen kalender tilgjengelig for opppretting av oppgaver"
 
-#: calendar/gui/tasks-component.c:514
+#: calendar/gui/tasks-component.c:519
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:722
+#: calendar/gui/tasks-component.c:732
 msgid "New task"
 msgstr "Ny oppgave"
 
-#: calendar/gui/tasks-component.c:723
+#: calendar/gui/tasks-component.c:733
 msgid "_Task"
 msgstr "_Oppgave"
 
-#: calendar/gui/tasks-component.c:724
+#: calendar/gui/tasks-component.c:734
 msgid "Create a new task"
 msgstr "Opprett en ny oppgave"
 
-#: calendar/gui/tasks-component.c:730
-#, fuzzy
+#: calendar/gui/tasks-component.c:740
 msgid "New tasks group"
-msgstr "Ny oppgave"
+msgstr "Ny oppgavegruppe"
 
-#: calendar/gui/tasks-component.c:731
-#, fuzzy
+#: calendar/gui/tasks-component.c:741
 msgid "_Tasks Group"
-msgstr "Oppgavelistegruppe"
+msgstr "_Oppgavegruppe"
 
-#: calendar/gui/tasks-component.c:732
-#, fuzzy
+#: calendar/gui/tasks-component.c:742
 msgid "Create a new tasks group"
-msgstr "Opprett en ny oppgave"
+msgstr "Opprett en ny oppgavegruppe"
 
 #: calendar/gui/tasks-control.c:152
 msgid "The URI of the tasks folder to display"
@@ -7015,7 +7027,7 @@ msgstr "Ikke spør meg igjen."
 msgid "Print Tasks"
 msgstr "Skriv ut oppgaver"
 
-#: calendar/gui/weekday-picker.c:326
+#: calendar/gui/weekday-picker.c:327
 msgid "SMTWTFS"
 msgstr "SMTOTFL"
 
@@ -8752,33 +8764,6 @@ msgstr "Ugyldige argumenter til (user-tag)"
 msgid "Error executing filter search: %s: %s"
 msgstr "Feil under lagring av filtersøk: %s: %s"
 
-#: camel/camel-folder-search.c:348
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"Kan ikke tolke uttrykket: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:358
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"Feil under kjøring av søkeuttrykket %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
-msgid "(match-all) requires a single bool result"
-msgstr "(treff-alle) krever et enkelt bolsk resultat"
-
-#: camel/camel-folder-search.c:650
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "Utfører spørring på ukjent header: %s"
-
 #: camel/camel-folder.c:653
 #, c-format
 msgid "Unsupported operation: append message: for %s"
@@ -8810,6 +8795,33 @@ msgstr ""
 msgid "Filtering new message(s)"
 msgstr "Filtrerer ny(e) melding(er)"
 
+#: camel/camel-folder-search.c:348
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"Kan ikke tolke uttrykket: %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:358
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"Feil under kjøring av søkeuttrykket %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
+msgid "(match-all) requires a single bool result"
+msgstr "(treff-alle) krever et enkelt bolsk resultat"
+
+#: camel/camel-folder-search.c:650
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr "Utfører spørring på ukjent header: %s"
+
 #: camel/camel-gpg-context.c:712
 #, c-format
 msgid ""
@@ -8926,26 +8938,6 @@ msgstr "Kryptert innhold"
 msgid "Unable to parse message content"
 msgstr "Kunne ikke lese meldingsinnhold"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Kunne ikke rør for låshjelper: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Kan ikke kjøre fork for låshjelper: %s"
-
-#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
-#, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr "Kunne ikke låse «%s»: protokollfeil med låshjelper"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Kunne ikke låse «%s»"
-
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -8966,6 +8958,26 @@ msgstr "Feil under låsing ved bruk av fcntl(2): %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Feil under låsing ved bruk av flock(2): %s"
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Kunne ikke rør for låshjelper: %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Kan ikke kjøre fork for låshjelper: %s"
+
+#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr "Kunne ikke låse «%s»: protokollfeil med låshjelper"
+
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "Kunne ikke låse «%s»"
+
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9362,9 +9374,9 @@ msgid "Enter security pass-phrase for `%s'"
 msgstr "Oppgi sikkerhets-passord for «%s»"
 
 #: camel/camel-smime-context.c:261
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot find certificate for '%s'"
-msgstr "Kan ikke opprette mappe: %s: %s"
+msgstr "Kan ikke finne sertifikat for «%s»"
 
 #: camel/camel-smime-context.c:267
 #, fuzzy
@@ -9463,7 +9475,6 @@ msgid "Signature algorithm unknown"
 msgstr "Ukjent signeringsalgoritme"
 
 #: camel/camel-smime-context.c:528
-#, fuzzy
 msgid "Signature algorithm unsupported"
 msgstr "Signaturalgoritmen er ikke støttet"
 
@@ -9870,10 +9881,12 @@ msgid "Cannot copy messages to the Junk folder"
 msgstr "Kan ikke kopiere meldinger til søppelmappen"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:53
+#: camel/providers/imap4/camel-imap4-provider.c:35
 msgid "Checking for new mail"
 msgstr "Ser etter nye meldinger"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:55
+#: camel/providers/imap4/camel-imap4-provider.c:37
 #: camel/providers/imap/camel-imap-provider.c:45
 msgid "Check for new messages in all folders"
 msgstr "Se etter nye meldinger i alle mapper"
@@ -9904,6 +9917,7 @@ msgid "For accessing Novell Groupwise servers"
 msgstr "For å aksessere Novell Groupwise-tjenere"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
@@ -9924,6 +9938,307 @@ msgstr ""
 msgid "Checklist"
 msgstr "Sjekkliste"
 
+#: camel/providers/imap4/camel-imap4-command.c:629
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Uventet svar fra IMAP-tjener: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:415
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Kan ikke slette mappe: %s: Ugyldig operasjon"
+
+#: camel/providers/imap4/camel-imap4-engine.c:421
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Finner ikke mappe: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:1144
+#: camel/providers/imap4/camel-imap4-engine.c:1533
+#: camel/providers/imap4/camel-imap4-engine.c:1560
+#: camel/providers/imap4/camel-imap4-engine.c:1590
+#: camel/providers/imap4/camel-imap4-engine.c:1630
+#, fuzzy, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr "Tjener koblet fra uventet: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:1145
+msgid "Got BYE response"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:335
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "Finner ikke mappe: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:341
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Kan ikke opprette mappe «%s»: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:476
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Finner ikke mappe: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:481
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Finner ikke mappe: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:616
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"Kan ikke hente melding: %s fra mappe %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:621
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr ""
+"Kan ikke hente melding: %s fra mappe %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:746
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Kan ikke legge til melding i mh-mappe: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:775
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Kan ikke legge til melding i mh-mappe: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:854
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Kan ikke hente melding: %s fra mappe %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:858
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Kan ikke hente melding: %s fra mappe %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:866
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Kan ikke hente melding: %s fra mappe %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:870
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Kan ikke hente melding: %s fra mappe %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-provider.c:40
+#: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/nntp/camel-nntp-provider.c:41
+msgid "Folders"
+msgstr "Mapper"
+
+#: camel/providers/imap4/camel-imap4-provider.c:42
+#: camel/providers/imap/camel-imap-provider.c:57
+msgid "Show only subscribed folders"
+msgstr "Vis kun abonnerte mapper"
+
+#: camel/providers/imap4/camel-imap4-provider.c:44
+#: camel/providers/imap/camel-imap-provider.c:59
+msgid "Override server-supplied folder namespace"
+msgstr "Overstyr tjeners navneområde for mapper"
+
+#: camel/providers/imap4/camel-imap4-provider.c:46
+#: camel/providers/imap/camel-imap-provider.c:61
+msgid "Namespace"
+msgstr "Navneområde"
+
+#: camel/providers/imap4/camel-imap4-provider.c:53
+#, fuzzy
+msgid "IMAPv4rev1"
+msgstr "IMAPv4"
+
+#: camel/providers/imap4/camel-imap4-provider.c:55
+#, fuzzy
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr "For lesing og lagring av e-post på IMAP-tjenere."
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr ""
+"Dette valget vil la deg koble til en IMAP-tjener ved å bruke et klartekst-"
+"passord."
+
+#: camel/providers/imap4/camel-imap4-store.c:165
+#: camel/providers/imap/camel-imap-store.c:424
+#, c-format
+msgid "IMAP server %s"
+msgstr "IMAP-tjener %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:167
+#: camel/providers/imap/camel-imap-store.c:426
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "IMAP-tjeneste for %s på %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:208
+#: camel/providers/imap4/camel-imap4-store.c:225
+#: camel/providers/imap/camel-imap-store.c:545
+#: camel/providers/imap/camel-imap-store.c:565
+#: camel/providers/imapp/camel-imapp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:140
+#: camel/providers/pop3/camel-pop3-store.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:269
+#: camel/providers/smtp/camel-smtp-transport.c:285
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr "Kunne ikke koble til %s (port %d): %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:210
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/pop3/camel-pop3-store.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:271
+msgid "SSL unavailable"
+msgstr "SSL er ikke tilgjengelig"
+
+#: camel/providers/imap4/camel-imap4-store.c:222
+#: camel/providers/imap/camel-imap-store.c:562
+#: camel/providers/imap/camel-imap-store.c:799
+#: camel/providers/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:137
+#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Tilkobling avbrutt"
+
+#: camel/providers/imap4/camel-imap4-store.c:261
+#, fuzzy, c-format
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+msgstr "Kunne ikke koble til IMAP-tjener %s i sikker modus: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:286
+#: camel/providers/imap/camel-imap-store.c:633
+#: camel/providers/imap/camel-imap-store.c:664
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "Kunne ikke koble til IMAP-tjener %s i sikker modus: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:287
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/pop3/camel-pop3-store.c:538
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1089
+msgid "Unknown error"
+msgstr "Ukjent feil"
+
+#: camel/providers/imap4/camel-imap4-store.c:373
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Kunne ikke koble til POP-tjener %s: Ingen støtte for forespurt "
+"autentiseringsmekanisme."
+
+#: camel/providers/imap4/camel-imap4-store.c:418
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sVennligst skriv inn SMTP-passord for %s på vert %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:492
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Kunne ikke autentisere mot POP-tjener %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:723
+#, fuzzy, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr "Finner ikke mappe: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:782
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgstr "Mappenavn «%s» er ugyldig fordi det inneholder tegnet «%c»"
+
+#: camel/providers/imap4/camel-imap4-store.c:826
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Kan ikke endre navn på mappe: %s: Ugyldig operasjon"
+
+#: camel/providers/imap4/camel-imap4-store.c:831
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Kan ikke opprette mappe «%s»: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:859
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Kan ikke slette mappe: %s: Ingen slik mappe"
+
+#: camel/providers/imap4/camel-imap4-store.c:891
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Kan ikke slette mappe: %s: Ugyldig operasjon"
+
+#: camel/providers/imap4/camel-imap4-store.c:896
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Kan ikke slette mappe: %s: Ugyldig operasjon"
+
+#: camel/providers/imap4/camel-imap4-store.c:1032
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1034
+#, fuzzy
+msgid "Bad command"
+msgstr "Kommando:"
+
+#: camel/providers/imap4/camel-imap4-store.c:1095
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Kan ikke slette mappe: %s: Ugyldig operasjon"
+
+#: camel/providers/imap4/camel-imap4-store.c:1100
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Kan ikke opprette mappe «%s»: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1144
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Kan ikke endre navn på mappe: %s: Ugyldig operasjon"
+
+#: camel/providers/imap4/camel-imap4-store.c:1149
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Kan ikke opprette mappe «%s»: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:85
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Uventet svar fra IMAP-tjener: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:108
+msgid "No data"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-utils.c:291
+#, fuzzy, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr "Tjener koblet fra uventet: %s"
+
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
@@ -9937,13 +10252,6 @@ msgstr "Operasjon avbrutt"
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Tjener koblet fra uventet: %s"
 
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1089
-msgid "Unknown error"
-msgstr "Ukjent feil"
-
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10059,7 +10367,6 @@ msgid "Failed to cache %s: %s"
 msgstr "Feil ved mellomlagring av %s: %s"
 
 #: camel/providers/imap/camel-imap-provider.c:43
-#, fuzzy
 msgid "Checking for New Mail"
 msgstr "Ser etter nye meldinger"
 
@@ -10075,36 +10382,17 @@ msgstr "Bruk egendefinert kommando for å koble til tjener"
 msgid "Command:"
 msgstr "Kommando:"
 
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Mapper"
-
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Vis kun abonnerte mapper"
-
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "Overstyr tjeners navneområde for mapper"
-
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Navneområde"
-
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Bruk filtre for nye meldinger i INNBOKS på denne tjeneren"
 
 #: camel/providers/imap/camel-imap-provider.c:66
-#, fuzzy
 msgid "Check new messages for Junk contents"
-msgstr "Se etter nye meldinger i alle mapper"
+msgstr "Se etter søppelinnhold i nye meldinger"
 
 #: camel/providers/imap/camel-imap-provider.c:68
-#, fuzzy
 msgid "Only check for Junk messages in the INBOX folder"
-msgstr "Se etter nye meldinger i alle mapper"
+msgstr "Se kun etter søppelinnhold i nye meldinger i innboksen"
 
 #: camel/providers/imap/camel-imap-provider.c:76
 msgid "IMAP"
@@ -10114,48 +10402,6 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "For lesing og lagring av e-post på IMAP-tjenere."
 
-#: camel/providers/imap/camel-imap-store.c:424
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP-tjener %s"
-
-#: camel/providers/imap/camel-imap-store.c:426
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "IMAP-tjeneste for %s på %s"
-
-#: camel/providers/imap/camel-imap-store.c:545
-#: camel/providers/imap/camel-imap-store.c:565
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
-#: camel/providers/pop3/camel-pop3-store.c:175
-#: camel/providers/smtp/camel-smtp-transport.c:269
-#: camel/providers/smtp/camel-smtp-transport.c:285
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr "Kunne ikke koble til %s (port %d): %s"
-
-#: camel/providers/imap/camel-imap-store.c:547
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr "SSL er ikke tilgjengelig"
-
-#: camel/providers/imap/camel-imap-store.c:562
-#: camel/providers/imap/camel-imap-store.c:799
-#: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:137
-#: camel/providers/nntp/camel-nntp-store.c:155
-#: camel/providers/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Tilkobling avbrutt"
-
-#: camel/providers/imap/camel-imap-store.c:633
-#: camel/providers/imap/camel-imap-store.c:664
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "Kunne ikke koble til IMAP-tjener %s i sikker modus: %s"
-
 #: camel/providers/imap/camel-imap-store.c:634
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
@@ -10433,9 +10679,9 @@ msgstr "Mappen «%s» eksisterer ikke."
 #: camel/providers/local/camel-maildir-store.c:119
 #: camel/providers/local/camel-mbox-store.c:184
 #: camel/providers/local/camel-mbox-store.c:196
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot create folder `%s': %s"
-msgstr "Kan ikke opprette mappe: %s: %s"
+msgstr "Kan ikke opprette mappe «%s»: %s"
 
 #: camel/providers/local/camel-maildir-store.c:134
 #, fuzzy, c-format
@@ -10663,11 +10909,9 @@ msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Kan ikke legge til melding i mh-mappe: %s: %s"
 
 #: camel/providers/local/camel-mh-store.c:219
-#, fuzzy, c-format
+#, c-format
 msgid "Could not create folder `%s': %s"
-msgstr ""
-"Kunne ikke opprette mappe «%s»:\n"
-"%s"
+msgstr "Kunne ikke opprette mappe «%s»: %s"
 
 #: camel/providers/local/camel-mh-store.c:231
 #, fuzzy, c-format
@@ -10969,7 +11213,8 @@ msgid "Could not get group: %s"
 msgstr "Kunne ikke hente gruppe: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:333
-msgid "Could not get messages: unspecificed error"
+#, fuzzy
+msgid "Could not get messages: unspecified error"
 msgstr "Kunne ikke hente meldinger: uspesifisert feil"
 
 #: camel/providers/nntp/camel-nntp-summary.c:378
@@ -11516,86 +11761,6 @@ msgstr "MIME-type:"
 msgid "Suggest automatic display of attachment"
 msgstr "Foreslå automatisk visning av vedlegg"
 
-#: composer/e-msg-composer-hdrs.c:512
-msgid "Posting destination"
-msgstr "Destinasjon for post"
-
-#: composer/e-msg-composer-hdrs.c:513
-msgid "Choose folders to post the message to."
-msgstr "Velg mapper meldingen skal postes til."
-
-#: composer/e-msg-composer-hdrs.c:547
-msgid "Click here for the address book"
-msgstr "Klikk her for å få opp adresseboken"
-
-#.
-#. * Reply-To:
-#. *
-#. * Create this before we call create_from_optionmenu,
-#. * because that causes from_changed to be called, which
-#. * expects the reply_to fields to be initialized.
-#.
-#: composer/e-msg-composer-hdrs.c:577
-msgid "Reply-To:"
-msgstr "Svar-til:"
-
-#.
-#. * From
-#.
-#: composer/e-msg-composer-hdrs.c:583
-msgid "From:"
-msgstr "Fra:"
-
-#.
-#. * Subject
-#.
-#: composer/e-msg-composer-hdrs.c:589
-msgid "Subject:"
-msgstr "Emne:"
-
-#: composer/e-msg-composer-hdrs.c:598
-msgid "To:"
-msgstr "Til:"
-
-#: composer/e-msg-composer-hdrs.c:599
-msgid "Enter the recipients of the message"
-msgstr "Skriv inn mottakerene for meldingen"
-
-#: composer/e-msg-composer-hdrs.c:602
-msgid "Cc:"
-msgstr "Cc:"
-
-#: composer/e-msg-composer-hdrs.c:603
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "Skriv inn adressene som skal motta en kopi av meldingen"
-
-#: composer/e-msg-composer-hdrs.c:606
-msgid "Bcc:"
-msgstr "Bcc:"
-
-#: composer/e-msg-composer-hdrs.c:607
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"Skriv inn adressene som skal motta en kopi av meldingen uten å komme til "
-"syne i mottakerlisten for meldingen."
-
-#.
-#. * Post-To
-#.
-#: composer/e-msg-composer-hdrs.c:614
-msgid "Post To:"
-msgstr "Post til:"
-
-#: composer/e-msg-composer-hdrs.c:619
-msgid "Click here to select folders to post to"
-msgstr "Klikk her for å velge mapper å poste til"
-
-#: composer/e-msg-composer-select-file.c:127
-msgid "Attach file(s)"
-msgstr "Legg ved fil(er)"
-
 #: composer/e-msg-composer.c:695
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for from account"
@@ -11692,13 +11857,93 @@ msgstr ""
 "<b>(Redigering inneholder en meldingskropp som ikke er tekst, og derfor ikke "
 "kan redigeres.)<b>"
 
+#: composer/e-msg-composer-hdrs.c:512
+msgid "Posting destination"
+msgstr "Destinasjon for post"
+
+#: composer/e-msg-composer-hdrs.c:513
+msgid "Choose folders to post the message to."
+msgstr "Velg mapper meldingen skal postes til."
+
+#: composer/e-msg-composer-hdrs.c:547
+msgid "Click here for the address book"
+msgstr "Klikk her for å få opp adresseboken"
+
+#.
+#. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
+#.
+#: composer/e-msg-composer-hdrs.c:577
+msgid "Reply-To:"
+msgstr "Svar-til:"
+
+#.
+#. * From
+#.
+#: composer/e-msg-composer-hdrs.c:583
+msgid "From:"
+msgstr "Fra:"
+
+#.
+#. * Subject
+#.
+#: composer/e-msg-composer-hdrs.c:589
+msgid "Subject:"
+msgstr "Emne:"
+
+#: composer/e-msg-composer-hdrs.c:598
+msgid "To:"
+msgstr "Til:"
+
+#: composer/e-msg-composer-hdrs.c:599
+msgid "Enter the recipients of the message"
+msgstr "Skriv inn mottakerene for meldingen"
+
+#: composer/e-msg-composer-hdrs.c:602
+msgid "Cc:"
+msgstr "Cc:"
+
+#: composer/e-msg-composer-hdrs.c:603
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr "Skriv inn adressene som skal motta en kopi av meldingen"
+
+#: composer/e-msg-composer-hdrs.c:606
+msgid "Bcc:"
+msgstr "Bcc:"
+
+#: composer/e-msg-composer-hdrs.c:607
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message."
+msgstr ""
+"Skriv inn adressene som skal motta en kopi av meldingen uten å komme til "
+"syne i mottakerlisten for meldingen."
+
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:614
+msgid "Post To:"
+msgstr "Post til:"
+
+#: composer/e-msg-composer-hdrs.c:619
+msgid "Click here to select folders to post to"
+msgstr "Klikk her for å velge mapper å poste til"
+
+#: composer/e-msg-composer-select-file.c:127
+msgid "Attach file(s)"
+msgstr "Legg ved fil(er)"
+
 #: composer/mail-composer-errors.xml.in.h:1
 msgid "${1}"
-msgstr ""
+msgstr "${1}"
 
 #: composer/mail-composer-errors.xml.in.h:2
 msgid "All accounts have been removed."
-msgstr ""
+msgstr "Alle kontoer er fjernet."
 
 #: composer/mail-composer-errors.xml.in.h:3
 #, fuzzy
@@ -11768,14 +12013,12 @@ msgid ""
 msgstr ""
 
 #: composer/mail-composer-errors.xml.in.h:16
-#, fuzzy
 msgid "Recover"
-msgstr "Fjern"
+msgstr "Gjenopprett"
 
 #: composer/mail-composer-errors.xml.in.h:17
-#, fuzzy
 msgid "Save Message"
-msgstr "Lagre melding..."
+msgstr "Lagre melding"
 
 #: composer/mail-composer-errors.xml.in.h:18
 msgid "The file `${0}' is not a regular file and cannot be sent in a message."
@@ -11788,9 +12031,8 @@ msgid ""
 msgstr ""
 
 #: composer/mail-composer-errors.xml.in.h:20
-#, fuzzy
 msgid "Unfinished messages found"
-msgstr "Uleste meldinger"
+msgstr "Uferdige meldinger funnet"
 
 #: composer/mail-composer-errors.xml.in.h:21
 msgid "Warning: Modified Message"
@@ -11934,7 +12176,7 @@ msgstr ""
 "En fil med samme navn eksisterer allerede.\n"
 "Overskriv den?"
 
-#: e-util/e-dialog-utils.c:251
+#: e-util/e-dialog-utils.c:251 widgets/misc/e-system-errors.xml.in.h:7
 msgid "Overwrite file?"
 msgstr "Overskriv fil?"
 
@@ -11956,12 +12198,16 @@ msgstr "Synkroniser kategorier:"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format, without seconds.
 #: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d.%m.%Y %H.%M"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format, without seconds.
 #: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d.%m.%Y %H.%M"
@@ -12013,23 +12259,31 @@ msgid "%m/%d/%Y %H"
 msgstr "%d.%m.%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
+#. strftime format of a time in 12-hour format.
 #: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
 msgstr "%H.%M.%S"
 
 #. strptime format for a time of day, in 24-hour format.
+#. strftime format of a time in 24-hour format.
 #: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
 msgstr "%H.%M.%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
+#. strftime format of a time in 12-hour format,
+#. without seconds.
+#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
 #: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%I:%M %p"
 msgstr "%H.%M"
 
 #. strptime format for time of day, without seconds 24-hour format.
+#. strftime format of a time in 24-hour format,
+#. without seconds.
+#. This is a strftime() format. %H = hour (0-23), %M = minute.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
 #: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
 msgid "%H:%M"
@@ -12041,53 +12295,53 @@ msgid "%I %p"
 msgstr "%H"
 
 #: filter/filter-datespec.c:73
-#, fuzzy, c-format
+#, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "1 sekund siden"
-msgstr[1] "1 sekund siden"
+msgstr[1] "%d sekunder siden"
 
 #: filter/filter-datespec.c:74
-#, fuzzy, c-format
+#, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "1 minutt siden"
-msgstr[1] "1 minutt siden"
+msgstr[1] "%d minutter siden"
 
 #: filter/filter-datespec.c:75
-#, fuzzy, c-format
+#, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "1 time siden"
-msgstr[1] "1 time siden"
+msgstr[1] "%d timer siden"
 
 #: filter/filter-datespec.c:76
-#, fuzzy, c-format
+#, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "1 dag siden"
-msgstr[1] "1 dag siden"
+msgstr[1] "%d dager siden"
 
 #: filter/filter-datespec.c:77
-#, fuzzy, c-format
+#, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "1 uke siden"
-msgstr[1] "1 uke siden"
+msgstr[1] "%d uker siden"
 
 #: filter/filter-datespec.c:78
-#, fuzzy, c-format
+#, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "1 måned siden"
-msgstr[1] "1 måned siden"
+msgstr[1] "%d måneder siden"
 
 #: filter/filter-datespec.c:79
-#, fuzzy, c-format
+#, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "1 år siden"
-msgstr[1] "1 år siden"
+msgstr[1] "%d år siden"
 
 #: filter/filter-datespec.c:280
 msgid "<click here to select a date>"
@@ -12107,9 +12361,8 @@ msgid "Select a time to compare against"
 msgstr "Velg en tid å sammenligne mot"
 
 #: filter/filter-editor.c:147
-#, fuzzy
 msgid "_Filter Rules"
-msgstr "<b>_Filterregler</b>"
+msgstr "_Filterregler"
 
 #: filter/filter-errors.xml.in.h:1
 #, fuzzy
@@ -12128,37 +12381,32 @@ msgid "File \"{0}\" does not exist or is not a regular file."
 msgstr "Fil «%s» eksisterer ikke eller er ikke en vanlig fil."
 
 #: filter/filter-errors.xml.in.h:4
-#, fuzzy
 msgid "Missing date."
-msgstr "Møteoppdatering"
+msgstr "Mangler dato."
 
 #: filter/filter-errors.xml.in.h:5
-#, fuzzy
 msgid "Missing file name."
-msgstr "Distinguished _name:"
+msgstr "Mangler filnavn."
 
 #: filter/filter-errors.xml.in.h:6
-#, fuzzy
 msgid "Missing folder."
-msgstr "Flytter mappe %s"
+msgstr "Mangler mappe."
 
 #: filter/filter-errors.xml.in.h:7
-#, fuzzy
 msgid "Missing name."
-msgstr "Tildeling"
+msgstr "Mangler navn."
 
 #: filter/filter-errors.xml.in.h:8
 msgid "Name \"{0}\" already used."
 msgstr ""
 
 #: filter/filter-errors.xml.in.h:9
-#, fuzzy
 msgid "No sources selected."
-msgstr "Ingen tjener er valgt"
+msgstr "Ingen kilder valgt."
 
 #: filter/filter-errors.xml.in.h:10
 msgid "Please choose another name."
-msgstr ""
+msgstr "Vennligst velg et annet navn."
 
 #: filter/filter-errors.xml.in.h:11
 msgid "You must choose a date."
@@ -12194,68 +12442,14 @@ msgstr "Velg en fil"
 
 #. and now for the action area
 #: filter/filter-filter.c:491
-#, fuzzy
 msgid "<b>Then</b>"
-msgstr "<b>Ferdig:</b> "
+msgstr "<b>Så</b> "
 
 #: filter/filter-folder.c:237 filter/vfolder-rule.c:492
 #: mail/mail-account-gui.c:1327
 msgid "Select Folder"
 msgstr "Velg mappe"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:922
-#: mail/mail-config.c:65 mail/mail-config.glade.h:90
-msgid "Important"
-msgstr "Viktig"
-
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:925 mail/mail-config.c:68
-#: mail/mail-config.glade.h:145
-msgid "To Do"
-msgstr "Oppgaver"
-
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:926 mail/mail-config.c:69
-#: mail/mail-config.glade.h:94
-msgid "Later"
-msgstr "Senere"
-
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "Test"
-
-#: filter/filter-rule.c:746
-msgid "Rule name:"
-msgstr "Regelnavn:"
-
-#: filter/filter-rule.c:750
-msgid "Untitled"
-msgstr "Uten navn"
-
-#: filter/filter-rule.c:773
-msgid "<b>If</b>"
-msgstr "<b>Hvis</b> "
-
-#: filter/filter-rule.c:804
-msgid "Execute actions"
-msgstr "Utfør handlinger"
-
-#: filter/filter-rule.c:808
-msgid "if all criteria are met"
-msgstr "hvis alle kriterier er møtt"
-
-#: filter/filter-rule.c:813
-msgid "if any criteria are met"
-msgstr "hvis ethvert kriterie er møtt"
-
-#: filter/filter-rule.c:904
-msgid "incoming"
-msgstr "innkommende"
-
-#: filter/filter-rule.c:904
-msgid "outgoing"
-msgstr "utgående"
-
 #: filter/filter.glade.h:1
 msgid "    "
 msgstr "    "
@@ -12344,6 +12538,55 @@ msgstr "med alle lokale mapper"
 msgid "years"
 msgstr "år"
 
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:922
+#: mail/mail-config.c:65 mail/mail-config.glade.h:90
+msgid "Important"
+msgstr "Viktig"
+
+#. forest green
+#: filter/filter-label.c:124 mail/em-migrate.c:925 mail/mail-config.c:68
+#: mail/mail-config.glade.h:145
+msgid "To Do"
+msgstr "Oppgaver"
+
+#. blue
+#: filter/filter-label.c:125 mail/em-migrate.c:926 mail/mail-config.c:69
+#: mail/mail-config.glade.h:94
+msgid "Later"
+msgstr "Senere"
+
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
+msgid "Test"
+msgstr "Test"
+
+#: filter/filter-rule.c:746
+msgid "Rule name:"
+msgstr "Regelnavn:"
+
+#: filter/filter-rule.c:773
+msgid "<b>If</b>"
+msgstr "<b>Hvis</b> "
+
+#: filter/filter-rule.c:804
+msgid "Execute actions"
+msgstr "Utfør handlinger"
+
+#: filter/filter-rule.c:808
+msgid "if all criteria are met"
+msgstr "hvis alle kriterier er møtt"
+
+#: filter/filter-rule.c:813
+msgid "if any criteria are met"
+msgstr "hvis ethvert kriterie er møtt"
+
+#: filter/filter-rule.c:904
+msgid "incoming"
+msgstr "innkommende"
+
+#: filter/filter-rule.c:904
+msgid "outgoing"
+msgstr "utgående"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -12503,9 +12746,8 @@ msgid "Move to Folder"
 msgstr "Flytt til mappe"
 
 #: filter/libfilter-i18n.h:44
-#, fuzzy
 msgid "Pipe to Program"
-msgstr "Avslutt programmet"
+msgstr "Send til program"
 
 #: filter/libfilter-i18n.h:45
 msgid "Play Sound"
@@ -12580,8 +12822,8 @@ msgstr "starter med"
 msgid "Stop Processing"
 msgstr "Stopp behandling"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1542
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
+#: filter/libfilter-i18n.h:64 mail/em-format.c:747 mail/em-format-html.c:1542
+#: mail/em-format-quote.c:301 mail/em-mailer-prefs.c:72
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:318
 #: smime/lib/e-cert.c:1079
 msgid "Subject"
@@ -12604,9 +12846,8 @@ msgid "Rule name"
 msgstr "Regelnavn"
 
 #: filter/score-editor.c:110
-#, fuzzy
 msgid "_Score Rules"
-msgstr "Poengregler"
+msgstr "_Poengregler"
 
 #: filter/searchtypes.xml.h:1
 msgid "Body contains"
@@ -12641,75 +12882,13 @@ msgid "Subject does not contain"
 msgstr "Emne inneholder ikke"
 
 #: filter/vfolder-editor.c:108
-#, fuzzy
 msgid "Virtual _Folders"
-msgstr "<b>Virtuelle _mapper</b>"
+msgstr "Virtuelle _mapper"
 
 #: filter/vfolder-rule.c:572
 msgid "VFolder source"
 msgstr "VFolder-kilde"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Brukervalg for redigering"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-"Konfigurer brukervalg for e-post, inkludert sikkerhet og meldingsvisning her"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "Konfigurer stavekontroll, signaturer og meldingskomposisjon her"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Konfigurer e-post-kontoer her"
-
-#: 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 "Konfigurasjonskontroll for Evolution e-postkonti"
-
-#: 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-postredigering"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Konfigurasjonskontroll for Evolution e-postredigering"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
-msgstr "Komponent for mappevisning for Evolution e-post"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Brukervalg-kontroll for Evolution e-post"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:829
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:539
-#: mail/mail-component.c:582
-msgid "Mail"
-msgstr "E-post"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "E-post-konti"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
-msgid "Mail Preferences"
-msgstr "Brukervalg for e-post"
-
 #. translators: default account indicator
 #: mail/em-account-prefs.c:415
 msgid "[Default]"
@@ -12733,9 +12912,8 @@ msgid "Language(s)"
 msgstr "Språk"
 
 #: mail/em-composer-prefs.c:941
-#, fuzzy
 msgid "Add signature script"
-msgstr "_Legg til signatur"
+msgstr "Legg til signaturskript"
 
 #: mail/em-composer-prefs.c:961
 msgid "Signature(s)"
@@ -12745,6 +12923,13 @@ msgstr "Signatur(er)"
 msgid "Create _Virtual Folder From Search..."
 msgstr "Lag _virtuell mappe fra søk..."
 
+#: mail/em-folder-browser.c:829 mail/GNOME_Evolution_Mail.server.in.in.h:12
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:539
+#: mail/mail-component.c:582
+msgid "Mail"
+msgstr "E-post"
+
 #: mail/em-folder-properties.c:120
 msgid "Folder properties"
 msgstr "Egenskaper for mappe"
@@ -12775,111 +12960,113 @@ msgstr "<klikk her for å velge en mappe>"
 msgid "Create New Folder"
 msgstr "Opprett ny mappe"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2266
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2334
 #: mail/mail-component.c:731
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Spesifiser hvor mappen skal opprettes:"
 
 #: mail/em-folder-selector.c:303
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "Mappe_navn:"
 
-#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:852
-msgid "VFolders"
-msgstr "VFoldere"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-msgid "UNMATCHED"
-msgstr "UTEN TREFF"
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:208 mail/em-folder-tree-model.c:210
-msgid "Inbox"
-msgstr "Innboks"
-
-#: mail/em-folder-tree-model.c:465 mail/em-folder-tree-model.c:774
-msgid "Loading..."
-msgstr "Laster..."
-
-#: mail/em-folder-tree.c:924
+#: mail/em-folder-tree.c:934
 #, c-format
 msgid "Moving folder %s"
 msgstr "Flytter mappe %s"
 
-#: mail/em-folder-tree.c:926
+#: mail/em-folder-tree.c:936
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopierer mappe %s"
 
-#: mail/em-folder-tree.c:933
+#: mail/em-folder-tree.c:943
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Flytter meldinger til mappe %s"
 
-#: mail/em-folder-tree.c:935
+#: mail/em-folder-tree.c:945
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopierer meldinger til mappe %s"
 
-#: mail/em-folder-tree.c:951
+#: mail/em-folder-tree.c:961
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Kan ikke slippe melding(er) toppnivå for lageret"
 
-#: mail/em-folder-tree.c:2040 mail/em-folder-tree.c:2053
+#: mail/em-folder-tree.c:2108 mail/em-folder-tree.c:2121
 #: mail/em-folder-view.c:672 mail/em-folder-view.c:686
 #: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Velg mappe"
 
-#: mail/em-folder-tree.c:2080
+#: mail/em-folder-tree.c:2148
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Oppretter mappe «%s»"
 
-#: mail/em-folder-tree.c:2266 mail/mail-component.c:731
+#: mail/em-folder-tree.c:2334 mail/mail-component.c:731
 msgid "Create folder"
 msgstr "Opprett mappe"
 
-#: mail/em-folder-tree.c:2458
+#: mail/em-folder-tree.c:2526
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Endre navn på mappe «%s» til:"
 
-#: mail/em-folder-tree.c:2460
+#: mail/em-folder-tree.c:2528
 msgid "Rename Folder"
 msgstr "Endre navn på mappe"
 
-#: mail/em-folder-tree.c:2529 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2597 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
 msgid "_View"
 msgstr "_Vis"
 
-#: mail/em-folder-tree.c:2530
+#: mail/em-folder-tree.c:2598
 msgid "Open in _New Window"
 msgstr "Åpne i _nytt vindu"
 
-#: mail/em-folder-tree.c:2535
+#: mail/em-folder-tree.c:2603
 msgid "_Move"
 msgstr "_Flytt"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2539
+#: mail/em-folder-tree.c:2607
 msgid "_New Folder..."
 msgstr "_Ny mappe..."
 
-#: mail/em-folder-tree.c:2542
+#: mail/em-folder-tree.c:2610
 msgid "_Rename"
 msgstr "End_re navn"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2613 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "Egenska_per..."
 
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
+#: mail/mail-vfolder.c:852
+msgid "VFolders"
+msgstr "VFoldere"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
+msgid "UNMATCHED"
+msgstr "UTEN TREFF"
+
+#. Inbox is always first
+#: mail/em-folder-tree-model.c:208 mail/em-folder-tree-model.c:210
+msgid "Inbox"
+msgstr "Innboks"
+
+#: mail/em-folder-tree-model.c:465 mail/em-folder-tree-model.c:774
+msgid "Loading..."
+msgstr "Laster..."
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:771 mail/em-popup.c:689
+#: mail/em-folder-view.c:771 mail/em-popup.c:691
 msgid "_Edit as New Message..."
 msgstr "R_ediger som ny melding..."
 
@@ -12891,17 +13078,17 @@ msgstr "S_kriv ut"
 msgid "_Reply to Sender"
 msgstr "Sva_r til avsender"
 
-#: mail/em-folder-view.c:777 mail/em-popup.c:809
+#: mail/em-folder-view.c:777 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Svar til _listen"
 
-#: mail/em-folder-view.c:778 mail/em-popup.c:810
+#: mail/em-folder-view.c:778 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: mail/em-folder-view.c:779 mail/em-popup.c:812
+#: mail/em-folder-view.c:779 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Forward"
 msgstr "_Videresend"
@@ -13029,10 +13216,155 @@ msgstr "_Kopier lokasjon for lenke"
 msgid "Click to mail %s"
 msgstr "Klikk for å sende melding til %s"
 
-#: mail/em-folder-view.c:2214
+#: mail/em-format.c:742 mail/em-format-html.c:1436 mail/em-format-quote.c:191
+#: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:314
+msgid "From"
+msgstr "Fra"
+
+#: mail/em-format.c:743 mail/em-format-html.c:1436 mail/em-format-quote.c:191
+#: mail/em-mailer-prefs.c:68
+msgid "Reply-To"
+msgstr "Svar-til"
+
+#: mail/em-format.c:744 mail/em-format-html.c:1436 mail/em-format-quote.c:191
+#: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Til"
+
+#: mail/em-format.c:745 mail/em-format-html.c:1436 mail/em-format-quote.c:191
+#: mail/em-mailer-prefs.c:70
+msgid "Cc"
+msgstr "Cc"
+
+#: mail/em-format.c:746 mail/em-format-html.c:1436 mail/em-format-quote.c:191
+#: mail/em-mailer-prefs.c:71
+msgid "Bcc"
+msgstr "Bcc"
+
+#: mail/em-format.c:748 mail/em-format-html.c:1586 mail/em-format-quote.c:315
+#: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Dato"
+
+#: mail/em-format.c:749 mail/em-format-html.c:1607 mail/em-mailer-prefs.c:74
+msgid "Newsgroups"
+msgstr ""
+
+#: mail/em-format.c:986
 #, c-format
-msgid "Click to open %s"
-msgstr "Klikk for å åpne %s"
+msgid "%s attachment"
+msgstr "%s-vedlegg"
+
+#: mail/em-format.c:1065 mail/em-format.c:1184
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Kunne ikke lese S/MIME-melding: Ukjent feil"
+
+#: mail/em-format.c:1174
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "Krypteringstype for multipart/encrypted som ikke er støttet"
+
+#: mail/em-format.c:1320
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Kunne ikke lese MIME-melding. Viser ren meldingstekst."
+
+#: mail/em-format.c:1339
+msgid "Unsupported signature format"
+msgstr "Ustøttet signaturformat"
+
+#: mail/em-format.c:1347
+msgid "Error verifying signature"
+msgstr "Feil under verifisering av signatur"
+
+#: mail/em-format.c:1347
+msgid "Unknown error verifying signature"
+msgstr "Ukjent feil under verifisering av signatur"
+
+#: mail/em-format-html.c:462 mail/em-format-html.c:464
+#, c-format
+msgid "Retrieving `%s'"
+msgstr "Henter «%s»"
+
+#: mail/em-format-html.c:569 mail/em-format-html-display.c:646
+msgid "Unsigned"
+msgstr "Usignert"
+
+#: mail/em-format-html.c:570 mail/em-format-html-display.c:647
+msgid "Valid signature"
+msgstr "Gyldig signatur"
+
+#: mail/em-format-html.c:571 mail/em-format-html-display.c:648
+msgid "Invalid signature"
+msgstr "Ugyldig signatur"
+
+#: mail/em-format-html.c:572 mail/em-format-html-display.c:649
+msgid "Valid signature, cannot verify sender"
+msgstr "Gyldig signatur. Kan ikke verifisere avsender"
+
+#: mail/em-format-html.c:578 mail/em-format-html-display.c:655
+msgid "Unencrypted"
+msgstr "Ukryptert"
+
+#: mail/em-format-html.c:579 mail/em-format-html-display.c:656
+msgid "Encrypted, weak"
+msgstr "Kryptert, svak"
+
+#: mail/em-format-html.c:580 mail/em-format-html-display.c:657
+msgid "Encrypted"
+msgstr "Kryptert"
+
+#: mail/em-format-html.c:581 mail/em-format-html-display.c:658
+msgid "Encrypted, strong"
+msgstr "Kryptert, sterk"
+
+#: mail/em-format-html.c:843
+msgid "Malformed external-body part."
+msgstr "Feilutformet del for ekstern kropp."
+
+#: mail/em-format-html.c:873
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Peker til FTP-tjener (%s)"
+
+#: mail/em-format-html.c:884
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Peker til lokal fil (%s) gyldig på nettsted «%s»"
+
+#: mail/em-format-html.c:886
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Peker til lokal fil (%s)"
+
+#: mail/em-format-html.c:907
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Peker til eksterne data (%s)"
+
+#: mail/em-format-html.c:918
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Peker til ukjente eksterne data («%s»-type)"
+
+#: mail/em-format-html.c:1160
+msgid "Formatting message"
+msgstr "Formatterer melding"
+
+#. pseudo-header
+#: mail/em-format-html.c:1546 mail/em-format-quote.c:308
+#: mail/em-mailer-prefs.c:918
+msgid "Mailer"
+msgstr "E-postprogram"
+
+#. translators: strftime format for local time equivalent in Date header display, with day
+#: mail/em-format-html.c:1573
+msgid "<I> (%a, %R %Z)</I>"
+msgstr "<I> (%a, %R %Z)</I>"
+
+#. translators: strftime format for local time equivalent in Date header display, without day
+#: mail/em-format-html.c:1576
+msgid "<I> (%R %Z)</I>"
+msgstr "<I> (%R %Z)</I>"
 
 #. message-search popup match count string
 #: mail/em-format-html-display.c:410
@@ -13040,10 +13372,6 @@ msgstr "Klikk for å åpne %s"
 msgid "Matches: %d"
 msgstr "Treff: %d"
 
-#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
-msgid "Unsigned"
-msgstr "Usignert"
-
 #: mail/em-format-html-display.c:646
 #, fuzzy
 msgid ""
@@ -13053,10 +13381,6 @@ msgstr ""
 "Denne meldingen er ikke signert. Du har ingen garanti for at avsender av "
 "meldingen er autentisk."
 
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:570
-msgid "Valid signature"
-msgstr "Gyldig signatur"
-
 #: mail/em-format-html-display.c:647
 #, fuzzy
 msgid ""
@@ -13066,10 +13390,6 @@ msgstr ""
 "Denne meldingen er signert og gyldig. Avsender av denne meldingen er høyst "
 "sannsynlig den den påstår at den er."
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
-msgid "Invalid signature"
-msgstr "Ugyldig signatur"
-
 #: mail/em-format-html-display.c:648
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
@@ -13078,10 +13398,6 @@ msgstr ""
 "Signaturen for denne meldingen kan ikke verifiseres. Den kan være endret "
 "under overføring."
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
-msgid "Valid signature, cannot verify sender"
-msgstr "Gyldig signatur. Kan ikke verifisere avsender"
-
 #: mail/em-format-html-display.c:649
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
@@ -13090,10 +13406,6 @@ msgstr ""
 "Denne meldingen er signert med en gyldig signatur, men avsender av meldingen "
 "kan ikke verifiseres."
 
-#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
-msgid "Unencrypted"
-msgstr "Ukryptert"
-
 #: mail/em-format-html-display.c:655
 #, fuzzy
 msgid ""
@@ -13103,10 +13415,6 @@ msgstr ""
 "Denne meldingen er ikke kryptert. Innholdet kan ses under overføring over "
 "Internett."
 
-#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
-msgid "Encrypted, weak"
-msgstr "Kryptert, svak"
-
 #: mail/em-format-html-display.c:656
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm.  It would "
@@ -13117,10 +13425,6 @@ msgstr ""
 "vanskelig, men ikke umulig for en utenforstående å se innholdet i denne "
 "meldingen på noenlunde kort tid."
 
-#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
-msgid "Encrypted"
-msgstr "Kryptert"
-
 #: mail/em-format-html-display.c:657
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
@@ -13129,10 +13433,6 @@ msgstr ""
 "Denne meldingen er kryptert. Det vil være vanskelig for en utenforstående å "
 "se innholdet i denne meldingen."
 
-#: mail/em-format-html-display.c:658 mail/em-format-html.c:581
-msgid "Encrypted, strong"
-msgstr "Kryptert, sterk"
-
 #: mail/em-format-html-display.c:658
 msgid ""
 "This message is encrypted, with a strong encryption algorithm.  It would be "
@@ -13175,125 +13475,6 @@ msgstr "_Skjul"
 msgid "Page %d of %d"
 msgstr "Side %d av %d"
 
-#: mail/em-format-html.c:462 mail/em-format-html.c:464
-#, c-format
-msgid "Retrieving `%s'"
-msgstr "Henter «%s»"
-
-#: mail/em-format-html.c:843
-msgid "Malformed external-body part."
-msgstr "Feilutformet del for ekstern kropp."
-
-#: mail/em-format-html.c:873
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Peker til FTP-tjener (%s)"
-
-#: mail/em-format-html.c:884
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Peker til lokal fil (%s) gyldig på nettsted «%s»"
-
-#: mail/em-format-html.c:886
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Peker til lokal fil (%s)"
-
-#: mail/em-format-html.c:907
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Peker til eksterne data (%s)"
-
-#: mail/em-format-html.c:918
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Peker til ukjente eksterne data («%s»-type)"
-
-#: mail/em-format-html.c:1160
-msgid "Formatting message"
-msgstr "Formatterer melding"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:742
-#: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:314
-msgid "From"
-msgstr "Fra"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:743
-#: mail/em-mailer-prefs.c:68
-msgid "Reply-To"
-msgstr "Svar-til"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:744
-#: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Til"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:745
-#: mail/em-mailer-prefs.c:70
-msgid "Cc"
-msgstr "Cc"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:746
-#: mail/em-mailer-prefs.c:71
-msgid "Bcc"
-msgstr "Bcc"
-
-#. pseudo-header
-#: mail/em-format-html.c:1546 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:918
-msgid "Mailer"
-msgstr "E-postprogram"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1573
-msgid "<I> (%a, %R %Z)</I>"
-msgstr "<I> (%a, %R %Z)</I>"
-
-#. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1576
-msgid "<I> (%R %Z)</I>"
-msgstr "<I> (%R %Z)</I>"
-
-#: mail/em-format-html.c:1586 mail/em-format-quote.c:315 mail/em-format.c:748
-#: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Dato"
-
-#: mail/em-format-html.c:1607 mail/em-format.c:749 mail/em-mailer-prefs.c:74
-msgid "Newsgroups"
-msgstr ""
-
-#: mail/em-format.c:986
-#, c-format
-msgid "%s attachment"
-msgstr "%s-vedlegg"
-
-#: mail/em-format.c:1065 mail/em-format.c:1184
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Kunne ikke lese S/MIME-melding: Ukjent feil"
-
-#: mail/em-format.c:1174
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "Krypteringstype for multipart/encrypted som ikke er støttet"
-
-#: mail/em-format.c:1320
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Kunne ikke lese MIME-melding. Viser ren meldingstekst."
-
-#: mail/em-format.c:1339
-msgid "Unsupported signature format"
-msgstr "Ustøttet signaturformat"
-
-#: mail/em-format.c:1347
-#, fuzzy
-msgid "Error verifying signature"
-msgstr "Ukjent feil under verifisering av signatur"
-
-#: mail/em-format.c:1347
-msgid "Unknown error verifying signature"
-msgstr "Ukjent feil under verifisering av signatur"
-
 #: mail/em-junk-filter.c:82
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (integrert)"
@@ -13346,36 +13527,36 @@ msgstr "Klarte ikke å opprette katalog «%s»: %s"
 msgid "Failed to open store for `%s': %s"
 msgstr "Klarte ikke å åpne lager for «%s»: %s"
 
-#: mail/em-popup.c:699
+#: mail/em-popup.c:701
 msgid "Save As..."
 msgstr "Lagre som..."
 
-#: mail/em-popup.c:717
+#: mail/em-popup.c:719
 #, c-format
 msgid "untitled_image.%s"
 msgstr "bilde_uten_navn.%s"
 
-#: mail/em-popup.c:806
+#: mail/em-popup.c:808
 msgid "Set as _Background"
 msgstr "Sett som _bakgrunn"
 
-#: mail/em-popup.c:808
+#: mail/em-popup.c:810
 msgid "_Reply to sender"
 msgstr "Sva_r til avsender"
 
-#: mail/em-popup.c:856
+#: mail/em-popup.c:858
 msgid "_Open Link in Browser"
 msgstr "_Åpne lenke i nettleser"
 
-#: mail/em-popup.c:857
+#: mail/em-popup.c:859
 msgid "Se_nd message to..."
 msgstr "Se_nd melding til..."
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:860
 msgid "_Add to Addressbook"
 msgstr "Legg til i _adressebok"
 
-#: mail/em-popup.c:964
+#: mail/em-popup.c:966
 #, c-format
 msgid "Open in %s..."
 msgstr "Åpne i %s..."
@@ -13455,11 +13636,13 @@ msgid "Check incoming mail being junk"
 msgstr "Sjekk om innkommende meldinger er søppel"
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Citation highlight colour"
+#, fuzzy
+msgid "Citation highlight color"
 msgstr "Farge for utheving av sitattekst"
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour."
+#, fuzzy
+msgid "Citation highlight color."
 msgstr "Farge for utheving av sitattekst."
 
 #: mail/evolution-mail.schemas.in.in.h:6
@@ -13560,7 +13743,7 @@ msgid "Last time empty trash was run"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:29
-msgid "List of Labels and their associated colours"
+msgid "List of Labels and their associated colors"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:30
@@ -13580,7 +13763,7 @@ msgstr ""
 #: mail/evolution-mail.schemas.in.in.h:33
 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."
+"strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:34
@@ -13762,8 +13945,9 @@ msgid "Spell check inline"
 msgstr "Stavekontroll i meldingen"
 
 #: mail/evolution-mail.schemas.in.in.h:76
-msgid "Subscribe dialog default hight"
-msgstr ""
+#, fuzzy
+msgid "Subscribe dialog default height"
+msgstr "Forvalgt vinduhøyde"
 
 #: mail/evolution-mail.schemas.in.in.h:77
 msgid "Subscribe dialog default width"
@@ -13899,33 +14083,59 @@ msgstr ""
 msgid "spamd port"
 msgstr "port for spamd"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Import fra Elm for Evolution"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr "Brukervalg for redigering"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Import av Netscape e-post for Evolution"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Konfigurer brukervalg for e-post, inkludert sikkerhet og meldingsvisning her"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Import fra Outlook Express 4 for Evolution"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "Konfigurer stavekontroll, signaturer og meldingskomposisjon her"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Import fra Pine for Evolutions"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr "Konfigurer e-post-kontoer her"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "mbox-import for Evolution"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Evolution Mail"
+msgstr "Evolution e-post"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (.mbox)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail accounts configuration control"
+msgstr "Konfigurasjonskontroll for Evolution e-postkonti"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
+#: 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-postredigering"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer configuration control"
+msgstr "Konfigurasjonskontroll for Evolution e-postredigering"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail folder viewer"
+msgstr "Komponent for mappevisning for Evolution e-post"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Brukervalg-kontroll for Evolution e-post"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "E-post-konti"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+msgid "Mail Preferences"
+msgstr "Brukervalg for e-post"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -13981,6 +14191,34 @@ msgstr "Importerer «%s»"
 msgid "Importing mailbox"
 msgstr "Importerer postboks"
 
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Import fra Elm for Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Import av Netscape e-post for Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Import fra Outlook Express 4 for Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Import fra Pine for Evolutions"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "mbox-import for Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (.mbox)"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
+
 #: mail/importers/mail-importer.c:354
 #, c-format
 msgid "Scanning %s"
@@ -14118,44 +14356,44 @@ msgid "Add Filter Rule"
 msgstr "Legg til filterregel"
 
 #: mail/mail-component.c:492
-#, fuzzy, c-format
+#, c-format
 msgid "%d deleted"
-msgstr "Slettet"
+msgstr "%d slettet"
 
 #: mail/mail-component.c:494
 #, c-format
 msgid "%d junk"
-msgstr ""
+msgstr "%d søppel"
 
 #: mail/mail-component.c:517
-#, fuzzy, c-format
+#, c-format
 msgid "%d drafts"
-msgstr "%d dag"
+msgstr "%d skisser"
 
 #: mail/mail-component.c:519
-#, fuzzy, c-format
+#, c-format
 msgid "%d sent"
-msgstr "%d sekund"
+msgstr "%d sendt"
 
 #: mail/mail-component.c:521
-#, fuzzy, c-format
+#, c-format
 msgid "%d unsent"
-msgstr "%d sekund"
+msgstr "%d usendt"
 
 #: mail/mail-component.c:525
-#, fuzzy, c-format
+#, c-format
 msgid "%d total"
-msgstr "%d kontakt"
+msgstr "%d totalt"
 
 #: mail/mail-component.c:527
 #, c-format
 msgid ", %d unread"
-msgstr ""
+msgstr ", %d ulest"
 
 #: mail/mail-component.c:531
-#, fuzzy, c-format
+#, c-format
 msgid ", %d selected"
-msgstr "Slettet"
+msgstr ", %d valgt"
 
 #: mail/mail-component.c:683
 msgid "New Mail Message"
@@ -14185,6 +14423,14 @@ msgstr "Opprett en ny e-postmappe"
 msgid "URI of the mail source that the view will display"
 msgstr "URI for e-postkilden som visningen skal vise"
 
+#: mail/mail-config.c:888
+msgid "Checking Service"
+msgstr "Sjekker tjeneste"
+
+#: mail/mail-config.c:966 mail/mail-config.c:970
+msgid "Connecting to server..."
+msgstr "Kobler til tjener..."
+
 #: mail/mail-config-druid.c:364 mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr "Identitet"
@@ -14247,18 +14493,9 @@ msgstr ""
 "et navn for denne kontoen i feltet under. Dette navnet blir kun brukt for "
 "visning på skjermen."
 
-#: mail/mail-config.c:888
-msgid "Checking Service"
-msgstr "Sjekker tjeneste"
-
-#: mail/mail-config.c:966 mail/mail-config.c:970
-msgid "Connecting to server..."
-msgstr "Kobler til tjener..."
-
 #: mail/mail-config.glade.h:1
-#, fuzzy
 msgid " Ch_eck for Supported Types "
-msgstr "_Søk etter støttede typer"
+msgstr "Sj_ekk støttede typer "
 
 #: mail/mail-config.glade.h:3
 msgid "<b>Preview</b>"
@@ -14313,9 +14550,8 @@ msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:16
-#, fuzzy
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
-msgstr "<b>_Meldingshoder som vises</b>"
+msgstr "<span weight=\"bold\">_Meldingshoder som vises</span>"
 
 #: mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Filter Options</span>"
@@ -14406,19 +14642,16 @@ msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "A_lltid krypter til meg selv ved sending av kryptert e-post"
 
 #: mail/mail-config.glade.h:39
-#, fuzzy
 msgid "Alway_s carbon-copy (cc) to:"
-msgstr "Alltid _kopi (Cc) til:"
+msgstr "All_tid _kopi (cc) til:"
 
 #: mail/mail-config.glade.h:41
-#, fuzzy
 msgid "Always _blind carbon-copy (bcc) to:"
-msgstr "Alltid _blindkopi (Bcc) til:"
+msgstr "Alltid _blindkopi (bcc) til:"
 
 #: mail/mail-config.glade.h:42
-#, fuzzy
 msgid "Always _sign outgoing messages when using this account"
-msgstr "_Alltid signer utgående meldinger når denne kontoen brukes"
+msgstr "Alltid _signer utgående meldinger når denne kontoen brukes"
 
 #: mail/mail-config.glade.h:43
 msgid "Always _trust keys in my keyring when encrypting"
@@ -14553,7 +14786,7 @@ msgid "Execute Command..."
 msgstr "Kjør kommando..."
 
 #: mail/mail-config.glade.h:81
-msgid "Fi_xed -width:"
+msgid "Fi_xed-width:"
 msgstr "Fast _bredde:"
 
 #: mail/mail-config.glade.h:82
@@ -14781,14 +15014,12 @@ msgid "_Add Signature"
 msgstr "_Legg til signatur"
 
 #: mail/mail-config.glade.h:157
-#, fuzzy
 msgid "_Always load images from the Internet"
-msgstr "_Alltid last bilder fra nettet"
+msgstr "_Alltid last bilder fra Internett"
 
 #: mail/mail-config.glade.h:158
-#, fuzzy
 msgid "_Digitally sign outgoing messages (by default)"
-msgstr "Signer utgående meldinger digitalt (forvalg)"
+msgstr "Signer utgående meldinger digitalt (som forvalg)"
 
 #: mail/mail-config.glade.h:159
 msgid "_Do not notify me when new mail arrives"
@@ -14823,9 +15054,8 @@ msgid "_Mark messages as read after"
 msgstr "_Merk meldinger som lest etter"
 
 #: mail/mail-config.glade.h:171
-#, fuzzy
 msgid "_Never load images from the Internet"
-msgstr "Aldri last bilder fra _nettet"
+msgstr "Aldri last bilder fra Internett"
 
 #: mail/mail-config.glade.h:173
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
@@ -14848,7 +15078,6 @@ msgid "_Show animated images"
 msgstr "Vi_s animerte bilder"
 
 #: mail/mail-config.glade.h:178
-#, fuzzy
 msgid "_Use Secure Connection (SSL):"
 msgstr "Br_uk sikker forbindelse (SSL):"
 
@@ -14916,7 +15145,7 @@ msgstr ""
 msgid "Because \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:10
+#: mail/mail-errors.xml.in.h:10 widgets/misc/e-system-errors.xml.in.h:2
 msgid "Because \"{1}\"."
 msgstr ""
 
@@ -14949,11 +15178,8 @@ msgid "Cannot create the save directory, because \"{1}\""
 msgstr "Kan ikke opprette katalog «%s»: %s."
 
 #: mail/mail-errors.xml.in.h:17
-#, fuzzy
 msgid "Cannot delete folder \"{0}\"."
-msgstr ""
-"Kunne ikke slette mappe:\n"
-"%s"
+msgstr "Kunne ikke slette mappe «{0}»."
 
 #: mail/mail-errors.xml.in.h:18
 #, fuzzy
@@ -14971,9 +15197,8 @@ msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Kunne ikke flytte mappe: %s"
 
 #: mail/mail-errors.xml.in.h:21
-#, fuzzy
 msgid "Cannot open source \"{1}\""
-msgstr "Kunne ikke åpne kilde"
+msgstr "Kan ikke åpne kilde «{1}»"
 
 #: mail/mail-errors.xml.in.h:22
 #, fuzzy
@@ -15022,38 +15247,32 @@ msgid ""
 msgstr ""
 
 #: mail/mail-errors.xml.in.h:31
-#, fuzzy
 msgid "Could not save signature file."
-msgstr "Kunne ikke lagre signaturfil: %s"
+msgstr "Kunne ikke lagre signaturfil."
 
 #: mail/mail-errors.xml.in.h:32
-#, fuzzy
 msgid "Delete \"{0}\"?"
-msgstr "Slett «%s»"
+msgstr "Slett «{0}»?"
 
 #: mail/mail-errors.xml.in.h:33
-#, fuzzy
 msgid "Delete account?"
-msgstr "Slett valgte kontakter"
+msgstr "Slett konto?"
 
 #: mail/mail-errors.xml.in.h:34
-#, fuzzy
 msgid "Discard changed?"
-msgstr "_Forkast endringene"
+msgstr "Forkast endringer?"
 
 #: mail/mail-errors.xml.in.h:35
-#, fuzzy
 msgid "Do you wish to save your changes?"
-msgstr "Vil du lagre endringene?"
+msgstr "Vil du lagre dine endringer?"
 
 #: mail/mail-errors.xml.in.h:36
 msgid "Don't delete"
 msgstr "Ikke slett"
 
 #: mail/mail-errors.xml.in.h:37
-#, fuzzy
 msgid "Enter password."
-msgstr "Oppgi passord"
+msgstr "Oppgi passord."
 
 #: mail/mail-errors.xml.in.h:38
 #, fuzzy
@@ -15107,9 +15326,8 @@ msgid ""
 msgstr ""
 
 #: mail/mail-errors.xml.in.h:47
-#, fuzzy
 msgid "Invalid authentication"
-msgstr "Autentisering"
+msgstr "Ugyldig autentisering"
 
 #: mail/mail-errors.xml.in.h:48
 msgid "Mail filters automatically updated."
@@ -15228,14 +15446,12 @@ msgstr ""
 "Vil du bruke standard skisse-mappe?"
 
 #: mail/mail-errors.xml.in.h:64
-#, fuzzy
 msgid "Use _Default"
-msgstr "Forvalgt"
+msgstr "Bruk _forvalg"
 
 #: mail/mail-errors.xml.in.h:65
-#, fuzzy
 msgid "Use default drafts folder?"
-msgstr "Sti til forvalgt mappe for kontakter"
+msgstr "Bruk forvalgt mappe for skisser?"
 
 #: mail/mail-errors.xml.in.h:66
 msgid "You have not filled in all of the required information."
@@ -15262,19 +15478,16 @@ msgid "_Discard changes"
 msgstr "_Forkast endringene"
 
 #: mail/mail-errors.xml.in.h:72
-#, fuzzy
 msgid "_Empty Trash"
-msgstr "Tø_m søppelkurven"
+msgstr "Tøm søpp_elkurven"
 
 #: mail/mail-errors.xml.in.h:73
-#, fuzzy
 msgid "_Expunge"
 msgstr "T_øm"
 
 #: mail/mail-errors.xml.in.h:74
-#, fuzzy
 msgid "_Send"
-msgstr "Send"
+msgstr "_Send"
 
 #: mail/mail-errors.xml.in.h:75
 msgid "vFolders automatically updated."
@@ -15422,17 +15635,17 @@ msgid "Retrieving message %s"
 msgstr "Henter melding %s"
 
 #: mail/mail-ops.c:1753
-#, fuzzy, c-format
+#, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
-msgstr[0] "Henter %d melding(er)"
+msgstr[0] "Henter %d melding"
 msgstr[1] "Henter %d melding(er)"
 
 #: mail/mail-ops.c:1839
-#, fuzzy, c-format
+#, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
-msgstr[0] "Lagrer %d melding(er)"
+msgstr[0] "Lagrer %d melding"
 msgstr[1] "Lagrer %d melding(er)"
 
 #: mail/mail-ops.c:1889
@@ -15679,7 +15892,7 @@ msgstr "%d %b %H.%M"
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:3109
+#: mail/message-list.c:3105
 msgid "Generating message list"
 msgstr "Genererer meldingsliste"
 
@@ -15791,116 +16004,56 @@ msgstr "_Abonner"
 msgid "_Unsubscribe"
 msgstr "_Fjern abonnement"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Evolution skall"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "Evolution test"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr "Testkomponent for Evolution"
-
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "480"
 msgstr "480"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:2
-msgid "Default shortcut group"
-msgstr "Forvalgt snarveigruppe"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default width of the folder bar pane"
 msgstr "Forvalgt bredde for mappelinjen"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:4
-msgid "Default width of the shortcut bar pane"
-msgstr "Forvalgt bredde for snarveilinjen"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:5
+#: shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default window height"
 msgstr "Forvalgt vinduhøyde"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:6
+#: shell/apps_evolution_shell.schemas.in.in.h:4
 msgid "Default window width"
 msgstr "Forvalgt vindubredde"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:7
+#: shell/apps_evolution_shell.schemas.in.in.h:5
 msgid "Evolution configuration version"
 msgstr "Konfigurasjonsversjon for Evolution"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:8
+#: shell/apps_evolution_shell.schemas.in.in.h:6
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "ID eller alias for komponenten som skal være forvalgt ved oppstart."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:9
+#: shell/apps_evolution_shell.schemas.in.in.h:7
 msgid ""
 "If set to true, Evolution will start up in offline mode instead of online "
 "mode."
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:10
+#: shell/apps_evolution_shell.schemas.in.in.h:8
 msgid ""
 "If set to true, the warning dialog in development versions of Evolution is "
 "not displayed."
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: shell/apps_evolution_shell.schemas.in.in.h:9
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
-msgid "Path to the default calendar folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:13
-msgid "Path to the default contacts folder"
-msgstr "Sti til forvalgt mappe for kontakter"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:14
-msgid "Path to the default mail folder"
-msgstr "Sti til forvalgt e-postmappe"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:15
-msgid "Path to the default tasks folder"
-msgstr "Sti til forvalgt oppgavemappe"
-
-#: 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
-msgid "Physical URI to the default tasks folder"
-msgstr "Fysisk URI til forvalgt oppgavemappe"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:20
+#: shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Whether Evolution should start up in offline mode"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:21
-msgid "Whether to show the folder bar"
-msgstr "Om mappelinjen skal vises"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:22
-msgid "Whether to show the shortcut bar"
-msgstr "Om snarveilinjen skal vises"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:23
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Whether to skip the development warning dialog"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:24
+#: shell/apps_evolution_shell.schemas.in.in.h:12
 msgid "mail"
 msgstr "e-post"
 
@@ -15908,6 +16061,34 @@ msgstr "e-post"
 msgid "Brought to you by"
 msgstr "Etter mange timers slit av"
 
+#: shell/e-shell.c:536
+#, c-format
+msgid ""
+"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
+"The data hasn't been deleted, but it will not be seen by this version of "
+"Evolution.\n"
+msgstr ""
+"Advarsel: Evolution kunne ikke oppgradere alle dine data fra versjon %d.%d.%"
+"d.\n"
+"Ingen data er slettet, men de vil ikke kunne vises i denne versjonen av "
+"Evolution.\n"
+
+#: shell/e-shell.c:1081
+msgid "Invalid arguments"
+msgstr "Ugyldige argumenter"
+
+#: shell/e-shell.c:1083
+msgid "Cannot register on OAF"
+msgstr "Kan ikke registrere i OAF"
+
+#: shell/e-shell.c:1085
+msgid "Configuration Database not found"
+msgstr "Konfigurasjonsdatabase ikke funnet"
+
+#: shell/e-shell.c:1087
+msgid "Generic error"
+msgstr "Vanlig feil"
+
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Uten navn)"
@@ -16049,7 +16230,7 @@ msgstr "_Importer"
 msgid "Closing connections..."
 msgstr "Lukker forbindelser..."
 
-#: shell/e-shell-settings-dialog.c:323
+#: shell/e-shell-settings-dialog.c:326
 msgid "Evolution Settings"
 msgstr "Innstillinger for Evolution"
 
@@ -16091,6 +16272,24 @@ msgstr "Mappenavn kan ikke inneholde tegnet «#»."
 msgid "'.' and '..' are reserved folder names."
 msgstr "«.» og «..» er reserverte mappenavn."
 
+#: shell/e-shell-window.c:336
+msgid ""
+"Ximian Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Ximian Evolution er koblet til. Klikk på denne knappen for å arbeide "
+"frakoblet."
+
+#: shell/e-shell-window.c:343
+msgid "Ximian Evolution is in the process of going offline."
+msgstr "Ximian Evolution er i ferd med å koble fra."
+
+#: shell/e-shell-window.c:349
+msgid ""
+"Ximian Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"Ximian Evolution er frakoblet. Klikk på denne knappen for å arbeide "
+"tilkoblet."
+
 #: shell/e-shell-window-commands.c:63
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
@@ -16101,76 +16300,30 @@ msgstr ""
 msgid "Error executing %s."
 msgstr "Feil under kjøring av %s."
 
-#: shell/e-shell-window-commands.c:121
+#: shell/e-shell-window-commands.c:120
 msgid "Bug buddy is not installed."
 msgstr "Bug buddy er ikke installert."
 
-#: shell/e-shell-window-commands.c:129
+#: shell/e-shell-window-commands.c:128
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy kunne ikke kjøres."
 
-#: shell/e-shell-window-commands.c:171
+#: shell/e-shell-window-commands.c:170
 msgid "About Ximian Evolution"
 msgstr "Om Ximian Evolution"
 
-#: shell/e-shell-window-commands.c:382
+#: shell/e-shell-window-commands.c:381
 msgid "_Work Online"
 msgstr "Ar_beid tilkoblet"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:36
+#: shell/e-shell-window-commands.c:394 ui/evolution.xml.h:36
 msgid "_Work Offline"
 msgstr "Ar_beid frakoblet"
 
-#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:407 ui/evolution.xml.h:22
 msgid "Work Offline"
 msgstr "Arbeid frakoblet"
 
-#: shell/e-shell-window.c:338
-msgid ""
-"Ximian Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"Ximian Evolution er koblet til. Klikk på denne knappen for å arbeide "
-"frakoblet."
-
-#: shell/e-shell-window.c:345
-msgid "Ximian Evolution is in the process of going offline."
-msgstr "Ximian Evolution er i ferd med å koble fra."
-
-#: shell/e-shell-window.c:351
-msgid ""
-"Ximian Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"Ximian Evolution er frakoblet. Klikk på denne knappen for å arbeide "
-"tilkoblet."
-
-#: shell/e-shell.c:536
-#, c-format
-msgid ""
-"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
-"The data hasn't been deleted, but it will not be seen by this version of "
-"Evolution.\n"
-msgstr ""
-"Advarsel: Evolution kunne ikke oppgradere alle dine data fra versjon %d.%d.%"
-"d.\n"
-"Ingen data er slettet, men de vil ikke kunne vises i denne versjonen av "
-"Evolution.\n"
-
-#: shell/e-shell.c:1081
-msgid "Invalid arguments"
-msgstr "Ugyldige argumenter"
-
-#: shell/e-shell.c:1083
-msgid "Cannot register on OAF"
-msgstr "Kan ikke registrere i OAF"
-
-#: shell/e-shell.c:1085
-msgid "Configuration Database not found"
-msgstr "Konfigurasjonsdatabase ikke funnet"
-
-#: shell/e-shell.c:1087
-msgid "Generic error"
-msgstr "Vanlig feil"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr "Avkryssingsboks"
@@ -16229,9 +16382,8 @@ msgid "Create a new test item"
 msgstr "Opprett en ny testoppføring"
 
 #: shell/glade/e-active-connection-dialog.glade.h:1
-#, fuzzy
 msgid "<b>Active Connections</b>"
-msgstr "Aktive tilkoblinger"
+msgstr "<b>Aktive forbindelser</b>"
 
 #: shell/glade/e-active-connection-dialog.glade.h:2
 msgid "Active Connections"
@@ -16241,6 +16393,42 @@ msgstr "Aktive tilkoblinger"
 msgid "Click OK to close these connections and go offline"
 msgstr "Klikk OK for å lukke disse forbindelsene og arbeide frakoblet"
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+msgid "C_alendar:"
+msgstr "K_alender:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+msgid "_Contacts:"
+msgstr "_Kontakter:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+msgid "_Mail:"
+msgstr "E-post:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+msgid "_Tasks:"
+msgstr "_Oppgaver:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+msgid "Folder _type:"
+msgstr "Mappe_type:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Open Other User's Folder"
+msgstr "Åpne annen brukers mappe"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "_Account:"
+msgstr "K_onto::"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+msgid "_Folder Name:"
+msgstr "_Mappenavn:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+msgid "_User:"
+msgstr "Br_uker:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Konfigurasjonsassistent for Evolution"
@@ -16283,6 +16471,18 @@ msgstr ""
 "\n"
 "Klikk på «Fullfør» for å lagre dine innstillinger. "
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Evolution skall"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+msgid "Evolution Test"
+msgstr "Evolution test"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
+msgstr "Testkomponent for Evolution"
+
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Klikk på «Importer» for å starte import av filen til Evolution."
@@ -16390,9 +16590,8 @@ msgid "Don't tell me again"
 msgstr "Ikke gi beskjed igjen"
 
 #: shell/main.c:391
-#, fuzzy
 msgid "Cannot register the Ximian Evolution shell."
-msgstr "Kan ikke aksessere Ximian Evolution-skallet."
+msgstr "Kan ikke registrere skallet for Ximian Evolution."
 
 #: shell/main.c:400
 #, c-format
@@ -16437,12 +16636,12 @@ msgstr ""
 "  Bruk %s --help for mer informasjon.\n"
 
 #: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:503
+#: smime/gui/certificate-manager.c:522
 msgid "Select a cert to import..."
 msgstr "Velg et sertifikat som skal importeres..."
 
 #: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:585
+#: smime/gui/certificate-manager.c:604
 msgid "Certificate Name"
 msgstr "Navn på sertifikat"
 
@@ -16672,11 +16871,6 @@ msgstr "Du har sertifikater som identifiserer disse menneskene på lager:"
 msgid "Your Certificates"
 msgstr "Dine sertifikater"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
-msgid "Certificate already exists"
-msgstr "Sertifikatet eksisterer allerede"
-
 #: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 msgid "%d/%m/%Y"
 msgstr "%d.%m.%Y"
@@ -16868,6 +17062,11 @@ msgstr "Unik ID for subjekt"
 msgid "Certificate Signature Value"
 msgstr "Signaturverdi for sertifikat"
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:605
+msgid "Certificate already exists"
+msgstr "Sertifikatet eksisterer allerede"
+
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "Passord for PKCS12-fil"
@@ -16907,12 +17106,12 @@ msgstr "Forvalgt emne for meldingen."
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
-#: tools/killev.c:63
+#: tools/killev.c:61
 #, c-format
 msgid "Could not execute '%s': %s\n"
 msgstr "Kunne ikke kjøre «%s»: %s\n"
 
-#: tools/killev.c:78
+#: tools/killev.c:76
 #, c-format
 msgid "Shutting down %s (%s)\n"
 msgstr "Stenger ned %s (%s)\n"
@@ -17007,8 +17206,8 @@ msgstr "Vis aktiv kontakt"
 #: 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:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
 msgid "_Actions"
 msgstr "H_andlinger"
@@ -17106,19 +17305,16 @@ msgid "Purge old appointments and meetings"
 msgstr "Fjern gamle avtaler og møter"
 
 #: ui/evolution-calendar.xml.h:25
-#, fuzzy
 msgid "Select _Date"
-msgstr "Velg all tekst"
+msgstr "Velg _dato"
 
 #: ui/evolution-calendar.xml.h:27
-#, fuzzy
 msgid "Select a specific date"
-msgstr "Gå til en spesifikk dato"
+msgstr "Velg en spesifikk dato"
 
 #: ui/evolution-calendar.xml.h:28
-#, fuzzy
 msgid "Select today"
-msgstr "Velg mappe"
+msgstr "Velg i dag"
 
 #: ui/evolution-calendar.xml.h:29
 msgid "Show as list"
@@ -17153,10 +17349,20 @@ msgstr "Vis denne avtalen"
 msgid "Week"
 msgstr "Uke"
 
+#: ui/evolution-calendar.xml.h:37
+msgid "Work Week"
+msgstr "Arbeidsuke"
+
 #: ui/evolution-calendar.xml.h:42
 msgid "_Open Appointment"
 msgstr "_Åpne avtale"
 
+#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-signature-editor.xml.h:1
+msgid "C_lose"
+msgstr "_Lukk"
+
 #: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
@@ -17474,6 +17680,16 @@ msgstr "_Reverser utvalg"
 msgid "_Threaded Message List"
 msgstr "Meldingsliste med _tråder"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Lukk dette vinduet"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:26
+msgid "_Close"
+msgstr "L_ukk"
+
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
 msgstr "L_egg til avsender i adressebok"
@@ -17887,16 +18103,6 @@ msgstr "Ve_rktøy"
 msgid "_Undelete"
 msgstr "A_ngre slett"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Lukk dette vinduet"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:26
-msgid "_Close"
-msgstr "L_ukk"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Legg ved"
@@ -18219,9 +18425,8 @@ msgid "Import data from other programs"
 msgstr "Importer data fra andre programmer"
 
 #: ui/evolution.xml.h:12
-#, fuzzy
 msgid "New _Window"
-msgstr "_Vindu"
+msgstr "Nytt _vindu"
 
 #: ui/evolution.xml.h:13
 msgid "Pi_lot Settings..."
@@ -18308,9 +18513,8 @@ msgid "_Day View"
 msgstr "_Dagvisning"
 
 #: views/calendar/galview.xml.h:3
-#, fuzzy
 msgid "_List View"
-msgstr "Listevisning"
+msgstr "_Listevisning"
 
 #: views/calendar/galview.xml.h:4
 msgid "_Month View"
@@ -18345,14 +18549,12 @@ msgid "_Messages"
 msgstr "_Meldinger"
 
 #: views/tasks/galview.xml.h:1
-#, fuzzy
 msgid "With _Due Date"
-msgstr "Ferdig-dato:"
+msgstr "Med ferdig-dato"
 
 #: views/tasks/galview.xml.h:2
-#, fuzzy
 msgid "With _Status"
-msgstr "Sett status"
+msgstr "Med _status"
 
 #: views/tasks/galview.xml.h:3
 msgid "_Tasks"
@@ -18364,14 +18566,12 @@ msgid "UTC"
 msgstr "UTC"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
-#, fuzzy
 msgid "<b>Time Zones</b>"
-msgstr "Tidssoner"
+msgstr "<b>Tidssoner</b>"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
-#, fuzzy
 msgid "<b>_Selection</b>"
-msgstr "_Utvalg:"
+msgstr "<b>_Utvalg</b>"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
 msgid "Select a Time Zone"
@@ -18406,12 +18606,12 @@ msgstr "Definer visninger..."
 
 #. 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:423
+#: widgets/misc/e-calendar-item.c:425
 msgid "MTWTFSS"
 msgstr "MTOTFLS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1128
+#: widgets/misc/e-calendar-item.c:1130
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -18473,9 +18673,8 @@ msgid "Western European"
 msgstr "Vest-europeisk"
 
 #: widgets/misc/e-charset-picker.c:74
-#, fuzzy
 msgid "Western European, New"
-msgstr "Vest-europeisk"
+msgstr "Vest-europeisk, ny"
 
 #: widgets/misc/e-charset-picker.c:91 widgets/misc/e-charset-picker.c:92
 #: widgets/misc/e-charset-picker.c:93
@@ -18516,6 +18715,31 @@ msgstr "Andre..."
 msgid "..."
 msgstr "..."
 
+#: widgets/misc/e-error.c:76 widgets/misc/e-error.c:77
+#: widgets/misc/e-error.c:119
+msgid "Evolution Error"
+msgstr "Evolution feil"
+
+#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
+#: widgets/misc/e-error.c:117
+msgid "Evolution Warning"
+msgstr "Evolution advarsel"
+
+#: widgets/misc/e-error.c:116
+msgid "Evolution Information"
+msgstr "Evolution informasjon"
+
+#: widgets/misc/e-error.c:118
+msgid "Evolution Query"
+msgstr "Evolution spørring"
+
+#. setup a dummy error
+#: widgets/misc/e-error.c:408
+#, fuzzy, c-format
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr "Sendte meldinger og skisser"
+
 #: widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr "Utvidet"
@@ -18571,7 +18795,6 @@ msgid "Spacing around expander arrow"
 msgstr "Mellomrom rundt utviderpilen"
 
 #: widgets/misc/e-filter-bar.c:195
-#, fuzzy
 msgid "_Searches"
 msgstr "_Søk"
 
@@ -18628,6 +18851,30 @@ msgstr "Tekst"
 msgid "Find _Now"
 msgstr "Finn _nå "
 
+#: widgets/misc/e-system-errors.xml.in.h:1
+msgid "Because \"{1}\""
+msgstr ""
+
+#: widgets/misc/e-system-errors.xml.in.h:3
+msgid "Cannot open file \"{0}\"."
+msgstr "Kan ikke åpne filen «{0}»."
+
+#: widgets/misc/e-system-errors.xml.in.h:4
+msgid "Cannot save file \"{0}\"."
+msgstr "Kan ikke lagre fil «{0}»."
+
+#: widgets/misc/e-system-errors.xml.in.h:5
+msgid "Do you wish to overwrite it?"
+msgstr "Vil du overskrive den?"
+
+#: widgets/misc/e-system-errors.xml.in.h:6
+msgid "File exists \"{0}\"."
+msgstr "Filen eksisterer «{0}»."
+
+#: widgets/misc/e-system-errors.xml.in.h:8
+msgid "_Overwrite"
+msgstr "_Overskriv"
+
 #: widgets/misc/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -18639,35 +18886,41 @@ msgid "%s (%d%% complete)"
 msgstr "%s (%d%% fullført)"
 
 #~ msgid ""
-#~ "Address book '%s' will be removed. Are you sure you want to continue?"
+#~ "The task backend for\n"
+#~ "%s\n"
+#~ " has crashed."
 #~ msgstr ""
-#~ "Adressebok «%s» vil bli fjernet. Er du sikker på at du vil fortsette?"
+#~ "Oppgavemotoren for\n"
+#~ "%s\n"
+#~ " har krasjet."
+
+#~ msgid "Default shortcut group"
+#~ msgstr "Forvalgt snarveigruppe"
+
+#~ msgid "Default width of the shortcut bar pane"
+#~ msgstr "Forvalgt bredde for snarveilinjen"
+
+#~ msgid "Path to the default contacts folder"
+#~ msgstr "Sti til forvalgt mappe for kontakter"
 
-#~ msgid "New Address Book"
-#~ msgstr "Ny adressebok"
+#~ msgid "Path to the default mail folder"
+#~ msgstr "Sti til forvalgt e-postmappe"
 
-#~ msgid "UID of the contacts source that the view will display"
-#~ msgstr "UID for kontaktkilden som visningen skal vise"
+#~ msgid "Path to the default tasks folder"
+#~ msgstr "Sti til forvalgt oppgavemappe"
 
-#~ msgid "The URI that the address book will display"
-#~ msgstr "URIen som adresseboken skal vise"
+#~ msgid "Physical URI to the default tasks folder"
+#~ msgstr "Fysisk URI til forvalgt oppgavemappe"
+
+#~ msgid "Whether to show the folder bar"
+#~ msgstr "Om mappelinjen skal vises"
+
+#~ msgid "Whether to show the shortcut bar"
+#~ msgstr "Om snarveilinjen skal vises"
 
 #~ msgid "Address Book Creation Assistant"
 #~ msgstr "Assistent for oppretting av adressebok"
 
-#, fuzzy
-#~ msgid ""
-#~ "Congratulations, you are\n"
-#~ "\t      finished setting up this address book.\n"
-#~ "\n"
-#~ "Please click the \"Apply\" button to save the settings you have entered "
-#~ "here."
-#~ msgstr ""
-#~ "Gratulerer. Du har fullført oppsett av denne adresseboken.\n"
-#~ "\n"
-#~ "Vennligst klikk på «Bruk»-knappen for å lagre innstillingenene du har "
-#~ "oppgitt her."
-
 #~ msgid "Finished"
 #~ msgstr "Fullført"
 
@@ -18683,15 +18936,6 @@ msgstr "%s (%d%% fullført)"
 #~ "forvalgte innstillinger\n"
 #~ "for LDAP-søk, og for oppretting og redigering av kontakter. "
 
-#, fuzzy
-#~ msgid ""
-#~ "Specifying a\n"
-#~ "\t\t\t  display name and group is the first step in setting\n"
-#~ "\t\t\t  up an address book."
-#~ msgstr ""
-#~ "Spesifisering av visningsnavn og gruppe er det siste steget i "
-#~ "konfigurasjon av en adressebok."
-
 #~ msgid "Step 1: Folder Characteristics"
 #~ msgstr "Steg 1: Karakteristikk for mappe"
 
@@ -18714,39 +18958,6 @@ msgstr "%s (%d%% fullført)"
 #~ "du trenger\n"
 #~ "å endre disse alternativene."
 
-#, fuzzy
-#~ msgid ""
-#~ "This assistant will help you\n"
-#~ "\t      create a new address book. \n"
-#~ "\n"
-#~ "Depending on the type of address book you create, additional\n"
-#~ "parameters may be required. Please contact your system\n"
-#~ "administrator if you need help finding this information."
-#~ msgstr ""
-#~ "Denne veiviseren vil hjelpe deg å opprette en ny adressebok.\n"
-#~ "\n"
-#~ "Mer informasjon vil være nødvendig avhengig av type adressebok du\n"
-#~ "oppretter. Vennligst kontakt din systemadministrator hvis du trenger\n"
-#~ "hjelp til å finne denne informasjonen."
-
-#~ msgid ""
-#~ "This is the name that will appear in your Evolution folder list. It is "
-#~ "for display purposes only. "
-#~ msgstr ""
-#~ "Dette er navnet som vises i mappelisten i Evolution og brukes kun for "
-#~ "visning på skjermen."
-
-#~ 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 ""
-#~ "Du har valgt å konfigurere en LDAP-tjener. Det første steget er å oppgi "
-#~ "navn og påloggingsinformasjon.\n"
-#~ "Vennligst spør din systemadministrator hvis du ikke er sikker på hva "
-#~ "dette er."
-
 #~ msgid " B_usiness:"
 #~ msgstr "A_rbeid:"
 
@@ -18927,15 +19138,6 @@ msgstr "%s (%d%% fullført)"
 #~ msgid "Due date is before start date!"
 #~ msgstr "Ferdigdato er før startdato!"
 
-#~ msgid "Start Date:"
-#~ msgstr "Startdato:"
-
-#~ msgid "Due Date:"
-#~ msgstr "Ferdig-dato:"
-
-#~ msgid "Priority:"
-#~ msgstr "Prioritet:"
-
 #~ msgid ""
 #~ "Error while reading file %s:\n"
 #~ "%s"
@@ -19043,404 +19245,6 @@ msgstr "%s (%d%% fullført)"
 #~ msgid "Could not delete folder: %s"
 #~ msgstr "Kunne ikke slette mappe: %s"
 
-#, fuzzy
-#~ msgid "Internal error: expecting CamelMultipart, got \"%s\""
-#~ msgstr "Intern feil: uid i ugyldig format: %s"
-
-#, fuzzy
-#~ msgid "Internal error: expecting CamelMimeMessage, got \"%s\""
-#~ msgstr "Intern feil: uid i ugyldig format: %s"
-
-#~ msgid ""
-#~ "`%s' already exists.\n"
-#~ "Overwrite it?"
-#~ msgstr ""
-#~ "«%s» eksisterer allerede\n"
-#~ "Vil du overskrive den?"
-
-#~ msgid "Error: '%s' exists and is not a regular file"
-#~ msgstr "Feil: «%s» eksisterer og er ikke en vanlig fil"
-
-#~ msgid ""
-#~ "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 ""
-#~ "Denne operasjonen vil fjerne alle slettede meldinger i mappen «%s». Hvis "
-#~ "du fortsetter vil du ikke kunne gjenopprette disse meldingene.\n"
-#~ "\n"
-#~ "Vil du virkelig slette disse meldingene?"
-
-#~ msgid ""
-#~ "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 ""
-#~ "Denne operasjonen vil fjerne alle slettede meldinger i alle mapper. Hvis "
-#~ "du fortsetter vil du ikke kunne gjenopprette disse meldingene.\n"
-#~ "\n"
-#~ "Vil du virkelig slette disse meldingene?"
-
-#~ msgid "The following filter rule(s):\n"
-#~ msgstr "Følgende filter-regel/regler:\n"
-
-#~ msgid ""
-#~ "Used the removed folder:\n"
-#~ "    '%s'\n"
-#~ "And have been updated."
-#~ msgstr ""
-#~ "Brukte fjernet mappe:\n"
-#~ "    «%s»\n"
-#~ "Og har blitt oppdatert."
-
-#~ msgid "Save signature"
-#~ msgstr "Lagre signatur"
-
-#~ msgid "Trying to edit a vfolder '%s' which doesn't exist."
-#~ msgstr "Prøver å redigere en vfolder «%s» som ikke eksisterer."
-
-#, fuzzy
-#~ msgid "New Addressbook Book"
-#~ msgstr "Ny adressebok"
-
-#, fuzzy
-#~ msgid "_Address Book"
-#~ msgstr "Adressebok"
-
-#, fuzzy
-#~ msgid "Create a new address book"
-#~ msgstr "Opprett en ny oppgave"
-
-#~ msgid "The view showing when the calendar starts"
-#~ msgstr "Visning som viser når kalenderen starter"
-
-#~ msgid "Enter the password for %s"
-#~ msgstr "Oppgi passordet for «%s»"
-
-#~ msgid "New task list"
-#~ msgstr "Ny oppgaveliste"
-
-#~ msgid "_Task List"
-#~ msgstr "_Oppgaveliste"
-
-#~ msgid "Create a new task list"
-#~ msgstr "Opprett en ny oppgaveliste"
-
-#~ msgid "_minute(s)"
-#~ msgstr "_minutt(er)"
-
-#~ msgid "Extra Completion folders"
-#~ msgstr "Ekstra fullføringsmappe"
-
-#~ msgid "Select Default Folder"
-#~ msgstr "Velg forvalgt mappe"
-
-#~ msgid "Default Folders"
-#~ msgstr "Forvalgte mapper"
-
-#~ msgid "Offline Folders"
-#~ msgstr "Frakoblede mapper"
-
-#~ msgid "Autocompletion Folders"
-#~ msgstr "Autofullføringsmapper"
-
-#~ msgid ""
-#~ "Cannot create the specified folder:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Kan ikke opprette spesifisert katalog:\n"
-#~ "%s"
-
-#~ msgid "The specified folder name is not valid: %s"
-#~ msgstr "Spesifisert mappenavn er ikke gyldig: %s"
-
-#~ msgid "Please select a user."
-#~ msgstr "Vennligst velg en bruker."
-
-#~ msgid "Opening Folder"
-#~ msgstr "Åpner mappe"
-
-#~ msgid "Opening Folder \"%s\""
-#~ msgstr "Åpner mappe «%s»"
-
-#~ msgid "in \"%s\" ..."
-#~ msgstr "i «%s» ..."
-
-#~ msgid "Could not open shared folder: %s."
-#~ msgstr "Kunne ikke åpne delt mappe: %s."
-
-#~ msgid "Cannot find the specified shared folder."
-#~ msgstr "Kan ikke finne spesifisert delt mappe."
-
-#~ msgid "C_alendar:"
-#~ msgstr "K_alender:"
-
-#~ msgid "_Mail:"
-#~ msgstr "_E-post:"
-
-#~ msgid "_Tasks:"
-#~ msgstr "_Oppgaver:"
-
-#~ msgid "Folder _type:"
-#~ msgstr "Mappe_type:"
-
-#~ msgid "Open Other User's Folder"
-#~ msgstr "Åpne annen brukers mappe"
-
-#~ msgid "_Account:"
-#~ msgstr "_Konto:"
-
-#~ msgid "_Folder Name:"
-#~ msgstr "_Mappenavn:"
-
-#~ msgid "_User:"
-#~ msgstr "Br_uker:"
-
-#~ msgid "Create a new window"
-#~ msgstr "Opprett et nytt vindu"
-
-#~ msgid "Open a new window"
-#~ msgstr "Åpne et nytt vindu"
-
-#~ msgid "2:30"
-#~ msgstr "2:30"
-
-#~ msgid "Address Book Sources"
-#~ msgstr "Kilder for adressebok"
-
-#~ msgid "Selected:"
-#~ msgstr "Valgt:"
-
-#~ msgid "Go To Date"
-#~ msgstr "Gå til dato"
-
-#~ msgid "_Go To Today"
-#~ msgstr "_Gå til i dag"
-
-#, fuzzy
-#~ msgid "Unexpected response from IMAP server %s: %s"
-#~ msgstr "Uventet svar fra IMAP-tjener: %s"
-
-#, fuzzy
-#~ msgid "Cannot select folder `%s': Invalid mailbox name"
-#~ msgstr "Kan ikke slette mappe: %s: Ugyldig operasjon"
-
-#, fuzzy
-#~ msgid "Cannot select folder `%s': Bad command"
-#~ msgstr "Finner ikke mappe: %s: %s"
-
-#, fuzzy
-#~ msgid "IMAP server %s unexpectedly disconnected: %s"
-#~ msgstr "Tjener koblet fra uventet: %s"
-
-#, fuzzy
-#~ msgid ""
-#~ "Failed to connect to IMAP server %s in secure mode: Server does not "
-#~ "support STARTTLS"
-#~ msgstr "Kunne ikke koble til IMAP-tjener %s i sikker modus: %s"
-
-#, fuzzy
-#~ msgid ""
-#~ "Cannot authenticate to IMAP server %s using the %s authentication "
-#~ "mechanism"
-#~ msgstr ""
-#~ "Kunne ikke koble til POP-tjener %s: Ingen støtte for forespurt "
-#~ "autentiseringsmekanisme."
-
-#, fuzzy
-#~ msgid "%sPlease enter the IMAP password for %s on host %s"
-#~ msgstr "%sVennligst skriv inn SMTP-passord for %s på vert %s"
-
-#, fuzzy
-#~ msgid "Cannot authenticate to IMAP server %s using %s"
-#~ msgstr "Kunne ikke autentisere mot POP-tjener %s: %s"
-
-#, fuzzy
-#~ msgid "Cannot create folder `%s': Invalid mailbox name"
-#~ msgstr "Kan ikke endre navn på mappe: %s: Ugyldig operasjon"
-
-#, fuzzy
-#~ msgid "Cannot create folder `%s': Bad command"
-#~ msgstr "Kan ikke opprette mappe: %s: %s"
-
-#, fuzzy
-#~ msgid "Cannot delete folder `%s': Special folder"
-#~ msgstr "Kan ikke slette mappe: %s: Ingen slik mappe"
-
-#, fuzzy
-#~ msgid "Cannot delete folder `%s': Invalid mailbox name"
-#~ msgstr "Kan ikke slette mappe: %s: Ugyldig operasjon"
-
-#, fuzzy
-#~ msgid "Cannot delete folder `%s': Bad command"
-#~ msgstr "Kan ikke slette mappe: %s: Ugyldig operasjon"
-
-#, fuzzy
-#~ msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-#~ msgstr "Kan ikke slette mappe: %s: Ugyldig operasjon"
-
-#, fuzzy
-#~ msgid "Cannot subscribe to folder `%s': Bad command"
-#~ msgstr "Kan ikke opprette mappe: %s: %s"
-
-#, fuzzy
-#~ msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-#~ msgstr "Kan ikke endre navn på mappe: %s: Ugyldig operasjon"
-
-#, fuzzy
-#~ msgid "Cannot unsubscribe from folder `%s': Bad command"
-#~ msgstr "Kan ikke opprette mappe: %s: %s"
-
-#, fuzzy
-#~ msgid "Unexpected token in response from IMAP server %s: "
-#~ msgstr "Uventet svar fra IMAP-tjener: %s"
-
-#, fuzzy
-#~ msgid "No data"
-#~ msgstr "Ingen data gitt"
-
-#~ msgid "<b>Filter Rules</b>"
-#~ msgstr "<b>Filterregler</b>"
-
-#~ msgid "Edit Filters"
-#~ msgstr "Rediger filtre"
-
-#~ msgid "Edit VFolders"
-#~ msgstr "Rediger virtuelle mapper"
-
-#~ msgid "Outgoing"
-#~ msgstr "Utgående"
-
-#~ msgid "[script]"
-#~ msgstr "[skript]"
-
-#~ msgid "The following connections are currently active:"
-#~ msgstr "Følgende forbindelser er aktive:"
-
-#~ msgid "_Search for Contacts"
-#~ msgstr "_Søk etter kontakter"
-
-#~ msgid "Go to _Date"
-#~ msgstr "Gå til _dato"
-
-#~ msgid "Go to today"
-#~ msgstr "Gå til i dag"
-
-#~ msgid "With _Category"
-#~ msgstr "Med _kategori"
-
-#~ msgid "1 contact"
-#~ msgstr "1 kontakt"
-
-#~ msgid "and %d other contacts."
-#~ msgstr "og %d andre kontakter."
-
-#~ msgid "Send an Email"
-#~ msgstr "Send en melding"
-
-#~ msgid "1 day"
-#~ msgstr "1 dag"
-
-#~ msgid "1 week"
-#~ msgstr "1 uke"
-
-#~ msgid "1 hour"
-#~ msgstr "1 time"
-
-#~ msgid "1 minute"
-#~ msgstr "1 minutt"
-
-#~ msgid "1 second"
-#~ msgstr "1 sekund"
-
-#~ msgid "Description"
-#~ msgstr "Beskrivelse"
-
-#~ msgid "component"
-#~ msgstr "komponent"
-
-#~ msgid "Alarms"
-#~ msgstr "Alarmer"
-
-#~ msgid "Geographical Position"
-#~ msgstr "Geografisk plassering"
-
-#~ msgid "URL"
-#~ msgstr "URL"
-
-#~ msgid "Every %d days"
-#~ msgstr "Hver %d dager"
-
-#~ msgid "Every %d weeks"
-#~ msgstr "Hver %d uker"
-
-#~ msgid "Every %d weeks on "
-#~ msgstr "Hver %d uker på "
-
-#~ msgid "every %d months"
-#~ msgstr "hver %d måneder"
-
-#~ msgid "Every %d years"
-#~ msgstr "Hvert %d år"
-
-#~ msgid "LDAP Server Name:"
-#~ msgstr "Navn på LDAP-tjener:"
-
-#~ msgid "STARTTLS request timed out: %s"
-#~ msgstr "Tidsavbrudd for STARTTLS-forespørsel: %s"
-
-#~ msgid "STARTTLS response error"
-#~ msgstr "Feil i STARTTLS-svar"
-
-#~ msgid "HELO request timed out: %s"
-#~ msgstr "Tidsavbrudd for HELO-forespørsel: %s"
-
-#~ msgid "HELO response error"
-#~ msgstr "Feil i HELO-svar"
-
-#~ msgid "AUTH request timed out: %s"
-#~ msgstr "Tidsavbrudd for AUTH-forespørsel: %s"
-
-#~ msgid "AUTH request failed."
-#~ msgstr "AUTH-forespørsel feilet."
-
-#~ msgid "MAIL FROM response error"
-#~ msgstr "Feil i «MAIL FROM»-svar"
-
-#~ msgid "DATA response error"
-#~ msgstr "Feil i DATA-svar"
-
-#~ msgid "DATA send timed out: message termination: %s: mail not sent"
-#~ msgstr ""
-#~ "Tidsavbrudd for DATA-send: meldingsterminering: %s: melding ikke sendt."
-
-#~ msgid "DATA termination response error"
-#~ msgstr "Feil i DATA-termineringssvar"
-
-#~ msgid "RSET request timed out: %s"
-#~ msgstr "Tidsavbrudd for RSET-forespørsel: %s"
-
-#~ msgid "RSET response error"
-#~ msgstr "Feil i RSET-svar"
-
-#~ msgid "QUIT request timed out: %s"
-#~ msgstr "Tidsavbrudd for QUIT-forespørsel: %s"
-
-#~ msgid "QUIT response error"
-#~ msgstr "Feil i QUIT-svar"
-
-#~ msgid "%d seconds ago"
-#~ msgstr "%d sekunder siden"
-
-#~ msgid "%d minutes ago"
-#~ msgstr "%d minutter siden"
-
-#~ msgid "%d hours ago"
-#~ msgstr "%d timer siden"
-
 #~ msgid "%d days ago"
 #~ msgstr "%d dager siden"
author	Kjartan Maraas <kmaraas@gnome.org>	2004-05-03 04:31:08 +0800
committer	Kjartan Maraas <kmaraas@src.gnome.org>	2004-05-03 04:31:08 +0800
commit	54535a17f301f9c5ece272a56f22ec8909d4f445 (patch)
tree	71bf3dbde3017d45565883ae849c9d2242c98158 /po/no.po
parent	d26948bf077b439cdf731d65df354f6c7870d4cf (diff)
download	gsoc2013-evolution-54535a17f301f9c5ece272a56f22ec8909d4f445.tar gsoc2013-evolution-54535a17f301f9c5ece272a56f22ec8909d4f445.tar.gz gsoc2013-evolution-54535a17f301f9c5ece272a56f22ec8909d4f445.tar.bz2 gsoc2013-evolution-54535a17f301f9c5ece272a56f22ec8909d4f445.tar.lz gsoc2013-evolution-54535a17f301f9c5ece272a56f22ec8909d4f445.tar.xz gsoc2013-evolution-54535a17f301f9c5ece272a56f22ec8909d4f445.tar.zst gsoc2013-evolution-54535a17f301f9c5ece272a56f22ec8909d4f445.zip