bump version, requirements

2004-07-02  JP Rosevear  <jpr@novell.com>

	* configure.in: bump version, requirements

2004-07-02  JP Rosevaer  <jpr@novell.com>

	* Makefile.am (SUBDIRS): Revert previous error change

svn path=/trunk/; revision=26583

1 files changed, 2092 insertions, 2063 deletions

diff --git a/po/no.po b/po/no.po
index f0efbd650b..be3c94e56e 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,14 +5,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.5\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-06-28 16:24+0200\n"
+"POT-Creation-Date: 2004-07-02 14:48-0400\n"
 "PO-Revision-Date: 2004-06-28 16:19+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,14 +21,6 @@ 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 "
@@ -49,6 +41,14 @@ 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:ldap-init primary
 #: addressbook/addressbook-errors.xml.h:2
 msgid "This addressbook could not be opened."
@@ -108,17 +108,6 @@ msgid "Could not remove addressbook."
 msgstr "Kunne ikke fjerne adressebok."
 
 #. addressbook:remove-addressbook secondary
-#. addressbook:generic-error primary
-#. addressbook:load-error secondary
-#. addressbook:search-error secondary
-#. mail:session-message-info secondary
-#. mail:session-message-info-cancel secondary
-#. mail:session-message-warning secondary
-#. mail:session-message-warning-cancel secondary
-#. mail:session-message-error secondary
-#. mail:session-message-error-cancel secondary
-#. mail:ask-session-password secondary
-#. mail:filter-load-error secondary
 #: addressbook/addressbook-errors.xml.h:22
 #: addressbook/addressbook-errors.xml.h:26
 #: addressbook/addressbook-errors.xml.h:34
@@ -136,8 +125,6 @@ msgid "Category editor not available."
 msgstr "Kategori editor ikke tilgjengelig."
 
 #. addressbook:generic-error secondary
-#. mail-composer:no-attach secondary
-#. mail:no-save-path secondary
 #: addressbook/addressbook-errors.xml.h:28
 #: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
 msgid "{1}"
@@ -223,20 +210,64 @@ msgstr "Kunne ikke laste adressebok"
 msgid "Could not read pilot's Address application block"
 msgstr "Kunne ikke lese pilotens adresseapplikasjonsblokk"
 
-#: 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:1
+msgid "*Control*F2"
+msgstr "*Control*F2"
 
-#: addressbook/gui/component/addressbook.c:173
-#: camel/providers/groupwise/camel-gw-listener.c:378
-msgid "Failed to authenticate.\n"
-msgstr "Kunne ikke autentisere.\n"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr "Autofullføring"
 
-#: addressbook/gui/component/addressbook.c:179
-#: camel/providers/groupwise/camel-gw-listener.c:367
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sSkriv inn passord for %s (bruker %s)"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "C_ontacts"
+msgstr "K_ontakter"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr "Sertifikater"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Configure autocomplete here"
+msgstr "Konfigurer automatisk fullføring her"
+
+#. Create the contacts group
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/addressbook-view.c:1044
+#: calendar/gui/migration.c:373
+msgid "Contacts"
+msgstr "Kontakter"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Evolution adressebok"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolution adressebok adressedialog"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution adressebok adressevisning"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution adressebok kortvisning"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Evolution adressebok-komponent"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+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:13
+msgid "Evolution folder settings configuration control"
+msgstr "Konfigurasjonskontroll for mappeinnstillinger i Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+msgid "Manage your S/MIME certificates here"
+msgstr "Håndter dine S/MIME-sertifikater her"
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -290,7 +321,6 @@ 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:489
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
 #: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
@@ -299,9 +329,6 @@ 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:497
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
@@ -390,12 +417,20 @@ msgstr "Slett"
 msgid "Properties..."
 msgstr "Egenskaper ..."
 
-#. Create the contacts group
-#: addressbook/gui/component/addressbook-view.c:1044
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Kontakter"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "Aksesserer LDAP-tjener anonymt"
+
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
+msgid "Failed to authenticate.\n"
+msgstr "Kunne ikke autentisere.\n"
+
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sSkriv inn passord for %s (bruker %s)"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -416,58 +451,6 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr "URI for sist brukt mappe i dialogen for å velge navn"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "*Control*F2"
-msgstr "*Control*F2"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Autocompletion"
-msgstr "Autofullføring"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "C_ontacts"
-msgstr "K_ontakter"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Certificates"
-msgstr "Sertifikater"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Configure autocomplete here"
-msgstr "Konfigurer automatisk fullføring her"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook"
-msgstr "Evolution adressebok"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address pop-up"
-msgstr "Evolution adressebok adressedialog"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution adressebok adressevisning"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution adressebok kortvisning"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook component"
-msgstr "Evolution adressebok-komponent"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-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:13
-msgid "Evolution folder settings configuration control"
-msgstr "Konfigurasjonskontroll for mappeinnstillinger i Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
-msgid "Manage your S/MIME certificates here"
-msgstr "Håndter dine S/MIME-sertifikater her"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
@@ -475,6 +458,7 @@ msgstr "Håndter dine S/MIME-sertifikater her"
 #: addressbook/gui/contact-editor/fullname.glade.h:1
 #: addressbook/gui/contact-editor/im.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: calendar/gui/dialogs/alarm-dialog.glade.h:1
 #: calendar/gui/dialogs/calendar-setup.glade.h:1
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
@@ -483,7 +467,7 @@ msgstr "Håndter dine S/MIME-sertifikater her"
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
-#: mail/mail-dialogs.glade.h:6
+#: mail/mail-dialogs.glade.h:6 mail/message-tags.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
@@ -509,6 +493,7 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:7
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
 msgid "<b>Authentication</b>"
 msgstr "<b>Autentisering</b>"
 
@@ -783,32 +768,26 @@ msgid "cards"
 msgstr "kort"
 
 #: addressbook/gui/component/ldap-config.glade.h:60
+#: calendar/gui/dialogs/alarm-dialog.glade.h:27
 #: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
 #: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "minutter"
 
-#: addressbook/gui/component/select-names/e-select-names.c:503
-#: 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/e-select-names-popup.c:208
+msgid "Remove All"
+msgstr "Fjern alle"
 
-#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: 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"
@@ -831,15 +810,22 @@ 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:228
 msgid "Source"
 msgstr "Kilde"
 
-#: 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.c:503
+#: 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/select-names.glade.h:2
 msgid "<b>Contacts</b>"
@@ -1036,8 +1022,8 @@ msgstr "Weblogg:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
 #: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
 #: mail/mail-config.glade.h:157
 msgid "Work"
@@ -1060,22 +1046,6 @@ msgstr "_Lagre under:"
 msgid "_Where:"
 msgstr "_Hvor:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:315
-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:318
-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:350
 #: addressbook/gui/widgets/eab-contact-display.c:365
@@ -1083,16 +1053,16 @@ msgid "Address"
 msgstr "Adresse"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:293
 #: 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:293
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
 #: 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.c:498
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:498
+#: addressbook/gui/widgets/e-minicard.c:174
 msgid "Editable"
 msgstr "Redigerbar"
 
@@ -2064,43 +2034,65 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: 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:185
 #: addressbook/gui/widgets/eab-contact-display.c:334
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:336
-msgid "Yahoo"
-msgstr "Yahoo"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
-#: addressbook/gui/widgets/eab-contact-display.c:335
-msgid "MSN"
-msgstr "MSN"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr "Yahoo Messenger"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:188
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
 #: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:189
-#: addressbook/gui/widgets/eab-contact-display.c:332
-msgid "GroupWise"
-msgstr "GroupWise"
+#: 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:3
+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:202
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 msgid "Home"
 msgstr "Hjemme"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:203
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
 msgid "Other"
 msgstr "Andre"
 
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/widgets/eab-contact-display.c:336
+msgid "Yahoo"
+msgstr "Yahoo"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:335
+msgid "MSN"
+msgstr "MSN"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/widgets/eab-contact-display.c:332
+msgid "GroupWise"
+msgstr "GroupWise"
+
 #: addressbook/gui/contact-editor/e-contact-editor.c:258
 msgid "Source Book"
 msgstr "Kildebok"
@@ -2159,28 +2151,6 @@ msgid ""
 "be removed from the source. Do you want to save a copy instead?"
 msgstr ""
 
-#: 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:3
-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"
@@ -2198,6 +2168,22 @@ msgstr "_Fullt navn:"
 msgid "E-_mail:"
 msgstr "E-_post:"
 
+#: addressbook/gui/contact-editor/eab-editor.c:315
+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:318
+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:"
@@ -2361,8 +2347,8 @@ msgstr "dialog1"
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
 #: addressbook/gui/widgets/e-addressbook-view.c:221
-#: addressbook/gui/widgets/e-minicard-view.c:484
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:484
 msgid "Book"
 msgstr "Bok"
 
@@ -2423,6 +2409,398 @@ 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:235
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:491
+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:167
+msgid "Name begins with"
+msgstr "Navn begynner med"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:168
+msgid "Email begins with"
+msgstr "E-post begynner med"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:169
+#: calendar/gui/cal-search-bar.c:54
+msgid "Category is"
+msgstr "Kategorien er"
+
+#. We attach subitems below
+#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: calendar/gui/cal-search-bar.c:49
+msgid "Any field contains"
+msgstr "Et felt inneholder"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: addressbook/gui/widgets/e-addressbook-view.c:176
+msgid "Advanced..."
+msgstr "Avansert..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:242
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-meeting-list-view.c:227
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
+msgid "Type"
+msgstr "Type"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:539
+msgid "Address Book"
+msgstr "Adressebok"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:1103
+#: addressbook/gui/widgets/e-addressbook-view.c:2093
+#: ui/evolution-addressbook.xml.h:19
+msgid "Save as VCard..."
+msgstr "Lagre som VCard..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
+msgid "New Contact..."
+msgstr "Ny kontakt..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1091
+msgid "New Contact List..."
+msgstr "Ny kontaktliste..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1094
+msgid "Go to Folder..."
+msgstr "Gå til mappe..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1095
+msgid "Import..."
+msgstr "Importer..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1097
+msgid "Search for Contacts..."
+msgstr "Søk etter kontakter..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1098
+msgid "Address Book Sources..."
+msgstr "Adressebok-kilder..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1100
+msgid "Pilot Settings..."
+msgstr "Innstillinger for pilot..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1104
+#: ui/evolution-addressbook.xml.h:10
+msgid "Forward Contact"
+msgstr "Videresend kontakt"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1105
+msgid "Send Message to Contact"
+msgstr "Send melding til kontakt"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1106 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:1108
+msgid "Print Envelope"
+msgstr "Skriv ut konvolutt"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1112
+msgid "Copy to Address Book..."
+msgstr "Kopier til adressebok..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1113
+msgid "Move to Address Book..."
+msgstr "Flytt til adressebok..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1116
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "Klipp ut"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1117
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
+#: 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:1118
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
+msgid "Paste"
+msgstr "Lim inn"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1123
+#: calendar/gui/e-calendar-view.c:1327
+msgid "Current View"
+msgstr "Aktiv visning"
+
+#. All, unmatched, separator
+#: addressbook/gui/widgets/e-addressbook-view.c:1678
+#: calendar/gui/cal-search-bar.c:358
+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
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:3
+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:545 smime/lib/e-cert.c:826
+msgid "Email"
+msgstr "E-post"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: addressbook/gui/widgets/eab-popup-control.c:441
+msgid "Email 2"
+msgstr "E-post 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/eab-popup-control.c:451
+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:364
+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:375
+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:345
+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:234
+#: 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:164
+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:167
+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:477
+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:131
 #: addressbook/gui/widgets/eab-contact-display.c:194
 msgid "(map)"
@@ -2443,11 +2821,6 @@ msgstr "Listemedlemmer"
 msgid "E-mail"
 msgstr "E-post"
 
-#: addressbook/gui/widgets/eab-contact-display.c:345
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Organization"
-msgstr "Organisasjon"
-
 #: addressbook/gui/widgets/eab-contact-display.c:346
 msgid "Position"
 msgstr "Stilling"
@@ -2478,30 +2851,14 @@ msgstr "WWW"
 msgid "Blog"
 msgstr "Weblogg"
 
-#: addressbook/gui/widgets/eab-contact-display.c:364
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Mobile Phone"
-msgstr "Mobiltelefon"
-
 #: addressbook/gui/widgets/eab-contact-display.c:368
 msgid "personal"
 msgstr "personlig"
 
-#: addressbook/gui/widgets/eab-contact-display.c:375
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Note"
-msgstr "Kommentar"
-
 #: addressbook/gui/widgets/eab-contact-display.c:541
 msgid "Job Title"
 msgstr "Jobbtittel"
 
-#: addressbook/gui/widgets/eab-contact-display.c:545
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:826
-msgid "Email"
-msgstr "E-post"
-
 #: addressbook/gui/widgets/eab-contact-display.c:572
 msgid "Home page"
 msgstr "Hjemmeside"
@@ -2558,8 +2915,8 @@ msgstr "Protokollen er ikke støttet"
 #: addressbook/gui/widgets/eab-gui-util.c:61
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: 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:655 calendar/gui/print.c:2349
+#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:655
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
 #: camel/camel-service.c:724 camel/camel-service.c:762
 #: camel/camel-service.c:846 camel/camel-service.c:886
 #: camel/providers/pop3/camel-pop3-store.c:456
@@ -2759,16 +3116,6 @@ msgstr "(ingen)"
 msgid "Primary Email"
 msgstr "Primær e-post"
 
-#: addressbook/gui/widgets/eab-popup-control.c:441
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Email 2"
-msgstr "E-post 2"
-
-#: addressbook/gui/widgets/eab-popup-control.c:451
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-msgid "Email 3"
-msgstr "E-post 3"
-
 #: addressbook/gui/widgets/eab-popup-control.c:567
 msgid "Select an Action"
 msgstr "Velg en handling"
@@ -2815,368 +3162,6 @@ 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:235
-#: addressbook/gui/widgets/e-minicard-view.c:491
-#: 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:167
-msgid "Name begins with"
-msgstr "Navn begynner med"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:168
-msgid "Email begins with"
-msgstr "E-post begynner med"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:169
-#: calendar/gui/cal-search-bar.c:55
-msgid "Category is"
-msgstr "Kategorien er"
-
-#. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:170
-#: calendar/gui/cal-search-bar.c:50
-msgid "Any field contains"
-msgstr "Et felt inneholder"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:171
-#: addressbook/gui/widgets/e-addressbook-view.c:176
-msgid "Advanced..."
-msgstr "Avansert..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:242
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:13
-#: calendar/gui/e-meeting-list-view.c:227
-#: calendar/gui/e-meeting-time-sel.etspec.h:11
-msgid "Type"
-msgstr "Type"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:539
-msgid "Address Book"
-msgstr "Adressebok"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:883
-#: addressbook/gui/widgets/e-addressbook-view.c:1103
-#: addressbook/gui/widgets/e-addressbook-view.c:2093
-#: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard..."
-msgstr "Lagre som VCard..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
-msgid "New Contact..."
-msgstr "Ny kontakt..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1091
-msgid "New Contact List..."
-msgstr "Ny kontaktliste..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1094
-msgid "Go to Folder..."
-msgstr "Gå til mappe..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1095
-msgid "Import..."
-msgstr "Importer..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1097
-msgid "Search for Contacts..."
-msgstr "Søk etter kontakter..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1098
-msgid "Address Book Sources..."
-msgstr "Adressebok-kilder..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1100
-msgid "Pilot Settings..."
-msgstr "Innstillinger for pilot..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1104
-#: ui/evolution-addressbook.xml.h:10
-msgid "Forward Contact"
-msgstr "Videresend kontakt"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1105
-msgid "Send Message to Contact"
-msgstr "Send melding til kontakt"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1106 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:1108
-msgid "Print Envelope"
-msgstr "Skriv ut konvolutt"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1112
-msgid "Copy to Address Book..."
-msgstr "Kopier til adressebok..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1113
-msgid "Move to Address Book..."
-msgstr "Flytt til adressebok..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1116
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
-msgid "Cut"
-msgstr "Klipp ut"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1117
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
-#: 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:1118
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
-msgid "Paste"
-msgstr "Lim inn"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1123
-#: calendar/gui/e-calendar-view.c:1327
-msgid "Current View"
-msgstr "Aktiv visning"
-
-#. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1678
-#: calendar/gui/cal-search-bar.c:361
-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
-#: calendar/gui/e-calendar-table.etspec.h:3
-#: calendar/gui/e-cal-list-view.etspec.h:1
-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:234
-#: 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:164
-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:167
-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:477
-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"
@@ -3185,17 +3170,17 @@ msgstr "Kortvisning"
 msgid "GTK Tree View"
 msgstr "GTK-trevisning"
 
-#: addressbook/gui/widgets/test-reflow.c:119
+#: addressbook/gui/widgets/test-reflow.c:106
 msgid "Reflow Test"
 msgstr ""
 
-#: addressbook/gui/widgets/test-reflow.c:120
+#: addressbook/gui/widgets/test-reflow.c:107
 #: 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:122
+#: addressbook/gui/widgets/test-reflow.c:109
 msgid "This should test the reflow canvas item"
 msgstr ""
 
@@ -3219,6 +3204,11 @@ msgstr "Evolution VCard-import"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
+#: 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.c:1000
 msgid "Print contacts"
 msgstr "Skriv ut kontakter"
@@ -3228,11 +3218,6 @@ 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"
@@ -3417,6 +3402,20 @@ msgstr "Test på utskrift av kontakt"
 msgid "This should test the contact print code"
 msgstr ""
 
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+msgid "Can not open file"
+msgstr "Kan ikke åpne fil"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+msgid "Couldn't get list of addressbooks"
+msgstr "Kunne ikke hente en liste med adressebøker"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+msgid "failed to open book"
+msgstr "kunne ikke åpne adressebok"
+
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr "Oppgi utdatafil i stedet for standard utdata"
@@ -3471,20 +3470,6 @@ msgstr ""
 msgid "Impossible internal error."
 msgstr "Umulig intern feil."
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
-msgid "Can not open file"
-msgstr "Kan ikke åpne fil"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
-msgid "Couldn't get list of addressbooks"
-msgstr "Kunne ikke hente en liste med adressebøker"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
-msgid "failed to open book"
-msgstr "kunne ikke åpne adressebok"
-
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Feil under lasting av standard adressebok."
@@ -3502,7 +3487,6 @@ msgid "Unnamed List"
 msgstr "Liste uten navn"
 
 #. calendar:prompt-cancel-meeting primary
-#. calendar:prompt-cancel-task primary
 #: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
 msgid "Would you like to send all the participants a cancellation notice?"
 msgstr ""
@@ -3550,8 +3534,6 @@ msgid "Are you sure you want to delete this task?"
 msgstr "Er du sikker på at du vil slette denne oppgaven?"
 
 #. calendar:prompt-delete-task secondary
-#. calendar:prompt-delete-named-task secondary
-#. calendar:prompt-delete-task secondary
 #: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
 #: calendar/calendar-errors.xml.h:46
 msgid "All information on this task will be deleted and can not be restored."
@@ -3588,7 +3570,6 @@ msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "Er du sikker på at du vil slette avtalen med navn «{0}»?"
 
 #. calendar:prompt-delete-titled-appointment secondary
-#. calendar:prompt-delete-appointment secondary
 #: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
 msgid ""
 "All information on this appointment will be deleted and can not be restored."
@@ -3610,7 +3591,6 @@ msgid "Are you sure you want to delete the journal entry '{0}'?"
 msgstr "Er du sikker på at du vil slette journaloppføringen «{0}»?"
 
 #. calendar:prompt-delete-named-journal secondary
-#. calendar:prompt-delete-journal secondary
 #: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
 msgid ""
 "All information in this journal will be deleted and can not be restored."
@@ -3778,6 +3758,72 @@ 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 "*Control*F3"
+msgstr "*Control*F3"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr "*Control*F4"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Kalender og oppgaver"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/calendar-component.c:1060
+msgid "Calendars"
+msgstr "Kalendere"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+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:6
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolution kalender og oppgaver"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr "Konfigurasjonskontroll for Evolution kalender"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Visning for møteplanlegging i Evolution kalender"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+msgstr "Redigering av kalender/oppgaver for Evolution"
+
+#: 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:1088 calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:412 calendar/gui/tasks-component.c:874
+#: calendar/gui/tasks-control.c:405 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Oppgaver"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+msgid "_Calendars"
+msgstr "_Kalendere"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+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:213
 msgid "Starting:"
 msgstr "Starter:"
@@ -3875,10 +3921,6 @@ 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:139
 msgid "Could not initialize Bonobo"
 msgstr "Kunne ikke initiere Bonobo"
@@ -4019,6 +4061,26 @@ 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:50
+msgid "Summary contains"
+msgstr "Sammendrag inneholder"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Beskrivelse inneholder"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Kommentar inneholder"
+
+#: calendar/gui/cal-search-bar.c:53
+msgid "Location contains"
+msgstr "Lokasjon inneholder"
+
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
+msgid "Unmatched"
+msgstr "Ingen treff"
+
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
 #: calendar/gui/dialogs/select-source-dialog.c:108
 #: calendar/gui/gnome-cal.c:1827
@@ -4041,6 +4103,7 @@ msgid "Purge events older than"
 msgstr "Slett hendelser eldre enn"
 
 #: calendar/gui/calendar-commands.c:363
+#: calendar/gui/dialogs/alarm-dialog.glade.h:21
 #: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:13
 msgid "days"
 msgstr "dager"
@@ -4051,12 +4114,8 @@ 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.
-#. 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:435 calendar/gui/calendar-component.c:507
-#: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/e-day-view-top-item.c:694 calendar/gui/e-day-view.c:1588
 #: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
@@ -4104,11 +4163,6 @@ msgstr "Kan ikke åpne kalender «%s» for oppretting av hendelser og møter"
 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:1060
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Calendars"
-msgstr "Kalendere"
-
 #: calendar/gui/calendar-component.c:1224
 msgid "New appointment"
 msgstr "Ny avtale"
@@ -4183,26 +4237,6 @@ msgstr "Ukevisning"
 msgid "Month View"
 msgstr "Månedsvisning"
 
-#: 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:53
-msgid "Comment contains"
-msgstr "Kommentar inneholder"
-
-#: calendar/gui/cal-search-bar.c:54
-msgid "Location contains"
-msgstr "Lokasjon inneholder"
-
-#: calendar/gui/cal-search-bar.c:365 camel/camel-vee-store.c:327
-msgid "Unmatched"
-msgstr "Ingen treff"
-
 #: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Feil under åpning av kalenderen"
@@ -4220,76 +4254,134 @@ msgstr "Tilgang nektet ved åpning av kalender"
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/dialogs/calendar-setup.c:172
-msgid "You must specify a location to get the calendar from."
-msgstr "Du må oppgi en lokasjon å hente kalenderen fra."
+#: calendar/gui/dialogs/alarm-dialog.glade.h:2
+#, fuzzy
+msgid "<b>Alarm</b>\t"
+msgstr "<b>Varsel</b> "
 
-#: calendar/gui/dialogs/calendar-setup.c:180
-#, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "Kildelokasjon «%s» er ikke riktig utformet."
+#: calendar/gui/dialogs/alarm-dialog.glade.h:3
+#, fuzzy
+msgid "<b>Options</b>"
+msgstr "<b>Unntak</b>"
 
-#: calendar/gui/dialogs/calendar-setup.c:195
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr "Kildelokasjon «%s» er ikke en webcal-kilde."
+#: calendar/gui/dialogs/alarm-dialog.glade.h:4
+#, fuzzy
+msgid "<b>Repeat</b>"
+msgstr "<b>Generell</b> "
 
-#: calendar/gui/dialogs/calendar-setup.c:275
-#, 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/alarm-dialog.glade.h:5
+#, fuzzy
+msgid "Add Alarm"
+msgstr "_Varsel"
 
-#: calendar/gui/dialogs/calendar-setup.c:288
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:6
+#, fuzzy
+msgid "Custom _message"
+msgstr "Skriv en melding"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:7
+msgid "Custom alarm sound"
 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/alarm-dialog.glade.h:8
+#, fuzzy
+msgid "Mes_sage:"
+msgstr "_Meldinger"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-msgid "Add Tasks Group"
-msgstr "Legg til oppgavegruppe"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:444
+msgid "Play a sound"
+msgstr "Spill en lyd"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-msgid "C_olor:"
-msgstr "F_arge:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: calendar/gui/e-alarm-list.c:448
+msgid "Pop up an alert"
+msgstr "Vis varsling"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
-msgid "Pick a color"
-msgstr "Velg en farge"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: calendar/gui/e-alarm-list.c:456
+msgid "Run a program"
+msgstr "Kjør et program"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
-msgid "_Add Calendar"
-msgstr "_Legg til kalender"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:12
+msgid "Send To:"
+msgstr "Send til:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
-msgid "_Add Group"
-msgstr "_Legg til gruppe"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: calendar/gui/e-alarm-list.c:452
+msgid "Send an email"
+msgstr "Send en melding"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "_Refresh:"
-msgstr "_Oppdater:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:14
+#, fuzzy
+msgid "_Arguments:"
+msgstr "K_onto::"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-msgid "_Type:"
-msgstr "_Type:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+#, fuzzy
+msgid "_Program:"
+msgstr "Kjør program"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-msgid "_URL:"
-msgstr "_URL:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+#, fuzzy
+msgid "_Repeat the alarm"
+msgstr "Gjenta alarmen"
 
+#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+#, fuzzy
+msgid "_Sound:"
+msgstr "_Send"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:18
+msgid "after"
+msgstr "etter"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:19
+msgid "before"
+msgstr "før"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
+msgid "day(s)"
+msgstr "dag(er)"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:22
+#, fuzzy
+msgid "end of appointment"
+msgstr "start på avtale"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid "extra times every"
+msgstr "ekstra ganger hver"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:24
+msgid "hour(s)"
+msgstr "time(r)"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:25
 #: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
 msgid "hours"
 msgstr "timer"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
-msgid "weeks"
-msgstr "uker"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:26
+msgid "minute(s)"
+msgstr "minutt(er)"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:28
+msgid "start of appointment"
+msgstr "start på avtale"
+
+#: calendar/gui/dialogs/alarm-list-dialog.c:192
+msgid "Action/Trigger"
+msgstr "Handling/utløser"
+
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+msgid "A_dd"
+msgstr "Le_gg til"
+
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+#, fuzzy
+msgid "Alarms"
+msgstr "_Varsel"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
@@ -4558,6 +4650,73 @@ msgstr "_On."
 msgid "before every appointment"
 msgstr "før hver avtale"
 
+#: calendar/gui/dialogs/calendar-setup.c:172
+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:180
+#, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "Kildelokasjon «%s» er ikke riktig utformet."
+
+#: calendar/gui/dialogs/calendar-setup.c:195
+#, 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:275
+#, 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:288
+#, 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:4
+msgid "C_olor:"
+msgstr "F_arge:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
+msgid "Pick a color"
+msgstr "Velg en farge"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+msgid "_Add Calendar"
+msgstr "_Legg til kalender"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+msgid "_Add Group"
+msgstr "_Legg til gruppe"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+msgid "_Refresh:"
+msgstr "_Oppdater:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+msgid "_Type:"
+msgstr "_Type:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+msgid "_URL:"
+msgstr "_URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
+msgid "weeks"
+msgstr "uker"
+
 #: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Denne hendelsen er slettet."
@@ -4604,6 +4763,31 @@ 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:464
+#, 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:264
 msgid "Could not update object"
 msgstr "Kunne ikke oppdatere objekt"
@@ -4648,31 +4832,6 @@ msgstr ""
 msgid "Unable to use current version!"
 msgstr "Kan ikke bruke denne versjonen!"
 
-#: calendar/gui/dialogs/comp-editor-page.c:464
-#, 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"
@@ -4861,9 +5020,8 @@ msgid "Classi_fication:"
 msgstr "Klassi_fisering"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:354 calendar/gui/e-cal-list-view.c:259
-#: calendar/gui/e-cal-model.c:332
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:332 calendar/gui/e-calendar-table.c:354
 msgid "Confidential"
 msgstr "Konfidensiell"
 
@@ -4872,16 +5030,15 @@ msgid "L_ocation:"
 msgstr "L_okasjon:"
 
 #: calendar/gui/dialogs/event-page.glade.h:14
-#: calendar/gui/dialogs/task-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:353 calendar/gui/e-cal-list-view.c:258
-#: calendar/gui/e-cal-model.c:330
+#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:330 calendar/gui/e-calendar-table.c:353
 msgid "Private"
 msgstr "Privat"
 
 #: calendar/gui/dialogs/event-page.glade.h:15
-#: calendar/gui/dialogs/task-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:352 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
 #: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
+#: calendar/gui/e-calendar-table.c:352
 msgid "Public"
 msgstr "Offentlig"
 
@@ -4907,21 +5064,16 @@ msgid "_Description:"
 msgstr "_Beskrivelse:"
 
 #: calendar/gui/dialogs/event-page.glade.h:21
-#: calendar/gui/e-meeting-time-sel.c:615
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_End time:"
 msgstr "S_lutt-tid:"
 
 #: calendar/gui/dialogs/event-page.glade.h:22
-#: calendar/gui/e-meeting-time-sel.c:596
+#: calendar/gui/e-meeting-time-sel.c:594
 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:313
 #: calendar/gui/dialogs/meeting-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:928
@@ -5020,7 +5172,7 @@ msgid "Change Or_ganizer"
 msgstr "Endre or_ganisator"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-meeting-time-sel.c:417
+#: calendar/gui/e-meeting-time-sel.c:415
 msgid "Con_tacts..."
 msgstr "Kon_takter..."
 
@@ -5166,10 +5318,6 @@ msgstr "Hver"
 msgid "This appointment rec_urs"
 msgstr "Denne avtalen _gjeninntreffer"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
-msgid "day(s)"
-msgstr "dag(er)"
-
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
 msgstr "for"
@@ -5222,8 +5370,8 @@ msgstr "<span weight=\"bold\">Status</span>"
 #. timezone.
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: 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:653 calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:653
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-itip-control.c:720
 #: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
 #: calendar/gui/print.c:2346
 msgid "Completed"
@@ -5237,8 +5385,8 @@ msgstr "Høy"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: 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:651 calendar/gui/e-cal-model-tasks.c:726
+#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:651
+#: calendar/gui/e-cal-model-tasks.c:726 calendar/gui/e-calendar-table.c:448
 #: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr "Under arbeid"
@@ -5250,16 +5398,15 @@ msgid "Low"
 msgstr "Lav"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:251
-#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:959
+#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:909
+#: calendar/gui/e-calendar-table.c:375 mail/message-list.c:959
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: 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:649 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:649
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "Ikke startet"
 
@@ -5334,52 +5481,53 @@ msgstr "Fer_dig-dato:"
 msgid "_Group:"
 msgstr "_Gruppe:"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
-msgid "Authentication Credentials for HTTP Server"
-msgstr "Autentiseringsdata for HTTP-tjener"
-
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "Calendars selected for publishing"
-msgstr "Kalendere valgt for publisering"
+#, fuzzy
+msgid "<b>Free/Busy C_alendars</b>"
+msgstr "<b>Kalenderalternativer</b>"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:4
-msgid "Daily"
-msgstr "Daglig"
+#, fuzzy
+msgid "<b>Publishing Frequency</b>"
+msgstr "Publiseringsfrekvens"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:5
-msgid "Free/Busy Editor"
-msgstr "Redigering av ledig/opptatt-informasjon"
+#, fuzzy
+msgid "<b>Publishing _Location</b>"
+msgstr "Lokasjon for publisering av ledig/opptatt-informasjon"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:6
-msgid "Free/Busy Publishing Location"
-msgstr "Lokasjon for publisering av ledig/opptatt-informasjon"
+msgid "Free/Busy Editor"
+msgstr "Redigering av ledig/opptatt-informasjon"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:7
-msgid "Login name:"
-msgstr "Påloggingsnavn:"
+#, fuzzy
+msgid "_Daily"
+msgstr "Daglig"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:8
-msgid "Password:"
-msgstr "Passord:"
+#, fuzzy
+msgid "_Manual"
+msgstr "_E-post"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:9
-msgid "Publishing Frequency"
-msgstr "Publiseringsfrekvens"
+#, fuzzy
+msgid "_Password:"
+msgstr "Passord:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:10
-msgid "Remember password"
+#, fuzzy
+msgid "_Remember password"
 msgstr "Husk passord"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "URL:"
-msgstr "URL:"
+#, fuzzy
+msgid "_Username:"
+msgstr "Bruker_navn:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:12
-msgid "User Publishes"
-msgstr "Bruker publiserer"
-
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:13
-msgid "Weekly"
+#, fuzzy
+msgid "_Weekly"
 msgstr "Ukentlig"
 
 #: calendar/gui/e-alarm-list.c:395
@@ -5417,22 +5565,6 @@ msgid_plural "%d seconds"
 msgstr[0] "%d sekund"
 msgstr[1] "%d sekunder"
 
-#: calendar/gui/e-alarm-list.c:444
-msgid "Play a sound"
-msgstr "Spill en lyd"
-
-#: calendar/gui/e-alarm-list.c:448
-msgid "Pop up an alert"
-msgstr "Vis varsling"
-
-#: calendar/gui/e-alarm-list.c:452
-msgid "Send an email"
-msgstr "Send en melding"
-
-#: calendar/gui/e-alarm-list.c:456
-msgid "Run a program"
-msgstr "Kjør et program"
-
 #: calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
 msgstr "Ukjent handling som skal utføres"
@@ -5514,6 +5646,94 @@ msgstr "Prioritet:"
 msgid "Web Page:"
 msgstr "Nettside:"
 
+#: calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr "Sluttdato"
+
+#: calendar/gui/e-cal-list-view.etspec.h:4
+msgid "Start Date"
+msgstr "Startdato"
+
+#: calendar/gui/e-cal-list-view.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:22
+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-model-tasks.c:302
+msgid "S"
+msgstr "S"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
+msgid "E"
+msgstr "Ø"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "V"
+
+#: calendar/gui/e-cal-model-tasks.c:601
+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"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:146 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-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr "Nei"
+
+#. 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:973 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 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:1705 camel/camel-gpg-context.c:1756
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1379
+#: camel/providers/imap4/camel-imap4-engine.c:1406
+#: camel/providers/imap4/camel-imap4-engine.c:1436
+#: camel/providers/imap4/camel-imap4-engine.c:1476
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#: camel/providers/imap4/camel-imap4-utils.c:457
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1120
+#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
+#: widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "Ukjent"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Gjeninntreffer"
+
+#: calendar/gui/e-cal-model.c:913
+msgid "Assigned"
+msgstr "Tildelt"
+
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
 msgstr "0%"
@@ -5558,15 +5778,6 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: 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:680 calendar/gui/e-calendar-view.c:647
 msgid "Deleting selected objects"
 msgstr "Sletter valgte objekter"
@@ -5587,7 +5798,7 @@ msgstr "_Åpne nettside"
 
 #: calendar/gui/e-calendar-table.c:1021 calendar/gui/e-calendar-table.c:1066
 #: calendar/gui/e-calendar-view.c:1341 calendar/gui/e-calendar-view.c:1426
-#: mail/em-folder-view.c:900 mail/em-popup.c:693 mail/em-popup.c:809
+#: mail/em-folder-view.c:900 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "Lagre _som..."
@@ -5610,7 +5821,7 @@ msgstr "Kli_pp ut"
 
 #: calendar/gui/e-calendar-table.c:1027 calendar/gui/e-calendar-table.c:1053
 #: calendar/gui/e-calendar-view.c:1348 calendar/gui/e-calendar-view.c:1388
-#: mail/em-folder-tree.c:966 mail/message-list.c:1650
+#: mail/em-folder-tree.c:965 mail/message-list.c:1650
 #: 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
@@ -5644,7 +5855,7 @@ msgstr "_Merk valgte oppgaver som fullført"
 #. FIXME: need to disable for undeletable folders
 #: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
 #: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
-#: mail/em-folder-tree.c:2616 mail/em-folder-view.c:923
+#: mail/em-folder-tree.c:2615 mail/em-folder-view.c:923
 #: 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
@@ -5691,11 +5902,6 @@ msgstr "Prioritet"
 msgid "Start date"
 msgstr "Startdato"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
-#: calendar/gui/e-cal-list-view.etspec.h:5 mail/mail-dialogs.glade.h:22
-msgid "Summary"
-msgstr "Sammendrag"
-
 #: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "Oppgavesortering"
@@ -5772,95 +5978,13 @@ msgstr "_Gå til dato..."
 msgid "_Settings..."
 msgstr "Inn_stillinger..."
 
-#: calendar/gui/e-cal-list-view.etspec.h:2
-msgid "End Date"
-msgstr "Sluttdato"
-
-#: calendar/gui/e-cal-list-view.etspec.h:4
-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:973 calendar/gui/e-itip-control.c:1175
-#: calendar/gui/e-meeting-list-view.c:122
-#: calendar/gui/e-meeting-list-view.c:136 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:1705 camel/camel-gpg-context.c:1756
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1379
-#: camel/providers/imap4/camel-imap4-engine.c:1406
-#: camel/providers/imap4/camel-imap4-engine.c:1436
-#: camel/providers/imap4/camel-imap4-engine.c:1476
-#: camel/providers/imap4/camel-imap4-store.c:1255
-#: camel/providers/imap4/camel-imap4-utils.c:293
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1120
-#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
-#: widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Ukjent"
-
-#: calendar/gui/e-cal-model.c:911
-msgid "Recurring"
-msgstr "Gjeninntreffer"
-
-#: calendar/gui/e-cal-model.c:913
-msgid "Assigned"
-msgstr "Tildelt"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:146 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:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:147 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:681
-msgid "E"
-msgstr "Ø"
-
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "V"
-
-#: calendar/gui/e-cal-model-tasks.c:601
-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"
@@ -5877,43 +6001,36 @@ msgstr ""
 "\n"
 "%s"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
-#: 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:820 calendar/gui/e-week-view.c:576
-#: 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"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#. 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:1571 calendar/gui/e-day-view-top-item.c:690
+#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1571
 #: 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.
-#. 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:1604 calendar/gui/e-day-view-top-item.c:698
+#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%d %b"
 
-#: 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:817 calendar/gui/e-week-view.c:573
+#: 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:820 calendar/gui/e-week-view.c:576
+#: calendar/gui/print.c:840
+msgid "pm"
+msgstr "pm"
 
 #: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
@@ -6396,7 +6513,7 @@ msgid "Needs Action"
 msgstr "Trenger handling"
 
 #: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
-#: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:400
+#: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "Tentativ"
 
@@ -6409,94 +6526,86 @@ msgstr "Delegert"
 msgid "In Process"
 msgstr "Under arbeid"
 
-#: calendar/gui/e-meeting-time-sel.c:402 designs/OOA/ooa.glade.h:11
+#. 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:2053
+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:2086 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
 msgid "Out of Office"
 msgstr "Ute"
 
-#: calendar/gui/e-meeting-time-sel.c:403
+#: calendar/gui/e-meeting-time-sel.c:401
 msgid "No Information"
 msgstr "Ingen informasjon"
 
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-time-sel.c:432
 msgid "O_ptions"
 msgstr "Al_ternativer"
 
-#: calendar/gui/e-meeting-time-sel.c:451
+#: calendar/gui/e-meeting-time-sel.c:449
 msgid "Show _only working hours"
 msgstr "K_un vis arbeidstid"
 
-#: calendar/gui/e-meeting-time-sel.c:461
+#: calendar/gui/e-meeting-time-sel.c:459
 msgid "Show _zoomed out"
 msgstr "Vis _zoomet ut"
 
-#: calendar/gui/e-meeting-time-sel.c:476
+#: calendar/gui/e-meeting-time-sel.c:474
 msgid "_Update free/busy"
 msgstr "_Oppdater ledig/opptatt"
 
-#: calendar/gui/e-meeting-time-sel.c:491
+#: calendar/gui/e-meeting-time-sel.c:489
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:509
+#: calendar/gui/e-meeting-time-sel.c:507
 msgid "_Autopick"
 msgstr "_Autovelg"
 
-#: calendar/gui/e-meeting-time-sel.c:524
+#: calendar/gui/e-meeting-time-sel.c:522
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:541
+#: calendar/gui/e-meeting-time-sel.c:539
 msgid "_All people and resources"
 msgstr "_Alle personer og ressurser"
 
-#: calendar/gui/e-meeting-time-sel.c:550
+#: calendar/gui/e-meeting-time-sel.c:548
 msgid "All _people and one resource"
 msgstr "Alle _personer og en ressurs"
 
-#: calendar/gui/e-meeting-time-sel.c:559
+#: calendar/gui/e-meeting-time-sel.c:557
 msgid "_Required people"
 msgstr "_Obligatoriske personer"
 
-#: calendar/gui/e-meeting-time-sel.c:568
+#: calendar/gui/e-meeting-time-sel.c:566
 msgid "Required people and _one resource"
 msgstr "Obligatoriske personer _og en ressurs"
 
-#. 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:2055
-#: 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:2088
-#: 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:710 calendar/gui/gnome-cal.c:2159
+#: calendar/gui/e-tasks.c:709 calendar/gui/gnome-cal.c:2159
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6505,38 +6614,27 @@ msgstr ""
 "Feil på «%s»:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:756
+#: calendar/gui/e-tasks.c:755
 msgid "Loading tasks"
 msgstr "Laster oppgaver"
 
-#. FIXME Loading should be async
-#. FIXME With no event handling here the status message never actually changes
 #: calendar/gui/e-tasks.c:846
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Åpner oppgaver på %s"
 
-#: calendar/gui/e-tasks.c:963
+#: calendar/gui/e-tasks.c:962
 msgid "Completing tasks..."
 msgstr "Fullfører oppgaver..."
 
-#: calendar/gui/e-tasks.c:986
+#: calendar/gui/e-tasks.c:985
 msgid "Deleting selected objects..."
 msgstr "Sletter valgte objekter..."
 
-#: calendar/gui/e-tasks.c:1013
+#: calendar/gui/e-tasks.c:1012
 msgid "Expunging"
 msgstr "Tømmer"
 
-#: calendar/gui/e-tasks.c:1089
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
-#: calendar/gui/tasks-component.c:874 calendar/gui/tasks-control.c:405
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Oppgaver"
-
 #: calendar/gui/gnome-cal.c:704
 msgid "Updating query"
 msgstr "Oppdaterer spørring"
@@ -6560,55 +6658,6 @@ msgstr "Åpner %s"
 msgid "Purging"
 msgstr "Sletter"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "*Control*F3"
-msgstr "*Control*F3"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "*Control*F4"
-msgstr "*Control*F4"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
-msgstr "Kalender og oppgaver"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-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:6
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution kalender og oppgaver"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar configuration control"
-msgstr "Konfigurasjonskontroll for Evolution kalender"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Visning for møteplanlegging i Evolution kalender"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Calendar/Task editor"
-msgstr "Redigering av kalender/oppgaver for Evolution"
-
-#: 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:13
-msgid "_Calendars"
-msgstr "_Kalendere"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Oppgaver"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "April"
@@ -7077,7 +7126,7 @@ msgstr "Ikke spør meg igjen."
 msgid "Print Tasks"
 msgstr "Skriv ut oppgaver"
 
-#: calendar/gui/weekday-picker.c:327
+#: calendar/gui/weekday-picker.c:326
 msgid "SMTWTFS"
 msgstr "SMTOTFL"
 
@@ -8814,41 +8863,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.c:653
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Ustøttet operasjon: legg til melding: for %s"
-
-#: camel/camel-folder.c:1262
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Ustøttet operasjon: søk etter uttrykk: etter %s"
-
-#: camel/camel-folder.c:1302
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr "Ustøttet operasjon: søk på uid: etter %s"
-
-#: camel/camel-folder.c:1416
-msgid "Moving messages"
-msgstr "Flytter meldinger"
-
-#: camel/camel-folder.c:1416
-msgid "Copying messages"
-msgstr "Kopierer meldinger"
-
-#: camel/camel-folder.c:1665
-msgid "Learning junk"
-msgstr "Oppdaterer data om søppel"
-
-#: camel/camel-folder.c:1682
-msgid "Learning non-junk"
-msgstr "Oppdaterer data om gyldige meldinger"
-
-#: camel/camel-folder.c:1701
-msgid "Filtering new message(s)"
-msgstr "Filtrerer ny(e) melding(er)"
-
 #: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
 #, c-format
 msgid ""
@@ -8894,6 +8908,41 @@ msgstr "(treff-alle) krever et enkelt bolsk resultat"
 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"
+msgstr "Ustøttet operasjon: legg til melding: for %s"
+
+#: camel/camel-folder.c:1262
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "Ustøttet operasjon: søk etter uttrykk: etter %s"
+
+#: camel/camel-folder.c:1302
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr "Ustøttet operasjon: søk på uid: etter %s"
+
+#: camel/camel-folder.c:1416
+msgid "Moving messages"
+msgstr "Flytter meldinger"
+
+#: camel/camel-folder.c:1416
+msgid "Copying messages"
+msgstr "Kopierer meldinger"
+
+#: camel/camel-folder.c:1665
+msgid "Learning junk"
+msgstr "Oppdaterer data om søppel"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr "Oppdaterer data om gyldige meldinger"
+
+#: camel/camel-folder.c:1701
+msgid "Filtering new message(s)"
+msgstr "Filtrerer ny(e) melding(er)"
+
 #: camel/camel-gpg-context.c:722
 #, c-format
 msgid ""
@@ -9011,26 +9060,6 @@ msgstr "Kryptert innhold"
 msgid "Unable to parse message content"
 msgstr "Kunne ikke lese meldingsinnhold"
 
-#: camel/camel-lock.c:92 camel/camel-lock.c:113
-#, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "Kunne ikke opprette låsfil for %s: %s"
-
-#: camel/camel-lock.c:154
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr "Tidsavbrudd under venting på låsfil for %s. Prøv igjen senere."
-
-#: camel/camel-lock.c:209
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr "Feil under låsing ved bruk av fcntl(2): %s"
-
-#: camel/camel-lock.c:272
-#, c-format
-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"
@@ -9051,6 +9080,26 @@ msgstr "Kunne ikke låse «%s»: protokollfeil med låshjelper"
 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"
+msgstr "Kunne ikke opprette låsfil for %s: %s"
+
+#: camel/camel-lock.c:154
+#, c-format
+msgid "Timed out trying to get lock file on %s. Try again later."
+msgstr "Tidsavbrudd under venting på låsfil for %s. Prøv igjen senere."
+
+#: camel/camel-lock.c:209
+#, c-format
+msgid "Failed to get lock using fcntl(2): %s"
+msgstr "Feil under låsing ved bruk av fcntl(2): %s"
+
+#: camel/camel-lock.c:272
+#, c-format
+msgid "Failed to get lock using flock(2): %s"
+msgstr "Feil under låsing ved bruk av flock(2): %s"
+
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9500,7 +9549,7 @@ msgstr "Kan ikke legge til sertifikat for kryptering"
 msgid "Cannot add CMS SignerInfo"
 msgstr "Kan ikke legge til SignerInfo for CMS"
 
-#: camel/camel-smime-context.c:430
+#: camel/camel-smime-context.c:430 camel/camel-smime-context.c:877
 msgid "Cannot create encoder context"
 msgstr "Kan ikke opprette kontekst for koding"
 
@@ -9586,7 +9635,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:635
 #, fuzzy
-msgid "Can't find signature digests"
+msgid "Cannot find signature digests"
 msgstr "Gyldig signatur"
 
 #: camel/camel-smime-context.c:651
@@ -9599,46 +9648,48 @@ msgid "Decoder failed"
 msgstr "Dekoder feilet"
 
 #: camel/camel-smime-context.c:804
-#, c-format
-msgid "Can't find certificate for `%s'"
+#, fuzzy, c-format
+msgid "Cannot find certificate for `%s'"
 msgstr "Kan ikke finne sertifikat for «%s»"
 
 #: camel/camel-smime-context.c:811
-msgid "Can't find common bulk encryption algorithm"
+msgid "Cannot find common bulk encryption algorithm"
 msgstr ""
 
 #. PORT_GetError(); ??
 #: camel/camel-smime-context.c:820
-msgid "Can't allocate slot for encryption bulk key"
+msgid "Cannot allocate slot for encryption bulk key"
 msgstr ""
 
 #: camel/camel-smime-context.c:831
-msgid "Can't create CMS Message"
+#, fuzzy
+msgid "Cannot create CMS Message"
 msgstr "Kan ikke opprette CMS-melding"
 
 #: camel/camel-smime-context.c:837
-msgid "Can't create CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS EnvelopedData"
+msgstr "Kan ikke opprette signedData for CMS"
 
 #: camel/camel-smime-context.c:843
-msgid "Can't attach CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot attach CMS EnvelopedData"
+msgstr "Kan ikke legge ved signedData for CMS"
 
 #: camel/camel-smime-context.c:849
-msgid "Can't attach CMS data object"
-msgstr ""
+#, fuzzy
+msgid "Cannot attach CMS data object"
+msgstr "Kan ikke legge ved CMS-data"
 
 #: camel/camel-smime-context.c:858
-msgid "Can't create CMS RecipientInfo"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS RecipientInfo"
+msgstr "Kan ikke opprette SignerInfo for CMS"
 
 #: camel/camel-smime-context.c:863
-msgid "Can't add CMS RecipientInfo"
-msgstr ""
-
-#: camel/camel-smime-context.c:877
-msgid "Can't create encoder context"
-msgstr "Kan ikke opprette kontekst for koding"
+#, fuzzy
+msgid "Cannot add CMS RecipientInfo"
+msgstr "Kan ikke legge til SignerInfo for CMS"
 
 #: camel/camel-smime-context.c:888
 #, fuzzy
@@ -9685,7 +9736,7 @@ msgstr "Kan ikke opprette mappe: «%s»: mappen eksisterer"
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kan ikke slette mappe: %s: Ugyldig operasjon"
 
-#: camel/camel-store.c:439 camel/camel-vee-store.c:387
+#: camel/camel-store.c:439 camel/camel-vee-store.c:388
 #: camel/providers/local/camel-maildir-store.c:232
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
@@ -9935,7 +9986,7 @@ msgstr "Kan ikke kopiere eller flytte meldinger inn i en virtuell mappe"
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kan ikke slette mappe: %s: Ingen slik mappe"
 
-#: camel/camel-vee-store.c:395
+#: camel/camel-vee-store.c:396
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kan ikke endre navn på mappe: %s: Ingen slik mappe"
@@ -9954,8 +10005,8 @@ 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
+#: camel/providers/imap4/camel-imap4-provider.c:37
 msgid "Check for new messages in all folders"
 msgstr "Se etter nye meldinger i alle mapper"
 
@@ -9985,8 +10036,8 @@ msgid "For accessing Novell Groupwise servers"
 msgstr "For å aksessere Novell Groupwise-tjenere"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
+#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
@@ -10006,324 +10057,6 @@ msgstr ""
 msgid "Checklist"
 msgstr "Sjekkliste"
 
-#: camel/providers/imap4/camel-imap4-command.c:531
-#: camel/providers/imap4/camel-imap4-command.c:538
-#, fuzzy, c-format
-msgid "Failed sending command to IMAP server %s: %s"
-msgstr "Kunne ikke autentisere mot POP-tjener %s: %s"
-
-#: camel/providers/imap4/camel-imap4-command.c:637
-#, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "Uventet svar fra IMAP4-tjener %s: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:232
-#, fuzzy, c-format
-msgid "Unexpected greeting from IMAP server %s."
-msgstr "Uventet svar fra IMAP-tjener: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:416
-#, c-format
-msgid "Cannot select folder `%s': Invalid mailbox name"
-msgstr "Kan ikke velge mappe «%s»: Ugyldig navn på postboks"
-
-#: camel/providers/imap4/camel-imap4-engine.c:422
-#, c-format
-msgid "Cannot select folder `%s': Bad command"
-msgstr "Kan ikke velge mappe «%s»: Ugyldig kommando"
-
-#: camel/providers/imap4/camel-imap4-engine.c:997
-#: camel/providers/imap4/camel-imap4-engine.c:1378
-#: camel/providers/imap4/camel-imap4-engine.c:1405
-#: camel/providers/imap4/camel-imap4-engine.c:1435
-#: camel/providers/imap4/camel-imap4-engine.c:1475
-#, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "IMAP4-tjener %s koblet fra uventet: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:998
-msgid "Got BYE response"
-msgstr "Mottok svaret BYE"
-
-#: camel/providers/imap4/camel-imap4-folder.c:507
-#, c-format
-msgid "Cannot sync flags to folder `%s': Unknown"
-msgstr "Kan ikke synkronisere flagg til mappe «%s»: Ukjent"
-
-#: camel/providers/imap4/camel-imap4-folder.c:513
-#, 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:650
-#, c-format
-msgid "Cannot expunge folder `%s': Unknown"
-msgstr "Kan ikke tømme mappe «%s»: Ukjent"
-
-#: camel/providers/imap4/camel-imap4-folder.c:655
-#, c-format
-msgid "Cannot expunge folder `%s': Bad command"
-msgstr "Kan ikke tømme mappe «%s»: Ugyldig kommando"
-
-#: camel/providers/imap4/camel-imap4-folder.c:845
-#, c-format
-msgid "Cannot get message %s from folder `%s': No such message"
-msgstr "Kan ikke hente melding %s fra mappe «%s»: Meldingen finnes ikke"
-
-#: camel/providers/imap4/camel-imap4-folder.c:850
-#, c-format
-msgid "Cannot get message %s from folder `%s': Bad command"
-msgstr "Kan ikke hente melding: %s fra mappe «%s»: Ugyldig kommando"
-
-#: camel/providers/imap4/camel-imap4-folder.c:975
-#, c-format
-msgid "Cannot append message to folder `%s': Unknown error"
-msgstr "Kan ikke legge til melding i mappe «%s»: Ukjent feil"
-
-#: camel/providers/imap4/camel-imap4-folder.c:1004
-#, c-format
-msgid "Cannot append message to folder `%s': Bad command"
-msgstr "Kan ikke legge til melding i mappe «%s»: Ugyldig kommando"
-
-#: camel/providers/imap4/camel-imap4-folder.c:1083
-#, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
-msgstr "Kan ikke flytte meldinger fra mappe «%s» til mappe «%s»: Ukjent"
-
-#: camel/providers/imap4/camel-imap4-folder.c:1087
-#, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-msgstr "Kan ikke kopiere meldinger fra mappe «%s» til mappe «%s»: Ukjent"
-
-#: camel/providers/imap4/camel-imap4-folder.c:1095
-#, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"Kan ikke flytte meldinger fra mappe «%s» til mappe «%s»: Ugyldig kommando"
-
-#: camel/providers/imap4/camel-imap4-folder.c:1099
-#, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"Kan ikke kopiere meldinger fra mappe «%s» til mappe «%s»: Ugyldig kommando"
-
-#: 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
-msgid "IMAPv4rev1"
-msgstr "IMAPv4rev1"
-
-#: 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:175
-#: 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:177
-#: 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:218
-#: camel/providers/imap4/camel-imap4-store.c:235
-#: camel/providers/imap/camel-imap-store.c:547
-#: camel/providers/imap/camel-imap-store.c:567
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:209
-#: 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:220
-#: camel/providers/imap/camel-imap-store.c:549
-#: 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:232
-#: camel/providers/imap/camel-imap-store.c:564
-#: camel/providers/imap/camel-imap-store.c:841
-#: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:206
-#: camel/providers/nntp/camel-nntp-store.c:224
-#: camel/providers/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Tilkobling avbrutt"
-
-#: camel/providers/imap4/camel-imap4-store.c:271
-#, 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:296
-#: camel/providers/imap/camel-imap-store.c:675
-#: camel/providers/imap/camel-imap-store.c:706
-#, 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:297
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/pop3/camel-pop3-store.c:543
-#: camel/providers/pop3/camel-pop3-store.c:550
-#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1139
-msgid "Unknown error"
-msgstr "Ukjent feil"
-
-#: camel/providers/imap4/camel-imap4-store.c:383
-#, 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:428
-#, c-format
-msgid "%sPlease enter the IMAP password for %s on host %s"
-msgstr "%sVennligst skriv inn IMAP-passord for %s på vert %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:502
-#, 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:733
-#, 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:796
-#: camel/providers/imap/camel-imap-store.c:1881
-#: camel/providers/imap/camel-imap-store.c:2259
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "Mappenavn «%s» er ugyldig fordi det inneholder tegnet «%c»"
-
-#: camel/providers/imap4/camel-imap4-store.c:847
-#, c-format
-msgid "Cannot create folder `%s': Invalid mailbox name"
-msgstr "Kan ikke opprette mappe «%s»: Ugyldig navn på postboks"
-
-#: camel/providers/imap4/camel-imap4-store.c:853
-#, c-format
-msgid "Cannot create folder `%s': Bad command"
-msgstr "Kan ikke opprette mappe «%s»: Ugyldig kommando"
-
-#: camel/providers/imap4/camel-imap4-store.c:884
-#, c-format
-msgid "Cannot delete folder `%s': Special folder"
-msgstr "Kan ikke slette mappe «%s»: Spesiell mappe"
-
-#: camel/providers/imap4/camel-imap4-store.c:943
-#, c-format
-msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgstr "Kan ikke slette mappe «%s»: Ugyldig navn på postboks"
-
-#: camel/providers/imap4/camel-imap4-store.c:948
-#, c-format
-msgid "Cannot delete folder `%s': Bad command"
-msgstr "Kan ikke slette mappe «%s»: Ugyldig kommando"
-
-#: camel/providers/imap4/camel-imap4-store.c:968
-#, fuzzy, c-format
-msgid "Cannot rename folder `%s' to `%s': Special folder"
-msgstr "Kan ikke slette mappe «%s»: Spesiell mappe"
-
-#: camel/providers/imap4/camel-imap4-store.c:1000
-#, fuzzy, c-format
-msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
-msgstr "Kan ikke opprette mappe «%s»: Ugyldig navn på postboks"
-
-#: camel/providers/imap4/camel-imap4-store.c:1005
-#, fuzzy, c-format
-msgid "Cannot rename folder `%s' to `%s': Bad command"
-msgstr "Kan ikke opprette mappe «%s»: Ugyldig kommando"
-
-#: camel/providers/imap4/camel-imap4-store.c:1253
-#, c-format
-msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:1255
-msgid "Bad command"
-msgstr "Ugyldig kommando"
-
-#: camel/providers/imap4/camel-imap4-store.c:1331
-#, 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:1336
-#, 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:1396
-#, 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:1401
-#, 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:86
-#, 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:109
-msgid "No data"
-msgstr "Ingen data"
-
-#: camel/providers/imap4/camel-imap4-utils.c:292
-#, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "IMAP-tjener %s 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
@@ -10337,6 +10070,15 @@ 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/imap4/camel-imap4-store.c:297
+#: camel/providers/pop3/camel-pop3-store.c:543
+#: camel/providers/pop3/camel-pop3-store.c:550
+#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1139
+msgid "Unknown error"
+msgstr "Ukjent feil"
+
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10476,6 +10218,27 @@ msgstr "Bruk egendefinert kommando for å koble til tjener"
 msgid "Command:"
 msgstr "Kommando:"
 
+#: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/imap4/camel-imap4-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:41
+msgid "Folders"
+msgstr "Mapper"
+
+#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap4/camel-imap4-provider.c:42
+msgid "Show only subscribed folders"
+msgstr "Vis kun abonnerte mapper"
+
+#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap4/camel-imap4-provider.c:44
+msgid "Override server-supplied folder namespace"
+msgstr "Overstyr tjeners navneområde for mapper"
+
+#: camel/providers/imap/camel-imap-provider.c:61
+#: camel/providers/imap4/camel-imap4-provider.c:46
+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"
@@ -10496,6 +10259,55 @@ 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
+#: camel/providers/imap4/camel-imap4-store.c:175
+#, c-format
+msgid "IMAP server %s"
+msgstr "IMAP-tjener %s"
+
+#: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap4/camel-imap4-store.c:177
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "IMAP-tjeneste for %s på %s"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:567
+#: camel/providers/imap4/camel-imap4-store.c:218
+#: camel/providers/imap4/camel-imap4-store.c:235
+#: camel/providers/imapp/camel-imapp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:209
+#: 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:549
+#: camel/providers/imap4/camel-imap4-store.c:220
+#: 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:564
+#: camel/providers/imap/camel-imap-store.c:841
+#: camel/providers/imap4/camel-imap4-store.c:232
+#: camel/providers/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Tilkobling avbrutt"
+
+#: camel/providers/imap/camel-imap-store.c:675
+#: camel/providers/imap/camel-imap-store.c:706
+#: camel/providers/imap4/camel-imap4-store.c:296
+#, 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:676
 #: camel/providers/pop3/camel-pop3-store.c:233
 msgid "SSL/TLS extension not supported."
@@ -10549,6 +10361,14 @@ msgstr ""
 msgid "No such folder %s"
 msgstr "Mappen %s eksisterer ikke"
 
+#: camel/providers/imap/camel-imap-store.c:1881
+#: camel/providers/imap/camel-imap-store.c:2259
+#: camel/providers/imap4/camel-imap4-store.c:796
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "Mappenavn «%s» er ugyldig fordi det inneholder tegnet «%c»"
+
 #: camel/providers/imap/camel-imap-store.c:1939
 #: camel/providers/imap/camel-imap-store.c:2320
 msgid "The parent folder is not allowed to contain subfolders"
@@ -10567,6 +10387,237 @@ msgstr "Kan ikke opprette mappe «%s»: mappen eksisterer."
 msgid "Unknown parent folder: %s"
 msgstr "Ukjent opphavsmappe: %s"
 
+#: camel/providers/imap4/camel-imap4-command.c:550
+#: camel/providers/imap4/camel-imap4-command.c:557
+#, fuzzy, c-format
+msgid "Failed sending command to IMAP server %s: %s"
+msgstr "Kunne ikke autentisere mot POP-tjener %s: %s"
+
+#: camel/providers/imap4/camel-imap4-command.c:656
+#, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Uventet svar fra IMAP4-tjener %s: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:232
+#, fuzzy, c-format
+msgid "Unexpected greeting from IMAP server %s."
+msgstr "Uventet svar fra IMAP-tjener: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:416
+#, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Kan ikke velge mappe «%s»: Ugyldig navn på postboks"
+
+#: camel/providers/imap4/camel-imap4-engine.c:422
+#, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Kan ikke velge mappe «%s»: Ugyldig kommando"
+
+#: camel/providers/imap4/camel-imap4-engine.c:997
+#: camel/providers/imap4/camel-imap4-engine.c:1378
+#: camel/providers/imap4/camel-imap4-engine.c:1405
+#: camel/providers/imap4/camel-imap4-engine.c:1435
+#: camel/providers/imap4/camel-imap4-engine.c:1475
+#, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr "IMAP4-tjener %s koblet fra uventet: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:998
+msgid "Got BYE response"
+msgstr "Mottok svaret BYE"
+
+#: camel/providers/imap4/camel-imap4-folder.c:359
+#, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "Kan ikke synkronisere flagg til mappe «%s»: Ukjent"
+
+#: camel/providers/imap4/camel-imap4-folder.c:365
+#, 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:502
+#, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Kan ikke tømme mappe «%s»: Ukjent"
+
+#: camel/providers/imap4/camel-imap4-folder.c:507
+#, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Kan ikke tømme mappe «%s»: Ugyldig kommando"
+
+#: camel/providers/imap4/camel-imap4-folder.c:697
+#, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr "Kan ikke hente melding %s fra mappe «%s»: Meldingen finnes ikke"
+
+#: camel/providers/imap4/camel-imap4-folder.c:702
+#, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr "Kan ikke hente melding: %s fra mappe «%s»: Ugyldig kommando"
+
+#: camel/providers/imap4/camel-imap4-folder.c:827
+#, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Kan ikke legge til melding i mappe «%s»: Ukjent feil"
+
+#: camel/providers/imap4/camel-imap4-folder.c:856
+#, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Kan ikke legge til melding i mappe «%s»: Ugyldig kommando"
+
+#: camel/providers/imap4/camel-imap4-folder.c:935
+#, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr "Kan ikke flytte meldinger fra mappe «%s» til mappe «%s»: Ukjent"
+
+#: camel/providers/imap4/camel-imap4-folder.c:939
+#, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr "Kan ikke kopiere meldinger fra mappe «%s» til mappe «%s»: Ukjent"
+
+#: camel/providers/imap4/camel-imap4-folder.c:947
+#, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Kan ikke flytte meldinger fra mappe «%s» til mappe «%s»: Ugyldig kommando"
+
+#: camel/providers/imap4/camel-imap4-folder.c:951
+#, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Kan ikke kopiere meldinger fra mappe «%s» til mappe «%s»: Ugyldig kommando"
+
+#: camel/providers/imap4/camel-imap4-provider.c:53
+msgid "IMAPv4rev1"
+msgstr "IMAPv4rev1"
+
+#: 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:271
+#, 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:383
+#, 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:428
+#, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sVennligst skriv inn IMAP-passord for %s på vert %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:502
+#, 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:733
+#, 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:847
+#, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Kan ikke opprette mappe «%s»: Ugyldig navn på postboks"
+
+#: camel/providers/imap4/camel-imap4-store.c:853
+#, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Kan ikke opprette mappe «%s»: Ugyldig kommando"
+
+#: camel/providers/imap4/camel-imap4-store.c:884
+#, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Kan ikke slette mappe «%s»: Spesiell mappe"
+
+#: camel/providers/imap4/camel-imap4-store.c:943
+#, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Kan ikke slette mappe «%s»: Ugyldig navn på postboks"
+
+#: camel/providers/imap4/camel-imap4-store.c:948
+#, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Kan ikke slette mappe «%s»: Ugyldig kommando"
+
+#: camel/providers/imap4/camel-imap4-store.c:968
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Special folder"
+msgstr "Kan ikke slette mappe «%s»: Spesiell mappe"
+
+#: camel/providers/imap4/camel-imap4-store.c:1000
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+msgstr "Kan ikke opprette mappe «%s»: Ugyldig navn på postboks"
+
+#: camel/providers/imap4/camel-imap4-store.c:1005
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Bad command"
+msgstr "Kan ikke opprette mappe «%s»: Ugyldig kommando"
+
+#: camel/providers/imap4/camel-imap4-store.c:1253
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1255
+msgid "Bad command"
+msgstr "Ugyldig kommando"
+
+#: camel/providers/imap4/camel-imap4-store.c:1331
+#, 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:1336
+#, 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:1396
+#, 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:1401
+#, 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:250
+#, 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:273
+msgid "No data"
+msgstr "Ingen data"
+
+#: camel/providers/imap4/camel-imap4-utils.c:456
+#, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr "IMAP-tjener %s koblet fra uventet: %s"
+
 #: camel/providers/imapp/camel-imapp-provider.c:39
 #: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
@@ -11858,86 +11909,6 @@ msgstr "MIME-type:"
 msgid "Suggest automatic display of attachment"
 msgstr "Foreslå automatisk visning av vedlegg"
 
-#: composer/e-msg-composer.c:704
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
-msgstr ""
-"Kan ikke signere utgående melding: Ingen sertifikat for signering satt for "
-"denne kontoen"
-
-#: composer/e-msg-composer.c:711
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr ""
-"Kan ikke kryptere utgående melding: Sertifikat for kryptering ikke satt for "
-"denne kontoen"
-
-#: composer/e-msg-composer.c:1283
-msgid "Could not open file"
-msgstr "Kunne ikke åpne fil"
-
-#: composer/e-msg-composer.c:1291
-msgid "Unable to retrieve message from editor"
-msgstr "Kunne ikke hente melding fra editor"
-
-#: composer/e-msg-composer.c:1561
-msgid "Untitled Message"
-msgstr "Melding uten navn"
-
-#: composer/e-msg-composer.c:1591
-msgid "Open file"
-msgstr "Åpne fil"
-
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
-msgid "Autogenerated"
-msgstr "Generert automatisk"
-
-#: composer/e-msg-composer.c:2097
-msgid "Signature:"
-msgstr "Signatur:"
-
-#: composer/e-msg-composer.c:2298
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
-
-#: composer/e-msg-composer.c:2327
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr "Skjul _vedleggsfeltet (slipp vedlegg her)"
-
-#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3286
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr "Vis _vedleggsfeltet (slipp vedlegg her)"
-
-#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3178
-#: composer/e-msg-composer.c:3179
-msgid "Compose a message"
-msgstr "Skriv en melding"
-
-#: composer/e-msg-composer.c:2649
-#, fuzzy, c-format
-msgid "Attached message - %s"
-msgstr "Videresendt melding - %s"
-
-#. translators, this count will always be >1
-#: composer/e-msg-composer.c:2654 composer/e-msg-composer.c:2798
-#, c-format
-msgid "Attached message"
-msgid_plural "%d attached messages"
-msgstr[0] "Vedlagt melding"
-msgstr[1] "%d vedlagte meldinger"
-
-#: composer/e-msg-composer.c:4332
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-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"
@@ -12018,6 +11989,86 @@ msgstr "Klikk her for å velge mapper å poste til"
 msgid "Attach file(s)"
 msgstr "Legg ved fil(er)"
 
+#: composer/e-msg-composer.c:704
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+"Kan ikke signere utgående melding: Ingen sertifikat for signering satt for "
+"denne kontoen"
+
+#: composer/e-msg-composer.c:711
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
+"Kan ikke kryptere utgående melding: Sertifikat for kryptering ikke satt for "
+"denne kontoen"
+
+#: composer/e-msg-composer.c:1283
+msgid "Could not open file"
+msgstr "Kunne ikke åpne fil"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Kunne ikke hente melding fra editor"
+
+#: composer/e-msg-composer.c:1561
+msgid "Untitled Message"
+msgstr "Melding uten navn"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Åpne fil"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
+msgid "Autogenerated"
+msgstr "Generert automatisk"
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "Signatur:"
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] ""
+msgstr[1] ""
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr "Skjul _vedleggsfeltet (slipp vedlegg her)"
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3286
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr "Vis _vedleggsfeltet (slipp vedlegg her)"
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3178
+#: composer/e-msg-composer.c:3179
+msgid "Compose a message"
+msgstr "Skriv en melding"
+
+#: composer/e-msg-composer.c:2649
+#, fuzzy, c-format
+msgid "Attached message - %s"
+msgstr "Videresendt melding - %s"
+
+#. translators, this count will always be >1
+#: composer/e-msg-composer.c:2654 composer/e-msg-composer.c:2798
+#, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "Vedlagt melding"
+msgstr[1] "%d vedlagte meldinger"
+
+#: composer/e-msg-composer.c:4332
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+"<b>(Redigering inneholder en meldingskropp som ikke er tekst, og derfor ikke "
+"kan redigeres.)<b>"
+
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
@@ -12048,11 +12099,6 @@ msgid "Could not retrieve messages to attach from {0}."
 msgstr "Kunne ikke opprette melding."
 
 #. mail-composer:attach-nomessages secondary
-#. mail-composer:no-sig-file secondary
-#. mail:no-create-tmp-path secondary
-#. mail:no-delete-folder secondary
-#. system:no-save-file secondary
-#. system:no-load-file secondary
 #: composer/mail-composer-errors.xml.h:14
 #: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:100
 #: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
@@ -12148,7 +12194,6 @@ msgid "You need to configure an account before you can compose mail."
 msgstr "Du må konfigurere en konto før du kan skrive meldinger."
 
 #. mail-composer:no-address-control primary
-#. mail-composer:no-editor-control primary
 #: composer/mail-composer-errors.xml.h:48
 #: composer/mail-composer-errors.xml.h:52
 #, fuzzy
@@ -12329,16 +12374,12 @@ 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"
@@ -12390,31 +12431,23 @@ 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"
@@ -12507,7 +12540,6 @@ msgid "Missing file name."
 msgstr "Mangler filnavn."
 
 #. filter:no-file secondary
-#. filter:bad-file secondary
 #: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
 msgid "You must specify a file name."
 msgstr "Du må oppgi et filnavn."
@@ -12528,7 +12560,6 @@ msgid "Could not compile regular expression \"{1}\"."
 msgstr "Kunne ikke sette sammen regulært uttrykk «{1}»."
 
 #. filter:no-name primary
-#. mail:no-name-vfolder primary
 #: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
 msgid "Missing name."
 msgstr "Mangler navn."
@@ -12552,6 +12583,71 @@ msgstr "Vennligst velg et annet navn."
 msgid "Choose a file"
 msgstr "Velg en fil"
 
+#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
+#: mail/mail-config.c:76 mail/mail-config.glade.h:93
+msgid "Important"
+msgstr "Viktig"
+
+#. forest green
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
+#: mail/mail-config.glade.h:148
+msgid "To Do"
+msgstr "Oppgaver"
+
+#. blue
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
+#: mail/mail-config.glade.h:97
+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:790
+msgid "Rule name:"
+msgstr "Regelnavn:"
+
+#: filter/filter-rule.c:817
+msgid "<b>If</b>"
+msgstr "<b>Hvis</b> "
+
+#: filter/filter-rule.c:854
+msgid "if all criteria are met"
+msgstr "hvis alle kriterier er møtt"
+
+#: filter/filter-rule.c:854
+msgid "if any criteria are met"
+msgstr "hvis ethvert kriterie er møtt"
+
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr "Utfør handlinger"
+
+#: filter/filter-rule.c:877
+msgid "All related"
+msgstr "Alle relaterte"
+
+#: filter/filter-rule.c:877
+msgid "Replies"
+msgstr "Svar"
+
+#: filter/filter-rule.c:877
+msgid "Replies and parents"
+msgstr "Svar med opphav"
+
+#: filter/filter-rule.c:879
+msgid "Include threads"
+msgstr "Ta med tråder"
+
+#: filter/filter-rule.c:974
+msgid "incoming"
+msgstr "innkommende"
+
+#: filter/filter-rule.c:974
+msgid "outgoing"
+msgstr "utgående"
+
 #: filter/filter.glade.h:1
 msgid "<b>_Filter Rules</b>"
 msgstr "<b>_Filterregler</b>"
@@ -12616,82 +12712,82 @@ msgstr "tiden du spesifiserer"
 msgid "years"
 msgstr "år"
 
-#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
-#: mail/mail-config.c:76 mail/mail-config.glade.h:93
-msgid "Important"
-msgstr "Viktig"
+#: filter/rule-editor.c:285
+msgid "Add Rule"
+msgstr "Legg til regel"
 
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
-#: mail/mail-config.glade.h:148
-msgid "To Do"
-msgstr "Oppgaver"
+#: filter/rule-editor.c:361
+msgid "Edit Rule"
+msgstr "Rediger regel"
 
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
-#: mail/mail-config.glade.h:97
-msgid "Later"
-msgstr "Senere"
+#: filter/rule-editor.c:685
+msgid "Rule name"
+msgstr "Regelnavn"
 
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "Test"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: filter/filter-rule.c:790
-msgid "Rule name:"
-msgstr "Regelnavn:"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "Brukervalg for redigering"
 
-#: filter/filter-rule.c:817
-msgid "<b>If</b>"
-msgstr "<b>Hvis</b> "
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Konfigurer brukervalg for e-post, inkludert sikkerhet og meldingsvisning her"
 
-#: filter/filter-rule.c:854
-msgid "if all criteria are met"
-msgstr "hvis alle kriterier er møtt"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "Konfigurer stavekontroll, signaturer og meldingskomposisjon her"
 
-#: filter/filter-rule.c:854
-msgid "if any criteria are met"
-msgstr "hvis ethvert kriterie er møtt"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Konfigurer e-post-kontoer her"
 
-#: filter/filter-rule.c:856
-msgid "Execute actions"
-msgstr "Utfør handlinger"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Evolution e-post"
 
-#: filter/filter-rule.c:877
-msgid "All related"
-msgstr "Alle relaterte"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Konfigurasjonskontroll for Evolution e-postkonti"
 
-#: filter/filter-rule.c:877
-msgid "Replies"
-msgstr "Svar"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Evolution e-postkomponent"
 
-#: filter/filter-rule.c:877
-msgid "Replies and parents"
-msgstr "Svar med opphav"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Evolution e-postredigering"
 
-#: filter/filter-rule.c:879
-msgid "Include threads"
-msgstr "Ta med tråder"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Konfigurasjonskontroll for Evolution e-postredigering"
 
-#: filter/filter-rule.c:974
-msgid "incoming"
-msgstr "innkommende"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Brukervalg-kontroll for Evolution e-post"
 
-#: filter/filter-rule.c:974
-msgid "outgoing"
-msgstr "utgående"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-view.c:418
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
+#: mail/mail-component.c:559
+msgid "Mail"
+msgstr "E-post"
 
-#: filter/rule-editor.c:285
-msgid "Add Rule"
-msgstr "Legg til regel"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "E-post-konti"
 
-#: filter/rule-editor.c:361
-msgid "Edit Rule"
-msgstr "Rediger regel"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
+msgid "Mail Preferences"
+msgstr "Brukervalg for e-post"
 
-#: filter/rule-editor.c:685
-msgid "Rule name"
-msgstr "Regelnavn"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+msgid "_Mail"
+msgstr "_E-post"
 
 #. translators: default account indicator
 #: mail/em-account-prefs.c:418
@@ -12744,7 +12840,7 @@ msgstr ""
 msgid "_Filter Rules"
 msgstr "_Filterregler"
 
-#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:493
+#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494
 #: mail/mail-account-gui.c:1347
 msgid "Select Folder"
 msgstr "Velg mappe"
@@ -12983,8 +13079,8 @@ msgstr "starter med"
 msgid "Stop Processing"
 msgstr "Stopp behandling"
 
-#: mail/em-filter-i18n.h:64 mail/em-format.c:755 mail/em-format-html.c:1519
-#: mail/em-format-quote.c:302 mail/em-mailer-prefs.c:87
+#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1519
+#: mail/em-format-quote.c:302 mail/em-format.c:755 mail/em-mailer-prefs.c:87
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
 #: smime/lib/e-cert.c:1131
 msgid "Subject"
@@ -13028,7 +13124,7 @@ 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:2331
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2330
 #: mail/mail-component.c:709
 msgid "Specify where to create the folder:"
 msgstr "Spesifiser hvor mappen skal opprettes:"
@@ -13041,130 +13137,123 @@ msgstr "Opprett"
 msgid "Folder _name:"
 msgstr "Mappe_navn:"
 
-#: mail/em-folder-tree.c:847
+#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
+#: mail/mail-vfolder.c:872
+msgid "VFolders"
+msgstr "VFoldere"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+msgid "UNMATCHED"
+msgstr "UTEN TREFF"
+
+#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
+msgid "Loading..."
+msgstr "Laster..."
+
+#: mail/em-folder-tree.c:846
 #, c-format
 msgid "Moving folder %s"
 msgstr "Flytter mappe %s"
 
-#: mail/em-folder-tree.c:849
+#: mail/em-folder-tree.c:848
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopierer mappe %s"
 
-#: mail/em-folder-tree.c:856 mail/message-list.c:1561
+#: mail/em-folder-tree.c:855 mail/message-list.c:1561
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Flytter meldinger til mappe %s"
 
-#: mail/em-folder-tree.c:858 mail/message-list.c:1563
+#: mail/em-folder-tree.c:857 mail/message-list.c:1563
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopierer meldinger til mappe %s"
 
-#: mail/em-folder-tree.c:874
+#: mail/em-folder-tree.c:873
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Kan ikke slippe melding(er) toppnivå for lageret"
 
-#: mail/em-folder-tree.c:964 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:963 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Kopier til mappe"
 
-#: mail/em-folder-tree.c:965 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:964 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Flytt til mappe"
 
-#: mail/em-folder-tree.c:967 mail/em-folder-tree.c:2118
+#: mail/em-folder-tree.c:966 mail/em-folder-tree.c:2117
 #: mail/em-folder-view.c:802 mail/message-list.c:1651
 msgid "_Move"
 msgstr "_Flytt"
 
-#: mail/em-folder-tree.c:969 mail/message-list.c:1653
+#: mail/em-folder-tree.c:968 mail/message-list.c:1653
 msgid "Cancel _Drag"
 msgstr "Avbryt _draoperasjon"
 
-#: mail/em-folder-tree.c:2105 mail/em-folder-tree.c:2118
+#: mail/em-folder-tree.c:2104 mail/em-folder-tree.c:2117
 #: mail/em-folder-view.c:802 mail/em-folder-view.c:816
 #: mail/importers/evolution-mbox-importer.c:119
 #: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Velg mappe"
 
-#: mail/em-folder-tree.c:2105 mail/em-folder-view.c:816
+#: mail/em-folder-tree.c:2104 mail/em-folder-view.c:816
 msgid "C_opy"
 msgstr "K_opier"
 
-#: mail/em-folder-tree.c:2145
+#: mail/em-folder-tree.c:2144
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Oppretter mappe «%s»"
 
-#: mail/em-folder-tree.c:2331 mail/mail-component.c:709
+#: mail/em-folder-tree.c:2330 mail/mail-component.c:709
 msgid "Create folder"
 msgstr "Opprett mappe"
 
-#: mail/em-folder-tree.c:2527
+#: 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:2529
+#: mail/em-folder-tree.c:2528
 msgid "Rename Folder"
 msgstr "Endre navn på mappe"
 
-#: mail/em-folder-tree.c:2604 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2603 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:37
 msgid "_View"
 msgstr "_Vis"
 
-#: mail/em-folder-tree.c:2605
+#: mail/em-folder-tree.c:2604
 msgid "Open in _New Window"
 msgstr "Åpne i _nytt vindu"
 
-#: mail/em-folder-tree.c:2609
+#: mail/em-folder-tree.c:2608
 msgid "_Copy..."
 msgstr "_Kopier..."
 
-#: mail/em-folder-tree.c:2610
+#: mail/em-folder-tree.c:2609
 msgid "_Move..."
 msgstr "_Flytt..."
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2614
+#: mail/em-folder-tree.c:2613
 msgid "_New Folder..."
 msgstr "_Ny mappe..."
 
-#: mail/em-folder-tree.c:2617
+#: mail/em-folder-tree.c:2616
 msgid "_Rename..."
 msgstr "End_re navn..."
 
-#: mail/em-folder-tree.c:2620 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2619 ui/evolution-mail-list.xml.h:27
 msgid "_Properties"
 msgstr "Egenska_per..."
 
-#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
-#: mail/mail-vfolder.c:872
-msgid "VFolders"
-msgstr "VFoldere"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
-msgid "UNMATCHED"
-msgstr "UTEN TREFF"
-
-#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
-msgid "Loading..."
-msgstr "Laster..."
-
-#: mail/em-folder-view.c:418 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
-#: mail/mail-component.c:559
-msgid "Mail"
-msgstr "E-post"
-
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:899 mail/em-popup.c:692
+#: mail/em-folder-view.c:899 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "R_ediger som ny melding..."
@@ -13177,17 +13266,17 @@ msgstr "S_kriv ut"
 msgid "_Reply to Sender"
 msgstr "Sva_r til avsender"
 
-#: mail/em-folder-view.c:905 mail/em-popup.c:813
+#: mail/em-folder-view.c:905 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:906 mail/em-popup.c:814
+#: mail/em-folder-view.c:906 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:907 mail/em-popup.c:816
+#: mail/em-folder-view.c:907 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Videresend"
@@ -13307,162 +13396,16 @@ msgstr "_Kopier lokasjon for lenke"
 msgid "Click to mail %s"
 msgstr "Klikk for å sende melding til %s"
 
-#: mail/em-format.c:750 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:325
-msgid "From"
-msgstr "Fra"
-
-#: mail/em-format.c:751 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:83
-msgid "Reply-To"
-msgstr "Svar-til"
-
-#: mail/em-format.c:752 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Til"
-
-#: mail/em-format.c:753 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:85
-msgid "Cc"
-msgstr "Cc"
-
-#: mail/em-format.c:754 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:86
-msgid "Bcc"
-msgstr "Bcc"
-
-#: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
-#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Dato"
-
-#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
-msgid "Newsgroups"
-msgstr "Nyhetsgrupper"
-
-#: mail/em-format.c:993
-#, c-format
-msgid "%s attachment"
-msgstr "%s-vedlegg"
-
-#: mail/em-format.c:1024 mail/em-format.c:1143
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Kunne ikke lese S/MIME-melding: Ukjent feil"
-
-#: mail/em-format.c:1133
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "Krypteringstype for multipart/encrypted som ikke er støttet"
-
-#: mail/em-format.c:1279
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Kunne ikke lese MIME-melding. Viser ren meldingstekst."
-
-#: mail/em-format.c:1298
-msgid "Unsupported signature format"
-msgstr "Ustøttet signaturformat"
-
-#: mail/em-format.c:1306
-msgid "Error verifying signature"
-msgstr "Feil under verifisering av signatur"
-
-#: mail/em-format.c:1306
-msgid "Unknown error verifying signature"
-msgstr "Ukjent feil under verifisering av signatur"
-
-#: mail/em-format-html.c:452 mail/em-format-html.c:454
-#, c-format
-msgid "Retrieving `%s'"
-msgstr "Henter «%s»"
-
-#: mail/em-format-html.c:559 mail/em-format-html-display.c:641
-msgid "Unsigned"
-msgstr "Usignert"
-
-#: mail/em-format-html.c:560 mail/em-format-html-display.c:642
-msgid "Valid signature"
-msgstr "Gyldig signatur"
-
-#: mail/em-format-html.c:561 mail/em-format-html-display.c:643
-msgid "Invalid signature"
-msgstr "Ugyldig signatur"
-
-#: mail/em-format-html.c:562
-msgid "Valid signature but cannot verify sender"
-msgstr "Gyldig signatur, men ikke verifisere avsender"
-
-#: mail/em-format-html.c:568 mail/em-format-html-display.c:650
-msgid "Unencrypted"
-msgstr "Ukryptert"
-
-#: mail/em-format-html.c:569 mail/em-format-html-display.c:651
-msgid "Encrypted, weak"
-msgstr "Kryptert, svak"
-
-#: mail/em-format-html.c:570 mail/em-format-html-display.c:652
-msgid "Encrypted"
-msgstr "Kryptert"
-
-#: mail/em-format-html.c:571 mail/em-format-html-display.c:653
-msgid "Encrypted, strong"
-msgstr "Kryptert, sterk"
-
-#: mail/em-format-html.c:820
-msgid "Malformed external-body part."
-msgstr "Feilutformet del for ekstern kropp."
-
-#: mail/em-format-html.c:850
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Peker til FTP-tjener (%s)"
-
-#: mail/em-format-html.c:861
-#, 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:863
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Peker til lokal fil (%s)"
-
-#: mail/em-format-html.c:884
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Peker til eksterne data (%s)"
-
-#: mail/em-format-html.c:895
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Peker til ukjente eksterne data («%s»-type)"
-
-#: mail/em-format-html.c:1137
-msgid "Formatting message"
-msgstr "Formatterer melding"
-
-#. pseudo-header
-#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
-#: mail/em-mailer-prefs.c:939
-msgid "Mailer"
-msgstr "E-postprogram"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1550
-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:1553
-msgid "<I> (%R %Z)</I>"
-msgstr "<I> (%R %Z)</I>"
-
 #. message-search popup match count string
 #: mail/em-format-html-display.c:410
 #, c-format
 msgid "Matches: %d"
 msgstr "Treff: %d"
 
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:559
+msgid "Unsigned"
+msgstr "Usignert"
+
 #: mail/em-format-html-display.c:641
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
@@ -13471,6 +13414,10 @@ msgstr ""
 "Denne meldingen er ikke signert. Du har ingen garanti for at meldingen er "
 "autentisk."
 
+#: mail/em-format-html-display.c:642 mail/em-format-html.c:560
+msgid "Valid signature"
+msgstr "Gyldig signatur"
+
 #: mail/em-format-html-display.c:642
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
@@ -13479,6 +13426,10 @@ msgstr ""
 "Denne meldingen er signert og gyldig hvilket betyr denne meldingen høyst "
 "sannsynlig er autentisk."
 
+#: mail/em-format-html-display.c:643 mail/em-format-html.c:561
+msgid "Invalid signature"
+msgstr "Ugyldig signatur"
+
 #: mail/em-format-html-display.c:643
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
@@ -13499,6 +13450,10 @@ msgstr ""
 "Denne meldingen er signert med en gyldig signatur, men avsender av meldingen "
 "kan ikke verifiseres."
 
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:568
+msgid "Unencrypted"
+msgstr "Ukryptert"
+
 #: mail/em-format-html-display.c:650
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
@@ -13507,6 +13462,10 @@ msgstr ""
 "Denne meldingen er ikke kryptert. Innholdet kan ses under overføring over "
 "Internett."
 
+#: mail/em-format-html-display.c:651 mail/em-format-html.c:569
+msgid "Encrypted, weak"
+msgstr "Kryptert, svak"
+
 #: mail/em-format-html-display.c:651
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm.  It would "
@@ -13517,6 +13476,10 @@ msgstr ""
 "vanskelig, men ikke umulig for en utenforstående å se innholdet i denne "
 "meldingen på noenlunde kort tid."
 
+#: mail/em-format-html-display.c:652 mail/em-format-html.c:570
+msgid "Encrypted"
+msgstr "Kryptert"
+
 #: mail/em-format-html-display.c:652
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
@@ -13525,6 +13488,10 @@ 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:653 mail/em-format-html.c:571
+msgid "Encrypted, strong"
+msgstr "Kryptert, sterk"
+
 #: mail/em-format-html-display.c:653
 msgid ""
 "This message is encrypted, with a strong encryption algorithm.  It would be "
@@ -13567,6 +13534,128 @@ msgstr "_Skjul"
 msgid "Page %d of %d"
 msgstr "Side %d av %d"
 
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, c-format
+msgid "Retrieving `%s'"
+msgstr "Henter «%s»"
+
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
+msgstr "Gyldig signatur, men ikke verifisere avsender"
+
+#: mail/em-format-html.c:820
+msgid "Malformed external-body part."
+msgstr "Feilutformet del for ekstern kropp."
+
+#: mail/em-format-html.c:850
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Peker til FTP-tjener (%s)"
+
+#: mail/em-format-html.c:861
+#, 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:863
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Peker til lokal fil (%s)"
+
+#: mail/em-format-html.c:884
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Peker til eksterne data (%s)"
+
+#: mail/em-format-html.c:895
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Peker til ukjente eksterne data («%s»-type)"
+
+#: mail/em-format-html.c:1137
+msgid "Formatting message"
+msgstr "Formatterer melding"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:750
+#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
+msgid "From"
+msgstr "Fra"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:751
+#: mail/em-mailer-prefs.c:83
+msgid "Reply-To"
+msgstr "Svar-til"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:752
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Til"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:753
+#: mail/em-mailer-prefs.c:85
+msgid "Cc"
+msgstr "Cc"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:754
+#: mail/em-mailer-prefs.c:86
+msgid "Bcc"
+msgstr "Bcc"
+
+#. pseudo-header
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:939
+msgid "Mailer"
+msgstr "E-postprogram"
+
+#. translators: strftime format for local time equivalent in Date header display, with day
+#: mail/em-format-html.c:1550
+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:1553
+msgid "<I> (%R %Z)</I>"
+msgstr "<I> (%R %Z)</I>"
+
+#: mail/em-format-html.c:1563 mail/em-format-quote.c:316 mail/em-format.c:756
+#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Dato"
+
+#: mail/em-format-html.c:1586 mail/em-format.c:757 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
+msgstr "Nyhetsgrupper"
+
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
+msgstr "%s-vedlegg"
+
+#: mail/em-format.c:1024 mail/em-format.c:1143
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Kunne ikke lese S/MIME-melding: Ukjent feil"
+
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "Krypteringstype for multipart/encrypted som ikke er støttet"
+
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Kunne ikke lese MIME-melding. Viser ren meldingstekst."
+
+#: mail/em-format.c:1298
+msgid "Unsupported signature format"
+msgstr "Ustøttet signaturformat"
+
+#: mail/em-format.c:1306
+msgid "Error verifying signature"
+msgstr "Feil under verifisering av signatur"
+
+#: mail/em-format.c:1306
+msgid "Unknown error verifying signature"
+msgstr "Ukjent feil under verifisering av signatur"
+
 #: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (integrert)"
@@ -13647,36 +13736,36 @@ msgid ""
 "xmldb' does not exist or is corrupt."
 msgstr ""
 
-#: mail/em-popup.c:702
+#: mail/em-popup.c:700
 msgid "Save As..."
 msgstr "Lagre som..."
 
-#: mail/em-popup.c:720
+#: mail/em-popup.c:718
 #, c-format
 msgid "untitled_image.%s"
 msgstr "bilde_uten_navn.%s"
 
-#: mail/em-popup.c:810
+#: mail/em-popup.c:808
 msgid "Set as _Background"
 msgstr "Sett som _bakgrunn"
 
-#: mail/em-popup.c:812
+#: mail/em-popup.c:810
 msgid "_Reply to sender"
 msgstr "Sva_r til avsender"
 
-#: mail/em-popup.c:861
+#: mail/em-popup.c:859
 msgid "_Open Link in Browser"
 msgstr "_Åpne lenke i nettleser"
 
-#: mail/em-popup.c:862
+#: mail/em-popup.c:860
 msgid "Se_nd message to..."
 msgstr "Se_nd melding til..."
 
-#: mail/em-popup.c:863
+#: mail/em-popup.c:861
 msgid "_Add to Addressbook"
 msgstr "Legg til i _adressebok"
 
-#: mail/em-popup.c:987
+#: mail/em-popup.c:985
 #, c-format
 msgid "Open in %s..."
 msgstr "Åpne i %s..."
@@ -13733,11 +13822,11 @@ msgstr "Meldinger fra %s"
 msgid "Virtual _Folders"
 msgstr "Virtuelle _mapper"
 
-#: mail/em-vfolder-rule.c:493
+#: mail/em-vfolder-rule.c:494
 msgid "_Add"
 msgstr "_Legg til"
 
-#: mail/em-vfolder-rule.c:573
+#: mail/em-vfolder-rule.c:574
 msgid "VFolder source"
 msgstr "VFolder-kilde"
 
@@ -14196,63 +14285,33 @@ msgstr ""
 msgid "spamd port"
 msgstr "port for spamd"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "*Control*F1"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Composer Preferences"
-msgstr "Brukervalg for redigering"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-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:4
-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:5
-msgid "Configure your email accounts here"
-msgstr "Konfigurer e-post-kontoer her"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail"
-msgstr "Evolution e-post"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail accounts configuration control"
-msgstr "Konfigurasjonskontroll for Evolution e-postkonti"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail component"
-msgstr "Evolution e-postkomponent"
+#: 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:9
-msgid "Evolution Mail composer"
-msgstr "Evolution e-postredigering"
+#: 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:10
-msgid "Evolution Mail composer configuration control"
-msgstr "Konfigurasjonskontroll for Evolution e-postredigering"
+#: 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:11
-msgid "Evolution Mail preferences control"
-msgstr "Brukervalg-kontroll for Evolution e-post"
+#: 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:13
-msgid "Mail Accounts"
-msgstr "E-post-konti"
+#: 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:14 mail/mail-config.glade.h:99
-msgid "Mail Preferences"
-msgstr "Brukervalg for 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:15
-msgid "_Mail"
-msgstr "_E-post"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -14310,34 +14369,6 @@ 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:360
 #, c-format
 msgid "Scanning %s"
@@ -14564,14 +14595,6 @@ msgstr "Opprett en ny e-postmappe"
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Feil under oppgradering av innstillinger eller mapper for e-post."
 
-#: mail/mail-config.c:895
-msgid "Checking Service"
-msgstr "Sjekker tjeneste"
-
-#: mail/mail-config.c:973 mail/mail-config.c:977
-msgid "Connecting to server..."
-msgstr "Kobler til tjener..."
-
 #: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Identitet"
@@ -14634,6 +14657,14 @@ msgstr ""
 "et navn for denne kontoen i feltet under. Dette navnet blir kun brukt for "
 "visning på skjermen."
 
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "Sjekker tjeneste"
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "Kobler til tjener..."
+
 #: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
 msgid "    "
 msgstr "    "
@@ -14895,7 +14926,7 @@ msgstr "Ikke siter opprinnelig melding"
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Ikke signer _møteforespørsler (for kompatibilitet med Outlook)"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:74 shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Ferdig"
 
@@ -15259,7 +15290,7 @@ msgstr "<span weight=\"bold\">Kryptering</span>"
 msgid "Accept License"
 msgstr "Godta lisensen"
 
-#: mail/mail-dialogs.glade.h:11
+#: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
 msgid "C_ompleted"
 msgstr "F_ullført"
 
@@ -15276,6 +15307,7 @@ msgid "Find:"
 msgstr "Finn:"
 
 #: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:294
+#: mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "Merk for oppfølging"
 
@@ -15299,7 +15331,7 @@ msgstr "Tj_ener:"
 msgid "Security Information"
 msgstr "Sikkerhetsinformasjon"
 
-#: mail/mail-dialogs.glade.h:23
+#: mail/mail-dialogs.glade.h:23 mail/message-tags.glade.h:4
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -15311,11 +15343,11 @@ msgstr ""
 msgid "Tick this to accept the license agreement"
 msgstr "Kryss av her for å godta lisensen"
 
-#: mail/mail-dialogs.glade.h:26
+#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:6
 msgid "_Due By:"
 msgstr "_Ferdig til:"
 
-#: mail/mail-dialogs.glade.h:27
+#: mail/mail-dialogs.glade.h:27 mail/message-tags.glade.h:7
 msgid "_Flag:"
 msgstr "_Flagg:"
 
@@ -15389,8 +15421,9 @@ msgstr ""
 
 #: mail/mail-errors.xml.h:15 mail/mail-errors.xml.h:20
 #: mail/mail-errors.xml.h:27 mail/mail-errors.xml.h:32
+#, fuzzy
 msgid "_Send"
-msgstr "_Send"
+msgstr "Send"
 
 #. mail:ask-send-no-subject primary
 #: mail/mail-errors.xml.h:17
@@ -15405,7 +15438,6 @@ msgid ""
 msgstr ""
 
 #. mail:ask-send-only-bcc-contact primary
-#. mail:ask-send-only-bcc primary
 #: mail/mail-errors.xml.h:22 mail/mail-errors.xml.h:29
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "Er du sikker på at du ønsker å sende en melding med kun BCB-mottakere?"
@@ -15470,7 +15502,6 @@ msgid ""
 msgstr "Fjern alle slettede meldinger fra denne mappen permanent"
 
 #. mail:ask-expunge secondary
-#. mail:ask-empty-trash secondary
 #: mail/mail-errors.xml.h:45 mail/mail-errors.xml.h:50
 msgid "If you continue, you will not be able to recover these messages."
 msgstr ""
@@ -15554,8 +15585,6 @@ msgid "Cannot save to directory \"{0}\"."
 msgstr "Kan ikke lagre til katalog «{0}»."
 
 #. mail:no-create-path primary
-#. mail:no-write-path-exists primary
-#. mail:no-write-path-notfile primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
 msgid "Cannot save to file \"{0}\"."
@@ -15592,7 +15621,6 @@ msgid "Cannot delete system folder \"{0}\"."
 msgstr "Kan ikke slette systemmappe «{0}»."
 
 #. mail:no-delete-spethal-folder secondary
-#. mail:no-rename-spethal-folder secondary
 #: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
@@ -15618,19 +15646,19 @@ msgstr "Vil du virkelig slette mappe «%s» og alle dens undermapper?"
 
 #. mail:ask-delete-folder secondary
 #: mail/mail-errors.xml.h:126
+#, fuzzy
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
-msgstr ""
+msgstr "Hvis du fortsetter vil kontoinformasjonen bli slettet permanent."
 
 #. mail:no-rename-folder-exists primary
-#. mail:no-rename-folder primary
 #: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
+#, fuzzy
 msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr ""
+msgstr "Kunne ikke flytte mappe: %s"
 
 #. mail:no-rename-folder-exists secondary
-#. mail:vfolder-notunique secondary
 #: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
 #, fuzzy
 msgid "A folder named \"{1}\" already exists. Please use a different name."
@@ -15643,26 +15671,22 @@ msgid "Because \"{2}\"."
 msgstr "Fordi «{2}»."
 
 #. mail:no-move-folder-nostore primary
-#. mail:no-move-folder-to-nostore primary
 #: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
 #, fuzzy
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Kunne ikke flytte mappe: %s"
 
 #. mail:no-move-folder-nostore secondary
-#. mail:no-copy-folder-nostore secondary
 #: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
 msgid "Cannot open source \"{2}\"."
 msgstr "Kan ikke åpne kilde «{2}»."
 
 #. mail:no-move-folder-to-nostore secondary
-#. mail:no-copy-folder-to-nostore secondary
 #: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
 msgid "Cannot open target \"{2}\"."
 msgstr "Kan ikke åpne mål «{2}»."
 
 #. mail:no-copy-folder-nostore primary
-#. mail:no-copy-folder-to-nostore primary
 #: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
 #, fuzzy
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
@@ -15679,7 +15703,6 @@ msgid "Cannot open source \"{1}\""
 msgstr "Kan ikke åpne kilde «{1}»"
 
 #. mail:account-incomplete primary
-#. mail:account-notunique primary
 #: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
 msgid "Cannot save changes to account."
 msgstr "Kan ikke lagre endringer for kontoen."
@@ -16292,6 +16315,50 @@ msgstr "Svar til alle"
 msgid "Review"
 msgstr "Gjennomgå"
 
+#: mail/searchtypes.xml.h:1
+msgid "Body contains"
+msgstr "Kropp inneholder"
+
+#: mail/searchtypes.xml.h:2
+msgid "Body does not contain"
+msgstr "Kropp inneholder ikke"
+
+#: mail/searchtypes.xml.h:3
+msgid "Body or subject contains"
+msgstr "Kropp eller emne inneholder"
+
+#: mail/searchtypes.xml.h:4
+msgid "Message contains"
+msgstr "Melding inneholder"
+
+#: mail/searchtypes.xml.h:5
+msgid "Recipients contain"
+msgstr "Mottakere inneholder"
+
+#: mail/searchtypes.xml.h:6
+msgid "Sender contains"
+msgstr "Avsender inneholder"
+
+#: mail/searchtypes.xml.h:7
+msgid "Subject contains"
+msgstr "Emne inneholder"
+
+#: mail/searchtypes.xml.h:8
+msgid "Subject does not contain"
+msgstr "Emne inneholder ikke"
+
+#: 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"
@@ -16353,30 +16420,17 @@ msgstr ""
 msgid "mail"
 msgstr "e-post"
 
-#: shell/e-shell.c:588 shell/e-shell.c:589
-#, c-format
-msgid "%ld KB"
-msgstr "%ld KB"
+#: shell/e-active-connection-dialog.glade.h:1
+msgid "<b>Active Connections</b>"
+msgstr "<b>Aktive forbindelser</b>"
 
-#: shell/e-shell.c:774
-msgid "Uknown system error."
-msgstr "Ukjent systemfeil."
+#: shell/e-active-connection-dialog.glade.h:2
+msgid "Active Connections"
+msgstr "Aktive tilkoblinger"
 
-#: shell/e-shell.c:1131
-msgid "Invalid arguments"
-msgstr "Ugyldige argumenter"
-
-#: shell/e-shell.c:1133
-msgid "Cannot register on OAF"
-msgstr "Kan ikke registrere i OAF"
-
-#: shell/e-shell.c:1135
-msgid "Configuration Database not found"
-msgstr "Konfigurasjonsdatabase ikke funnet"
-
-#: shell/e-shell.c:1137
-msgid "Generic error"
-msgstr "Vanlig feil"
+#: shell/e-active-connection-dialog.glade.h:3
+msgid "Click OK to close these connections and go offline"
+msgstr "Klikk OK for å lukke disse forbindelsene og arbeide frakoblet"
 
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
@@ -16561,25 +16615,6 @@ msgstr "Mappenavn kan ikke inneholde tegnet «#»."
 msgid "'.' and '..' are reserved folder names."
 msgstr "«.» og «..» er reserverte mappenavn."
 
-#: shell/e-shell-window.c:337
-msgid "Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"Evolution er koblet til. Klikk på denne knappen for å arbeide frakoblet."
-
-#: shell/e-shell-window.c:344
-msgid "Evolution is in the process of going offline."
-msgstr "Evolution er i ferd med å koble fra."
-
-#: shell/e-shell-window.c:350
-msgid "Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"Evolution er frakoblet. Klikk på denne knappen for å arbeide tilkoblet."
-
-#: shell/e-shell-window.c:637
-#, c-format
-msgid "Switch to %s"
-msgstr "Bytt til %s"
-
 #: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
@@ -16614,10 +16649,96 @@ msgstr "Ar_beid frakoblet"
 msgid "Work Offline"
 msgstr "Arbeid frakoblet"
 
+#: shell/e-shell-window.c:337
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Evolution er koblet til. Klikk på denne knappen for å arbeide frakoblet."
+
+#: shell/e-shell-window.c:344
+msgid "Evolution is in the process of going offline."
+msgstr "Evolution er i ferd med å koble fra."
+
+#: shell/e-shell-window.c:350
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"Evolution er frakoblet. Klikk på denne knappen for å arbeide tilkoblet."
+
+#: shell/e-shell-window.c:637
+#, c-format
+msgid "Switch to %s"
+msgstr "Bytt til %s"
+
+#: shell/e-shell.c:588 shell/e-shell.c:589
+#, c-format
+msgid "%ld KB"
+msgstr "%ld KB"
+
+#: shell/e-shell.c:774
+msgid "Uknown system error."
+msgstr "Ukjent systemfeil."
+
+#: shell/e-shell.c:1131
+msgid "Invalid arguments"
+msgstr "Ugyldige argumenter"
+
+#: shell/e-shell.c:1133
+msgid "Cannot register on OAF"
+msgstr "Kan ikke registrere i OAF"
+
+#: shell/e-shell.c:1135
+msgid "Configuration Database not found"
+msgstr "Konfigurasjonsdatabase ikke funnet"
+
+#: shell/e-shell.c:1137
+msgid "Generic error"
+msgstr "Vanlig feil"
+
 #: shell/e-user-creatable-items-handler.c:691
 msgid "New"
 msgstr "Ny"
 
+#: shell/evolution-startup-wizard.glade.h:2
+msgid "Evolution Setup Assistant"
+msgstr "Konfigurasjonsassistent for Evolution"
+
+#: shell/evolution-startup-wizard.glade.h:3
+msgid "Importing Files"
+msgstr "Importerer filer"
+
+#: shell/evolution-startup-wizard.glade.h:4
+msgid "Timezone "
+msgstr "Tidssone "
+
+#: shell/evolution-startup-wizard.glade.h:5
+msgid "Welcome"
+msgstr "Velkommen"
+
+#: shell/evolution-startup-wizard.glade.h:6
+msgid ""
+"Welcome to Evolution. The next few screens will allow\n"
+"Evolution to connect to your email accounts, and to import\n"
+"files from other applications. \n"
+"\n"
+"Please click the \"Forward\" button to continue. "
+msgstr ""
+"Velkommen til Evolution. De neste skjermene lar deg\n"
+"konfigurere Evolution til å koble til dine e-post kontoer, og\n"
+"importere filer fra andre applikasjoner. \n"
+"\n"
+"Vennligst klikk «Neste» for å fortsette. "
+
+#: shell/evolution-startup-wizard.glade.h:11
+msgid ""
+"You have successfully entered all of the information\n"
+"needed to set up Evolution. \n"
+"\n"
+"Click the \"Apply\" button to save your settings. "
+msgstr ""
+"Du har fullført inntasting av all informasjon\n"
+"som trengs for å konfigurere Evolution.\n"
+"\n"
+"Klikk på «Fullfør» for å lagre dine innstillinger. "
+
 #: shell/evolution-test-component.c:140
 msgid "New Test"
 msgstr "Ny test"
@@ -16630,18 +16751,6 @@ msgstr "_Test"
 msgid "Create a new test item"
 msgstr "Opprett en ny testoppføring"
 
-#: 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."
@@ -16823,13 +16932,11 @@ msgid "Continue"
 msgstr "Fortsett"
 
 #. shell:noshell title
-#. shell:noshell-reason title
 #: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
 msgid "Cannot start Evolution"
 msgstr "Kan ikke starte Evolution."
 
 #. shell:noshell primary
-#. shell:noshell-reason primary
 #: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
 msgid "Evolution can not start."
 msgstr "Evolution kan ikke starte."
@@ -17118,6 +17225,11 @@ msgstr "Dine sertifikater"
 msgid "_Edit CA Trust"
 msgstr ""
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:612
+msgid "Certificate already exists"
+msgstr "Sertifikatet eksisterer allerede"
+
 #: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d.%m.%Y"
@@ -17318,11 +17430,6 @@ 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:612
-msgid "Certificate already exists"
-msgstr "Sertifikatet eksisterer allerede"
-
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "Passord for PKCS12-fil"
@@ -17462,8 +17569,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-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
+#: 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-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "H_andlinger"
@@ -17936,16 +18043,6 @@ msgstr "_Reverser utvalg"
 msgid "_Threaded Message List"
 msgstr "Meldingsliste med _tråder"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
-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:28
-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"
@@ -18346,6 +18443,16 @@ msgstr "Ve_rktøy"
 msgid "_Undelete"
 msgstr "A_ngre slett"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+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:28
+msgid "_Close"
+msgstr "L_ukk"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Legg ved"
@@ -18853,12 +18960,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:425
+#: widgets/misc/e-calendar-item.c:423
 msgid "MTWTFSS"
 msgstr "MTOTFLS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1130
+#: widgets/misc/e-calendar-item.c:1128
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -19128,6 +19235,30 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% fullført)"
 
+#~ msgid "Authentication Credentials for HTTP Server"
+#~ msgstr "Autentiseringsdata for HTTP-tjener"
+
+#~ msgid "Calendars selected for publishing"
+#~ msgstr "Kalendere valgt for publisering"
+
+#~ msgid "Login name:"
+#~ msgstr "Påloggingsnavn:"
+
+#~ msgid "URL:"
+#~ msgstr "URL:"
+
+#~ msgid "User Publishes"
+#~ msgstr "Bruker publiserer"
+
+#~ msgid "Can't find certificate for `%s'"
+#~ msgstr "Kan ikke finne sertifikat for «%s»"
+
+#~ msgid "Can't create CMS Message"
+#~ msgstr "Kan ikke opprette CMS-melding"
+
+#~ msgid "Can't create encoder context"
+#~ msgstr "Kan ikke opprette kontekst for koding"
+
 #~ msgid "Groupwise"
 #~ msgstr "Groupwise"
 
@@ -19171,27 +19302,12 @@ msgstr "%s (%d%% fullført)"
 #~ msgid "Play sound:"
 #~ msgstr "Spill lyd:"
 
-#~ msgid "Repeat the alarm"
-#~ msgstr "Gjenta alarmen"
-
 #~ msgid "Run program:"
 #~ msgstr "Kjør program:"
 
-#~ msgid "Send To:"
-#~ msgstr "Send til:"
-
 #~ msgid "With these arguments:"
 #~ msgstr "Med disse argumentene:"
 
-#~ msgid "extra times every"
-#~ msgstr "ekstra ganger hver"
-
-#~ msgid "Action/Trigger"
-#~ msgstr "Handling/utløser"
-
-#~ msgid "A_dd"
-#~ msgstr "Le_gg til"
-
 #~ msgid "Basics"
 #~ msgstr "Grunnleggende"
 
@@ -19204,21 +19320,6 @@ msgstr "%s (%d%% fullført)"
 #~ msgid "_Options..."
 #~ msgstr "Alte_rnativer..."
 
-#~ msgid "after"
-#~ msgstr "etter"
-
-#~ msgid "before"
-#~ msgstr "før"
-
-#~ msgid "hour(s)"
-#~ msgstr "time(r)"
-
-#~ msgid "minute(s)"
-#~ msgstr "minutt(er)"
-
-#~ msgid "start of appointment"
-#~ msgstr "start på avtale"
-
 #~ msgid "Addressbook..."
 #~ msgstr "Adressebok..."
 
@@ -19313,30 +19414,6 @@ msgstr "%s (%d%% fullført)"
 #~ msgid "_Score Rules"
 #~ msgstr "_Poengregler"
 
-#~ msgid "Body contains"
-#~ msgstr "Kropp inneholder"
-
-#~ msgid "Body does not contain"
-#~ msgstr "Kropp inneholder ikke"
-
-#~ msgid "Body or subject contains"
-#~ msgstr "Kropp eller emne inneholder"
-
-#~ msgid "Message contains"
-#~ msgstr "Melding inneholder"
-
-#~ msgid "Recipients contain"
-#~ msgstr "Mottakere inneholder"
-
-#~ msgid "Sender contains"
-#~ msgstr "Avsender inneholder"
-
-#~ msgid "Subject contains"
-#~ msgstr "Emne inneholder"
-
-#~ msgid "Subject does not contain"
-#~ msgstr "Emne inneholder ikke"
-
 #~ msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 #~ msgstr "%a, %d.%m.%Y kl. %H.%M %%+05d, skrev %%s:"
 
@@ -19349,15 +19426,6 @@ msgstr "%s (%d%% fullført)"
 #~ msgid "Checkbox"
 #~ msgstr "Avkryssingsboks"
 
-#~ msgid "<b>Active Connections</b>"
-#~ msgstr "<b>Aktive forbindelser</b>"
-
-#~ msgid "Active Connections"
-#~ msgstr "Aktive tilkoblinger"
-
-#~ msgid "Click OK to close these connections and go offline"
-#~ msgstr "Klikk OK for å lukke disse forbindelsene og arbeide frakoblet"
-
 #~ msgid "C_alendar:"
 #~ msgstr "K_alender:"
 
@@ -19376,51 +19444,12 @@ msgstr "%s (%d%% fullført)"
 #~ msgid "Open Other User's Folder"
 #~ msgstr "Åpne annen brukers mappe"
 
-#~ msgid "_Account:"
-#~ msgstr "K_onto::"
-
 #~ msgid "_Folder Name:"
 #~ msgstr "_Mappenavn:"
 
 #~ msgid "_User:"
 #~ msgstr "Br_uker:"
 
-#~ msgid "Evolution Setup Assistant"
-#~ msgstr "Konfigurasjonsassistent for Evolution"
-
-#~ msgid "Importing Files"
-#~ msgstr "Importerer filer"
-
-#~ msgid "Timezone "
-#~ msgstr "Tidssone "
-
-#~ msgid "Welcome"
-#~ msgstr "Velkommen"
-
-#~ msgid ""
-#~ "Welcome to Evolution. The next few screens will allow\n"
-#~ "Evolution to connect to your email accounts, and to import\n"
-#~ "files from other applications. \n"
-#~ "\n"
-#~ "Please click the \"Forward\" button to continue. "
-#~ msgstr ""
-#~ "Velkommen til Evolution. De neste skjermene lar deg\n"
-#~ "konfigurere Evolution til å koble til dine e-post kontoer, og\n"
-#~ "importere filer fra andre applikasjoner. \n"
-#~ "\n"
-#~ "Vennligst klikk «Neste» for å fortsette. "
-
-#~ msgid ""
-#~ "You have successfully entered all of the information\n"
-#~ "needed to set up Evolution. \n"
-#~ "\n"
-#~ "Click the \"Apply\" button to save your settings. "
-#~ msgstr ""
-#~ "Du har fullført inntasting av all informasjon\n"
-#~ "som trengs for å konfigurere Evolution.\n"
-#~ "\n"
-#~ "Klikk på «Fullfør» for å lagre dine innstillinger. "
-
 #~ msgid "contact-list-editor"
 #~ msgstr "kontakt-liste-redigering"